bundler 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d03cb52cb9c56cfb0a8e3ac50050a2dfe2e73e
-  data.tar.gz: 4a1e485a82e9703c83f4eec7fd8b11d36c0aaeef
+  metadata.gz: fdd61d3f649a2286c95d0bc5515d4ea65c973eb9
+  data.tar.gz: 76e9fa0bc5815e53bb843aba5740beb312c0e431
 SHA512:
-  metadata.gz: 04ff3dd741753285f4f95d1bc62830025f861176f922308b0fdaad31c13bc7661c34a4d3e225045ecafe7725ceaf6d666b16cf68af884b763eb0f70b374826e4
-  data.tar.gz: 7f4850dfe4fabc581ca1a5be0fad0caf357f48c8397a92f5aadcf5537e48ee322248d7c4021cc5cb92c1a124c2c84e1bb3c0f676834c73100ffde153a7c36745
+  metadata.gz: b8632f839d3b851aa0616049fba43da47ae30cb3ccb2ec08b17bff58500918587734e5355fea0b4315b60a393a573a11991bac41c606a4762ec69dbe76f60c36
+  data.tar.gz: 03c4b99989fc26da6126342f4e79625d153bb06c1675b426fd64bb1e2570592e8123c5c5adddcc4bfff8e7dc9ec5c0331b01d724f8d9e7d25e6d38f1a3445d34

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.6.4 (2014-07-17)
+
+Bugfixes:
+
+  - fix undefined constant error when can't find gem during binstubs (#3095, @jetaggart)
+  - work when installed git gems are not writable (#3092, @pmahoney)
+  - don't store configured source credentials in Gemfile.lock (#3045, @lhz)
+  - don't include config source credentials in the lockfile (Lars Haugseth)
+  - use threads for jobs on Rubinius (@YorickPeterse)
+  - skip dependencies from other platforms (@mvz)
+  - work when Rubygems was built without SSL (@andremedeiros)
+
 ## 1.6.3 (2014-06-16)
 
 Bugfixes:

data/Rakefile

@@ -30,11 +30,10 @@ end
 namespace :spec do
   desc "Ensure spec dependencies are installed"
   task :deps do
-    deps = {
-      "rdiscount" => "~> 1.6",
-      "ronn" => "~> 0.7.3",
-      "rspec" => "~> 3.0.beta"
-    }
+    spec = Gem::Specification.load("bundler.gemspec")
+    deps = Hash[spec.development_dependencies.map do |d|
+      [d.name, d.requirement.to_s]
+    end]
 
     # JRuby can't build ronn or rdiscount, so we skip that
     if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
@@ -77,7 +76,6 @@ namespace :spec do
 end
 
 begin
-  # running the specs needs both rspec and ronn
   require 'rspec/core/rake_task'
 
   desc "Run specs"

data/bin/bundle

@@ -14,7 +14,8 @@ $LOAD_PATH.each do |path|
   end
 end
 
-require 'bundler/cli'
-
 require 'bundler/friendly_errors'
-Bundler.with_friendly_errors { Bundler::CLI.start(ARGV, :debug => true) }
+Bundler.with_friendly_errors do
+  require 'bundler/cli'
+  Bundler::CLI.start(ARGV, :debug => true)
+end

data/bin/bundler

@@ -1,10 +1,21 @@
 #!/usr/bin/env ruby
 
-require 'bundler'
-require 'bundler/cli'
+# Exit cleanly from an early interrupt
+Signal.trap("INT") { exit 1 }
 
-ui = Bundler::UI::Shell.new
-ui.error "It's recommended to use Bundler through 'bundle' binary instead of 'bundler'"
+require 'bundler'
+# Check if an older version of bundler is installed
+$LOAD_PATH.each do |path|
+  if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
+    err = "Looks like you have a version of bundler that's older than 0.9.\n"
+    err << "Please remove your old versions.\n"
+    err << "An easy way to do this is by running `gem cleanup bundler`."
+    abort(err)
+  end
+end
 
-bin = "#{File.dirname(__FILE__)}/bundle #{ARGV.join(" ")}"
-exec bin
+require 'bundler/friendly_errors'
+Bundler.with_friendly_errors do
+  require 'bundler/cli'
+  Bundler::CLI.start(ARGV, :debug => true)
+end

data/bundler.gemspec

@@ -16,8 +16,9 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version     = '>= 1.8.7'
   spec.required_rubygems_version = '>= 1.3.6'
 
+  spec.add_development_dependency 'rdiscount', '~> 1.6'
   spec.add_development_dependency 'ronn', '~> 0.7.3'
-  spec.add_development_dependency 'rspec', '~> 2.99.0.beta1'
+  spec.add_development_dependency 'rspec', '~> 3.0.0.beta1'
 
   spec.files       = `git ls-files -z`.split("\x0")
   spec.files      += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git

data/lib/bundler/cli.rb

@@ -136,8 +136,7 @@ module Bundler
       "Run bundle clean automatically after install"
     method_option "trust-policy", :alias => "P", :type => :string, :banner =>
       "Gem trust policy (like gem install -P). Must be one of " +
-        Bundler.rubygems.security_policies.keys.join('|') unless
-        Bundler.rubygems.security_policies.empty?
+        Bundler.rubygems.security_policy_keys.join('|')
     method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
       "Specify the number of jobs to run in parallel"
 

data/lib/bundler/cli/binstubs.rb

@@ -1,3 +1,5 @@
+require "bundler/cli/common"
+
 module Bundler
   class CLI::Binstubs
     attr_reader :options, :gems

data/lib/bundler/definition.rb

@@ -580,6 +580,7 @@ module Bundler
       deps = []
       dependencies.each do |dep|
         dep = Dependency.new(dep, ">= 0") unless dep.respond_to?(:name)
+        next unless remote || dep.current_platform?
         dep.gem_platforms(@platforms).each do |p|
           deps << DepProxy.new(dep, p) if remote || p == generic(Gem::Platform.local)
         end

data/lib/bundler/parallel_workers.rb

@@ -8,7 +8,7 @@ module Bundler
     autoload :ThreadWorker, "bundler/parallel_workers/thread_worker"
 
     def self.worker_pool(size, job)
-      if Bundler.current_ruby.mswin? || Bundler.current_ruby.jruby?
+      if Bundler.current_ruby.mswin? || Bundler.current_ruby.jruby? || Bundler.current_ruby.rbx?
         ThreadWorker.new(size, job)
       else
         UnixWorker.new(size, job)

data/lib/bundler/rubygems_integration.rb

@@ -202,6 +202,10 @@ module Bundler
       fetcher.download(spec, uri, path)
     end
 
+    def security_policy_keys
+      %w{High Medium Low AlmostNo No}.map { |level| "#{level}Security" }
+    end
+
     def security_policies
       @security_policies ||= begin
         require 'rubygems/security'

data/lib/bundler/source/git.rb

@@ -79,11 +79,12 @@ module Bundler
       def install_path
         @install_path ||= begin
           git_scope = "#{base_name}-#{shortref_for_path(revision)}"
+          path = Bundler.install_path.join(git_scope)
 
-          if Bundler.requires_sudo?
+          if !path.exist? && Bundler.requires_sudo?
             Bundler.user_bundle_path.join(Bundler.ruby_scope).join(git_scope)
           else
-            Bundler.install_path.join(git_scope)
+            path
           end
         end
       end

data/lib/bundler/source/rubygems.rb

@@ -50,7 +50,9 @@ module Bundler
 
       def to_lock
         out = "GEM\n"
-        out << remotes.map {|r| "  remote: #{r}\n" }.join
+        out << remotes.map { |remote|
+          "  remote: #{suppress_configured_credentials remote}\n"
+        }.join
         out << "  specs:\n"
       end
 
@@ -183,6 +185,15 @@ module Bundler
         uri
       end
 
+      def suppress_configured_credentials(remote)
+        remote_nouser = remote.tap { |uri| uri.user = uri.password = nil }.to_s
+        if remote.userinfo && remote.userinfo == Bundler.settings[remote_nouser]
+          remote_nouser
+        else
+          remote
+        end
+      end
+
       def fetch_specs
         # remote_specs usually generates a way larger Index than the other
         # sources, and large_idx.use small_idx is way faster than

data/lib/bundler/templates/newgem/README.md.tt

@@ -6,7 +6,9 @@ TODO: Write a gem description
 
 Add this line to your application's Gemfile:
 
-    gem '<%=config[:name]%>'
+```ruby
+gem '<%=config[:name]%>'
+```
 
 And then execute:
 

data/lib/bundler/templates/newgem/gitignore.tt

@@ -1,20 +1,12 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
 *.bundle
 *.so
 *.o

data/lib/bundler/templates/newgem/newgem.gemspec.tt

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> <%= Bundler::VERSION.split(".")[0..1].join(".") %>"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.0"
 <% if config[:ext] -%>
   spec.add_development_dependency "rake-compiler"
 <% 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.3" unless defined?(::Bundler::VERSION)
+  VERSION = "1.6.4" unless defined?(::Bundler::VERSION)
 end

data/man/bundle-install.ronn

@@ -91,8 +91,9 @@ update process below under [CONSERVATIVE UPDATING][].
 
 * `--trust-policy=[<policy>]`:
   Apply the Rubygems security policy named <policy>, where policy is one of
-  HighSecurity, MediumSecurity, LowSecurity, or NoSecurity. For more detail,
-  see the Rubygems signing documentation, linked below in [SEE ALSO][].
+  HighSecurity, MediumSecurity, LowSecurity, AlmostNoSecurity, or NoSecurity.
+  For more detail, see the Rubygems signing documentation, linked below in
+  [SEE ALSO][].
 
 * `--jobs=[<size>]`:
   Install gems parallely by starting <size> number of parallel workers.
@@ -367,5 +368,5 @@ does not work, run [bundle update(1)][bundle-update].
 
 ## SEE ALSO
 
-* Gem install docs: http://docs.rubygems.org/read/chapter/2
-* Rubygems signing docs: http://docs.rubygems.org/read/chapter/21
+* Gem install docs: http://guides.rubygems.org/rubygems-basics/#installing-gems
+* Rubygems signing docs: http://guides.rubygems.org/security/

data/spec/commands/binstubs_spec.rb

@@ -105,6 +105,19 @@ describe "bundle binstubs <gem>" do
     end
   end
 
+  context "when the gem doesn't exist" do
+    it "displays an error with correct status" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+      G
+
+      bundle "binstubs doesnt_exist", :exitstatus => true
+
+      expect(exitstatus).to eq(7)
+      expect(out).to eq("Could not find gem 'doesnt_exist'.")
+    end
+  end
+
   context "--path" do
     it "sets the binstubs dir" do
       install_gemfile <<-G

data/spec/lock/lockfile_spec.rb

@@ -70,6 +70,31 @@ describe "the lockfile format" do
     G
   end
 
+  it "generates a lockfile wihout credentials for a configured source" do
+    bundle "config http://localgemserver.test/ user:pass"
+
+    install_gemfile(<<-G, :artifice => "endpoint_strict_basic_authentication", :quiet => true)
+      source "http://localgemserver.test/"
+
+      gem "rack-obama", ">= 1.0"
+    G
+
+    lockfile_should_be <<-G
+      GEM
+        remote: http://localgemserver.test/
+        specs:
+          rack (1.0.0)
+          rack-obama (1.0)
+            rack
+
+      PLATFORMS
+        #{generic(Gem::Platform.local)}
+
+      DEPENDENCIES
+        rack-obama (>= 1.0)
+    G
+  end
+
   it "generates lockfiles with multiple requirements" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"

data/spec/quality_spec.rb

@@ -42,13 +42,13 @@ describe "The library itself" do
   end
 
   RSpec::Matchers.define :be_well_formed do
-    failure_message do |actual|
-      actual.join("\n")
-    end
-
     match do |actual|
       actual.empty?
     end
+
+    failure_message_for_should do |actual|
+      actual.join("\n")
+    end
   end
 
   it "has no malformed whitespace" do

data/spec/runtime/setup_spec.rb

@@ -368,21 +368,18 @@ describe "Bundler.setup" do
     end
 
     it "does not randomly change the path when specifying --path and the bundle directory becomes read only" do
-      begin
-        bundle "install --path vendor/bundle"
+      bundle "install --path vendor/bundle"
 
-        Dir["**/*"].each do |f|
-          File.directory?(f) ?
-            File.chmod(0555, f) :
-            File.chmod(0444, f)
-        end
+      with_read_only("**/*") do
+        should_be_installed "rack 1.0.0"
+      end
+    end
+
+    it "finds git gem when default bundle path becomes read only" do
+      bundle "install"
+
+      with_read_only("#{Bundler.bundle_path}/**/*") do
         should_be_installed "rack 1.0.0"
-      ensure
-        Dir["**/*"].each do |f|
-          File.directory?(f) ?
-            File.chmod(0755, f) :
-            File.chmod(0644, f)
-        end
       end
     end
   end

data/spec/support/helpers.rb

@@ -341,5 +341,19 @@ module Spec
     ensure
       $stdout = actual_stdout
     end
+
+    def with_read_only(pattern)
+      chmod = lambda do |dirmode, filemode|
+        lambda do |f|
+          mode = File.directory?(f) ? dirmode : filemode
+          File.chmod(mode, f)
+        end
+      end
+
+      Dir[pattern].each(&chmod[0555, 0444])
+      yield
+    ensure
+      Dir[pattern].each(&chmod[0755, 0644])
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - André Arko
@@ -11,8 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
@@ -33,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: 3.0.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0.beta1
+        version: 3.0.0.beta1
 description: Bundler manages an application's dependencies through its entire life,
   across many machines, systematically and repeatably
 email: