bundler 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fb84cf9bb021582ed99f745047f672b3cdbc665
-  data.tar.gz: 22604b1633c62d5aa0167dfba12b585490c54c76
+  metadata.gz: 41d7927009486de82bc1e93eeaef65d49419e7df
+  data.tar.gz: a03b3ee06e879cb4795e73c692d1b5d0308a807e
 SHA512:
-  metadata.gz: aa68a32dabf6211b673273b54c02c16f46da81df452aab7c1443b8f0012c9add0a54308bca5ae50bb62fee28a4eadf97a0a0ea72a1a2d1c8c1bead09aa1a60c0
-  data.tar.gz: fbec4407a62c7e418362731ff5cb4479afceb56afed0a16891cb870a219bf342ab4fb3a2b9da280210833393a62d70e19529f61544853c033ecbff83bec08cfa
+  metadata.gz: d65135c439064b73f6dc08a5940c6125374395047eccd4bd39b2e848471e57643632f0df36c7600419db24934965aa169be1642d2257a8ea1a7240430bd93223
+  data.tar.gz: 99dcf65cf946d7c3752cd82034f833d9968813f9d41f15992b60a3d86998448913040d5d567361f01da3ec7f6808ced4f0072993ce9550f5bc3c2181c55e011a

data/.travis.yml

@@ -5,6 +5,7 @@ before_script: travis_retry rake spec:travis:deps
 branches:
   only:
     - master
