bundler 1.3.5 → 1.3.6

data/spec/other/binstubs_spec.rb

@@ -37,7 +37,7 @@ describe "bundle binstubs <gem>" do
       expect(out).to eq("Sorry, Bundler can only be run via Rubygems.")
     end
 
-    it "install binstubs from git gems" do
+    it "installs binstubs from git gems" do
       FileUtils.mkdir_p(lib_path("foo/bin"))
       FileUtils.touch(lib_path("foo/bin/foo"))
       build_git "foo", "1.0", :path => lib_path("foo") do |s|
@@ -66,6 +66,19 @@ describe "bundle binstubs <gem>" do
 
       expect(bundled_app("bin/foo")).to exist
     end
+
+    it "sets correct permissions for binstubs" do
+      with_umask(0002) do
+        install_gemfile <<-G
+          source "file://#{gem_repo1}"
+          gem "rack"
+        G
+
+        bundle "binstubs rack"
+        binary = bundled_app("bin/rackup")
+        expect(File.stat(binary).mode.to_s(8)).to eq("100775")
+      end
+    end
   end
 
   context "--path" do
@@ -95,7 +108,7 @@ describe "bundle binstubs <gem>" do
   end
 
   context "when the bin already exists" do
-    it "don't override it and warn" do
+    it "doesn't overwrite and warns" do
       FileUtils.mkdir_p(bundled_app("bin"))
       File.open(bundled_app("bin/rackup"), 'wb') do |file|
         file.print "OMG"
@@ -115,7 +128,7 @@ describe "bundle binstubs <gem>" do
     end
 
     context "when using --force" do
-      it "overrides the binstub" do
+      it "overwrites the binstub" do
         FileUtils.mkdir_p(bundled_app("bin"))
         File.open(bundled_app("bin/rackup"), 'wb') do |file|
           file.print "OMG"

data/spec/other/bundle_ruby_spec.rb

@@ -83,7 +83,7 @@ describe "bundle_ruby" do
     expect(out).to eq("Please define :engine")
   end
 
-  it "raises an error if engine version doesn't match ruby version for mri" do
+  it "raises an error if engine version doesn't match ruby version for MRI" do
     gemfile <<-G
       source "file://#{gem_repo1}"
       ruby "1.8.7", :engine => 'ruby', :engine_version => '1.2.4'

data/spec/other/check_spec.rb

@@ -23,7 +23,7 @@ describe "bundle check" do
     expect(out).to eq("The Gemfile's dependencies are satisfied")
   end
 
-  it "creates a Gemfile.lock by default if one did not exist" do
+  it "creates a Gemfile.lock by default if one does not exist" do
     install_gemfile <<-G
       source "file://#{gem_repo1}"
       gem "rails"

data/spec/other/clean_spec.rb

@@ -100,7 +100,7 @@ describe "bundle clean" do
     expect(vendored_gems("bin/rackup")).to exist
   end
 
-  it "remove gems in bundle without groups" do
+  it "removes gems in bundle without groups" do
     gemfile <<-G
       source "file://#{gem_repo1}"
 
@@ -288,7 +288,7 @@ describe "bundle clean" do
   end
 
   # handling bundle clean upgrade path from the pre's
-  it "removes .gem/.gemspec file even if there's no corresponding gem dir is already moved" do
+  it "removes .gem/.gemspec file even if there's no corresponding gem dir" do
     gemfile <<-G
       source "file://#{gem_repo1}"
 

data/spec/other/exec_spec.rb

@@ -244,6 +244,5 @@ describe "bundle exec" do
         expect(out).to eq("1.0")
       end
     end
-
   end
 end

data/spec/other/init_spec.rb

@@ -36,5 +36,4 @@ describe "bundle init" do
     expect(gemfile.scan(/gem "rspec", "= 1.2"/).size).to eq(1)
     expect(gemfile.scan(/group :development/).size).to eq(1)
   end
-
 end

data/spec/other/outdated_spec.rb

@@ -1,7 +1,6 @@
 require "spec_helper"
 
 describe "bundle outdated" do
-
   before :each do
     build_repo2 do
       build_git "foo", :path => lib_path("foo")
@@ -114,5 +113,4 @@ describe "bundle outdated" do
       end
     end
   end
-
 end

data/spec/other/platform_spec.rb

@@ -81,7 +81,7 @@ G
       expect(out).to eq("ruby 1.9.3")
     end
 
-    it "engine defaults to MRI" do
+    it "defaults to MRI" do
       gemfile <<-G
         source "file://#{gem_repo1}"
         ruby "1.9.3"
@@ -146,7 +146,7 @@ G
       expect(exitstatus).not_to eq(0)
     end
 
-    it "raises an error if engine version doesn't match ruby version for mri" do
+    it "raises an error if engine version doesn't match ruby version for MRI" do
       gemfile <<-G
         source "file://#{gem_repo1}"
         ruby "1.8.7", :engine => 'ruby', :engine_version => '1.2.4'

data/spec/quality_spec.rb

