bundler 1.0.0.rc.1 → 1.0.0.rc.2

data/CHANGELOG.md

@@ -1,3 +1,51 @@
+## 1.0.0.rc.2 (July 29, 2010)
+
+  - `bundle install path` was causing confusion, so we now print
+    a clarifying warning. The preferred way to install to a path
+    (which will not print the warning) is
+    `bundle install --path path/to/install`.
+  - `bundle install --system` installs to the default system
+    location ($BUNDLE_PATH or $GEM_HOME) even if you previously
+    used `bundle install --path`
+  - completely remove `--disable-shared-gems`. If you install to
+    system, you will not be isolated, while if you install to
+    another path, you will be isolated from gems installed to
+    the system. This was mostly an internal option whose naming
+    and semantics were extremely confusing.
+  - Add a `--production` option to `bundle install`:
+    - by default, installs to `vendor/bundle`. This can be
+      overridden with the `--path` option
+    - uses `--local` if `vendor/cache` is found. This will
+      guarantee that Bundler does not attempt to connect to
+      Rubygems and will use the gems cached in `vendor/cache`
+      instead
+    - Raises an exception if a Gemfile.lock is not found
+    - Raises an exception if you modify your Gemfile in development
+      but do not check in an updated Gemfile.lock
+  - Fixes a bug where switching a source from Rubygems to git
+    would always say "the git source is not checked out" when
+    running `bundle install`
+
+NOTE: We received several reports of "the git source has not
+been checked out. Please run bundle install". As far as we
+can tell, these problems have two possible causes:
+
+1. `bundle install ~/.bundle` in one user, but actually running
+   the application as another user. Never install gems to a
+   directory scoped to a user (`~` or `$HOME`) in deployment.
+2. A bug that happened when changing a gem to a git source.
+
+To mitigate several common causes of `(1)`, please use the
+new `--production` flag. This flag is simply a roll-up of
+the best practices we have been encouraging people to use
+for deployment.
+
+If you want to share gems across deployments, and you use
+Capistrano, symlink release_path/current/vendor/bundle to
+release_path/shared/bundled_gems. This will keep deployments
+snappy while maintaining the benefits of clean, deploy-time
+isolation.
+
 ## 1.0.0.rc.1 (July 26, 2010)
 
   - Fixed a bug with `bundle install` on multiple machines and git

data/lib/bundler.rb

@@ -28,12 +28,7 @@ module Bundler
 
   class BundlerError < StandardError
     def self.status_code(code = nil)
-      return @code unless code
-      @code = code
-    end
-
-    def status_code
-      self.class.status_code
+      define_method(:status_code) { code }
     end
   end
 
@@ -45,7 +40,9 @@ module Bundler
   class GemspecError     < BundlerError; status_code(14) ; end
   class DeprecatedError  < BundlerError; status_code(12) ; end
   class GemspecError     < BundlerError; status_code(14) ; end
-  class InvalidOption    < BundlerError; status_code(15) ; end
+  class DslError         < BundlerError; status_code(15) ; end
+  class ProductionError  < BundlerError; status_code(16) ; end
+  class InvalidOption    < DslError                      ; end
 
   class VersionConflict  < BundlerError
     attr_reader :conflicts
@@ -71,6 +68,14 @@ module Bundler
       end
     end
 
+    def production?
+      @production
+    end
+
+    def production=(value)
+      @production = value
+    end
+
     def ui
       @ui ||= UI.new
     end

data/lib/bundler/cli.rb

@@ -86,7 +86,7 @@ module Bundler
     method_option "without", :type => :array, :banner =>
       "Exclude gems that are part of the specified named group."
     method_option "disable-shared-gems", :type => :boolean, :banner =>
-      "Do not use any shared gems, such as the system gem repository."
+      "This option is deprecated. Please do not use it."
     method_option "gemfile", :type => :string, :banner =>
       "Use the specified gemfile instead of Gemfile"
     method_option "no-prune", :type => :boolean, :banner =>
@@ -99,16 +99,61 @@ module Bundler
       "Do not attempt to fetch gems remotely and use the gem cache instead"
     method_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
       "Generate bin stubs for bundled gems to ./bin"
+    method_option "path", :type => :string, :banner =>
+      "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
+    method_option "system", :type => :boolean, :banner =>
+      "Install to the system location ($BUNDLE_PATH or $GEM_HOME) even if the bundle was previously installed somewhere else for this application"
+    method_option "production", :type => :boolean, :banner =>
+      "Install using defaults tuned for deployment environments"
     def install(path = nil)
       opts = options.dup
       opts[:without] ||= []
       opts[:without].map! { |g| g.to_sym }
 
