bundler 1.3.0.pre.7 → 1.3.0.pre.8

data/spec/support/artifice/endpoint.rb

@@ -15,6 +15,8 @@ class Endpoint < Sinatra::Base
 
   helpers do
     def dependencies_for(gem_names, marshal = gem_repo1("specs.4.8"))
+      return [] if gem_names.nil? || gem_names.empty?
+
       require 'rubygems'
       require 'bundler'
       Bundler::Deprecate.skip_during do

data/spec/support/builders.rb

@@ -126,6 +126,10 @@ module Spec
           s.add_development_dependency "activesupport", "= 2.3.5"
         end
 
+        build_gem "with_license" do |s|
+          s.license = "MIT"
+        end
+
         build_gem "with_implicit_rake_dep" do |s|
           s.extensions << "Rakefile"
           s.write "Rakefile", <<-RUBY
@@ -261,6 +265,22 @@ module Spec
       end
     end
 
+    def build_security_repo
+      build_repo security_repo do
+        build_gem "rack"
+
+        build_gem "signed_gem" do |s|
+          cert = 'signing-cert.pem'
+          pkey = 'signing-pkey.pem'
+          s.write cert, TEST_CERT
+          s.write pkey, TEST_PKEY
+          s.signing_key = pkey
+          s.cert_chain = [cert]
+        end
+      end
+
+    end
+
     def build_repo(path, &blk)
       return if File.directory?(path)
       rake_path = Dir["#{Path.base_system_gems}/**/rake*.gem"].first
@@ -319,7 +339,8 @@ module Spec
     end
 
     def update_git(name, *args, &block)
-      build_with(GitUpdater, name, args, &block)
+      spec = build_with(GitUpdater, name, args, &block)
+      GitReader.new lib_path(spec.full_name)
     end
 
   private
@@ -597,5 +618,57 @@ module Spec
         @context.gem_repo1('gems')
       end
     end
+
+    TEST_CERT=<<CERT
+-----BEGIN CERTIFICATE-----
+MIIDLDCCAhSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MRAwDgYDVQQDDAdleGFt
+cGxlMRMwEQYKCZImiZPyLGQBGRYDZm9vMRMwEQYKCZImiZPyLGQBGRYDY29tMB4X
+DTEzMDIwNDIxMTYzNVoXDTE0MDIwNDIxMTYzNVowPDEQMA4GA1UEAwwHZXhhbXBs
+ZTETMBEGCgmSJomT8ixkARkWA2ZvbzETMBEGCgmSJomT8ixkARkWA2NvbTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANVgibTKM0ux14SXQU9M2Ec2mTHG
+hoPJl/3Qq+p4wEalT87/Ascc2BaT6hXWWfAJ4oxReZnPfVop+fXZZDgtVC0JijPC
+v+5JHs5KLEG1N+wzaVI7238yv4N62t48XD585bPp1meiVh9wE2kdax1bIJBwcRhd
+gzR5kFfr2+O7u/g1nO/LN6aAWlKBXqntUmG0wEoWAibWDqpv4AIJhSGrzAqw648F
+5TWiOEvKyrwohAt7IWbmiS8Cr3qT+GSq6tR9Hi6IC8vFW0gBvd1pSX25oUjdNApX
+lzf6zkqBTzek9R7FN6TiymbJfCqaMz55rNAGZDDX0DOqJIvRTR6I2MQSfJsCAwEA
+AaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQULUiq0A8j8lc03KGvxV4a0tuBqfUw
+CwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQBMqoR/F94kK2ou9Yff+DMp
+b/hXEnl8lXzW0euUiTQcVRX6HO2AqGTqdZemUmm1uetGiozsuA1nbPInZQTL/zQq
+oNbg60JxlKWStxF3zsZdKVDNXsXWg4WlzvF6qd4AjDCO//e/BHHe44r+vASqglYO
+zTrTWYgjtDmPOLDvZTHhZ3kBV0Q0pGCBi7f0VYpqjEHSeyRfqJH1LT8yYC3vuYzZ
+PPIub1CZNnaS4jvtSKZsEzaijftwI7ddt/S9Yt7BahUrfHCMrA/Nt3XSDu0BcgaF
+cxrVBbDO8ELUvTY1yFcMYE1gzTIPCYE9TWXgm7A9HcD/7XLXkUL6nuvG3wwpBPTa
+-----END CERTIFICATE-----
+CERT
+
+    TEST_PKEY=<<PKEY
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA1WCJtMozS7HXhJdBT0zYRzaZMcaGg8mX/dCr6njARqVPzv8C
+xxzYFpPqFdZZ8AnijFF5mc99Win59dlkOC1ULQmKM8K/7kkezkosQbU37DNpUjvb
+fzK/g3ra3jxcPnzls+nWZ6JWH3ATaR1rHVsgkHBxGF2DNHmQV+vb47u7+DWc78s3
+poBaUoFeqe1SYbTAShYCJtYOqm/gAgmFIavMCrDrjwXlNaI4S8rKvCiEC3shZuaJ
+LwKvepP4ZKrq1H0eLogLy8VbSAG93WlJfbmhSN00CleXN/rOSoFPN6T1HsU3pOLK
+Zsl8KpozPnms0AZkMNfQM6oki9FNHojYxBJ8mwIDAQABAoIBAD8AD+iXQun4il+V
+oSzezYTJNBYkPZcvsHa6Y+gI2wyAxr2hQZq0g4C3D4h/D3L2GDPB4pttTd+PQUQ7
+eYG0sIPTq0B5Id4jLLtP3x1PekF9NH2ZOselnjId1f2D6OByVAf45NsYbUE/ABwr
+GXNDcqvy5xGAmrqlod6zvurQhUFVWNYw1Ry6MCxD79S54Rky9cv6qzviPAh570y+
+aWS+lXJeqVVhmwWnbOUBWu/8dsniJbknassxwOYCShNLGnPMW+gklPaUucOkDF8K
+R0xYbOpAowQaIOdm7sQtt/CZOD34pgAWlLMev/J5y7+y6jvdqBMoLKIMAj/YqphW
+FqOY4fECgYEA9t5MqdexzOpz5LTQbqUDDiMtVR5mn/7wPbgNCRuAADTuM8QJkREe
+JCEG/S9CEmefoa6gr+CyWhq9qbFhLC7rEgBCInW/hL5m8qGVAVcpIUCbpYh7nirN
+fHQP6zL2RESmJDo3Y0vLZosR+XR1UDSb3tdTQSXt/MX6p+gjcswnzN0CgYEA3UUY
+ew22HjB1dnS7ps/gdsNwlalYYwSkfuBqNkluvMRE56HGbKeDYjEV4egkWZVYUNDJ
+P+jVKUTOSfgzXOsR7rKeiaQ3UEZfVpV3iQWtqzS2+BlhWBoQsBLD5CjdP8ykOQGr
+NQVNegXAFGhsiRNwm4Mpl5+t+Ap9aqSy1WwAu9cCgYBwY0vrlrLvY11XpamudZkq
+eoFM2wZFmL6umnf0yXxAm9hF4N2qGWzrbc3MvhMKZfqalPG6oEUSGFJ4SrS+dK24
+CD4Tih+iwzwDAeTgM1oaNVumxLfijgH2wq/sl8rd0ZMBsy88GWmESZPpSUePOCQu
+E0Fny2jJRyiSAHEC9ka4UQKBgDFBmWKDOeBcjzlwYPmQWvp1JVHbodZhCTFJSbuN
++z3AP0qFA8PaQnAQVzuzzqu2iDNtVu+IKDOIopdqzhxII/TMBGjFip6vG7gNi8+P
+2Qo8sOJn2/idzMs1UjAvPJlgN8qM6YzjAk1AjHK+kDKvhijIOPEM1dBanXKo+Tpz
+UXJ/AoGABULY7oaW7vW7XLiHVTHeoqi9m9yNTVQRnsMFJm5GhisjavZbCzCGz1Tl
+hiIdZiAgSpltgy7+R7l7JhmFf04xVnEJc/4lyJc4ZwYXkMGqD1tE9FXowbBFKktB
+cPFVDEsR7SPkiAmGm99WiigexSwxW9hl+TjgolcXG7HTDsES2Sg=
+-----END RSA PRIVATE KEY-----
+PKEY
   end
 end

data/spec/support/fakeweb/windows.rb

@@ -19,5 +19,5 @@ end
 FakeWeb.register_uri(:get, "http://localgemserver.test/gems/rcov-1.0-x86-mswin32.gem",
   :status => ["404", "Not Found"])
 
