From 25c9734957a2c063a5c9378380cd50a482fca52b Mon Sep 17 00:00:00 2001 From: Felipe Tanus Date: Mon, 30 Nov 2015 13:54:04 -0200 Subject: Deal with ENOEXEC --- lib/bundler/cli/exec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb index 7aad040fab..d1af0b8bb7 100644 --- a/lib/bundler/cli/exec.rb +++ b/lib/bundler/cli/exec.rb @@ -33,7 +33,7 @@ module Bundler Bundler.load.setup_environment Bundler.ui = nil Kernel.exec(@cmd, *args) - rescue Errno::EACCES + rescue Errno::EACCES, Errno::ENOEXEC Bundler.ui = ui Bundler.ui.error "bundler: not executable: #{cmd}" exit 126 -- cgit v1.2.1 From 638bb692ccb8fe4a93f05753882214c564484a7d Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Sun, 29 Nov 2015 21:17:32 -0600 Subject: [GemHelper] Fix crash when pushing gem --- lib/bundler/gem_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb index d468194538..99d4194edf 100644 --- a/lib/bundler/gem_helper.rb +++ b/lib/bundler/gem_helper.rb @@ -94,7 +94,7 @@ module Bundler if Pathname.new("~/.gem/credentials").expand_path.exist? allowed_push_host = nil gem_command = "gem push '#{path}'" - if spec.respond_to?(:metadata) + if @gemspec.respond_to?(:metadata) allowed_push_host = @gemspec.metadata["allowed_push_host"] gem_command << " --host #{allowed_push_host}" if allowed_push_host end -- cgit v1.2.1 From 3c15d722d78ef859b8420709f1ecc5e2bbec860e Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Sun, 6 Dec 2015 17:09:50 -0600 Subject: Update changelog for 1.11.0.pre.2 --- CHANGELOG.md | 7 +++++++ lib/bundler/version.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f17b1d78c1..a6b47b7d8f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## 1.11.0.pre.2 (2015-12-06) + +Bugfixes: + + - fail gracefully when trying to execute a non-executable file (#4081, @fotanus) + - fix a crash when pushing a gem via `rake release` (@segiddins) + ## 1.11.0.pre.1 (2015-11-29) Features: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index 5bf1cb03c1..d753d21cdc 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.11.0.pre.1" unless defined?(::Bundler::VERSION) + VERSION = "1.11.0.pre.2" unless defined?(::Bundler::VERSION) end -- cgit v1.2.1 From 92691a732a86f2f0a57e958023ac6edfba719fbd Mon Sep 17 00:00:00 2001 From: Samuel Giddins Date: Sat, 12 Dec 2015 18:00:59 -0800 Subject: Update changelog for 1.11.0 --- CHANGELOG.md | 4 ++++ lib/bundler/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6b47b7d8f..40e28291ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.11.0 (2015-12-12) + +(this space intentionally left blank) + ## 1.11.0.pre.2 (2015-12-06) Bugfixes: diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index d753d21cdc..97811e5934 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.11.0.pre.2" unless defined?(::Bundler::VERSION) + VERSION = "1.11.0" unless defined?(::Bundler::VERSION) end -- cgit v1.2.1