bundler 1.6.0.pre.1 → 1.6.0.pre.2

data/lib/bundler/cli/inject.rb

@@ -0,0 +1,33 @@
+module Bundler
+  class CLI::Inject
+    attr_reader :options, :name, :version, :gems
+    def initialize(options, name, version, gems)
+      @options = options
+      @name = name
+      @version = version
+      @gems = gems
+    end
+
+    def run
+      # The required arguments allow Thor to give useful feedback when the arguments
+      # are incorrect. This adds those first two arguments onto the list as a whole.
+      gems.unshift(version).unshift(name)
+
+      # Build an array of Dependency objects out of the arguments
+      deps = []
+      gems.each_slice(2) do |gem_name, gem_version|
+        deps << Bundler::Dependency.new(gem_name, gem_version)
+      end
+
+      added = Injector.inject(deps)
+
+      if added.any?
+        Bundler.ui.confirm "Added to Gemfile:"
+        Bundler.ui.confirm added.map{ |g| "  #{g}" }.join("\n")
+      else
+        Bundler.ui.confirm "All injected gems were already present in the Gemfile"
+      end
+    end
+
+  end
+end

data/lib/bundler/cli/install.rb

@@ -0,0 +1,123 @@
+module Bundler
+  class CLI::Install
+    attr_reader :options
+    def initialize(options)
+      @options = options.dup
+    end
+
+    def run
+      if options[:without]
+        options[:without] = options[:without].map{|g| g.tr(' ', ':') }
+      end
+
+      ENV['RB_USER_INSTALL'] = '1' if Bundler::FREEBSD
+
+      # Just disable color in deployment mode
+      Bundler.ui.shell = Thor::Shell::Basic.new if options[:deployment]
+
+      if (options[:path] || options[:deployment]) && 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 (options["trust-policy"])
+        unless (Bundler.rubygems.security_policies.keys.include?(options["trust-policy"]))
+          Bundler.ui.error "Rubygems doesn't know about trust policy '#{options["trust-policy"]}'. " \
+            "The known policies are: #{Bundler.rubygems.security_policies.keys.join(', ')}."
+          exit 1
+        end
+        Bundler.settings["trust-policy"] = options["trust-policy"]
+      else
+        Bundler.settings["trust-policy"] = nil if Bundler.settings["trust-policy"]
+      end
+
+      if options[:deployment] || options[:frozen]
+        unless Bundler.default_lockfile.exist?
+          flag = options[:deployment] ? '--deployment' : '--frozen'
+          raise ProductionError, "The #{flag} flag requires a Gemfile.lock. Please make " \
+                                 "sure you have checked your Gemfile.lock into version control " \
+                                 "before deploying."
+        end
+
+        if Bundler.root.join("vendor/cache").exist?
+          options[:local] = true
+        end
+
+        Bundler.settings[:frozen] = '1'
+      end
+
+      # When install is called with --no-deployment, disable deployment mode
+      if options[:deployment] == false
+        Bundler.settings.delete(:frozen)
+        options[:system] = true
+      end
+
+      Bundler.settings[:path]     = nil if options[:system]
+      Bundler.settings[:path]     = "vendor/bundle" if options[:deployment]
+      Bundler.settings[:path]     = options["path"] if options["path"]
+      Bundler.settings[:path]     ||= "bundle" if options["standalone"]
+      Bundler.settings[:bin]      = options["binstubs"] if options["binstubs"]
+      Bundler.settings[:bin]      = nil if options["binstubs"] && options["binstubs"].empty?
+      Bundler.settings[:shebang]  = options["shebang"] if options["shebang"]
+      Bundler.settings[:jobs]     = options["jobs"] if options["jobs"]
+      Bundler.settings[:no_prune] = true if options["no-prune"]
+      Bundler.settings[:clean]    = options["clean"] if options["clean"]
+      Bundler.settings.without    = options[:without]
+      Bundler.ui.level            = "warn" if options[:quiet]
+      Bundler::Fetcher.disable_endpoint = options["full-index"]
+      Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
+
+      # rubygems plugins sometimes hook into the gem install process
+      Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
+
+      definition = Bundler.definition
+      definition.validate_ruby!
+      Installer.install(Bundler.root, definition, options)
+      Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
+
+      if Bundler.settings[:path]
+        absolute_path = File.expand_path(Bundler.settings[:path])
+        relative_path = absolute_path.sub(File.expand_path('.'), '.')
+        Bundler.ui.confirm "Your bundle is complete!"
+        without_groups_messages
+        Bundler.ui.confirm "It was installed into #{relative_path}"
+      else
+        Bundler.ui.confirm "Your bundle is complete!"
+        without_groups_messages
+        Bundler.ui.confirm "Use `bundle show [gemname]` to see where a bundled gem is installed."
+      end
+      Installer.post_install_messages.to_a.each do |name, msg|
+        Bundler.ui.confirm "Post-install message from #{name}:"
+        Bundler.ui.info msg
+      end
+
+      if Bundler.settings[:clean] && Bundler.settings[:path]
+        require "bundler/cli/clean"
+        Bundler::CLI::Clean.new(options).run
+      end
+    rescue GemNotFound, VersionConflict => e
+      if options[:local] && Bundler.app_cache.exist?
+        Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory."
+      end
+
+      if Bundler.definition.rubygems_remotes.empty?
+        Bundler.ui.warn <<-WARN, :wrap => true
+          Your Gemfile has no gem server sources. If you need gems that are \
+          not already on your machine, add a line like this to your Gemfile:
+          source 'https://rubygems.org'
+        WARN
+      end
+      raise e
+    end
+
+  private
+
+    def without_groups_messages
+      if Bundler.settings.without.any?
+        require "bundler/cli/common"
+        Bundler.ui.confirm Bundler::CLI::Common.without_groups_message
+      end
+    end
+  end
+end

data/lib/bundler/cli/open.rb

@@ -0,0 +1,25 @@
+require 'bundler/cli/common'
+
+module Bundler
+  class CLI::Open
+    attr_reader :options, :name
+    def initialize(options, name)
+      @options = options
+      @name = name
+    end
+
+    def run
+      editor = [ENV['BUNDLER_EDITOR'], ENV['VISUAL'], ENV['EDITOR']].find{|e| !e.nil? && !e.empty? }
+      return Bundler.ui.info("To open a bundled gem, set $EDITOR or $BUNDLER_EDITOR") unless editor
+      spec = Bundler::CLI::Common.select_spec(name, :regex_match)
+      return unless spec
+      full_gem_path = spec.full_gem_path
+      Dir.chdir(full_gem_path) do
+        command = "#{editor} #{full_gem_path}"
+        success = system(command)
+        Bundler.ui.info "Could not run '#{command}'" unless success
+      end
+    end
+
+  end
+end

data/lib/bundler/cli/outdated.rb

@@ -0,0 +1,80 @@
+require 'bundler/cli/common'
+
+module Bundler
+  class CLI::Outdated
+    attr_reader :options, :gems
+    def initialize(options, gems)
+      @options = options
+      @gems = gems
+    end
+
+    def run
+      sources = Array(options[:source])
+
+      gems.each do |gem_name|
+        Bundler::CLI::Common.select_spec(gem_name)
+      end
+
+      Bundler.definition.validate_ruby!
+      current_specs = Bundler.ui.silence { Bundler.load.specs }
+      current_dependencies = {}
+      Bundler.ui.silence { Bundler.load.dependencies.each { |dep| current_dependencies[dep.name] = dep } }
+
+      if gems.empty? && sources.empty?
+        # We're doing a full update
+        definition = Bundler.definition(true)
+      else
+        definition = Bundler.definition(:gems => gems, :sources => sources)
+      end
+      options["local"] ? definition.resolve_with_cache! : definition.resolve_remotely!
+
+      Bundler.ui.info ""
+
+      out_count = 0
+      # Loop through the current specs
+      gemfile_specs, dependency_specs = current_specs.partition { |spec| current_dependencies.has_key? spec.name }
+      [gemfile_specs.sort_by(&:name), dependency_specs.sort_by(&:name)].flatten.each do |current_spec|
+        next if !gems.empty? && !gems.include?(current_spec.name)
+
+        dependency = current_dependencies[current_spec.name]
+
+        if options["strict"]
+          active_spec =  definition.specs.detect { |spec| spec.name == current_spec.name }
+        else
+          active_spec = definition.index[current_spec.name].sort_by { |b| b.version }
+          if !current_spec.version.prerelease? && !options[:pre] && active_spec.size > 1
+            active_spec = active_spec.delete_if { |b| b.respond_to?(:version) && b.version.prerelease? }
+          end
+          active_spec = active_spec.last
+        end
+        next if active_spec.nil?
+
+        gem_outdated = Gem::Version.new(active_spec.version) > Gem::Version.new(current_spec.version)
+        git_outdated = current_spec.git_version != active_spec.git_version
+        if gem_outdated || git_outdated
+          if out_count == 0
+            if options["pre"]
+              Bundler.ui.info "Outdated gems included in the bundle (including pre-releases):"
+            else
+              Bundler.ui.info "Outdated gems included in the bundle:"
+            end
+          end
+
+          spec_version    = "#{active_spec.version}#{active_spec.git_version}"
+          current_version = "#{current_spec.version}#{current_spec.git_version}"
+          dependency_version = %|Gemfile specifies "#{dependency.requirement}"| if dependency && dependency.specific?
+          Bundler.ui.info "  * #{active_spec.name} (#{spec_version} > #{current_version}) #{dependency_version}".rstrip
+          out_count += 1
+        end
+        Bundler.ui.debug "from #{active_spec.loaded_from}"
+      end
+
+      if out_count.zero?
+        Bundler.ui.info "Your bundle is up to date!\n"
+      else
+        exit 1
+      end
+    end
+
+  end
+end

data/lib/bundler/cli/package.rb

@@ -0,0 +1,36 @@
+module Bundler
+  class CLI::Package
+    attr_reader :options
+
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      Bundler.ui.level = "warn" if options[:quiet]
+      Bundler.settings[:path] = File.expand_path(options[:path]) if options[:path]
+      setup_cache_all
+      install
+      # TODO: move cache contents here now that all bundles are locked
+      custom_path = Pathname.new(options[:path]) if options[:path]
+      Bundler.load.cache(custom_path)
+    end
+
+  private
+
+    def install
+      require 'bundler/cli/install'
+      Bundler::CLI::Install.new(options.dup).run
+    end
+
+    def setup_cache_all
+      Bundler.settings[:cache_all] = options[:all] if options.key?("all")
+
+      if Bundler.definition.sources.any? { |s| !s.is_a?(Source::Rubygems) } && !Bundler.settings[:cache_all]
+        Bundler.ui.warn "Your Gemfile contains path and git dependencies. If you want "    \
+          "to package them as well, please pass the --all flag. This will be the default " \
+          "on Bundler 2.0."
+      end
+    end
+  end
+end

data/lib/bundler/cli/platform.rb

@@ -0,0 +1,43 @@
+module Bundler
+  class CLI::Platform
+    attr_reader :options
+    def initialize(options)
+      @options = options
+    end
+
+    def run
+      platforms, ruby_version = Bundler.ui.silence do
+        [ Bundler.definition.platforms.map {|p| "* #{p}" },
+          Bundler.definition.ruby_version ]
+      end
+      output = []
+
+      if options[:ruby]
+        if ruby_version
+          output << ruby_version
+        else
+          output << "No ruby version specified"
+        end
+      else
+        output << "Your platform is: #{RUBY_PLATFORM}"
+        output << "Your app has gems that work on these platforms:\n#{platforms.join("\n")}"
+
+        if ruby_version
+          output << "Your Gemfile specifies a Ruby version requirement:\n* #{ruby_version}"
+
+          begin
+            Bundler.definition.validate_ruby!
+            output << "Your current platform satisfies the Ruby version requirement."
+          rescue RubyVersionMismatch => e
+            output << e.message
+          end
+        else
+          output << "Your Gemfile does not specify a Ruby version requirement."
+        end
+      end
+
+      Bundler.ui.info output.join("\n\n")
+    end
+
+  end
+end

data/lib/bundler/cli/show.rb

@@ -0,0 +1,44 @@
+require 'bundler/cli/common'
+
+module Bundler
+  class CLI::Show
+    attr_reader :options, :gem_name
+    def initialize(options, gem_name)
+      @options = options
+      @gem_name = gem_name
+    end
+
+    def run
+      Bundler.ui.silence do
+        Bundler.definition.validate_ruby!
+        Bundler.load.lock
+      end
+
+      if gem_name
+        if gem_name == "bundler"
+          path = File.expand_path("../../../..", __FILE__)
+        else
+          spec = Bundler::CLI::Common.select_spec(gem_name, :regex_match)
+          return unless spec
+          path = spec.full_gem_path
+          if !File.directory?(path)
+            Bundler.ui.warn "The gem #{gem_name} has been deleted. It was installed at:"
+          end
+        end
+        return Bundler.ui.info(path)
+      end
+
+      if options[:paths]
+        Bundler.load.specs.sort_by { |s| s.name }.map do |s|
+          Bundler.ui.info s.full_gem_path
+        end
+      else
+        Bundler.ui.info "Gems included by the bundle:"
+        Bundler.load.specs.sort_by { |s| s.name }.each do |s|
+          Bundler.ui.info "  * #{s.name} (#{s.version}#{s.git_version})"
+        end
+      end
+    end
+
+  end
+end

data/lib/bundler/cli/update.rb

@@ -0,0 +1,73 @@
+module Bundler
+  class CLI::Update
+    attr_reader :options, :gems
+    def initialize(options, gems)
+      @options = options
+      @gems = gems
+    end
+
+    def run
+
+      sources = Array(options[:source])
+      groups  = Array(options[:group]).map(&:to_sym)
+      Bundler.ui.level = "warn" if options[:quiet]
+
+      if gems.empty? && sources.empty? && groups.empty?
+        # We're doing a full update
+        Bundler.definition(true)
+      else
+        unless Bundler.default_lockfile.exist?
+          raise GemfileLockNotFound, "This Bundle hasn't been installed yet. " \
+            "Run `bundle install` to update and install the bundled gems."
+        end
+        # cycle through the requested gems, just to make sure they exist
+        names = Bundler.locked_gems.specs.map{ |s| s.name }
+        gems.each do |g|
+          next if names.include?(g)
+          require "bundler/cli/common"
+          raise GemNotFound, Bundler::CLI::Common.gem_not_found_message(g, names)
+        end
+
+        if groups.any?
+          specs = Bundler.definition.specs_for groups
+          sources.concat(specs.map(&:name))
+        end
+
+        Bundler.definition(:gems => gems, :sources => sources)
+      end
+
+      Bundler::Fetcher.disable_endpoint = options["full-index"]
+
+      opts = options.dup
+      opts["update"] = true
+      opts["local"] = options[:local]
+
+      Bundler.settings[:jobs] = opts["jobs"] if opts["jobs"]
+
+      # rubygems plugins sometimes hook into the gem install process
+      Gem.load_env_plugins if Gem.respond_to?(:load_env_plugins)
+
+      Bundler.definition.validate_ruby!
+      Installer.install Bundler.root, Bundler.definition, opts
+      Bundler.load.cache if Bundler.root.join("vendor/cache").exist?
+
+      if Bundler.settings[:clean] && Bundler.settings[:path]
+        require "bundler/cli/clean"
+        Bundler::CLI::Clean.new(options).run
+      end
+
+      Bundler.ui.confirm "Your bundle is updated!"
+      without_groups_messages
+    end
+
+  private
+
+    def without_groups_messages
+      if Bundler.settings.without.any?
+        require "bundler/cli/common"
+        Bundler.ui.confirm Bundler::CLI::Common.without_groups_message
+      end
+    end
+
+  end
+end