From 3e27bb568742eecf70a5ad8f855bec7d7f7909dc Mon Sep 17 00:00:00 2001 From: Cezary Baginski Date: Mon, 2 May 2016 21:50:08 +0200 Subject: [PATCH 1/3] use release Bundler 1.12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 393a0ea..0d1465c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ bundler_args: --without development rvm: - 2.2.4 - jruby-9.0.5.0 -before_install: gem install bundler -v 1.12.0.rc.4 +before_install: gem install bundler -v 1.12.1 From 4fbaab94e547152a3d6e101e29b9d0f6e28350ee Mon Sep 17 00:00:00 2001 From: Cezary Baginski Date: Mon, 2 May 2016 21:50:39 +0200 Subject: [PATCH 2/3] fix gemspec filter regexp --- ruby_dep.gemspec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ruby_dep.gemspec b/ruby_dep.gemspec index 37c0ca1..f9344d9 100644 --- a/ruby_dep.gemspec +++ b/ruby_dep.gemspec @@ -21,7 +21,17 @@ Gem::Specification.new do |spec| spec.required_ruby_version = RubyDep::Travis.new.version_constraint spec.files = `git ls-files -z`.split("\x0").reject do |f| - f.match(%r{^(?:(?:test|spec|features)/)|(?:(?:bin/console|bin/setup|Rakefile|Gemfile|Guardfile|ruby_dep\.gemspec))$}) + f.match( + %r{^ + (?: + (?:test|spec|features) + /) # directories + | + (?: + (?:bin/console|bin/setup|Rakefile|Gemfile|Guardfile|ruby_dep\.gemspec) + $) # files + }x + ) end spec.bindir = 'exe' From 2f1ab7b0df194e1001736b915479503c0d39e1c1 Mon Sep 17 00:00:00 2001 From: Cezary Baginski Date: Mon, 2 May 2016 21:51:57 +0200 Subject: [PATCH 3/3] bump Bundler dependency in gemspec This is for smarter dependency resolution. (If required Ruby of gem doesn't match, Bundler installs earlier version). --- ruby_dep.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby_dep.gemspec b/ruby_dep.gemspec index f9344d9..a048e18 100644 --- a/ruby_dep.gemspec +++ b/ruby_dep.gemspec @@ -38,5 +38,5 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ['lib'] - spec.add_development_dependency 'bundler', '~> 1.11' + spec.add_development_dependency 'bundler', '~> 1.12' end