+      if (path || options[:path] || options[:production]) && options[:system]
+        Bundler.ui.error "You have specified both a path to install your gems to, \n" \
+                         "as well as --system. Please choose."
+        exit 1
+      end
+
+      if path && options[:path]
+        Bundler.ui.error "You have specified a path via `bundle install #{path}` as well as\n" \
+                         "by `bundle install --path #{options[:path]}`. These options are\n" \
+                         "equivalent, so please use one or the other."
+        exit 1
+      end
+
+      if opts["disable-shared-gems"]
+        Bundler.ui.error "The disable-shared-gem option is no longer available.\n\n" \
+                         "Instead, use `bundle install` to install to your system,\n" \
+                         "or `bundle install --path path/to/gems` to install to an isolated\n" \
+                         "location. Bundler will resolve relative paths relative to\n" \
+                         "your `Gemfile`."
+        exit 1
+      end
+
+      if opts[:production]
+        Bundler.production = true
+
+        unless Bundler.root.join("Gemfile.lock").exist?
+          raise ProductionError, "The --production flag requires a Gemfile.lock. Please\n" \
+                                 "make sure you have checked your Gemfile.lock into version\n" \
+                                 "control before deploying."
+        end
+
+        if Bundler.root.join("vendor/cache").exist?
+          opts["local"] = true
+        end
+      end
+
       # Can't use Bundler.settings for this because settings needs gemfile.dirname
       ENV['BUNDLE_GEMFILE'] = opts[:gemfile] if opts[:gemfile]
+      Bundler.settings[:path] = nil if options[:system]
+      Bundler.settings[:path] = "vendor/bundle" if options[:production]
       Bundler.settings[:path] = path if path
+      Bundler.settings[:path] = options[:path] if options[:path]
       Bundler.settings[:bin] = opts["binstubs"] if opts[:binstubs]
-      Bundler.settings[:disable_shared_gems] = '1' if options["disable-shared-gems"] || path
+      Bundler.settings[:disable_shared_gems] = '1' if Bundler.settings[:path]
       Bundler.settings.without = opts[:without]
       Bundler.ui.be_quiet! if opts[:quiet]
 
@@ -116,6 +161,13 @@ module Bundler
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist?
       Bundler.ui.confirm "Your bundle is complete! " +
         "Use `bundle show [gemname]` to see where a bundled gem is installed."
+
+      Bundler.ui.confirm "\nYour bundle was installed to `#{Bundler.settings[:path]}`" if Bundler.settings[:path]
+
+      if path
+        Bundler.ui.warn "\nIf you meant to install it to your system, please remove the\n" \
+                        "`#{path}` directory and run `bundle install --system`"
+      end
     rescue GemNotFound => e
       if Bundler.definition.no_sources?
         Bundler.ui.warn "Your Gemfile doesn't have any sources. You can add one with a line like 'source :gemcutter'"
@@ -231,8 +283,7 @@ module Bundler
       existing value with the newly provided one.
 
       By default, setting a configuration value sets it for all projects
-      on the machine. If you want to set the configuration for a specific
-      project, use the --local flag.
+      on the machine.
 
       If a global setting is superceded by local configuration, this command
       will show the current value, as well as any superceded values and

data/lib/bundler/definition.rb

@@ -67,7 +67,12 @@ module Bundler
       current_platform = Gem.platforms.map { |p| generic(p) }.compact.last
       @platforms |= [current_platform]
 
-      converge
+      if Bundler.production?
+        ensure_equivalent_gemfile_and_lockfile
+      end
+
+      converge_sources
+      converge_dependencies
     end
 
     def resolve_with_cache!
@@ -122,6 +127,7 @@ module Bundler
 
     def resolve
       @resolve ||= begin
+        converge_locked_specs
         if @last_resolve.valid_for?(expanded_dependencies)
           @last_resolve
         else
@@ -202,17 +208,74 @@ module Bundler
     end
 
   private
+    def ensure_equivalent_gemfile_and_lockfile
+      changes = false
 
-    def converge
-      converge_sources
-      converge_dependencies
-      converge_locked_specs
+      msg = "You have modified your Gemfile in development but did not check\n" \
+            "the resulting snapshot (Gemfile.lock) into version control"
+
+      added =   []
+      deleted = []
+      changed = []
+
+      if @locked_sources != @sources
+        new_sources = @sources - @locked_sources
+        deleted_sources = @locked_sources - @sources
+
+        if new_sources.any?
+          added.concat new_sources.map { |source| "* source: #{source}" }
+        end
+
+        if deleted_sources.any?
+          deleted.concat deleted_sources.map { |source| "* source: #{source}" }
+        end
+
+        changes = true
+      end
+
+      both_sources = Hash.new { |h,k| h[k] = ["no specified source", "no specified source"] }
+      @dependencies.each { |d| both_sources[d.name][0] = d.source if d.source }
+      @locked_deps.each  { |d| both_sources[d.name][1] = d.source if d.source }
+      both_sources.delete_if { |k,v| v[0] == v[1] }
+
+      if @dependencies != @locked_deps
+        new_deps = @dependencies - @locked_deps
+        deleted_deps = @locked_deps - @dependencies
+
+        if new_deps.any?
+          added.concat new_deps.map { |d| "* #{pretty_dep(d)}" }
+        end
+
+        if deleted_deps.any?
+          deleted.concat deleted_deps.map { |d| "* #{pretty_dep(d)}" }
+        end
+
+        both_sources.each do |name, sources|
+          changed << "* #{name} from `#{sources[0]}` to `#{sources[1]}`"
+        end
+
+        changes = true
+      end
+
+      msg << "\n\nYou have added to the Gemfile:\n"     << added.join("\n") if added.any?
+      msg << "\n\nYou have deleted from the Gemfile:\n" << deleted.join("\n") if deleted.any?
+      msg << "\n\nYou have changed in the Gemfile:\n"   << changed.join("\n") if changed.any?
+
+      raise ProductionError, msg if added.any? || deleted.any? || changed.any?
+    end
+
+    def pretty_dep(dep, source = false)
+      msg  = "#{dep.name}"
+      msg << " (#{dep.requirement})" unless dep.requirement == Gem::Requirement.default
+      msg << " from the `#{dep.source}` source" if source && dep.source
+      msg
     end
 
     def converge_sources
       @sources.map! do |source|
         @locked_sources.find { |s| s == source } || source
       end
