bundler 1.10.0.pre → 1.10.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4128a621db3d926d6579de067a966664457734f
-  data.tar.gz: b0629f20a391f86092ce149087566e1f16ed7991
+  metadata.gz: 21f13f887ed73b0848d65d47894abe47d8326666
+  data.tar.gz: 7af0af667a8a5f982f19339c7523976d8c7f7204
 SHA512:
-  metadata.gz: 7000dfc488e2c0c88fd3e195803b2ba301004f97a91c1ab7c8d56a4b06391a7000a78f4b9cd429ede5be1d50d34e1e727cd363253ebae4478ef44fd922191d1b
-  data.tar.gz: e4da7e38155cc47bb60b9727445d36974c19faee89bdaa596dc0d195a57cd69ca9aeb4002b2712e9009c05f7ce6c8061bac5cc271b87bcab016ed21ca249f12f
+  metadata.gz: faf27bd7e7ad2043c510ae311fc09dbdd9cc8d38010b4f6c5fc57ce28fc9b5acb721e23c58c099026a4e2e0b3787035458f933e6d35afec5cacca49f0051d7e6
+  data.tar.gz: c2a54f343a9e32d396b76ce22c7b1cf54a8c1a45b7a56ab6dfa839cd19385f58d1f62b2807340dae2a6d6242dd12869283346c23228ac0326e41db081823b8b1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.10.0.pre.1 (2015-05-05)
+
+Bugfixes:
+
+  - always clean up tmp dirs (#3277, @hone, @indirect, @segiddins)
+
 ## 1.10.0.pre (2015-05-03)
 
 Features:

data/lib/bundler.rb

@@ -206,13 +206,11 @@ module Bundler
     end
 
     def tmp(name = Process.pid.to_s)
-      @tmp ||= Pathname.new Dir.mktmpdir("bundler")
-      @tmp.join(name)
+      Pathname.new(Dir.mktmpdir(["bundler", name]))
     end
 
-    def cleanup
-      FileUtils.remove_entry_secure(@tmp) if defined?(@tmp) && @tmp
-    rescue
+    def rm_rf(path)
+      FileUtils.remove_entry_secure(path) if path && File.exist?(path)
     end
 
     def settings

data/lib/bundler/cli.rb

@@ -11,8 +11,6 @@ module Bundler
     rescue Exception => e
       Bundler.ui = UI::Shell.new
       raise e
-    ensure
-      Bundler.cleanup
     end
 
     def initialize(*args)

data/lib/bundler/definition.rb

@@ -249,6 +249,16 @@ module Bundler
         return
       end
 
+      if @locked_bundler_version
+        locked_major = @locked_bundler_version.segments.first
+        current_major = Gem::Version.create(Bundler::VERSION).segments.first
+
+        if locked_major < current_major
+          Bundler.ui.warn "Warning: the lockfile is being updated to Bundler #{Bundler::VERSION.split('.').first}, " \
+                          "after which you will be unable to return to Bundler #{@locked_bundler_version.segments.first}."
+        end
+      end
+
       File.open(file, 'wb'){|f| f.puts(contents) }
     rescue Errno::EACCES
       raise Bundler::InstallError,

data/lib/bundler/lockfile_parser.rb

@@ -60,11 +60,17 @@ module Bundler
     def warn_for_outdated_bundler_version
       return unless bundler_version
       prerelease_text = bundler_version.prerelease? ? " --pre" : ""
-      if Gem::Version.new(Bundler::VERSION) < Gem::Version.new(bundler_version)
-        Bundler.ui.warn "Warning: the running version of Bundler is older " \
-             "than the version that created the lockfile. We suggest you " \
-             "upgrade to the latest version of Bundler by running `gem " \
-             "install bundler#{prerelease_text}`.\n"
+      current_version = Gem::Version.create(Bundler::VERSION)
+      case current_version.segments.first <=> bundler_version.segments.first
+      when -1
+        raise LockfileError, "You must use Bundler #{bundler_version.segments.first} or greater with this lockfile."
+      when 0
+        if current_version < bundler_version
+          Bundler.ui.warn "Warning: the running version of Bundler is older " \
+               "than the version that created the lockfile. We suggest you " \
+               "upgrade to the latest version of Bundler by running `gem " \
+               "install bundler#{prerelease_text}`.\n"
+        end
       end
     end
 

data/lib/bundler/source/path/installer.rb

@@ -7,31 +7,34 @@ module Bundler
 
         def initialize(spec, options = {})
           @spec              = spec
-          @tmp_bin_dir       = "#{Bundler.tmp(spec.full_name)}/bin"
-          @gem_bin_dir       = "#{Bundler.rubygems.gem_dir}/bin"
-          @bin_dir           = Bundler.requires_sudo? ? @tmp_bin_dir : @gem_bin_dir
           @gem_dir           = Bundler.rubygems.path(spec.full_gem_path)
-          @wrappers          = options[:wrappers] || true
-          @env_shebang       = options[:env_shebang] || true
+          @wrappers          = true
+          @env_shebang       = true
           @format_executable = options[:format_executable] || false
           @build_args        = options[:build_args] || Bundler.rubygems.build_args
+          @gem_bin_dir       = "#{Bundler.rubygems.gem_dir}/bin"
+
+          if Bundler.requires_sudo?
+            @tmp_dir = Bundler.tmp(spec.full_name).to_s
+            @bin_dir = "#{@tmp_dir}/bin"
+          else
+            @bin_dir = @gem_bin_dir
+          end
         end
 
         def generate_bin
           return if spec.executables.nil? || spec.executables.empty?
 
-          if Bundler.requires_sudo?
-            FileUtils.mkdir_p(@tmp_bin_dir) unless File.exist?(@tmp_bin_dir)
-          end
-
           super
 
           if Bundler.requires_sudo?
             Bundler.mkdir_p @gem_bin_dir
             spec.executables.each do |exe|
-              Bundler.sudo "cp -R #{@tmp_bin_dir}/#{exe} #{@gem_bin_dir}"
+              Bundler.sudo "cp -R #{@bin_dir}/#{exe} #{@gem_bin_dir}"
             end
           end
+        ensure
+          Bundler.rm_rf(@tmp_dir) if Bundler.requires_sudo?
         end
       end
 

data/lib/bundler/source/rubygems.rb

@@ -160,9 +160,7 @@ module Bundler
         spec.loaded_from = loaded_from(spec)
         ["Installing #{version_message(spec)}", spec.post_install_message]
       ensure
-        if install_path && Bundler.requires_sudo?
-          FileUtils.remove_entry_secure(install_path)
-        end
+        Bundler.rm_rf(install_path) if Bundler.requires_sudo?
       end
 
       def cache(spec, custom_path = nil)
@@ -392,10 +390,12 @@ module Bundler
 
         if Bundler.requires_sudo?
           Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/cache"
-          Bundler.sudo "mv #{Bundler.tmp(spec.full_name)}/cache/#{spec.full_name}.gem #{gem_path}"
+          Bundler.sudo "mv #{download_path}/cache/#{spec.full_name}.gem #{gem_path}"
         end
 
         gem_path
+      ensure
+        Bundler.rm_rf(download_path) if Bundler.requires_sudo?
       end
 
       def builtin_gem?(spec)

data/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.0.pre" unless defined?(::Bundler::VERSION)
+  VERSION = "1.10.0.pre.1" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.10.0.pre
+  version: 1.10.0.pre.1
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-03 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache