From 9d82a27d0c13bfb287fdb892d264362aa032de7d Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Sat, 10 Sep 2016 12:26:16 +0900 Subject: [PATCH 1/8] avoid to test fail caused by bundler-1.13.0 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 62088270f..85b036757 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ rvm: - jruby-9.1.0.0 - jruby-head before_install: + - gem update --system - gem install bundler --no-document before_script: - unset JRUBY_OPTS From b82883f641b849f478cd46c29a8b108275a99d62 Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Sat, 10 Sep 2016 14:00:38 +0900 Subject: [PATCH 2/8] use bundler-1.12.x --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 85b036757..32dc1880c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,8 +12,8 @@ rvm: - jruby-9.1.0.0 - jruby-head before_install: - - gem update --system - - gem install bundler --no-document + - gem install bundler -v '~> 1.12.5' --no-document + before_script: - unset JRUBY_OPTS script: ruby -Ilib exe/rake From f6e54ca1a862dd5f126582db3a741af6970cc9c1 Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Sat, 10 Sep 2016 15:26:04 +0900 Subject: [PATCH 3/8] removed latest bundler --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 32dc1880c..33ab17188 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ rvm: - jruby-9.1.0.0 - jruby-head before_install: + - gem uninstall bundler - gem install bundler -v '~> 1.12.5' --no-document before_script: From 65c55b0af15fd35b3807c3d102eeaaa1d6a38052 Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Wed, 14 Sep 2016 07:20:35 +0900 Subject: [PATCH 4/8] try to 1.13.1 --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 33ab17188..62088270f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,9 +12,7 @@ rvm: - jruby-9.1.0.0 - jruby-head before_install: - - gem uninstall bundler - - gem install bundler -v '~> 1.12.5' --no-document - + - gem install bundler --no-document before_script: - unset JRUBY_OPTS script: ruby -Ilib exe/rake From 1aa2db80f5b4a16f4db9b7d23fbfc516402a69df Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Thu, 15 Sep 2016 17:04:00 +0900 Subject: [PATCH 5/8] Try to ~> 1.12.x --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 62088270f..92ba4e650 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ rvm: - jruby-9.1.0.0 - jruby-head before_install: - - gem install bundler --no-document + - gem install bundler -v '~> 1.12.5' --no-document before_script: - unset JRUBY_OPTS script: ruby -Ilib exe/rake From 2d7668d00f2aea67e813e7279717b2db40301cdb Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Thu, 15 Sep 2016 22:24:26 +0900 Subject: [PATCH 6/8] added workaround for bundler internal --- .travis.yml | 2 +- Rakefile | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 92ba4e650..62088270f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ rvm: - jruby-9.1.0.0 - jruby-head before_install: - - gem install bundler -v '~> 1.12.5' --no-document + - gem install bundler --no-document before_script: - unset JRUBY_OPTS script: ruby -Ilib exe/rake diff --git a/Rakefile b/Rakefile index e0d2ced3d..6179be099 100644 --- a/Rakefile +++ b/Rakefile @@ -9,6 +9,9 @@ lib = File.expand_path("../lib", __FILE__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +# XXX: https://github.com/bundler/bundler/pull/4981 +require "bundler/plugin/api/source" + require "bundler/gem_tasks" require "rake/testtask" require "rdoc/task" From 36866f924de9421c25fe286e9e4d275b799d9475 Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Thu, 15 Sep 2016 22:39:35 +0900 Subject: [PATCH 7/8] tweak bundler --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 2710426ad..a2761f8ce 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,8 @@ clone_depth: 10 install: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - ruby --version - - gem update --system - gem --version - - gem install minitest --no-document + - gem install minitest bundler --no-document build_script: - net user - net localgroup From b4ddc3ab1592f024af7289850389a3aac066420d Mon Sep 17 00:00:00 2001 From: SHIBATA Hiroshi Date: Fri, 16 Sep 2016 07:31:19 +0900 Subject: [PATCH 8/8] style --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a2761f8ce..62378b53a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,6 @@ build_script: - net localgroup test_script: - ruby -Ilib exe/rake - environment: matrix: - ruby_version: "193"