+
       @sources.each do |source|
         source.unlock! if source.respond_to?(:unlock!) && @unlock[:sources].include?(source.name)
       end
@@ -237,8 +300,12 @@ module Bundler
       # the gem in the Gemfile.lock still satisfies it, this is fine
       # too.
       @dependencies.each do |dep|
-        if in_locked_deps?(dep) || satisfies_locked_spec?(dep)
+        locked_dep = @locked_deps.find { |d| dep == d }
+
+        if in_locked_deps?(dep, locked_dep) || satisfies_locked_spec?(dep)
           deps << dep
+        elsif dep.source.is_a?(Source::Path) && (!locked_dep || dep.source != locked_dep.source)
+          dep.source.specs.each { |s| @unlock[:gems] << s.name }
         end
       end
 
@@ -271,10 +338,8 @@ module Bundler
       @last_resolve = resolve
     end
 
-    def in_locked_deps?(dep)
-      @locked_deps.any? do |d|
-        dep == d && dep.source == d.source
-      end
+    def in_locked_deps?(dep, d)
+      d && dep.source == d.source
     end
 
     def satisfies_locked_spec?(dep)

data/lib/bundler/dsl.rb

@@ -1,6 +1,4 @@
 module Bundler
-  class DslError < StandardError; end
-
   class Dsl
     def self.evaluate(gemfile)
       builder = new
@@ -8,7 +6,7 @@ module Bundler
       builder.to_definition
     end
 
-    VALID_PLATFORMS = [:ruby, :ruby_18, :ruby_19, :mri, :mri_18, :mri19, :jruby, :mswin]
+    VALID_PLATFORMS = [:ruby, :ruby_18, :ruby_19, :mri, :mri_18, :mri_19, :jruby, :mswin]
 
     def initialize
       @rubygems_source = Source::Rubygems.new
@@ -190,7 +188,7 @@ module Bundler
     def _normalize_options(name, version, opts)
       _normalize_hash(opts)
 
-      invalid_keys = opts.keys - %w(group git path name branch ref tag require submodules)
+      invalid_keys = opts.keys - %w(group git path name branch ref tag require submodules platforms)
       if invalid_keys.any?
         plural = invalid_keys.size > 1
         message = "You passed #{invalid_keys.map{|k| ':'+k }.join(", ")} "

data/lib/bundler/resolver.rb

@@ -232,9 +232,6 @@ 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/settings.rb

@@ -15,6 +15,10 @@ module Bundler
       set_key(key, value, @local_config, local_config_file)
     end
 
+    def delete(key)
+      @local_config
+    end
+
     def set_global(key, value)
       set_key(key, value, @global_config, global_config_file)
     end
@@ -90,6 +94,7 @@ module Bundler
 
       unless hash[key] == value
         hash[key] = value
+        hash.delete(key) if value.nil?
         FileUtils.mkdir_p(file.dirname)
         File.open(file, "w") { |f| f.puts hash.to_yaml }
       end

data/lib/bundler/vendor/thor/shell/html.rb

@@ -58,7 +58,7 @@ class Thor
         bold, end_bold = bold ? [BOLD, END_BOLD] : ['', '']
         "#{bold}#{color}#{string}#{CLEAR}#{end_bold}"
       end
-      
+
       # Ask something to the user and receives a response.
       #
       # ==== Example

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

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  hash: 15424055
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
   - rc
-  - 1
-  version: 1.0.0.rc.1
+  - 2
+  version: 1.0.0.rc.2
 platform: ruby
 authors: 
 - Carl Lerche
@@ -19,18 +18,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -07:00
+date: 2010-07-29 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"
@@ -105,20 +102,16 @@ 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
@@ -127,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bundler
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The best way to manage your application's dependencies