bundler 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9badf28b802fec90f725b4ff52a5a222552ebe32
-  data.tar.gz: 274ae3d0b61cfc32012342791182d5af829e8895
+  metadata.gz: 859744bca4fa4bf88cbe5c1935e4c54a151ceb2e
+  data.tar.gz: f597f3f62256ce30c585b68a2b3502102f2e5cb4
 SHA512:
-  metadata.gz: 09eefdb50afa1afcb9daa00bc1a5d149621ce58c82373176ec11ee5bc019516471c06acc2b32100c5be87b6c604777c91eb6b53cff299174de472d9de96df4e9
-  data.tar.gz: 2de981c2e0c4d42b127c65ca0c4ca03a4d97b699d8db9c87bb849a9d5e663991545f5b0f8f4a590afe18d301b4433773dd7bd639bafec73ca4ae6323ec4f51da
+  metadata.gz: 31d78a3839acbd4e47defaa27980522ead8a7a4ac3a85999542c2ae6f94259b210e5b8deb8dfce5523389a641b815f43848c27da3411b9d28abaa6c61e9dbf4e
+  data.tar.gz: 168d70e1e4f17069e568814fca58b96fb1479e69dd444ba83fed82ad176baaf7672f2ae674937538dc705f795420db0a835ae1bc3a5f62a97209584d70d2fa4a

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.6.2 (2014-04-13)
+
+Bugfixes:
+
+  - fix an exception when using builtin gems (#2915, #2963, @gnufied)
+  - cache gems that are built in to the running ruby (#2975, @indirect)
+  - re-allow deploying cached git gems without git installed (#2968, @aughr)
+  - keep standalone working even with builtin gems (@indirect)
+  - don't update vendor/cache in deployment mode (#2921, @indirect)
+
+Features:
+
+  - warn informatively when `bundle install` is run as root (#2936, @1337807)
+
 ## 1.6.1 (2014-04-02)
 
 Bugfixes:
@@ -8,7 +22,7 @@ Features:
 
   - add support for C extensions in sudo mode on Rubygems 2.2
 
-## 1.6.0 (2014-04-28)
+## 1.6.0 (2014-03-28)
 
 Bugfixes:
 

data/lib/bundler/cli/install.rb

@@ -6,6 +6,8 @@ module Bundler
     end
 
     def run
+      warn_if_root
+
       if options[:without]
         options[:without] = options[:without].map{|g| g.tr(' ', ':') }
       end
@@ -74,7 +76,7 @@ module Bundler
       definition = Bundler.definition
       definition.validate_ruby!
       Installer.install(Bundler.root, definition, options)
-      Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
+      Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"] && !Bundler.settings[:frozen]
 
       if Bundler.settings[:path]
         absolute_path = File.expand_path(Bundler.settings[:path])
@@ -113,6 +115,13 @@ module Bundler
 
   private
 
+    def warn_if_root
+      return unless Process.uid.zero?
+      Bundler.ui.warn "Don't run Bundler as root. Bundler can ask for sudo " \
+        "if it is needed, and installing your bundle as root will break this " \
+        "application for all non-root users on this machine.", :wrap => true
+    end
+
     def without_groups_messages
       if Bundler.settings.without.any?
         require "bundler/cli/common"

data/lib/bundler/installer.rb

@@ -91,7 +91,7 @@ module Bundler
         install_sequentially options[:standalone]
       end
 
-      lock
+      lock unless Bundler.settings[:frozen]
       generate_standalone(options[:standalone]) if options[:standalone]
     end
 
@@ -235,6 +235,7 @@ module Bundler
 
       specs.each do |spec|
         next if spec.name == "bundler"
+        next if spec.require_paths.nil? # builtin gems
 
         spec.require_paths.each do |path|
           full_path = File.join(spec.full_gem_path, path)

data/lib/bundler/rubygems_integration.rb

@@ -93,6 +93,10 @@ module Bundler
       Gem.path
     end
 
+    def gem_cache
+      gem_path.map{|p| File.expand_path("cache", p) }
+    end
+
     def spec_cache_dirs
       @spec_cache_dirs ||= begin
         dirs = gem_path.map {|dir| File.join(dir, 'specifications')}

data/lib/bundler/source/git.rb

@@ -211,6 +211,10 @@ module Bundler
         git_proxy.revision
       end
 
+      def allow_git_ops?
+        @allow_remote || @allow_cached
+      end
+
     private
 
       def serialize_gemspecs_in(destination)
@@ -267,10 +271,6 @@ module Bundler
         Digest::SHA1.hexdigest(input)
       end
 
-      def allow_git_ops?
-        @allow_remote || @allow_cached
-      end
-
       def cached_revision
         options["revision"]
       end
@@ -280,7 +280,7 @@ module Bundler
       end
 
       def git_proxy
-        @git_proxy ||= GitProxy.new(cache_path, uri, ref, cached_revision){ allow_git_ops? }
+        @git_proxy ||= GitProxy.new(cache_path, uri, ref, cached_revision, self)
       end
 
     end

data/lib/bundler/source/git/git_proxy.rb

@@ -34,13 +34,13 @@ module Bundler
         attr_accessor :path, :uri, :ref
         attr_writer :revision
 
-        def initialize(path, uri, ref, revision=nil, &allow)
+        def initialize(path, uri, ref, revision = nil, git = nil)
           @path     = path
           @uri      = uri
           @ref      = ref
           @revision = revision
-          @allow    = allow || Proc.new { true }
-          raise GitNotInstalledError.new unless Bundler.git_present?
+          @git      = git
+          raise GitNotInstalledError.new if allow? && !Bundler.git_present?
         end
 
         def revision
@@ -138,7 +138,7 @@ module Bundler
         end
 
         def allow?
-          @allow.call
+          @git ? @git.allow_git_ops? : true
         end
 
         def in_path(&blk)
@@ -147,11 +147,8 @@ module Bundler
         end
 
         def allowed_in_path
-          if allow?
-            in_path { yield }
-          else
-            raise GitError, "The git source #{uri} is not yet checked out. Please run `bundle install` before trying to start your application"
-          end
+          return in_path { yield } if allow?
+          raise GitError, "The git source #{uri} is not yet checked out. Please run `bundle install` before trying to start your application"
         end
 
       end

data/lib/bundler/source/path.rb

@@ -78,6 +78,11 @@ module Bundler
         app_cache_path = app_cache_path(custom_path)
         return unless Bundler.settings[:cache_all]
         return if expand(@original_path).to_s.index(Bundler.root.to_s) == 0
+
+        unless @original_path.exist?
+          raise GemNotFound, "Can't cache gem #{version_message(spec)} because #{to_s} is missing!"
+        end
+
         FileUtils.rm_rf(app_cache_path)
         FileUtils.cp_r("#{@original_path}/.", app_cache_path)
         FileUtils.touch(app_cache_path.join(".bundlecache"))

data/lib/bundler/source/rubygems.rb

@@ -17,9 +17,7 @@ module Bundler
         @dependency_names = []
         @allow_remote = false
         @allow_cached = false
-
-        @caches = [ Bundler.app_cache ] +
-          Bundler.rubygems.gem_path.map{|p| File.expand_path("#{p}/cache") }
+        @caches = [Bundler.app_cache, *Bundler.rubygems.gem_cache]
       end
 
       def remote!
@@ -72,8 +70,7 @@ module Bundler
         # Download the gem to get the spec, because some specs that are returned
         # by rubygems.org are broken and wrong.
         if spec.source_uri
-          path = Fetcher.download_gem_from_uri(spec, spec.source_uri)
-          s = Bundler.rubygems.spec_from_gem(path, Bundler.settings["trust-policy"])
+          s = Bundler.rubygems.spec_from_gem(fetch_gem(spec), Bundler.settings["trust-policy"])
           spec.__swap__(s)
         end
 
@@ -128,11 +125,12 @@ module Bundler
       end
 
       def cache(spec, custom_path = nil)
-        # Gems bundled with Ruby don't have .gem files cached locally, but it doesn't matter
-        # since they're always going to be installed on this Ruby version.
-        return if builtin_gem?(spec)
-
-        cached_path = cached_gem(spec)
+        if builtin_gem?(spec)
+          remote_spec = remote_specs.search(spec).first
+          cached_path = fetch_gem(remote_spec)
+        else
+          cached_path = cached_gem(spec)
+        end
         raise GemNotFound, "Missing gem file '#{spec.full_name}.gem'." unless cached_path
         return if File.dirname(cached_path) == Bundler.app_cache.to_s
         Bundler.ui.info "  * #{File.basename(cached_path)}"
@@ -291,12 +289,17 @@ module Bundler
         end
       end
 
+      def fetch_gem(spec)
+        return false unless spec.source_uri
+        Fetcher.download_gem_from_uri(spec, spec.source_uri)
+      end
+
       def builtin_gem?(spec)
-        # Ruby 2.1-style
+        # Ruby 2.1, where all included gems have this summary
         return true if spec.summary =~ /is bundled with Ruby/
 
-        # Ruby 2.0 style
-        spec.loaded_from.include?("specifications/default/")
+        # Ruby 2.0, where gemspecs are stored in specifications/default/
+        spec.loaded_from && spec.loaded_from.include?("specifications/default/")
       end
     end
   end

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

data/spec/bundler/cli_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
+require 'bundler/cli'
 
 describe "bundle executable" do
+  let(:source_uri) { "http://localgemserver.test" }
+
   it "returns non-zero exit status when passed unrecognized options" do
     bundle '--invalid_argument', :exitstatus => true
     expect(exitstatus).to_not be_zero

data/spec/cache/gems_spec.rb

@@ -74,39 +74,34 @@ describe "bundle cache" do
     end
   end
 
-  describe "when there is a built-in gem" do
-    let(:version) { "1.0.0" }
-
+  describe "when there is a built-in gem", :ruby => "2.0" do
     before :each do
       build_repo2 do
-        build_gem "builtin_gem", version do |s|
-          s.summary = "This builtin_gem is bundled with Ruby"
-        end
-
-        build_gem "remote_gem", version do |s|
-          s.summary = "Totally normal gem"
-        end
+        build_gem "builtin_gem", "1.0.2"
       end
 
-      build_gem "builtin_gem", version, :to_system => true do |s|
+      build_gem "builtin_gem", "1.0.2", :to_system => true do |s|
         s.summary = "This builtin_gem is bundled with Ruby"
       end
 
-      install_gemfile <<-G
-        source "file://#{gem_repo2}"
-        gem 'builtin_gem', '#{version}'
-        gem 'remote_gem', '#{version}'
-      G
+      FileUtils.rm("#{system_gem_path}/cache/builtin_gem-1.0.2.gem")
+    end
 
-      FileUtils.rm("#{system_gem_path}/cache/builtin_gem-#{version}.gem")
+    it "uses builtin gems" do
+      install_gemfile %|gem 'builtin_gem', '1.0.2'|
+      should_be_installed("builtin_gem 1.0.2")
     end
 
-    it "caches normal gems successfully" do
-      bundle :cache, :exitstatus => true
+    it "caches remote and builtin gems" do
+      install_gemfile <<-G
+        source "file://#{gem_repo2}"
+        gem 'builtin_gem', '1.0.2'
+        gem 'rack', '1.0.0'
+      G
 
-      expect(exitstatus).to be_zero
-      expect(bundled_app("vendor/cache/builtin_gem-#{version}.gem")).to_not exist
-      expect(bundled_app("vendor/cache/remote_gem-#{version}.gem")).to exist
+      bundle :cache
+      expect(bundled_app("vendor/cache/rack-1.0.0.gem")).to exist
+      expect(bundled_app("vendor/cache/builtin_gem-1.0.2.gem")).to exist
     end
   end
 

data/spec/install/gemfile/git_spec.rb

@@ -947,5 +947,21 @@ describe "bundle install with git sources" do
       bundle "update", :env => {"PATH" => ""}
       expect(out).to include("You need to install git to be able to use gems from git repositories. For help installing git, please refer to GitHub's tutorial at https://help.github.com/articles/set-up-git")
     end
+
+    it "installs a packaged git gem successfully" do
+      build_git "foo"
+
+      install_gemfile <<-G
+        git "#{lib_path('foo-1.0')}" do
+          gem 'foo'
+        end
+      G
+      bundle "package --all"
+      simulate_new_machine
+
+      bundle "install", :env => {"PATH" => ""}, :exitstatus => true
+      expect(out).to_not include("You need to install git to be able to use gems from git repositories.")
+      expect(exitstatus).to be_zero
+    end
   end
 end

data/spec/install/gems/sudo_spec.rb

@@ -125,4 +125,12 @@ describe "when using sudo", :sudo => true do
     end
   end
 
+  describe "and root runs install" do
+    it "warns against that" do
+      gemfile %|source "file://#{gem_repo1}"|
+      bundle :install, :sudo => true
+      expect(out).to include("Don't run Bundler as root.")
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -63,6 +63,14 @@ RSpec.configure do |config|
     config.filter_run_excluding :ruby => "1.9"
   end
 
+  if RUBY_VERSION >= "2.0"
+    config.filter_run_excluding :ruby => "1.8"
+    config.filter_run_excluding :ruby => "1.9"
+  else
+    config.filter_run_excluding :ruby => "2.0"
+    config.filter_run_excluding :ruby => "2.1"
+  end
+
   if Gem::VERSION < "2.2"
     config.filter_run_excluding :rubygems => "2.2"
   end

data/spec/support/helpers.rb

@@ -58,6 +58,7 @@ module Spec
     def bundle(cmd, options = {})
       expect_err = options.delete(:expect_err)
       exitstatus = options.delete(:exitstatus)
+      sudo       = "sudo" if options.delete(:sudo)
       options["no-color"] = true unless options.key?("no-color") || %w(exec conf).include?(cmd.to_s[0..3])
 
       bundle_bin = File.expand_path('../../../bin/bundle', __FILE__)
@@ -67,12 +68,12 @@ module Spec
       requires << File.expand_path('../artifice/'+options.delete(:artifice)+'.rb', __FILE__) if options.key?(:artifice)
       requires_str = requires.map{|r| "-r#{r}"}.join(" ")
 
-      env = (options.delete(:env) || {}).map{|k,v| "#{k}='#{v}' "}.join
+      env = (options.delete(:env) || {}).map{|k,v| "#{k}='#{v}'"}.join(" ")
       args = options.map do |k,v|
         v == true ? " --#{k}" : " --#{k} #{v}" if v
       end.join
 
-      cmd = "#{env}#{Gem.ruby} -I#{lib} #{requires_str} #{bundle_bin} #{cmd}#{args}"
+      cmd = "#{env} #{sudo} #{Gem.ruby} -I#{lib} #{requires_str} #{bundle_bin} #{cmd}#{args}"
 
       if exitstatus
         sys_status(cmd)
@@ -329,5 +330,16 @@ module Spec
     def revision_for(path)
       Dir.chdir(path) { `git rev-parse HEAD`.strip }
     end
+
+    def capture_output
+      fake_stdout = StringIO.new
+      actual_stdout = $stdout
+      $stdout = fake_stdout
+      yield
+      fake_stdout.rewind
+      fake_stdout.read
+    ensure
+      $stdout = actual_stdout
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn