bundler 1.0.0.beta.10 → 1.0.0.rc.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.0.rc.1 (July 26, 2010)
+
+  - Fixed a bug with `bundle install` on multiple machines and git
+
 ## 1.0.0.beta.10 (July 25, 2010)
 
   - Last release before 1.0.0.rc.1

data/TODO.md

@@ -6,3 +6,8 @@
   - Interactive mode for bundle (install) to work out conflicts
   - bundle irb / bundle ruby / bundle [whatever] -> bundle exec
   - Generate a bundle stub into the application
+  - bundle install --production
+    - (recommend symlinking vendor/bundle to a shared location for perf)
+    - defaults to bundle install vendor/bundle --disable-shared-gems
+    - if vendor/cache exists, defaults to --local
+    - disallow modifications to Gemfile.lock

data/lib/bundler/resolver.rb

@@ -232,6 +232,9 @@ module Bundler
           # to keep a list of every spot a failure happened.
           debug { "    -> Jumping to: #{parent.name}" }
           if parent
+            p [parent, parent.name]
+            p current
+            throw parent.name, nil if !existing.respond_to?(:required_by) || !existing.required_by.last
             throw parent.name, existing.respond_to?(:required_by) && existing.required_by.last.name
           else
             # The original set of dependencies conflict with the base set of specs

data/lib/bundler/source.rb

@@ -258,7 +258,8 @@ module Bundler
     class Path
       attr_reader :path, :options
       # Kind of a hack, but needed for the lock file parser
-      attr_accessor :name, :version
+      attr_writer   :name
+      attr_accessor :version
 
       DEFAULT_GLOB = "{,*/}*.gemspec"
 
@@ -328,7 +329,7 @@ module Bundler
               begin
                 Gem::Specification.from_yaml(file.basename)
                 # Raises ArgumentError if the file is not valid YAML
-              rescue ArgumentError, Gem::EndOfYAMLException, Gem::Exception
+              rescue ArgumentError, SyntaxError, Gem::EndOfYAMLException, Gem::Exception
                 begin
                   eval(File.read(file.basename), TOPLEVEL_BINDING, file.expand_path.to_s)
                 rescue LoadError
@@ -558,7 +559,7 @@ module Bundler
           out = %x{git #{command}}
 
           if $? != 0
-            raise GitError, "An error has occurred in git. Cannot complete bundling."
+            raise GitError, "An error has occurred in git when running `git #{command}. Cannot complete bundling."
           end
           out
         else
@@ -630,8 +631,10 @@ module Bundler
 
       def has_revision_cached?
         return unless @revision
-        in_cache { git %|cat-file -t #{@revision}| }
-        $? == 0
+        in_cache { git %|rev-parse --verify --quiet #{@revision}| }
+        true
+      rescue GitError
+        false
       end
 
       def allow_git_ops?

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.0.0.beta.10" unless defined?(::Bundler::VERSION)
+  VERSION = "1.0.0.rc.1" unless defined?(::Bundler::VERSION)
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
+  hash: 15424055
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta
-  - 10
-  version: 1.0.0.beta.10
+  - rc
+  - 1
+  version: 1.0.0.rc.1
 platform: ruby
 authors: 
 - Carl Lerche
@@ -18,16 +19,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 -07:00
+date: 2010-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -102,16 +105,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -120,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies