bundler 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d16968eae1c5a56edc60ec57ec834ffdfb9af52e
-  data.tar.gz: 2d179b57f5b43cd083a0660b85b84a2eccd322b0
+  metadata.gz: 96e28345d9c519a160bdabca5ae4746d05a1bc4a
+  data.tar.gz: bb30271388491a82103e07acb7d5e00084b6cfd7
 SHA512:
-  metadata.gz: 8c648e2a488da6ad4a30adf96d0f07834c20a5a4e971e3182c220fff3ae780236a43a5a0ef382e73680a56725e20fda88a964eb5772e788e578481246395cbf0
-  data.tar.gz: 5ece721abfc3d426cf737e57d480a32b6ecd4a6fe052eb6f8142078d2612b578c4ba8908a5fab3065d1954086f9544f8a882c45bbd85b2ab33ec9b18e6a78839
+  metadata.gz: 6e5829c1f677281766f56a786ca7e2ba4dedc3aebed23d74e447a762599d77a738dbb1fbad49334d84682cc6ce566e215f7dc62d3377b825c60c9c2f7aad283d
+  data.tar.gz: 2743f91766b319a5192e0a12aedb5e4ea24d7f412ffdb16feff1a43e3ae7b5db02ec3fe81de4aa7576707d170c36d138362fbd9125ebd5507ab6810ebc62c1ac

data/.travis.yml

@@ -42,7 +42,7 @@ env:
   # We need to know if changes to rubygems will break bundler on release
   - RGV=master
   # Test the latest rubygems release with all of our supported rubies
-  - RGV=v2.4.7
+  - RGV=v2.4.8
 
 matrix:
   fast_finish: true
@@ -100,7 +100,7 @@ matrix:
     # Ruby 1.9.2 sanity check
     # (but it's just too slow and sometimes goes over the Travis limit)
     - rvm: 1.9.2
-      env: RGV=v2.4.7
+      env: RGV=v2.4.8
     # Ruby-head (we want to know how we're doing, but not fail the build)
     - rvm: ruby-head
       env: RGV=master

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.10.4 (2015-06-16)
+
+Workarounds:
+
+  - don't add BUNDLED WITH to the lock when Spring runs `check` over and over (@indirect)
+
+Bugfixes:
+
+  - display "with native extensions" log output correctly (@ivantsepp)
+  - alias `i` to `install`, `c` to `check`, and `e` to `exec` (@indirect)
+
 ## 1.10.3 (2015-06-03)
 
 Bugfixes:

data/Rakefile

@@ -171,7 +171,7 @@ begin
       rubyopt = ENV["RUBYOPT"]
       # When editing this list, also edit .travis.yml!
       branches = %w(master)
-      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.3 v2.4.7)
+      releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.3 v2.4.8)
       (branches + releases).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|

data/lib/bundler/cli.rb

@@ -15,10 +15,13 @@ module Bundler
 
     def initialize(*args)
       super
-      current_cmd = args.last[:current_command].name
+
       custom_gemfile = options[:gemfile] || Bundler.settings[:gemfile]
       ENV['BUNDLE_GEMFILE']   = File.expand_path(custom_gemfile) if custom_gemfile
+
       Bundler.settings[:retry] = options[:retry] if options[:retry]
+
+      current_cmd = args.last[:current_command].name
       auto_install if AUTO_INSTALL_CMDS.include?(current_cmd)
     rescue UnknownArgumentError => e
       raise InvalidOption, e.message
@@ -97,6 +100,7 @@ module Bundler
       "Use the specified gemfile instead of Gemfile"
     method_option "path", :type => :string, :banner =>
       "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
+    map "c" => "check"
     def check
       require 'bundler/cli/check'
       Check.new(options).run
@@ -152,7 +156,7 @@ module Bundler
       "Exclude gems that are part of the specified named group."
     method_option "with", :type => :array, :banner =>
       "Include gems that are part of the specified named group."
-
+    map "i" => "install"
     def install
       require 'bundler/cli/install'
       Install.new(options.dup).run
@@ -269,6 +273,7 @@ module Bundler
       bundle exec you can require and call the bundled gems as if they were installed
       into the system wide Rubygems repository.
     D
+    map "e" => "exec"
     def exec(*args)
       require 'bundler/cli/exec'
       Exec.new(options, args).run

data/lib/bundler/cli/check.rb

@@ -26,7 +26,7 @@ module Bundler
         Bundler.ui.error "This bundle has been frozen, but there is no Gemfile.lock present"
         exit 1
       else
-        Bundler.load.lock unless options[:"dry-run"]
+        Bundler.load.lock(:preserve_bundled_with => true) unless options[:"dry-run"]
         Bundler.ui.info "The Gemfile's dependencies are satisfied"
       end
     end

data/lib/bundler/definition.rb

@@ -1,3 +1,4 @@
+require "bundler/lockfile_parser"
 require "digest/sha1"
 require "set"
 
@@ -240,14 +241,14 @@ module Bundler
       dependencies.map { |d| d.groups }.flatten.uniq
     end
 
-    def lock(file)
+    def lock(file, preserve_bundled_with = false)
       contents = to_lock
 
       # Convert to \r\n if the existing lock has them
       # i.e., Windows with `git config core.autocrlf=true`
       contents.gsub!(/\n/, "\r\n") if @lockfile_contents.match("\r\n")
 
-      return if @lockfile_contents == contents
+      return if lockfiles_equal?(@lockfile_contents, contents, preserve_bundled_with)
 
       if Bundler.settings[:frozen]
         Bundler.ui.error "Cannot write a changed lockfile while frozen."
@@ -658,5 +659,15 @@ module Bundler
     def requested_groups
       self.groups - Bundler.settings.without - @optional_groups + Bundler.settings.with
     end
+
+    def lockfiles_equal?(current, proposed, preserve_bundled_with)
+      if preserve_bundled_with
+        pattern = /\n\n#{LockfileParser::BUNDLED}\n\s+#{Gem::Version::VERSION_PATTERN}\n/
+        current.sub(pattern, "\n") == proposed.sub(pattern, "\n")
+      else
+        current == proposed
+      end
+    end
+
   end
 end

data/lib/bundler/endpoint_specification.rb

@@ -70,6 +70,15 @@ module Bundler
       end
     end
 
+    # needed for "with native extensions" during install
+    def extensions
+      if @remote_specification
+        @remote_specification.extensions
+      elsif _local_specification
+        _local_specification.extensions
+      end
+    end
+
     def _local_specification
       if @loaded_from && File.exist?(local_specification_path)
         eval(File.read(local_specification_path)).tap do |spec|

data/lib/bundler/environment.rb

@@ -30,8 +30,8 @@ module Bundler
       @definition.current_dependencies
     end
 
-    def lock
-      @definition.lock(Bundler.default_lockfile)
+    def lock(opts = {})
+      @definition.lock(Bundler.default_lockfile, opts[:preserve_bundled_with])
     end
 
     def update(*gems)

data/lib/bundler/inline.rb

@@ -39,14 +39,14 @@ def gemfile(install = false, &gemfile)
   builder.instance_eval(&gemfile)
 
   definition = builder.to_definition(nil, true)
-  def definition.lock(file); end
+  def definition.lock(*); end
   definition.validate_ruby!
 
   if install
     Bundler.ui = Bundler::UI::Shell.new
     Bundler::Installer.install(Bundler.root, definition, :system => true)
     Bundler::Installer.post_install_messages.each do |name, message|
-      Bundler.ui.info "Post install message from #{name}:\n#{message}"
+      Bundler.ui.info "Post-install message from #{name}:\n#{message}"
     end
   end
 

data/lib/bundler/installer.rb

@@ -100,27 +100,18 @@ module Bundler
     def install_gem_from_spec(spec, standalone = false, worker = 0, force = false)
       # Fetch the build settings, if there are any
       settings = Bundler.settings["build.#{spec.name}"]
-      messages = nil
-
       install_options = { :force => force, :ensure_builtin_gems_cached => standalone }
 
+      post_install_message = nil
       if settings
         # Build arguments are global, so this is mutexed
         Bundler.rubygems.with_build_args [settings] do
-          messages = spec.source.install(spec, install_options)
+          post_install_message = spec.source.install(spec, install_options)
         end
       else
-        messages = spec.source.install(spec, install_options)
+        post_install_message = spec.source.install(spec, install_options)
       end
 
-      install_message, post_install_message, debug_message = *messages
-
-      if install_message.include? 'Installing'
-        Bundler.ui.confirm install_message
-      else
-        Bundler.ui.info install_message
-      end
-      Bundler.ui.debug debug_message if debug_message
       Bundler.ui.debug "#{worker}:  #{spec.name} (#{spec.version}) from #{spec.loaded_from}"
 
       if Bundler.settings[:bin] && standalone

data/lib/bundler/runtime.rb

@@ -41,7 +41,7 @@ module Bundler
 
       setup_manpath
 
-      lock
+      lock(:preserve_bundled_with => true)
 
       self
     end

data/lib/bundler/source/git.rb

@@ -160,18 +160,17 @@ module Bundler
       end
 
       def install(spec, force = false)
-        debug = nil
+        Bundler.ui.info "Using #{version_message(spec)} from #{to_s}"
+
         if requires_checkout? && !@copied && !force
-          debug = "  * Checking out revision: #{ref}"
+          Bundler.ui.debug "  * Checking out revision: #{ref}"
           git_proxy.copy_to(install_path, submodules)
           serialize_gemspecs_in(install_path)
           @copied = true
         end
         generate_bin(spec)
-        if requires_checkout? && spec.post_install_message
-          Installer.post_install_messages[spec.name] = spec.post_install_message
-        end
-        ["Using #{version_message(spec)} from #{to_s}", nil, debug]
+
+        requires_checkout? ? spec.post_install_message : nil
       end
 
       def cache(spec, custom_path = nil)

data/lib/bundler/source/path.rb

@@ -69,8 +69,9 @@ module Bundler
       end
 
       def install(spec, force = false)
+        Bundler.ui.info "Using #{version_message(spec)} from #{to_s}"
         generate_bin(spec, :disable_extensions)
-        ["Using #{version_message(spec)} from #{to_s}", nil]
+        nil # no post-install message
       end
 
       def cache(spec, custom_path = nil)

data/lib/bundler/source/rubygems.rb

@@ -98,8 +98,10 @@ module Bundler
           end
         end
 
-        return ["Using #{version_message(spec)}", nil] if installed_specs[spec].any? && !force
-
+        if installed_specs[spec].any? && !force
+          Bundler.ui.info "Using #{version_message(spec)}"
+          return nil # no post-install message
+        end
 
         # Download the gem to get the spec, because some specs that are returned
         # by rubygems.org are broken and wrong.
@@ -115,6 +117,10 @@ module Bundler
         end
 
         unless Bundler.settings[:no_install]
+          message = "Installing #{version_message(spec)}"
+          message << " with native extensions" if spec.extensions.any?
+          Bundler.ui.confirm message
+
           path = cached_gem(spec)
           if Bundler.requires_sudo?
             install_path = Bundler.tmp(spec.full_name)
@@ -158,7 +164,8 @@ module Bundler
           installed_spec.loaded_from = loaded_from(spec)
         end
         spec.loaded_from = loaded_from(spec)
-        ["Installing #{version_message(spec)}", spec.post_install_message]
+
+        spec.post_install_message
       ensure
         Bundler.rm_rf(install_path) if Bundler.requires_sudo?
       end

data/lib/bundler/ui/rg_proxy.rb

@@ -10,11 +10,7 @@ module Bundler
       end
 
       def say(message)
-        if message =~ /native extensions/
-          @ui.info "with native extensions "
-        else
-          @ui.debug(message)
-        end
+        @ui && @ui.debug(message)
       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.10.3" unless defined?(::Bundler::VERSION)
+  VERSION = "1.10.4" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -316,9 +316,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files: []
-has_rdoc: