diff options
author | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-22 14:38:06 -0700 |
---|---|---|
committer | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-22 14:38:06 -0700 |
commit | c784ea3ade399fd487184493f7e8c0e340e7d6d7 (patch) | |
tree | af0c0d52d663b81c110929a96fd22faf1b2897e3 | |
parent | 8d25615ab4c3b72d8d1154d32d5b65e268f16226 (diff) | |
parent | a85578ca41922c74f3789c755ee5105014cd9d7c (diff) | |
download | bundler-c784ea3ade399fd487184493f7e8c0e340e7d6d7.tar.gz |
Merge tag 'v1.10.6'
Version 1.10.6
# Conflicts:
# lib/bundler/cli.rb
# lib/bundler/source/git/git_proxy.rb
# spec/install/parallel/spec_installation_spec.rb
-rw-r--r-- | CHANGELOG.md | 12 | ||||
-rw-r--r-- | lib/bundler.rb | 3 | ||||
-rw-r--r-- | lib/bundler/cli.rb | 2 | ||||
-rw-r--r-- | lib/bundler/source/git/git_proxy.rb | 2 | ||||
-rw-r--r-- | lib/bundler/templates/newgem/README.md.tt | 2 | ||||
-rw-r--r-- | lib/bundler/version.rb | 2 | ||||
-rw-r--r-- | spec/install/gemfile/path_spec.rb | 4 |
7 files changed, 20 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bad906041..1765cc0372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## 1.10.6 (2015-07-22) + +Workarounds: + + - only warn on invalid gemspecs (@indirect) + +Bugfixes: + + - fix installing dependencies in the correct order (#3799, @pducks32) + - fix sorting of mixed DependencyLists (#3762, @tony-spataro-rs) + - fix `install_if` conditionals when using the block form (@danieltdt) + ## 1.10.5 (2015-06-24) Workarounds: diff --git a/lib/bundler.rb b/lib/bundler.rb index f7755fa188..109cf287e6 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -385,8 +385,9 @@ module Bundler spec end rescue Gem::InvalidSpecificationException => e - raise InvalidOption, "The gemspec at #{file} is not valid. " \ + Bundler.ui.warn "The gemspec at #{file} is not valid. " \ "The validation error was '#{e.message}'" + nil end def clear_gemspec_cache diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index cd4eb10b0b..c11567640c 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -351,7 +351,7 @@ module Bundler :lazy_default => [ENV["BUNDLER_EDITOR"], ENV["VISUAL"], ENV["EDITOR"]].find {|e| !e.nil? && !e.empty? }, :desc => "Open generated gemspec in the specified editor (defaults to $EDITOR or $BUNDLER_EDITOR)" method_option :ext, :type => :boolean, :default => false, :desc => "Generate the boilerplate for C extension code" - method_option :mit, :type => :boolean, :desc => "Generate an MIT license file" + method_option :mit, :type => :boolean, :desc => "Generate an MIT license file. Set a default with `bundle config gem.mit true`." method_option :test, :type => :string, :lazy_default => "rspec", :aliases => "-t", :banner => "rspec", :desc => "Generate a test directory for your library, either rspec or minitest. Set a default with `bundle config gem.test rspec`." def gem(name) diff --git a/lib/bundler/source/git/git_proxy.rb b/lib/bundler/source/git/git_proxy.rb index cc78e8c367..0659d04452 100644 --- a/lib/bundler/source/git/git_proxy.rb +++ b/lib/bundler/source/git/git_proxy.rb @@ -84,7 +84,7 @@ module Bundler FileUtils.mkdir_p(destination.dirname) FileUtils.rm_rf(destination) git_retry %|clone --no-checkout --quiet "#{path}" "#{destination}"| - File.chmod((0777 & ~File.umask), destination) + File.chmod(((File.stat(destination).mode | 0777) & ~File.umask), destination) rescue Errno::EEXIST => e file_path = e.message[/.*?(\/.*)/, 1] raise GitError, "Bundler could not install a gem because it needs to " \ diff --git a/lib/bundler/templates/newgem/README.md.tt b/lib/bundler/templates/newgem/README.md.tt index 2a0d8330b8..30c7b93609 100644 --- a/lib/bundler/templates/newgem/README.md.tt +++ b/lib/bundler/templates/newgem/README.md.tt @@ -26,7 +26,7 @@ TODO: Write usage instructions here ## Development -After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %> +After checking out the repo, run `bin/setup` to install dependencies.<% if config[:test] %> Then, run `rake <%= config[:test].sub('mini', '').sub('rspec', 'spec') %>` to run the tests.<% end %> You can also run `bin/console` for an interactive prompt that will allow you to experiment.<% if config[:bin] %> Run `bundle exec <%= config[:name] %>` to use the gem in this directory, ignoring other installed copies of this gem.<% end %> To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org). diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 9873d538f3..984293e95e 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -2,5 +2,5 @@ module Bundler # We're doing this because we might write tests that deal # with other versions of bundler and we are unsure how to # handle this better. - VERSION = "1.10.5" unless defined?(::Bundler::VERSION) + VERSION = "1.10.6" unless defined?(::Bundler::VERSION) end diff --git a/spec/install/gemfile/path_spec.rb b/spec/install/gemfile/path_spec.rb index 486ff85b2e..d0f3078723 100644 --- a/spec/install/gemfile/path_spec.rb +++ b/spec/install/gemfile/path_spec.rb @@ -141,7 +141,7 @@ describe "bundle install with explicit source paths" do should_be_installed "premailer 1.0.0" end - it "errors on invalid specs", :rubygems => "1.7" do + it "warns on invalid specs", :rubygems => "1.7" do build_lib "foo" gemspec = lib_path("foo-1.0").join("foo.gemspec").to_s @@ -158,7 +158,7 @@ describe "bundle install with explicit source paths" do G expect(out).to match(/missing value for attribute version/) - should_not_be_installed("foo 1.0") + expect(out).to_not include("ERROR REPORT") end it "supports gemspec syntax" do |