+    - 1-9-stable
     - 1-8-stable
     - 1-7-stable
     - 1-6-stable

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.9.1 (2015-03-21)
+
+Bugfixes:
+
+  - avoid exception in 'bundler/gem_tasks' (#3492, @segiddins)
+
 ## 1.9.0 (2015-03-20)
 
 ## 1.9.0.rc (2015-03-13)

data/Rakefile

@@ -27,23 +27,32 @@ module Rake
   end
 end
 
+def clean_files(files, regex, replacement = '')
+  files.each do |file|
+    contents = File.read(file)
+    contents.gsub!(regex, replacement)
+    File.open(file, 'w') { |f| f << contents }
+  end
+end
+
 namespace :molinillo do
   task :namespace do
-    files = Dir.glob('lib/bundler/vendor/Molinillo*/**/*.rb')
-    sh "sed -i.bak 's/Molinillo/Bundler::Molinillo/g' #{files.join(' ')}"
-    sh "rm #{files.join('.bak ')}.bak"
+    files = Dir.glob('lib/bundler/vendor/molinillo*/**/*.rb')
+    clean_files(files, 'Molinillo', 'Bundler::Molinillo')
+    clean_files(files, /require (["'])molinillo/, 'require \1bundler/vendor/molinillo/lib/molinillo')
   end
 
   task :clean do
-    files = Dir.glob('lib/bundler/vendor/Molinillo*/*', File::FNM_DOTMATCH).reject { |f| %(. .. lib).include? f.split('/').last }
-    puts files
-    sh "rm -r #{files.join(' ')}"
+    files = Dir.glob('lib/bundler/vendor/molinillo*/*', File::FNM_DOTMATCH).reject { |f| %(. .. lib).include? f.split('/').last }
+    rm_r files
   end
 
   task :update, [:tag] => [] do |t, args|
     tag = args[:tag]
     Dir.chdir 'lib/bundler/vendor' do
-      `curl -L https://github.com/CocoaPods/molinillo/archive/#{tag}.tar.gz | tar -xz`
+      rm_rf 'molinillo'
+      sh "curl -L https://github.com/CocoaPods/molinillo/archive/#{tag}.tar.gz | tar -xz"
+      sh "mv Molinillo-* molinillo"
     end
     Rake::Task['molinillo:namespace'].invoke
     Rake::Task['molinillo:clean'].invoke
@@ -53,20 +62,22 @@ end
 namespace :thor do
   task :namespace do
     files = Dir.glob('lib/bundler/vendor/thor*/**/*.rb')
-    sh "sed -i.bak 's/Thor/Bundler::Thor/g' #{files.join(' ')}"
-    sh "rm #{files.join('.bak ')}.bak"
+    clean_files(files, 'Thor', 'Bundler::Thor')
+    clean_files(files, /require (["'])thor/, 'require \1bundler/vendor/thor/lib/thor')
+    clean_files(files, /(autoload\s+[:\w]+,\s+["'])(thor[\w\/]+["'])/, '\1bundler/vendor/thor/lib/\2')
   end
 
   task :clean do
     files = Dir.glob('lib/bundler/vendor/thor*/*', File::FNM_DOTMATCH).reject { |f| %(. .. lib).include? f.split('/').last }
-    puts files
-    sh "rm -r #{files.join(' ')}"
+    rm_r files
   end
 
   task :update, [:tag] => [] do |t, args|
     tag = args[:tag]
     Dir.chdir 'lib/bundler/vendor' do
-      `curl -L https://github.com/erikhuda/thor/archive/#{tag}.tar.gz | tar -xz`
+      rm_rf 'thor'
+      sh "curl -L https://github.com/erikhuda/thor/archive/#{tag}.tar.gz | tar -xz"
+      sh "mv thor-* thor"
     end
     Rake::Task['thor:namespace'].invoke
     Rake::Task['thor:clean'].invoke

data/lib/bundler/vendor/molinillo/lib/molinillo.rb

@@ -0,0 +1,5 @@
+require 'bundler/vendor/molinillo/lib/molinillo/gem_metadata'
+require 'bundler/vendor/molinillo/lib/molinillo/errors'
+require 'bundler/vendor/molinillo/lib/molinillo/resolver'
+require 'bundler/vendor/molinillo/lib/molinillo/modules/ui'
+require 'bundler/vendor/molinillo/lib/molinillo/modules/specification_provider'

data/lib/bundler/vendor/{Molinillo-0.2.1 → molinillo}/lib/molinillo/resolution.rb

@@ -98,8 +98,8 @@ module Bundler::Molinillo
         debug { 'Activated: ' + Hash[activated.vertices.select { |_n, v| v.payload }].keys.join(', ') } if state
       end
 
-      require 'molinillo/state'
-      require 'molinillo/modules/specification_provider'
+      require 'bundler/vendor/molinillo/lib/molinillo/state'
+      require 'bundler/vendor/molinillo/lib/molinillo/modules/specification_provider'
 
       # @return [Integer] the number of resolver iterations in between calls to
       #   {#resolver_ui}'s {UI#indicate_progress} method

data/lib/bundler/vendor/{Molinillo-0.2.1 → molinillo}/lib/molinillo/resolver.rb

@@ -1,4 +1,4 @@
-require 'molinillo/dependency_graph'
+require 'bundler/vendor/molinillo/lib/molinillo/dependency_graph'
 
 module Bundler::Molinillo
   # This class encapsulates a dependency resolver.
@@ -7,7 +7,7 @@ module Bundler::Molinillo
   #
   #
   class Resolver
-    require 'molinillo/resolution'
+    require 'bundler/vendor/molinillo/lib/molinillo/resolution'
 
     # @return [SpecificationProvider] the specification provider used
     #   in the resolution process

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor.rb

@@ -1,5 +1,5 @@
 require "set"
-require "thor/base"
+require "bundler/vendor/thor/lib/thor/base"
 
 class Bundler::Thor # rubocop:disable ClassLength
   class << self

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/actions.rb

@@ -1,12 +1,12 @@
 require "fileutils"
 require "uri"
-require "thor/core_ext/io_binary_read"
-require "thor/actions/create_file"
-require "thor/actions/create_link"
-require "thor/actions/directory"
-require "thor/actions/empty_directory"
-require "thor/actions/file_manipulation"
-require "thor/actions/inject_into_file"
+require "bundler/vendor/thor/lib/thor/core_ext/io_binary_read"
+require "bundler/vendor/thor/lib/thor/actions/create_file"
+require "bundler/vendor/thor/lib/thor/actions/create_link"
+require "bundler/vendor/thor/lib/thor/actions/directory"
+require "bundler/vendor/thor/lib/thor/actions/empty_directory"
+require "bundler/vendor/thor/lib/thor/actions/file_manipulation"
+require "bundler/vendor/thor/lib/thor/actions/inject_into_file"
 
 class Bundler::Thor
   module Actions

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/actions/create_file.rb

@@ -1,4 +1,4 @@
-require "thor/actions/empty_directory"
+require "bundler/vendor/thor/lib/thor/actions/empty_directory"
 
 class Bundler::Thor
   module Actions

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/actions/create_link.rb

@@ -1,4 +1,4 @@
-require "thor/actions/create_file"
+require "bundler/vendor/thor/lib/thor/actions/create_file"
 
 class Bundler::Thor
   module Actions

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/actions/directory.rb

@@ -1,4 +1,4 @@
-require "thor/actions/empty_directory"
+require "bundler/vendor/thor/lib/thor/actions/empty_directory"
 
 class Bundler::Thor
   module Actions

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/actions/inject_into_file.rb

@@ -1,4 +1,4 @@
-require "thor/actions/empty_directory"
+require "bundler/vendor/thor/lib/thor/actions/empty_directory"
 
 class Bundler::Thor
   module Actions

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/base.rb

@@ -1,17 +1,17 @@
-require "thor/command"
-require "thor/core_ext/hash_with_indifferent_access"
-require "thor/core_ext/ordered_hash"
-require "thor/error"
-require "thor/invocation"
-require "thor/parser"
-require "thor/shell"
-require "thor/line_editor"
-require "thor/util"
+require "bundler/vendor/thor/lib/thor/command"
+require "bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access"
+require "bundler/vendor/thor/lib/thor/core_ext/ordered_hash"
+require "bundler/vendor/thor/lib/thor/error"
+require "bundler/vendor/thor/lib/thor/invocation"
+require "bundler/vendor/thor/lib/thor/parser"
+require "bundler/vendor/thor/lib/thor/shell"
+require "bundler/vendor/thor/lib/thor/line_editor"
+require "bundler/vendor/thor/lib/thor/util"
 
 class Bundler::Thor
-  autoload :Actions,    "thor/actions"
-  autoload :RakeCompat, "thor/rake_compat"
-  autoload :Group,      "thor/group"
+  autoload :Actions,    "bundler/vendor/thor/lib/thor/actions"
+  autoload :RakeCompat, "bundler/vendor/thor/lib/thor/rake_compat"
+  autoload :Group,      "bundler/vendor/thor/lib/thor/group"
 
   # Shortcuts for help.
   HELP_MAPPINGS       = %w[-h -? --help -D]

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/group.rb

@@ -1,4 +1,4 @@
-require "thor/base"
+require "bundler/vendor/thor/lib/thor/base"
 
 # Bundler::Thor has a special class called Bundler::Thor::Group. The main difference to Bundler::Thor class
 # is that it invokes all commands at once. It also include some methods that allows

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/line_editor.rb

@@ -1,5 +1,5 @@
-require "thor/line_editor/basic"
-require "thor/line_editor/readline"
+require "bundler/vendor/thor/lib/thor/line_editor/basic"
+require "bundler/vendor/thor/lib/thor/line_editor/readline"
 
 class Bundler::Thor
   module LineEditor

data/lib/bundler/vendor/thor/lib/thor/parser.rb

@@ -0,0 +1,4 @@
+require "bundler/vendor/thor/lib/thor/parser/argument"
+require "bundler/vendor/thor/lib/thor/parser/arguments"
+require "bundler/vendor/thor/lib/thor/parser/option"
+require "bundler/vendor/thor/lib/thor/parser/options"

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/rake_compat.rb

@@ -5,7 +5,7 @@ class Bundler::Thor
   # Adds a compatibility layer to your Bundler::Thor classes which allows you to use
   # rake package tasks. For example, to use rspec rake tasks, one can do:
   #
-  #   require 'thor/rake_compat'
+  #   require 'bundler/vendor/thor/lib/thor/rake_compat'
   #   require 'rspec/core/rake_task'
   #
   #   class Default < Bundler::Thor

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/runner.rb

@@ -1,6 +1,6 @@
-require "thor"
-require "thor/group"
-require "thor/core_ext/io_binary_read"
+require "bundler/vendor/thor/lib/thor"
+require "bundler/vendor/thor/lib/thor/group"
+require "bundler/vendor/thor/lib/thor/core_ext/io_binary_read"
 
 require "fileutils"
 require "open-uri"
@@ -102,7 +102,7 @@ class Bundler::Thor::Runner < Bundler::Thor #:nodoc: # rubocop:disable ClassLeng
 
   desc "version", "Show Bundler::Thor version"
   def version
-    require "thor/version"
+    require "bundler/vendor/thor/lib/thor/version"
     say "Bundler::Thor #{Bundler::Thor::VERSION}"
   end
 

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/shell.rb

@@ -24,9 +24,9 @@ class Bundler::Thor
     SHELL_DELEGATED_METHODS = [:ask, :error, :set_color, :yes?, :no?, :say, :say_status, :print_in_columns, :print_table, :print_wrapped, :file_collision, :terminal_width]
     attr_writer :shell
 
-    autoload :Basic, "thor/shell/basic"
-    autoload :Color, "thor/shell/color"
-    autoload :HTML,  "thor/shell/html"
+    autoload :Basic, "bundler/vendor/thor/lib/thor/shell/basic"
+    autoload :Color, "bundler/vendor/thor/lib/thor/shell/color"
+    autoload :HTML,  "bundler/vendor/thor/lib/thor/shell/html"
 
     # Add shell to initialize config values.
     #

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/shell/color.rb

@@ -1,4 +1,4 @@
-require "thor/shell/basic"
+require "bundler/vendor/thor/lib/thor/shell/basic"
 
 class Bundler::Thor
   module Shell

data/lib/bundler/vendor/{thor-0.19.1 → thor}/lib/thor/shell/html.rb

@@ -1,4 +1,4 @@
-require "thor/shell/basic"
+require "bundler/vendor/thor/lib/thor/shell/basic"
 
 class Bundler::Thor
   module Shell

data/lib/bundler/vendored_molinillo.rb

@@ -1,5 +1,2 @@
-vendor = File.expand_path('../vendor/Molinillo-0.2.1/lib', __FILE__)
-loaded = $:.include?(vendor)
-$:.unshift(vendor) unless loaded
-require 'molinillo'
-$:.delete(vendor) unless loaded
+module Bundler; end
+require 'bundler/vendor/molinillo/lib/molinillo'

data/lib/bundler/vendored_thor.rb

@@ -1,5 +1,3 @@
-vendor = File.expand_path('../vendor/thor-0.19.1/lib', __FILE__)
-loaded = $:.include?(vendor)
-$:.unshift(vendor) unless loaded
-require 'thor'
-require 'thor/actions'
+module Bundler; end
+require 'bundler/vendor/thor/lib/thor'
+require 'bundler/vendor/thor/lib/thor/actions'

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - André Arko
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
@@ -216,50 +216,50 @@ files:
 - lib/bundler/ui/rg_proxy.rb
 - lib/bundler/ui/shell.rb
 - lib/bundler/ui/silent.rb
-- lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo.rb
-- lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/dependency_graph.rb
-- lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/errors.rb
-- lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/gem_metadata.rb
-- lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/modules/specification_provider.rb
-- lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/modules/ui.rb
-- lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/resolution.rb
-- lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/resolver.rb
-- lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo/state.rb
+- lib/bundler/vendor/molinillo/lib/molinillo.rb
+- lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb
+- lib/bundler/vendor/molinillo/lib/molinillo/errors.rb
+- lib/bundler/vendor/molinillo/lib/molinillo/gem_metadata.rb
+- lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb
+- lib/bundler/vendor/molinillo/lib/molinillo/modules/ui.rb
+- lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
+- lib/bundler/vendor/molinillo/lib/molinillo/resolver.rb
+- lib/bundler/vendor/molinillo/lib/molinillo/state.rb
 - lib/bundler/vendor/net/http/faster.rb
 - lib/bundler/vendor/net/http/persistent.rb
 - lib/bundler/vendor/net/http/persistent/ssl_reuse.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/actions.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/actions/create_file.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/actions/create_link.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/actions/directory.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/actions/empty_directory.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/actions/file_manipulation.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/actions/inject_into_file.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/base.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/command.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/hash_with_indifferent_access.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/io_binary_read.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/core_ext/ordered_hash.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/error.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/group.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/invocation.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor/basic.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/line_editor/readline.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/parser.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/parser/argument.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/parser/arguments.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/parser/option.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/parser/options.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/rake_compat.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/runner.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/shell.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/shell/basic.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/shell/color.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/shell/html.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/util.rb
-- lib/bundler/vendor/thor-0.19.1/lib/thor/version.rb
+- lib/bundler/vendor/thor/lib/thor.rb
+- lib/bundler/vendor/thor/lib/thor/actions.rb
+- lib/bundler/vendor/thor/lib/thor/actions/create_file.rb
+- lib/bundler/vendor/thor/lib/thor/actions/create_link.rb
+- lib/bundler/vendor/thor/lib/thor/actions/directory.rb
+- lib/bundler/vendor/thor/lib/thor/actions/empty_directory.rb
+- lib/bundler/vendor/thor/lib/thor/actions/file_manipulation.rb
+- lib/bundler/vendor/thor/lib/thor/actions/inject_into_file.rb
+- lib/bundler/vendor/thor/lib/thor/base.rb
+- lib/bundler/vendor/thor/lib/thor/command.rb
+- lib/bundler/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
+- lib/bundler/vendor/thor/lib/thor/core_ext/io_binary_read.rb
+- lib/bundler/vendor/thor/lib/thor/core_ext/ordered_hash.rb
+- lib/bundler/vendor/thor/lib/thor/error.rb
+- lib/bundler/vendor/thor/lib/thor/group.rb
+- lib/bundler/vendor/thor/lib/thor/invocation.rb
+- lib/bundler/vendor/thor/lib/thor/line_editor.rb
+- lib/bundler/vendor/thor/lib/thor/line_editor/basic.rb
+- lib/bundler/vendor/thor/lib/thor/line_editor/readline.rb
+- lib/bundler/vendor/thor/lib/thor/parser.rb
+- lib/bundler/vendor/thor/lib/thor/parser/argument.rb
+- lib/bundler/vendor/thor/lib/thor/parser/arguments.rb
+- lib/bundler/vendor/thor/lib/thor/parser/option.rb
+- lib/bundler/vendor/thor/lib/thor/parser/options.rb
+- lib/bundler/vendor/thor/lib/thor/rake_compat.rb
+- lib/bundler/vendor/thor/lib/thor/runner.rb
+- lib/bundler/vendor/thor/lib/thor/shell.rb
+- lib/bundler/vendor/thor/lib/thor/shell/basic.rb
+- lib/bundler/vendor/thor/lib/thor/shell/color.rb
+- lib/bundler/vendor/thor/lib/thor/shell/html.rb
+- lib/bundler/vendor/thor/lib/thor/util.rb
+- lib/bundler/vendor/thor/lib/thor/version.rb
 - lib/bundler/vendored_molinillo.rb
 - lib/bundler/vendored_persistent.rb
 - lib/bundler/vendored_thor.rb

data/lib/bundler/vendor/Molinillo-0.2.1/lib/molinillo.rb

@@ -1,5 +0,0 @@
-require 'molinillo/gem_metadata'
-require 'molinillo/errors'
-require 'molinillo/resolver'
-require 'molinillo/modules/ui'
-require 'molinillo/modules/specification_provider'

data/lib/bundler/vendor/thor-0.19.1/lib/thor/parser.rb

@@ -1,4 +0,0 @@
-require "thor/parser/argument"
-require "thor/parser/arguments"
-require "thor/parser/option"
-require "thor/parser/options"