bundler 0.9.0.pre5 → 0.9.0

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems'
 
 module Bundler
-  VERSION = "0.9.0.pre5"
+  VERSION = "0.9.0"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'

data/lib/bundler/cli.rb

@@ -10,16 +10,12 @@ module Bundler
   class CLI < Thor
     ARGV = ::ARGV.dup
 
-    def self.banner(task)
-      task.formatted_usage(self, false)
-    end
-
     desc "init", "Generates a Gemfile into the current working directory"
     def init
       if File.exist?("Gemfile")
-        puts "Gemfile already exists at `#{Dir.pwd}/Gemfile`"
+        puts "Gemfile already exists at #{Dir.pwd}/Gemfile"
       else
-        puts "Writing new Gemfile to `#{Dir.pwd}/Gemfile`"
+        puts "Writing new Gemfile to #{Dir.pwd}/Gemfile"
         FileUtils.cp(File.expand_path('../templates/Gemfile', __FILE__), 'Gemfile')
       end
     end
@@ -97,4 +93,4 @@ module Bundler
     end
 
   end
-end
+end

data/lib/bundler/definition.rb

@@ -4,7 +4,7 @@ module Bundler
       gemfile = Pathname.new(gemfile).expand_path
 
       unless gemfile.file?
-        raise GemfileNotFound, "`#{gemfile}` not found"
+        raise GemfileNotFound, "#{gemfile} not found"
       end
 
       Dsl.evaluate(gemfile)
@@ -77,4 +77,4 @@ module Bundler
       end
     end
   end
-end
+end

data/lib/bundler/environment.rb

@@ -1,3 +1,5 @@
+require 'erb'
+
 module Bundler
   class Environment
     attr_reader :root

data/lib/bundler/index.rb

@@ -17,7 +17,8 @@ module Bundler
     end
 
     def empty?
-      @specs.values.flatten.empty?
+      each { return false }
+      true
     end
 
     def search(query)
@@ -41,9 +42,9 @@ module Bundler
       spec
     end
 
-    def each
-      @specs.values.flatten.each do |spec|
-        yield spec
+    def each(&blk)
+      @specs.values.each do |specs|
+        specs.each(&blk)
       end
     end
 

data/lib/bundler/installer.rb

@@ -25,7 +25,7 @@ module Bundler
         # end
 
         if (spec.groups & options[:without]).any?
-          Bundler.ui.debug "  * Not in requested group... skipping."
+          Bundler.ui.debug "  * Not in requested group; skipping."
           next
         end
         spec.source.install(spec)
@@ -71,7 +71,7 @@ module Bundler
 
     def resolve_remotely
       index # trigger building the index
-      Bundler.ui.info "Resolving dependencies... "
+      Bundler.ui.info "Resolving dependencies"
       source_requirements = {}
       dependencies.each do |dep|
         next unless dep.source
@@ -79,7 +79,6 @@ module Bundler
       end
 
       specs = Resolver.resolve(dependencies, index, source_requirements)
-      Bundler.ui.info "Done."
       specs
     end
 
@@ -117,18 +116,16 @@ module Bundler
 
         other_sources.each do |source|
           i = source.specs
-          Bundler.ui.debug "Source: Processing index... "
+          Bundler.ui.debug "Source: Processing index"
           index = i.merge(index).freeze
-          Bundler.ui.debug "Done."
         end
 
         index = Index.from_installed_gems.merge(index)
 
         rg_sources.each do |source|
           i = source.specs
-          Bundler.ui.debug "Source: Processing index... "
+          Bundler.ui.debug "Source: Processing index"
           index = i.merge(index).freeze
-          Bundler.ui.debug "Done."
         end
 
         index
@@ -157,4 +154,4 @@ module Bundler
     end
 
   end
-end
+end

data/lib/bundler/remote_specification.rb

@@ -47,7 +47,11 @@ module Bundler
     end
 
     def method_missing(method, *args, &blk)
-      _remote_specification.send(method, *args, &blk)
+      if Gem::Specification.new.respond_to?(method)
+        _remote_specification.send(method, *args, &blk)
+      else
+        super
+      end
     end
   end
 end

data/lib/bundler/source.rb

@@ -16,7 +16,7 @@ module Bundler
       end
 
       def to_s
-        "rubygems repository at `#{uri}`"
+        "rubygems repository at #{uri}"
       end
 
       def specs
