From 3fa116f0d77229e9c5b120313b10b9f632838a07 Mon Sep 17 00:00:00 2001 From: Phil Trimble Date: Tue, 7 Feb 2017 02:15:48 +0000 Subject: [PATCH 1/6] Fix jruby on Travis CI --- .travis.yml | 9 +++++++-- Gemfile | 1 + Gemfile.lock | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14e5830..96ba30f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,14 @@ +env: JRUBY_OPTS=--debug language: ruby +cache: + bundler: true + sudo: false before_install: - - gem install bundler -v 1.14.3 - - bundle --version + - bundler --version + - gem --version script: - make test @@ -19,4 +23,5 @@ rvm: - 2.2.0 - 2.3.0 - 2.4.0 + - jruby-head - ruby-head diff --git a/Gemfile b/Gemfile index 4c8d866..0f02e30 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' do gem 'rspec', '~>3.5.0' gem 'pry', :require => false + gem 'spoon', :require => false gem 'simplecov-rcov', :require => false end diff --git a/Gemfile.lock b/Gemfile.lock index cf59b87..eee6e42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,6 +4,7 @@ GEM coderay (1.1.1) diff-lcs (1.3) docile (1.1.5) + ffi (1.9.17) json (2.0.3) method_source (0.8.2) pry (0.10.4) @@ -31,6 +32,8 @@ GEM simplecov-rcov (0.2.3) simplecov (>= 0.4.1) slop (3.6.0) + spoon (0.0.6) + ffi PLATFORMS ruby @@ -39,6 +42,7 @@ DEPENDENCIES pry! rspec (~> 3.5.0)! simplecov-rcov! + spoon! BUNDLED WITH 1.14.3 From 5bba89b262c3ad3184e44d0f5b55a0c5cb8c5634 Mon Sep 17 00:00:00 2001 From: ttw Date: Mon, 1 May 2017 13:20:38 +0900 Subject: [PATCH 2/6] ignore gemfile.lock --- .gitignore | 1 + Gemfile.lock | 48 ------------------------------------------------ 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 Gemfile.lock diff --git a/.gitignore b/.gitignore index 51b16a3..8fa2444 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store .ruby-version coverage/ +Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index eee6e42..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,48 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - coderay (1.1.1) - diff-lcs (1.3) - docile (1.1.5) - ffi (1.9.17) - json (2.0.3) - method_source (0.8.2) - pry (0.10.4) - coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - rspec (3.5.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-core (3.5.4) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) - simplecov (0.13.0) - docile (~> 1.1.0) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - simplecov-rcov (0.2.3) - simplecov (>= 0.4.1) - slop (3.6.0) - spoon (0.0.6) - ffi - -PLATFORMS - ruby - -DEPENDENCIES - pry! - rspec (~> 3.5.0)! - simplecov-rcov! - spoon! - -BUNDLED WITH - 1.14.3 From 74a1d3fab5b051b5b46f503da902a844e62950df Mon Sep 17 00:00:00 2001 From: ttw Date: Mon, 1 May 2017 13:59:16 +0900 Subject: [PATCH 3/6] bundlers verson prior to 1.7 ignore the block. --- Gemfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 0f02e30..0df746b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ -source 'https://rubygems.org' do - gem 'rspec', '~>3.5.0' - gem 'pry', :require => false - gem 'spoon', :require => false - gem 'simplecov-rcov', :require => false -end +source 'https://rubygems.org' + +gem 'rspec', '~>3.5.0' +gem 'pry', :require => false +gem 'spoon', :require => false +gem 'simplecov-rcov', :require => false \ No newline at end of file From d170fb6a69e5275e74391b963dc057ceb100cb32 Mon Sep 17 00:00:00 2001 From: ttw Date: Mon, 1 May 2017 15:49:22 +0900 Subject: [PATCH 4/6] Once set cache false --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 96ba30f..e1f5ed2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ env: JRUBY_OPTS=--debug language: ruby cache: - bundler: true + bundler: false sudo: false From 4f4064b478bb4460727d255619c8098fa9cfbd2b Mon Sep 17 00:00:00 2001 From: ttw Date: Mon, 1 May 2017 16:00:23 +0900 Subject: [PATCH 5/6] return cache true --- .idea/inspectionProfiles/profiles_settings.xml | 6 ++++++ .travis.yml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .idea/inspectionProfiles/profiles_settings.xml diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..cb2fdb3 --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index e1f5ed2..96ba30f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ env: JRUBY_OPTS=--debug language: ruby cache: - bundler: false + bundler: true sudo: false From 1d8eb1fdd8c479d997cc1ff457a26b1a381ded30 Mon Sep 17 00:00:00 2001 From: ttw Date: Mon, 1 May 2017 16:06:10 +0900 Subject: [PATCH 6/6] Try to fix the build for JRuby-head --- .idea/inspectionProfiles/profiles_settings.xml | 6 ------ .travis.yml | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index cb2fdb3..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 96ba30f..896254a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ cache: sudo: false before_install: + - gem install bundler - bundler --version - gem --version