@@ -5,6 +5,18 @@ if defined?(Encoding) && Encoding.default_external != "UTF-8"
 end
 
 describe "The library itself" do
+  def check_for_spec_defs_with_single_quotes(filename)
+    failing_lines = []
+
+    File.readlines(filename).each_with_index do |line,number|
+      failing_lines << number + 1 if line =~ /^ *(describe|it|context) {1}'{1}/
+    end
+
+    unless failing_lines.empty?
+      "#{filename} uses inconsistent single quotes on lines #{failing_lines.join(', ')}"
+    end
+  end
+
   def check_for_tab_characters(filename)
     failing_lines = []
     File.readlines(filename).each_with_index do |line,number|
@@ -39,10 +51,11 @@ describe "The library itself" do
   end
 
   it "has no malformed whitespace" do
+    exempt = /\.gitmodules|\.marshal|fixtures|vendor|ssl_certs|LICENSE/
     error_messages = []
     Dir.chdir(File.expand_path("../..", __FILE__)) do
-      `git ls-files`.split("\n").each do |filename|
-        next if filename =~ /\.gitmodules|\.marshal|fixtures|vendor|ssl_certs/
+      `git ls-files -z`.split("\x0").each do |filename|
+        next if filename =~ exempt
         error_messages << check_for_tab_characters(filename)
         error_messages << check_for_extra_spaces(filename)
       end
@@ -50,6 +63,18 @@ describe "The library itself" do
     expect(error_messages.compact).to be_well_formed
   end
 
+  it "uses double-quotes consistently in specs" do
+    included = /spec/
+    error_messages = []
+    Dir.chdir(File.expand_path("../", __FILE__)) do
+      `git ls-files -z`.split("\x0").each do |filename|
+        next unless filename =~ included
+        error_messages << check_for_spec_defs_with_single_quotes(filename)
+      end
+    end
+    expect(error_messages.compact).to be_well_formed
+  end
+
   it "can still be built" do
     Dir.chdir(root) do
       `gem build bundler.gemspec`

data/spec/realworld/dependency_api_spec.rb

@@ -57,5 +57,4 @@ describe "gemcutter's dependency API", :realworld => true do
       should_be_installed "rack 1.0.0"
     end
   end
-
 end

data/spec/resolver/basic_spec.rb

@@ -18,7 +18,7 @@ describe "Resolving" do
     should_resolve_as %w(actionpack-2.3.5 activesupport-2.3.5 rack-1.0)
   end
 
-  it "resolve a conflicting index" do
+  it "resolves a conflicting index" do
     @index = a_conflict_index
     dep "my_app"
     should_resolve_as %w(activemodel-3.2.11 builder-3.0.4 grape-0.2.6 my_app-1.0.0)

data/spec/runtime/setup_spec.rb

@@ -314,7 +314,7 @@ describe "Bundler.setup" do
 
     it "provides a useful exception when the git repo is not checked out yet" do
       run "1", :expect_err => true