@@ -26,9 +26,9 @@ module Bundler
       def install(spec)
         destination = Gem.dir
 
-        Bundler.ui.debug "  * Downloading..."
+        Bundler.ui.debug "  * Downloading"
         gem_path  = Gem::RemoteFetcher.fetcher.download(spec, uri, destination)
-        Bundler.ui.debug "  * Installing..."
+        Bundler.ui.debug "  * Installing"
         installer = Gem::Installer.new gem_path,
           :install_dir => Gem.dir,
           :ignore_dependencies => true
@@ -40,14 +40,13 @@ module Bundler
 
       def fetch_specs
         index = Index.new
-        Bundler.ui.info "Fetching source index from `#{uri}`... "
+        Bundler.ui.info "Fetching source index from #{uri}"
         (main_specs + prerelease_specs).each do |name, version, platform|
           next unless Gem::Platform.match(platform)
           spec = RemoteSpecification.new(name, version, platform, @uri)
           spec.source = self
           index << spec
         end
-        Bundler.ui.info "Done."
         index.freeze
       end
 
@@ -84,7 +83,7 @@ module Bundler
       end
 
       def install(spec)
-        Bundler.ui.debug "  * already installed... skipping"
+        Bundler.ui.debug "  * already installed; skipping"
       end
     end
 
@@ -114,7 +113,7 @@ module Bundler
       def install(spec)
         destination = Gem.dir
 
-        Bundler.ui.debug "  * Installing from pack..."
+        Bundler.ui.debug "  * Installing from pack"
         installer = Gem::Installer.new "#{@path}/#{spec.full_name}.gem",
           :install_dir => Gem.dir,
           :ignore_dependencies => true
@@ -173,7 +172,7 @@ module Bundler
       end
 
       def install(spec)
-        Bundler.ui.debug "  * Using path `#{path}`..."
+        Bundler.ui.debug "  * Using path #{path}"
       end
 
       alias specs local_specs
@@ -234,12 +233,12 @@ module Bundler
       end
 
       def install(spec)
-        Bundler.ui.debug "  * Using git `#{uri}`..."
+        Bundler.ui.debug "  * Using git #{uri}"
 
         if @installed
-          Bundler.ui.debug "  * Already checked out revision: #{ref}..."
+          Bundler.ui.debug "  * Already checked out revision: #{ref}"
         else
-          Bundler.ui.debug "  * Checking out revision: #{ref}..."
+          Bundler.ui.debug "  * Checking out revision: #{ref}"
           FileUtils.mkdir_p(path)
           Dir.chdir(path) do
             unless File.exist?(".git")
@@ -276,14 +275,13 @@ module Bundler
 
       def cache
         if cache_path.exist?
-          Bundler.ui.info "Updating `#{uri}`... "
+          Bundler.ui.info "Updating #{uri}"
           in_cache { git "fetch --quiet #{uri} master:master" }
         else
-          Bundler.ui.info "Fetching `#{uri}`... "
+          Bundler.ui.info "Fetching #{uri}"
           FileUtils.mkdir_p(cache_path.dirname)
           git "clone #{uri} #{cache_path} --bare --no-hardlinks"
         end
-        Bundler.ui.info "Done."
       end
 
       def revision
@@ -295,4 +293,4 @@ module Bundler
       end
     end
   end
-end
+end

data/lib/bundler/vendor/thor.rb

@@ -1,6 +1,4 @@
 require 'thor/base'
-require 'thor/group'
-require 'thor/actions'
 
 # TODO: Update thor to allow for git-style CLI (git bisect run)
 class Thor
@@ -193,7 +191,8 @@ class Thor
       # the namespace should be displayed as arguments.
       #
       def banner(task)
-        "thor " + task.formatted_usage(self)
+        base = $thor_runner ? "thor" : File.basename($0.split(" ").first)
+        "#{base} #{task.formatted_usage(self, base == "thor")}"
       end
 
       def baseclass #:nodoc:

data/lib/bundler/vendor/thor/base.rb

@@ -8,6 +8,9 @@ require 'thor/task'
 require 'thor/util'
 
 class Thor
+  autoload :Actions,    'thor/actions'
+  autoload :RakeCompat, 'thor/rake_compat'
+
   # Shortcuts for help.
   HELP_MAPPINGS       = %w(-h -? --help -D)
 
@@ -94,6 +97,18 @@ class Thor
     module ClassMethods
       attr_accessor :debugging
 
+      def attr_reader(*) #:nodoc:
+        no_tasks { super }
+      end
+
+      def attr_writer(*) #:nodoc:
+        no_tasks { super }
+      end
+
+      def attr_accessor(*) #:nodoc:
+        no_tasks { super }
+      end
+
       # Adds an argument to the class and creates an attr_accessor for it.
       #
       # Arguments are different from options in several aspects. The first one

data/lib/bundler/vendor/thor/task.rb

@@ -1,6 +1,6 @@
 class Thor
   class Task < Struct.new(:name, :description, :usage, :options)
-    FILE_REGEXP = /^#{Regexp.escape(File.expand_path(__FILE__))}:[\w:]+ `run'$/
+    FILE_REGEXP = /^#{Regexp.escape(File.dirname(__FILE__))}/
 
     # A dynamic task that handles method missing scenarios.
     class Dynamic < Task
@@ -40,8 +40,8 @@ class Thor
 
     # Returns the formatted usage by injecting given required arguments 
     # and required options into the given usage.
-    def formatted_usage(klass, namespace=nil)
-      namespace = klass.namespace if namespace.nil?
+    def formatted_usage(klass, namespace=true)
+      namespace = klass.namespace unless namespace == false
 
       # Add namespace
       formatted = if namespace
@@ -78,15 +78,15 @@ class Thor
         (collection & [name.to_s, name.to_sym]).empty?
       end
 
