bundler 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b1aaf8e4e40f84d9eca9b9d919d08c10f5b426c
-  data.tar.gz: e7d8a3f164414640330e9d82da8ca3d697f72065
+  metadata.gz: 553a69b15deef7d959ae0290d04daa23e0caa732
+  data.tar.gz: 221e5cb9211137431446b472826c5494d808a7ab
 SHA512:
-  metadata.gz: c412782fb44f681f0d932a2315aea509c12592788993ecf9fc91ca6fe1608ff51b1733b17048879b0bb3a61fb9fb5c9c928f08422527a0d38d5acd5e35f02f89
-  data.tar.gz: 925bf88b4902b053e2f16348fac713091b1390e386c036bca32066a61ea52e890a9bd906faf84fd5e10084b98584dc03226022fba515c2af04944f24ae788b6f
+  metadata.gz: 9cb54b02735aa3eeac4ec223c8cfb3e25906526590d1d59bcd89271f79aa53e3ef5462017a96ac12b4d2079091a5c217e58947bbc257e674552d590fdf372c2d
+  data.tar.gz: 07d82e6e251c21f7a745820d2d7a320452c170c2354abb8ce90424b4496bf44223995bed880d511a17bea8129c23e800edad3aa0608d811bebebfa2628a08fac

data/CHANGELOG.md

