bundler 1.9.6 → 1.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 553a69b15deef7d959ae0290d04daa23e0caa732
-  data.tar.gz: 221e5cb9211137431446b472826c5494d808a7ab
+  metadata.gz: 9da845ed48643f130b627dbdb032cb956e9e31c9
+  data.tar.gz: 0918eef63ba429595173b14172905fcb2d1626e2
 SHA512:
-  metadata.gz: 9cb54b02735aa3eeac4ec223c8cfb3e25906526590d1d59bcd89271f79aa53e3ef5462017a96ac12b4d2079091a5c217e58947bbc257e674552d590fdf372c2d
-  data.tar.gz: 07d82e6e251c21f7a745820d2d7a320452c170c2354abb8ce90424b4496bf44223995bed880d511a17bea8129c23e800edad3aa0608d811bebebfa2628a08fac
+  metadata.gz: 9e4d0bac4e002f42948dae0daaf690f38408dde5e240525f37cda092a04078233f41f916baee55604d557a2cf28e47d4a1c3f5312b68906e0e9ba9a41c61312b
+  data.tar.gz: ba9684a0fcdfe506bf0dc3fac3b380fa57614a17550a848b1c314d84bba987cbb392dd34d753bf204873e34b7217ad0ac876d3cd286dd4f02eb532110b2b3bae

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+## 1.9.7 (2015-05-05)
+
+Bugfixes:
+
+  - always clean up tmp dirs (#3277, @hone, @indirect, @segiddins)
+
 ## 1.9.6 (2015-05-02)
 
 Bugfixes:
 
-  - support RubyGems versions above 2.4.6 (@tenderlove, @segiddins, @indirect)
+  - use RubyGems spec stubs if available (@segiddins)
   - allow creating gems with names containing two dashes (#3483, @janlelis)
   - allow creating gems with names extending constants (#3603, @amatsuda)
 
@@ -75,7 +81,7 @@ Features:
 
 Bugfixes:
 
-  - Support RubyGems versions above 2.4.6 (@tenderlove, @segiddins, @indirect)
+  - Use RubyGems spec stubs if available (@segiddins)
 
 ## 1.8.8 (2015-04-29)
 

data/lib/bundler.rb

@@ -212,13 +212,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 @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/fetcher.rb

@@ -68,6 +68,8 @@ module Bundler
         end
 
         gem_path
+      ensure
+        Bundler.rm_rf(download_path) if Bundler.requires_sudo?
       end
 
       def user_agent

data/lib/bundler/lockfile_parser.rb

@@ -21,12 +21,13 @@ module Bundler
     PATH         = "PATH"
     SPECS        = "  specs:"
     OPTIONS      = /^  ([a-z]+): (.*)$/i
+    SOURCE       = [GIT, GEM, PATH]
 
     def initialize(lockfile)
       @platforms    = []
       @sources      = []
       @dependencies = []
-      @state        = :source
+      @state        = nil
       @specs        = {}
 
       @rubygems_aggregate = Source::Rubygems.new
@@ -37,11 +38,16 @@ module Bundler
       end
 
       lockfile.split(/(?:\r?\n)+/).each do |line|
-        if line == DEPENDENCIES
+        if SOURCE.include?(line)
+          @state = :source
+          parse_source(line)
+        elsif line == DEPENDENCIES
           @state = :dependency
         elsif line == PLATFORMS
           @state = :platform
-        else
+        elsif line =~ /^[^\s]/
+          @state = nil
+        elsif @state
           send("parse_#{@state}", line)
         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
           @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

@@ -145,9 +145,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)

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.9.6" unless defined?(::Bundler::VERSION)
+  VERSION = "1.9.7" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.9.6
+  version: 1.9.7
 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-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache