bundler 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c9f315a84cc713eb5c8e32ac8d6adb2c79616c9
-  data.tar.gz: d89692edcbf19e5232655a26b3f080917490ab8d
+  metadata.gz: a6aa71f486e6b4b5d1692c18491fcb29101802c4
+  data.tar.gz: b2fab0763dac40223188dd8fdfc4d662693d6be3
 SHA512:
-  metadata.gz: 78bbfc567097d4d04dbf0c4f4aadfd7a34c109e154e5c910b648723122247e532ef307cc3871a430af0b7b9155c01d5473355c80709eba00fc402a11669f4d47
-  data.tar.gz: 8a3f40a299f1910aa7a495c08138e1c3c76f6a5bda3a035e3239a08bab906999013cf98ad72244fc4558128649f106bddc37c8a2c330e9ce82b7f194eb4cbe1e
+  metadata.gz: b2aaf805b52b9bfef1c380f9ea835d0b7fefb8aa4962b8b5706f24fe23ff4ebbf3eb2b58a51d1dfc8fa228d3ce0b5a8a260b37028b8a9ca58451b3f4615a9d13
+  data.tar.gz: 36eb16b2c3e86df6010ea8623260c61ac1b82f4333fb69d091839e263aa7e49d1d35bd3fc831c283bb2b732b7405db08fb8668c03fb47ebb9256ae62e1019eaf

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.15.1 (2017-06-02)
+
+Bugfixes:
+
+  - `bundle lock --update GEM` will fail gracefully when the gem is not in the lockfile (#5693, @segiddins)
+  - `bundle init --gemspec` will fail gracefully when the gemspec is invalid (@colby-swandale)
+  - `bundle install --force` works when the gemfile contains git gems (#5678, @segiddins)
+  - `bundle env` will print well-formed markdown when there are no settings (#5677, @segiddins)
+
 ## 1.15.0 (2017-05-19)
 
 This space intentionally left blank.

data/lib/bundler/cli/common.rb

@@ -70,6 +70,13 @@ module Bundler
       message
     end
 
+    def self.ensure_all_gems_in_lockfile!(names, locked_gems = Bundler.locked_gems)
+      locked_names = locked_gems.specs.map(&:name)
+      names.-(locked_names).each do |g|
+        raise GemNotFound, gem_not_found_message(g, locked_names)
+      end
+    end
+
     def self.configure_gem_version_promoter(definition, options)
       patch_level = patch_level_options(options)
       raise InvalidOption, "Provide only one of the following options: #{patch_level.join(", ")}" unless patch_level.length <= 1

data/lib/bundler/cli/init.rb

@@ -18,7 +18,9 @@ module Bundler
           Bundler.ui.error "Gem specification #{gemspec} doesn't exist"
           exit 1
         end
-        spec = Gem::Specification.load(gemspec)
+
+        spec = Bundler.load_gemspec_uncached(gemspec)
+
         puts "Writing new Gemfile to #{SharedHelpers.pwd}/Gemfile"
         File.open("Gemfile", "wb") do |file|
           file << "# Generated from #{gemspec}\n"

data/lib/bundler/cli/lock.rb

@@ -22,7 +22,10 @@ module Bundler
       Bundler::Fetcher.disable_endpoint = options["full-index"]
 
       update = options[:update]
-      update = { :gems => update, :lock_shared_dependencies => options[:conservative] } if update.is_a?(Array)
+      if update.is_a?(Array) # unlocking specific gems
+        Bundler::CLI::Common.ensure_all_gems_in_lockfile!(update)
+        update = { :gems => update, :lock_shared_dependencies => options[:conservative] }
+      end
       definition = Bundler.definition(update)
 
       Bundler::CLI::Common.configure_gem_version_promoter(Bundler.definition, options) if options[:update]

data/lib/bundler/cli/update.rb

@@ -25,12 +25,7 @@ module Bundler
           raise GemfileLockNotFound, "This Bundle hasn't been installed yet. " \
             "Run `bundle install` to update and install the bundled gems."
         end
-        # cycle through the requested gems, to make sure they exist
-        names = Bundler.locked_gems.specs.map(&:name)
-        gems.each do |g|
-          next if names.include?(g)
-          raise GemNotFound, Bundler::CLI::Common.gem_not_found_message(g, names)
-        end
+        Bundler::CLI::Common.ensure_all_gems_in_lockfile!(gems)
 
         if groups.any?
           specs = Bundler.definition.specs_for groups

data/lib/bundler/env.rb

@@ -29,14 +29,16 @@ module Bundler
 
       out << "```\n"
 
-      out << "\n## Bundler settings\n\n```\n" unless Bundler.settings.all.empty?
-      Bundler.settings.all.each do |setting|
-        out << setting << "\n"
-        Bundler.settings.pretty_values_for(setting).each do |line|
-          out << "  " << line << "\n"
+      unless Bundler.settings.all.empty?
+        out << "\n## Bundler settings\n\n```\n"
+        Bundler.settings.all.each do |setting|
+          out << setting << "\n"
+          Bundler.settings.pretty_values_for(setting).each do |line|
+            out << "  " << line << "\n"
+          end
         end
+        out << "```\n"
       end
-      out << "```\n"
 
       return out unless SharedHelpers.in_bundle?
 

data/lib/bundler/installer.rb

@@ -212,7 +212,7 @@ module Bundler
     end
 
     def resolve_if_need(options)
-      if !options["update"] && !options[:inline] && Bundler.default_lockfile.file?
+      if !options["update"] && !options[:inline] && !options["force"] && Bundler.default_lockfile.file?
         local = Bundler.ui.silence do
           begin
             tmpdef = Definition.build(Bundler.default_gemfile, Bundler.default_lockfile, nil)

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

@@ -3,7 +3,7 @@ require "shellwords"
 require "tempfile"
 module Bundler
   class Source
-    class Git < Path
+    class Git
       class GitNotInstalledError < GitError
         def initialize
           msg = String.new
@@ -132,7 +132,7 @@ module Bundler
             if submodules
               git_retry "submodule update --init --recursive"
             elsif Gem::Version.create(version) >= Gem::Version.create("2.9.0")
-              git_retry "submodule deinit --all"
+              git_retry "submodule deinit --all --force"
             end
           end
         end

data/lib/bundler/version.rb

@@ -7,7 +7,7 @@ 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.15.0" unless defined?(::Bundler::VERSION)
+  VERSION = "1.15.1" unless defined?(::Bundler::VERSION)
 
   def self.overwrite_loaded_gem_version
     begin

data/man/bundle.ronn

@@ -48,6 +48,9 @@ We divide `bundle` subcommands into primary commands and utilities.
 
 ## UTILITIES
 
+* `bundle add(1)`:
+  Add the named gem to the Gemfile and run `bundle install`
+
 * `bundle binstubs(1)`:
   Generate binstubs for executables in a gem
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - André Arko
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: automatiek