@@ -1,8 +1,16 @@
+## 1.9.6 (2015-05-02)
+
+Bugfixes:
+
+  - support RubyGems versions above 2.4.6 (@tenderlove, @segiddins, @indirect)
+  - allow creating gems with names containing two dashes (#3483, @janlelis)
+  - allow creating gems with names extending constants (#3603, @amatsuda)
+
 ## 1.9.5 (2015-04-29)
 
 Bugfixes:
 
-  - Respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
+  - respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
 
 ## 1.9.4 (2015-04-13)
 
@@ -63,6 +71,24 @@ Features:
   - Molinillo resolver, shared with CocoaPods (@segiddins)
   - updated Thor to v0.19.1 (@segiddins)
 
+## 1.8.9 (2015-05-02)
+
+Bugfixes:
+
+  - Support RubyGems versions above 2.4.6 (@tenderlove, @segiddins, @indirect)
+
+## 1.8.8 (2015-04-29)
+
+Bugfixes:
+
+  - Respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
+
+## 1.8.7 (2015-04-07)
+
+Bugfixes:
+
+  - stop suppressing errors inside gems that get required (#3549, @indirect)
+
 ## 1.8.6 (2015-03-30)
 
 Bugfixes:
@@ -169,6 +195,19 @@ Documentation:
 
   - add missing Gemfile global `path` explanation (@agenteo)
 
+## 1.7.15 (2015-04-29)
+
+Bugfixes:
+
+  - Respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
+
+## 1.7.14 (2015-03-30)
+
+Bugfixes:
+
+  - Keep gems locked when updating another gem from the same source (#3250, @indirect)
+  - Don't add extra quotes around long, quoted config values (@aroben, #3338)
+
 ## 1.7.13 (2015-02-07)
 
 Bugfixes:

data/Rakefile

@@ -291,12 +291,15 @@ begin
     task :clean do
       rm_rf "lib/bundler/man"
     end
+
+    task(:require) { }
   end
 
 rescue LoadError
   namespace :man do
-    task(:build) { warn "Install the ronn gem to be able to release!" }
-    task(:clean) { warn "Install the ronn gem to be able to release!" }
+    task(:require) { abort "Install the ronn gem to be able to release!" }
+    task(:build) { warn "Install the ronn gem to build the help pages" }
+    task(:clean) { }
   end
 end
 
@@ -308,6 +311,6 @@ end
 
 require 'bundler/gem_tasks'
 task :build => ["man:clean", "man:build"]
-task :release => ["man:clean", "man:build"]
+task :release => ["man:require", "man:clean", "man:build"]
 
 task :default => :spec

data/lib/bundler/cli/gem.rb

@@ -20,9 +20,9 @@ module Bundler
 
       underscored_name = name.tr('-', '_')
       namespaced_path = name.tr('-', '/')
-      constant_name = name.split('_').map{|p| p[0..0].upcase + p[1..-1] unless p.empty?}.join
-      constant_name = constant_name.split('-').map{|q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
+      constant_name = name.gsub(/-[_-]*(?![_-]|$)/){ '::' }.gsub(/([_-]+|(::)|^)(.|$)/){ $2.to_s + $3.upcase }
       constant_array = constant_name.split('::')
+
       git_user_name = `git config user.name`.chomp
       git_user_email = `git config user.email`.chomp
 
@@ -185,7 +185,7 @@ module Bundler
       if name =~ /^\d/
         Bundler.ui.error "Invalid gem name #{name} Please give a name which does not start with numbers."
         exit 1
-      elsif Object.const_defined?(constant_array.first)
+      elsif constant_array.inject(Object) {|c, s| (c.const_defined?(s) && c.const_get(s)) || break }
         Bundler.ui.error "Invalid gem name #{name} constant #{constant_array.join("::")} is already in use. Please choose another gem name."
         exit 1
       end

data/lib/bundler/definition.rb

@@ -521,7 +521,7 @@ module Bundler
       converged = []
       @locked_specs.each do |s|
         # Replace the locked dependency's source with the equivalent source from the Gemfile
-        dep = @dependencies.find { |dep| s.satisfies?(dep) }
+        dep = @dependencies.find { |d| s.satisfies?(d) }
         s.source = (dep && dep.source) || sources.get(s.source)
 
         # Don't add a spec to the list if its source is expired. For example,

data/lib/bundler/friendly_errors.rb

@@ -41,18 +41,27 @@ module Bundler
 
   def self.request_issue_report_for(e)
     Bundler.ui.info <<-EOS.gsub(/^ {6}/, '')
-      #{'――― ERROR REPORT TEMPLATE ―――――――――――――――――――――――――――――――――――――――――――――――――――――――'}
+      #{'--- ERROR REPORT TEMPLATE -------------------------------------------------------'}
       - What did you do?
+
+        I ran the command `#{$PROGRAM_NAME} #{ARGV.join(' ')}`
+
       - What did you expect to happen?
+
+        I expected Bundler to...
+
       - What happened instead?
 
+        Instead, what actually happened was...
+
+
       Error details
 
           #{e.class}: #{e.message}
-          #{e.backtrace.join("\n          ")}
+            #{e.backtrace.join("\n            ")}
 
       #{Bundler::Env.new.report(:print_gemfile => false).gsub(/\n/, "\n      ").strip}
-      #{'――― TEMPLATE END ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――'}
+      #{'--- TEMPLATE END ----------------------------------------------------------------'}
 
     EOS
 

data/lib/bundler/rubygems_integration.rb

@@ -585,6 +585,12 @@ module Bundler
       def ext_lock
         Gem::Ext::Builder::CHDIR_MONITOR
       end
+
+      def find_name(name)
+        Gem::Specification.stubs.find_all do |spec|
+          spec.name == name
+        end.map(&:to_spec)
+      end
     end
 
   end

data/lib/bundler/source/rubygems.rb

@@ -208,6 +208,8 @@ module Bundler
         remotes.map(&method(:suppress_configured_credentials))
       end
 
+    private
+
       def source_uris_for_spec(spec)
         specs.search_all(spec.name).inject([]) do |uris, s|
           uris << s.source_uri.without_credentials if s.source_uri
@@ -215,8 +217,6 @@ module Bundler
         end
       end
 
-    private
-
       def loaded_from(spec)
         "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
       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.9.5" unless defined?(::Bundler::VERSION)
+  VERSION = "1.9.6" unless defined?(::Bundler::VERSION)
 end

metadata

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