-      # For Ruby <= 1.8.7, we have to match the method name that we are trying to call.
-      # In Ruby >= 1.9.1, we have to match the method run in this file.
-      def backtrace_match?(backtrace) #:nodoc:
-        method_name = /`#{Regexp.escape(name.split(':').last)}'/
-        backtrace =~ method_name || backtrace =~ FILE_REGEXP
+      def sans_backtrace(backtrace, caller) #:nodoc:
+        saned  = backtrace.reject { |frame| frame =~ FILE_REGEXP }
+        saned -= caller
       end
 
       def parse_argument_error(instance, e, caller) #:nodoc:
-        if e.message =~ /wrong number of arguments/ && backtrace_match?(e.backtrace.first.to_s)
+        backtrace = sans_backtrace(e.backtrace, caller)
+
+        if backtrace.empty? && e.message =~ /wrong number of arguments/
           if instance.is_a?(Thor::Group)
             raise e, "'#{name}' was called incorrectly. Are you sure it has arity equals to 0?"
           else

data/lib/bundler/vendor/thor/version.rb

@@ -1,3 +1,3 @@
 class Thor
-  VERSION = "0.12.2".freeze
+  VERSION = "0.12.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.9.0.pre5
+  version: 0.9.0
 platform: ruby
 authors: 
 - Carl Lerche
@@ -42,26 +42,17 @@ files:
 - lib/bundler/templates/environment.erb
 - lib/bundler/templates/Gemfile
 - lib/bundler/ui.rb
-- lib/bundler/vendor/thor/actions/create_file.rb
-- lib/bundler/vendor/thor/actions/directory.rb
-- lib/bundler/vendor/thor/actions/empty_directory.rb
-- lib/bundler/vendor/thor/actions/file_manipulation.rb
-- lib/bundler/vendor/thor/actions/inject_into_file.rb
-- lib/bundler/vendor/thor/actions.rb
 - lib/bundler/vendor/thor/base.rb
 - lib/bundler/vendor/thor/core_ext/file_binary_read.rb
 - lib/bundler/vendor/thor/core_ext/hash_with_indifferent_access.rb
 - lib/bundler/vendor/thor/core_ext/ordered_hash.rb
 - lib/bundler/vendor/thor/error.rb
-- lib/bundler/vendor/thor/group.rb
 - lib/bundler/vendor/thor/invocation.rb
 - lib/bundler/vendor/thor/parser/argument.rb
 - lib/bundler/vendor/thor/parser/arguments.rb
 - lib/bundler/vendor/thor/parser/option.rb
 - lib/bundler/vendor/thor/parser/options.rb
 - lib/bundler/vendor/thor/parser.rb
-- lib/bundler/vendor/thor/rake_compat.rb
-- lib/bundler/vendor/thor/runner.rb
 - lib/bundler/vendor/thor/shell/basic.rb
 - lib/bundler/vendor/thor/shell/color.rb
 - lib/bundler/vendor/thor/shell.rb

data/lib/bundler/vendor/thor/actions.rb

@@ -1,274 +0,0 @@
-require 'fileutils'
-require 'thor/core_ext/file_binary_read'
-
-Dir[File.join(File.dirname(__FILE__), "actions", "*.rb")].each do |action|
-  require action
-end
-
-class Thor
-  module Actions
-    attr_accessor :behavior
-
-    def self.included(base) #:nodoc:
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      # Hold source paths for one Thor instance. source_paths_for_search is the
-      # method responsible to gather source_paths from this current class,
-      # inherited paths and the source root.
-      #
-      def source_paths
-        @source_paths ||= []
-      end
-
-      # Returns the source paths in the following order:
-      #
-      #   1) This class source paths
-      #   2) Source root
-      #   3) Parents source paths
-      #
-      def source_paths_for_search
-        paths = []
-        paths += self.source_paths
-        paths << self.source_root if self.respond_to?(:source_root)
-        paths += from_superclass(:source_paths, [])
-        paths
-      end
-
-      # Add runtime options that help actions execution.
-      #
-      def add_runtime_options!
-        class_option :force, :type => :boolean, :aliases => "-f", :group => :runtime,
-                             :desc => "Overwrite files that already exist"
-
-        class_option :pretend, :type => :boolean, :aliases => "-p", :group => :runtime,
-                               :desc => "Run but do not make any changes"
-
-        class_option :quiet, :type => :boolean, :aliases => "-q", :group => :runtime,
-                             :desc => "Supress status output"
-
-        class_option :skip, :type => :boolean, :aliases => "-s", :group => :runtime,
-                            :desc => "Skip files that already exist"
-      end
-    end
-
-    # Extends initializer to add more configuration options.
-    #
-    # ==== Configuration
-    # behavior<Symbol>:: The actions default behavior. Can be :invoke or :revoke.
-    #                    It also accepts :force, :skip and :pretend to set the behavior
-    #                    and the respective option.
-    #
-    # destination_root<String>:: The root directory needed for some actions.
-    #
-    def initialize(args=[], options={}, config={})
-      self.behavior = case config[:behavior].to_s
-        when "force", "skip"
-          _cleanup_options_and_set(options, config[:behavior])
-          :invoke
-        when "revoke"
-          :revoke
-        else
-          :invoke
-      end
-
-      super
-      self.destination_root = config[:destination_root]
-    end
-
-    # Wraps an action object and call it accordingly to the thor class behavior.
-    #
-    def action(instance) #:nodoc:
-      if behavior == :revoke
-        instance.revoke!
-      else
-        instance.invoke!
-      end
-    end
-
-    # Returns the root for this thor class (also aliased as destination root).
-    #
-    def destination_root
-      @destination_stack.last
-    end
-
-    # Sets the root for this thor class. Relatives path are added to the
-    # directory where the script was invoked and expanded.
-    #
-    def destination_root=(root)
-      @destination_stack ||= []
-      @destination_stack[0] = File.expand_path(root || '')
-    end
-
-    # Returns the given path relative to the absolute root (ie, root where
-    # the script started).
-    #
-    def relative_to_original_destination_root(path, remove_dot=true)
-      path = path.gsub(@destination_stack[0], '.')
-      remove_dot ? (path[2..-1] || '') : path
-    end
-
-    # Holds source paths in instance so they can be manipulated.
-    #
-    def source_paths
-      @source_paths ||= self.class.source_paths_for_search
-    end
-
-    # Receives a file or directory and search for it in the source paths. 
-    #
-    def find_in_source_paths(file)
-      relative_root = relative_to_original_destination_root(destination_root, false)
-
-      source_paths.each do |source|
-        source_file = File.expand_path(file, File.join(source, relative_root))
-        return source_file if File.exists?(source_file)
-      end
-
-      if source_paths.empty?
-        raise Error, "You don't have any source path defined for class #{self.class.name}. To fix this, " <<
-                     "you can define a source_root in your class."
-      else
-        raise Error, "Could not find #{file.inspect} in source paths."
-      end
-    end
-
-    # Do something in the root or on a provided subfolder. If a relative path
-    # is given it's referenced from the current root. The full path is yielded
-    # to the block you provide. The path is set back to the previous path when
-    # the method exits.
-    #
-    # ==== Parameters
-    # dir<String>:: the directory to move to.
-    # config<Hash>:: give :verbose => true to log and use padding.
-    #
-    def inside(dir='', config={}, &block)
-      verbose = config.fetch(:verbose, false)
-
-      say_status :inside, dir, verbose
-      shell.padding += 1 if verbose
-      @destination_stack.push File.expand_path(dir, destination_root)
-
-      FileUtils.mkdir_p(destination_root) unless File.exist?(destination_root)
-      FileUtils.cd(destination_root) { block.arity == 1 ? yield(destination_root) : yield }
-
-      @destination_stack.pop
-      shell.padding -= 1 if verbose
-    end
-
-    # Goes to the root and execute the given block.
-    #
-    def in_root
-      inside(@destination_stack.first) { yield }
-    end
-
-    # Loads an external file and execute it in the instance binding.
-    #
-    # ==== Parameters
-    # path<String>:: The path to the file to execute. Can be a web address or
-    #                a relative path from the source root.
-    #
-    # ==== Examples
-    #
-    #   apply "http://gist.github.com/103208"
-    #
-    #   apply "recipes/jquery.rb"
-    #
-    def apply(path, config={})
-      verbose = config.fetch(:verbose, true)
-      path    = find_in_source_paths(path) unless path =~ /^http\:\/\//
-
-      say_status :apply, path, verbose
-      shell.padding += 1 if verbose
-      instance_eval(open(path).read)
-      shell.padding -= 1 if verbose
-    end
-
-    # Executes a command.
-    #
-    # ==== Parameters
-    # command<String>:: the command to be executed.
-    # config<Hash>:: give :verbose => false to not log the status. Specify :with
-    #                to append an executable to command executation.
-    #
-    # ==== Example
-    #
-    #   inside('vendor') do
-    #     run('ln -s ~/edge rails')
-    #   end
-    #
-    def run(command, config={})
-      return unless behavior == :invoke
-
-      destination = relative_to_original_destination_root(destination_root, false)
-      desc = "#{command} from #{destination.inspect}"
-
-      if config[:with]
-        desc = "#{File.basename(config[:with].to_s)} #{desc}"
-        command = "#{config[:with]} #{command}"
-      end
-
-      say_status :run, desc, config.fetch(:verbose, true)
-      system(command) unless options[:pretend]
-    end
-
-    # Executes a ruby script (taking into account WIN32 platform quirks).
-    #
-    # ==== Parameters
-    # command<String>:: the command to be executed.
-    # config<Hash>:: give :verbose => false to not log the status.
-    #
-    def run_ruby_script(command, config={})
-      return unless behavior == :invoke
-      run "#{command}", config.merge(:with => Thor::Util.ruby_command)
-    end
-
-    # Run a thor command. A hash of options can be given and it's converted to 
-    # switches.
-    #
-    # ==== Parameters
-    # task<String>:: the task to be invoked
-    # args<Array>:: arguments to the task
-    # config<Hash>:: give :verbose => false to not log the status. Other options
-    #                are given as parameter to Thor.
-    #
-    # ==== Examples
-    #
-    #   thor :install, "http://gist.github.com/103208"
-    #   #=> thor install http://gist.github.com/103208
-    #
-    #   thor :list, :all => true, :substring => 'rails'
-    #   #=> thor list --all --substring=rails
-    #
-    def thor(task, *args)
-      config  = args.last.is_a?(Hash) ? args.pop : {}
-      verbose = config.key?(:verbose) ? config.delete(:verbose) : true
-
-      args.unshift task
-      args.push Thor::Options.to_switches(config)
-      command = args.join(' ').strip
-
-      run command, :with => :thor, :verbose => verbose
-    end
-
-    protected
-
-      # Allow current root to be shared between invocations.
-      #
-      def _shared_configuration #:nodoc:
-        super.merge!(:destination_root => self.destination_root)
-      end
-
-      def _cleanup_options_and_set(options, key) #:nodoc:
-        case options
-          when Array
-            %w(--force -f --skip -s).each { |i| options.delete(i) }
-            options << "--#{key}"
-          when Hash
-            [:force, :skip, "force", "skip"].each { |i| options.delete(i) }
-            options.merge!(key => true)
-        end
-      end
-
-  end
-end