-      expect(err).to include("#{lib_path('rack-1.0.0')} (at master) is not checked out. Please run `bundle install`")
+      expect(err).to match(/the git source #{lib_path('rack-1.0.0')} is not yet checked out. Please run `bundle install`/i)
     end
 
     it "does not hit the git binary if the lockfile is available and up to date" do
@@ -631,7 +631,7 @@ describe "Bundler.setup" do
     expect(out).to eq("yay")
   end
 
-  it "ignores Gem.refresh" do
+  it "stubs out Gem.refresh so it does not reveal system gems" do
     system_gems "rack-1.0.0"
 
     install_gemfile <<-G
@@ -640,11 +640,12 @@ describe "Bundler.setup" do
     G
 
     run <<-R
+      puts Bundler.rubygems.find_name("rack").inspect
       Gem.refresh
       puts Bundler.rubygems.find_name("rack").inspect
     R
 
-    expect(out).to eq("[]")
+    expect(out).to eq("[]\n[]")
   end
 
   describe "when a vendored gem specification uses the :path option" do

data/spec/runtime/with_clean_env_spec.rb

@@ -88,5 +88,4 @@ describe "Bundler.with_env helpers" do
       expect($?.exitstatus).to eq(42)
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -43,6 +43,7 @@ RSpec.configure do |config|
   config.include Spec::Rubygems
   config.include Spec::Platforms
   config.include Spec::Sudo
+  config.include Spec::Permissions
 
   if Spec::Sudo.test_sudo?
     config.filter_run :sudo => true

data/spec/support/artifice/endpoint_host_redirect.rb

@@ -0,0 +1,15 @@
+require File.expand_path("../endpoint", __FILE__)
+
+Artifice.deactivate
+
+class EndpointHostRedirect < Endpoint
+  get "/fetch/actual/gem/:id", :host_name => 'localgemserver.test' do
+    redirect "http://bundler.localgemserver.test#{request.path_info}"
+  end
+
+  get "/api/v1/dependencies" do
+    status 404
+  end
+end
+
+Artifice.activate_with(EndpointHostRedirect)

data/spec/support/builders.rb

@@ -234,7 +234,9 @@ module Spec
         end
 
         # Capistrano did this (at least until version 2.5.10)
-        build_gem "double_deps" do |s|
+        # Rubygems 2.2 doesn't allow the specifying of a dependency twice
+        # See https://github.com/rubygems/rubygems/commit/03dbac93a3396a80db258d9bc63500333c25bd2f
+        build_gem "double_deps", "1.0", :skip_validation => true do |s|
           s.add_dependency "net-ssh", ">= 1.0.0"
           s.add_dependency "net-ssh"
         end
@@ -605,7 +607,7 @@ module Spec
             @spec.authors = ["that guy"]
           end
 
-          Bundler.rubygems.build(@spec)
+          Bundler.rubygems.build(@spec, opts[:skip_validation])
           if opts[:to_system]
             `gem install --ignore-dependencies #{@spec.full_name}.gem`
           else

data/spec/support/permissions.rb

@@ -0,0 +1,11 @@
+module Spec
+  module Permissions
+    def with_umask(new_umask)
+      old_umask = File.umask(new_umask)
+      yield if block_given?
+    ensure
+      File.umask(old_umask)
+    end
+  end
+end
+

data/spec/update/gems_spec.rb

@@ -34,12 +34,12 @@ describe "bundle update" do
   end
 
   describe "--quiet argument" do
-    it 'shows UI messages without --quiet argument' do
+    it "shows UI messages without --quiet argument" do
       bundle "update"
       expect(out).to include("Fetching source")
     end
 
-    it 'does not show UI messages with --quiet argument' do
+    it "does not show UI messages with --quiet argument" do
       bundle "update --quiet"
       expect(out).not_to include("Fetching source")
     end
@@ -56,7 +56,7 @@ describe "bundle update" do
     end
   end
 
-  describe "with a unknown dependency" do
+  describe "with an unknown dependency" do
     it "should inform the user" do
       bundle "update halting-problem-solver", :expect_err=>true
       expect(out).to include "Could not find gem 'halting-problem-solver'"

data/spec/update/git_spec.rb

@@ -137,7 +137,7 @@ describe "bundle update" do
         end
       end
 
-      it "it unlocks the source when submodules is added to a git source" do
+      it "it unlocks the source when submodules are added to a git source" do
         install_gemfile <<-G
           git "#{lib_path('has_submodule-1.0')}" do
             gem "has_submodule"
@@ -157,7 +157,7 @@ describe "bundle update" do
         expect(out).to eq('GIT')
       end
 
-      it "it unlocks the source when submodules is removed from git source" do
+      it "it unlocks the source when submodules are removed from git source" do
         pending "This would require actually removing the submodule from the clone"
         install_gemfile <<-G
           git "#{lib_path('has_submodule-1.0')}", :submodules => true do

data/spec/update/source_spec.rb

@@ -47,5 +47,4 @@ describe "bundle update" do
       should_be_installed "rack 1.0"
     end
   end
-
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bundler
 version: !ruby/object:Gem::Version
-  version: 1.3.5
-  prerelease: 
+  version: 1.3.6
 platform: ruby
 authors:
 - André Arko
@@ -12,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ronn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -33,7 +30,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,7 +37,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -257,6 +252,7 @@ files:
 - spec/support/artifice/endpoint_extra.rb
 - spec/support/artifice/endpoint_extra_missing.rb
 - spec/support/artifice/endpoint_fallback.rb
+- spec/support/artifice/endpoint_host_redirect.rb
 - spec/support/artifice/endpoint_marshal_fail.rb
 - spec/support/artifice/endpoint_redirect.rb
 - spec/support/artifice/endpoint_timeout.rb
@@ -267,6 +263,7 @@ files:
 - spec/support/indexes.rb
 - spec/support/matchers.rb
 - spec/support/path.rb
+- spec/support/permissions.rb
 - spec/support/platforms.rb
 - spec/support/ruby_ext.rb
 - spec/support/rubygems_ext.rb
@@ -294,27 +291,26 @@ files:
 homepage: http://gembundler.com
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The best way to manage your application's dependencies
 test_files:
 - spec/bundler/bundler_spec.rb
@@ -389,6 +385,7 @@ test_files:
 - spec/support/artifice/endpoint_extra.rb
 - spec/support/artifice/endpoint_extra_missing.rb
 - spec/support/artifice/endpoint_fallback.rb
+- spec/support/artifice/endpoint_host_redirect.rb
 - spec/support/artifice/endpoint_marshal_fail.rb
 - spec/support/artifice/endpoint_redirect.rb
 - spec/support/artifice/endpoint_timeout.rb
@@ -399,6 +396,7 @@ test_files:
 - spec/support/indexes.rb
 - spec/support/matchers.rb
 - spec/support/path.rb
+- spec/support/permissions.rb
 - spec/support/platforms.rb
 - spec/support/ruby_ext.rb
 - spec/support/rubygems_ext.rb