-FakeWeb.register_uri(:get, "http://localgemserver.test/api/v1/dependencies?gems=rcov",
+FakeWeb.register_uri(:get, "http://localgemserver.test/api/v1/dependencies",
   :status => ["404", "Not Found"])

data/spec/support/indexes.rb

@@ -108,5 +108,27 @@ module Spec
         end
       end
     end
+
+    # Builder 3.1.4 will activate first, but if all
+    # goes well, it should resolve to 3.0.4
+    def a_conflict_index
+      build_index do
+        gem "builder", %w(3.0.4 3.1.4)
+        gem("grape", '0.2.6') do
+          dep "builder", ">= 0"
+        end
+
+        versions '3.2.8 3.2.9 3.2.10 3.2.11' do |version|
+          gem("activemodel", version) do
+            dep "builder", "~> 3.0.0"
+          end
+        end
+
+        gem("my_app", '1.0.0') do
+          dep "activemodel", ">= 0"
+          dep "grape", ">= 0"
+        end
+      end
+    end
   end
 end

data/spec/support/path.rb

@@ -56,6 +56,10 @@ module Spec
       tmp("gems/remote3", *args)
     end
 
+    def security_repo(*args)
+      tmp("gems/security_repo", *args)
+    end
+
     def system_gem_path(*path)
       tmp("gems/system", *path)
     end

data/spec/support/rubygems_ext.rb

@@ -19,6 +19,7 @@ module Spec
         # 3.0.0 breaks 1.9.2 specs
         `gem install builder --version 2.1.2 --no-rdoc --no-ri`
         `gem install rack --no-rdoc --no-ri`
+        `gem install pry --no-rdoc --no-ri`
       end
 
       ENV['HOME'] = Path.home.to_s

metadata

@@ -1,62 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bundler
-version: !ruby/object:Gem::Version 
-  prerelease: true
-  segments: 
-  - 1
-  - 3
-  - 0
-  - pre
-  - 7
-  version: 1.3.0.pre.7
+version: !ruby/object:Gem::Version
+  version: 1.3.0.pre.8
+  prerelease: 6
 platform: ruby
-authors: 
-- "Andr\xC3\xA9 Arko"
+authors:
+- André Arko
 - Terence Lee
 - Carl Lerche
 - Yehuda Katz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-22 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ronn
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.3
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  version_requirements: *id002
-description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
+description: Bundler manages an application's dependencies through its entire life,
+  across many machines, systematically and repeatably
+email:
 - andre@arko.net
-executables: 
+executables:
 - bundle
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -64,7 +62,7 @@ files:
 - CONTRIBUTE.md
 - CONTRIBUTING.md
 - ISSUES.md
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
 - UPGRADING.md
@@ -119,6 +117,7 @@ files:
 - lib/bundler/templates/Executable
 - lib/bundler/templates/Executable.standalone
 - lib/bundler/templates/Gemfile
+- lib/bundler/templates/newgem/.travis.yml.tt
 - lib/bundler/templates/newgem/Gemfile.tt
 - lib/bundler/templates/newgem/LICENSE.txt.tt
 - lib/bundler/templates/newgem/README.md.tt
@@ -137,6 +136,7 @@ files:
 - lib/bundler/vendor/.document
 - 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.rb
 - lib/bundler/vendor/thor/actions.rb
 - lib/bundler/vendor/thor/actions/create_file.rb
@@ -209,6 +209,7 @@ files:
 - spec/install/git_spec.rb
 - spec/install/invalid_spec.rb
 - spec/install/path_spec.rb
+- spec/install/security_policy_spec.rb
 - spec/install/upgrade_spec.rb
 - spec/integration/inject.rb
 - spec/lock/git_spec.rb
@@ -223,6 +224,7 @@ files:
 - spec/other/ext_spec.rb
 - spec/other/help_spec.rb
 - spec/other/init_spec.rb
+- spec/other/licenses_spec.rb
 - spec/other/newgem_spec.rb
 - spec/other/open_spec.rb
 - spec/other/outdated_spec.rb
@@ -266,57 +268,32 @@ files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
-- lib/bundler/man/bundle
-- lib/bundler/man/bundle-config
-- lib/bundler/man/bundle-config.txt
-- lib/bundler/man/bundle-exec
-- lib/bundler/man/bundle-exec.txt
-- lib/bundler/man/bundle-install
-- lib/bundler/man/bundle-install.txt
-- lib/bundler/man/bundle-package
-- lib/bundler/man/bundle-package.txt
-- lib/bundler/man/bundle-platform
-- lib/bundler/man/bundle-platform.txt
-- lib/bundler/man/bundle-update
-- lib/bundler/man/bundle-update.txt
-- lib/bundler/man/bundle.txt
-- lib/bundler/man/gemfile.5
-- lib/bundler/man/gemfile.5.txt
-has_rdoc: true
 homepage: http://gembundler.com
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
+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 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
-rubyforge_project: bundler
-rubygems_version: 1.3.6
+rubyforge_project: 
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies
-test_files: 
+test_files:
 - spec/bundler/bundler_spec.rb
 - spec/bundler/cli_rspec.rb
 - spec/bundler/definition_spec.rb
@@ -346,6 +323,7 @@ test_files:
 - spec/install/git_spec.rb
 - spec/install/invalid_spec.rb
 - spec/install/path_spec.rb
+- spec/install/security_policy_spec.rb
 - spec/install/upgrade_spec.rb
 - spec/integration/inject.rb
 - spec/lock/git_spec.rb
@@ -360,6 +338,7 @@ test_files:
 - spec/other/ext_spec.rb
 - spec/other/help_spec.rb
 - spec/other/init_spec.rb
+- spec/other/licenses_spec.rb
 - spec/other/newgem_spec.rb
 - spec/other/open_spec.rb
 - spec/other/outdated_spec.rb
@@ -403,3 +382,4 @@ test_files:
 - spec/update/gems_spec.rb
 - spec/update/git_spec.rb
 - spec/update/source_spec.rb
+has_rdoc: