vendorificator 0.5.git.v0.4.0.17.g26d50d8 → 0.5.git.v0.4.0.60.g9c35209

data/lib/vendorificator/environment.rb

@@ -6,23 +6,28 @@ require 'vendorificator/config'
 module Vendorificator
   class Environment
     attr_reader :config
-    attr_accessor :shell, :vendor_instances
+    attr_accessor :vendor_instances, :io
 
-    def initialize(vendorfile=nil, &block)
+    def initialize(shell, verbosity = :default, vendorfile = nil, &block)
       @vendor_instances = []
+      @io = IOProxy.new(shell, verbosity)
+      @vendorfile = find_vendorfile(vendorfile)
+      @vendor_block = block
 
       @config = Vendorificator::Config.new
       @config.environment = self
-      if vendorfile || !block_given?
-        @config.read_file(find_vendorfile(vendorfile).to_s)
-      end
-      @config.instance_eval(&block) if block_given?
+    end
+
+    def shell
+      io.shell
+    end
 
-      self.each_vendor_instance{ |mod| mod.compute_dependencies! }
+    def say(*args)
+      io.say(*args)
     end
 
     def say_status(*args)
-      shell.say_status(*args) if shell
+      io.say_status(*args)
     end
 
     # Main MiniGit instance
@@ -49,10 +54,12 @@ module Vendorificator
     #
     # Returns nothing.
     def pull_all(options = {})
+      load_vendorfile
+
       ensure_clean!
       remotes = options[:remote] ? options[:remote].split(',') : config[:remotes]
       remotes.each do |remote|
-        indent 'remote', remote do
+        indent :default, 'remote', remote do
           pull(remote, options)
         end
       end
@@ -68,7 +75,10 @@ module Vendorificator
 
       git.fetch(remote)
       git.fetch({:tags => true}, remote)
-      git.fetch(remote, 'refs/notes/vendor:refs/notes/vendor')
+      begin
+        git.fetch(remote, 'refs/notes/vendor:refs/notes/vendor')
+      rescue MiniGit::GitError  # ignore
+      end
 
       ref_rx = /^refs\/remotes\/#{Regexp.quote(remote)}\//
       remote_branches = Hash[ git.capturing.show_ref.
@@ -82,20 +92,20 @@ module Vendorificator
         theirs = remote_branches[mod.branch_name]
         if theirs
           if not ours
-            say_status 'new', mod.branch_name, :yellow
+            say_status :default, 'new', mod.branch_name, :yellow
             git.branch({:track => true}, mod.branch_name, theirs) unless options[:dry_run]
           elsif ours == theirs
-            say_status 'unchanged', mod.branch_name
+            say_status :default, 'unchanged', mod.branch_name
           elsif fast_forwardable?(theirs, ours)
-            say_status 'updated', mod.name, :yellow
+            say_status :default, 'updated', mod.name, :yellow
             mod.in_branch { git.merge({:ff_only => true}, theirs) } unless options[:dry_run]
           elsif fast_forwardable?(ours, theirs)
-            say_status 'older', mod.branch_name
+            say_status :default, 'older', mod.branch_name
           else
-            say_status 'complicated', mod.branch_name, :red
+            say_status :default, 'complicated', mod.branch_name, :red
           end
         else
-          say_status 'unknown', mod.branch_name
+          say_status :default, 'unknown', mod.branch_name
         end
       end
     end
@@ -107,35 +117,64 @@ module Vendorificator
     #
     # Returns nothing.
     def info(mod_name, options = {})
+      load_vendorfile
+
       if vendor = find_vendor_instance_by_name(mod_name)
-        shell.say "Module name: #{vendor.name}\n"
-        shell.say "Module category: #{vendor.category}\n"
-        shell.say "Module merged version: #{vendor.merged_version}\n"
-        shell.say "Module merged notes: #{vendor.merged_notes.ai}\n"
+        say :default, "Module name: #{vendor.name}\n"
+        say :default, "Module group: #{vendor.group}\n"
+        say :default, "Module merged version: #{vendor.merged_version}\n"
+        say :default, "Module merged notes: #{vendor.merged_notes.ai}\n"
       elsif (commit = Commit.new(mod_name, git)).exists?
-        shell.say "Branches that contain this commit: #{commit.branches.join(', ')}\n"
-        shell.say "Vendorificator notes on this commit: #{commit.notes.ai}\n"
+        say :default, "Branches that contain this commit: #{commit.branches.join(', ')}\n"
+        say :default, "Vendorificator notes on this commit: #{commit.notes.ai}\n"
       else
-        shell.say "Module or ref #{mod_name.inspect} not found."
+        say :default, "Module or ref #{mod_name.inspect} not found."
       end
     end
 
+    # Public: Displays info about current modules.
+    #
+    # Returns nothing.
+    def list
+      load_vendorfile
+
+      each_vendor_instance do |mod|
+        shell.say "Module: #{mod.name}, version: #{mod.version}"
+      end
+    end
+
+    # Public: Displays info about outdated modules.
+    #
+    # Returns nothing.
+    def outdated
+      load_vendorfile
+
+      outdated = []
+      each_vendor_instance do |mod|
+        outdated << mod if [:unpulled, :unmerged, :outdated].include? mod.status
+      end
+
+      outdated.each { |mod| say_status :quiet, 'outdated', mod.name }
+    end
+
     # Public: Push changes on module branches.
     #
     # options - The Hash containing options
     #
     # Returns nothing.
     def push(options = {})
+      load_vendorfile
+
       ensure_clean!
 
       pushable = []
-      each_vendor_instance{ |mod| pushable += mod.pushable_refs }
+      each_vendor_instance { |mod| pushable += mod.pushable_refs }
+
+      pushable << 'refs/notes/vendor' if has_notes?
 
       remotes = options[:remote] ? options[:remote].split(',') : config[:remotes]
       remotes.each do |remote|
         git.push remote, pushable
-        git.push remote, :tags => true
-        git.push remote, 'refs/notes/vendor'
       end
     end
 
@@ -145,12 +184,14 @@ module Vendorificator
     #
     # Returns nothing.
     def sync(options = {})
+      load_vendorfile
+
       ensure_clean!
       config[:use_upstream_version] = options[:update]
       metadata = metadata_snapshot
 
       each_vendor_instance(*options[:modules]) do |mod|
-        say_status :module, mod.name
+        say_status :default, :module, mod.name
         indent do
           mod.run!(:metadata => metadata)
         end
@@ -159,12 +200,10 @@ module Vendorificator
 
     # Public: Goes through all the Vendor instances and runs the block
     #
-    # modules - ?
+    # modules - An Array of vendor modules to yield the block for.
     #
     # Returns nothing.
     def each_vendor_instance(*modules)
-      modpaths = modules.map { |m| File.expand_path(m) }
-
       # We don't use @vendor_instances.each here, because Vendor#run! is
       # explicitly allowed to append to instantiate new dependencies, and #each
       # fails to catch up on some Ruby implementations.
@@ -172,9 +211,7 @@ module Vendorificator
       while true
         break if i >= @vendor_instances.length
         mod = @vendor_instances[i]
-        yield mod if modules.empty? ||
-          modules.include?(mod.name) ||
-          modpaths.include?(mod.work_dir)
+        yield mod if modules.empty? || mod.included_in_list?(modules)
         i += 1
       end
     end
@@ -204,7 +241,8 @@ module Vendorificator
     # Public: returns `config[:root_dir]` relative to Git repository root
     def relative_root_dir
       @relative_root_dir ||= config[:root_dir].relative_path_from(
-        Pathname.new(git.git_work_tree))
+        Pathname.new(git.git_work_tree)
+      )
     end
 
     # Public: Returns module with given name
@@ -212,16 +250,41 @@ module Vendorificator
       vendor_instances.find { |v| v.name == name }
     end
 
+    # Public: Loads the vendorfile.
+    #
+    # Returns nothing.
+    def load_vendorfile
+      raise RuntimeError, 'Vendorfile has been already loaded!' if @vendorfile_loaded
+
+      if @vendorfile
+        @config.read_file @vendorfile.to_s
+      else
+        raise MissingVendorfileError unless @vendor_block
+      end
+      @config.instance_eval(&@vendor_block) if @vendor_block
+
+      each_vendor_instance{ |mod| mod.compute_dependencies! }
+
+      @vendorfile_loaded = true
+    end
+
+    # Public: Checks if vendorfile has been already loaded.
+    #
+    # Returns boolean.
+    def vendorfile_loaded?
+      defined?(@vendorfile_loaded) && @vendorfile_loaded
+    end
+
     private
 
-    # Private: Finds a vendor instance by module name.
+    # Private: Finds a vendor instance by module (qualified) name, path or branch.
     #
-    # mod_name - The String containing the module name.
+    # mod_name - The String containing the module id.
     #
     # Returns Vendor instance.
     def find_vendor_instance_by_name(mod_name)
-      each_vendor_instance do |mod|
-        return mod if mod.name == mod_name
+      each_vendor_instance(mod_name) do |mod|
+        return mod
       end
       nil
     end
@@ -231,8 +294,8 @@ module Vendorificator
     # given - the optional String containing vendorfile path.
     #
     # Returns a String containing the vendorfile path.
-    def find_vendorfile(given=nil)
-      given = [ given, ENV['VENDORFILE'] ].find do |candidate|
+    def find_vendorfile(given = nil)
+      given = [given, ENV['VENDORFILE']].find do |candidate|
         candidate && !(candidate.respond_to?(:empty?) && candidate.empty?)
       end
       return given if given
@@ -247,11 +310,11 @@ module Vendorificator
         # avoid stepping above the tmp directory when testing
         if ENV['VENDORIFICATOR_SPEC_RUN'] &&
             dir.join('vendorificator.gemspec').exist?
-          raise ArgumentError, "Vendorfile not found"
+          break
         end
       end
 
-      raise ArgumentError, "Vendorfile not found"
+      return nil
     end
 
     # Private: Aborts on a dirty repository.
@@ -264,12 +327,23 @@ module Vendorificator
     # Private: Indents the output.
     #
     # Returns nothing.
-    def indent(*args, &block)
-      say_status *args unless args.empty?
+    def indent(verb_level = :default, *args, &block)
+      say_status verb_level, *args unless args.empty?
       shell.padding += 1 if shell
       yield
     ensure
       shell.padding -= 1 if shell
     end
+
+    # Private: Checks if there are git vendor notes.
+    #
+    # Returns true/false.
+    def has_notes?
+      git.capturing.rev_parse({:quiet => true, :verify => true}, 'refs/notes/vendor')
+      true
+    rescue MiniGit::GitError
+      false
+    end
+
   end
 end

data/lib/vendorificator/errors.rb

@@ -1,3 +1,4 @@
 module Vendorificator
   class DirtyRepoError < StandardError; end
+  class MissingVendorfileError < StandardError; end
 end

data/lib/vendorificator/hooks/chef_cookbook.rb

@@ -26,7 +26,7 @@ module Vendorificator::Hooks
         metadata = File.join(self.work_dir, 'metadata.rb')
 
         unless File.exist?(metadata)
-          shell.say_status 'WARNING', "Metadata of #{name} does not exist at #{metadata}, could not gather dependencies", :red
+          say_status :quiet, 'WARNING', "Metadata of #{name} does not exist at #{metadata}, could not gather dependencies", :red
           return super
         end
 

data/lib/vendorificator/io_proxy.rb

@@ -0,0 +1,46 @@
+require 'stringio'
+
+module Vendorificator
+  class IOProxy < StringIO
+    attr_reader :shell
+
+    def initialize(shell, verbosity = :default)
+      @shell = shell
+      @verbosity = verbosity
+
+      super()
+      capture_stdout
+    end
+
+    def puts(value, verb_level = :default)
+      @orig_stdout.puts value if should_speak?(verb_level)
+      super
+    end
+
+    def say_status(verb_level, *args)
+      write args[0..1].join('  ' * @shell.padding)
+      @shell.say_status(*args) if @shell && should_speak?(verb_level)
+    end
+
+    def say(verb_level, *args)
+      write args[0]
+      @shell.say(*args) if @shell && should_speak?(verb_level)
+    end
+
+    private
+
+    def capture_stdout
+      @orig_stdout = $stdout
+
+      $stdout = self
+    end
+
+    def should_speak?(level)
+      levels = {:quiet => 1, :default => 2, :chatty => 3, :debug => 9}
+      raise "Unknown verbosity level: #{level.inspect}" if levels[level].nil?
+
+      levels[level] <= levels[@verbosity]
+    end
+  end
+end
+

data/lib/vendorificator/vendor/archive.rb

@@ -13,9 +13,9 @@ module Vendorificator
     attr_reader :conjured_checksum, :conjured_filesize
 
     def conjure!
-      shell.say_status :download, url
+      say_status :default, :download, url
       archive = download_file
-      shell.say_status :unpack, filename
+      say_status :default, :unpack, filename
       unpack_file archive
       add_archive_metadata
       super

data/lib/vendorificator/vendor/chef_cookbook.rb

@@ -10,7 +10,7 @@ module Vendorificator
     include Hooks::ChefCookbookDependencies
 
     @method_name = :chef_cookbook
-    @category = :cookbooks
+    @group = :cookbooks
 
     API_PREFIX = 'http://cookbooks.opscode.com/api/v1/cookbooks/'
 

data/lib/vendorificator/vendor/download.rb

@@ -11,11 +11,11 @@ module Vendorificator
     attr_reader :conjured_checksum, :conjured_filesize
 
     def path
-      args[:path] || category
+      args[:path] || group
     end
 
     def conjure!
-      shell.say_status :download, url
+      say_status :default, :download, url
       File.open name, 'w' do |outf|
         outf.write( open(url).read )
       end

data/lib/vendorificator/vendor/git.rb

@@ -7,7 +7,7 @@ module Vendorificator
     attr_reader :conjured_revision
 
     def conjure!
-      shell.say_status :clone, repository
+      say_status :default, :clone, repository
       MiniGit.git :clone, repository, '.'
       local_git = MiniGit.new('.')
 

data/lib/vendorificator/vendor.rb

@@ -8,7 +8,7 @@ module Vendorificator
   class Vendor
 
     class << self
-      attr_accessor :category, :method_name
+      attr_accessor :group, :method_name
 
       def arg_reader(*names)
         names.each do |name|
@@ -41,19 +41,28 @@ module Vendorificator
     end
 
     def path
-      args[:path] || _join(category, name)
+      args[:path] || _join(group, name)
     end
 
     def shell
-      @shell ||= config[:shell] || Thor::Shell::Basic.new
+      @environment.shell
     end
 
-    def category
-      defined?(@category) ? @category : self.class.category
+    def say(verb_level= :default, &block)
+      output = yield
+      @environment.say verb_level, output
+    end
+
+    def say_status(*args, &block)
+      @environment.say_status(*args, &block)
+    end
+
+    def group
+      defined?(@group) ? @group : self.class.group
     end
 
     def branch_name
-      _join(config[:branch_prefix], category, name)
+      _join(config[:branch_prefix], group, name)
     end
 
     def to_s
@@ -167,14 +176,17 @@ module Vendorificator
                     rescue MiniGit::GitError
                       nil
                     end
-      Dir.mktmpdir("vendor-#{category}-#{name}") do |tmpdir|
+      Dir.mktmpdir("vendor-#{group}-#{name}") do |tmpdir|
         clone_opts = {:shared => true, :no_checkout => true}
         clone_opts[:branch] = branch_name if branch_exists
-        MiniGit.git(:clone, clone_opts, git.git_dir, tmpdir)
-        tmpgit = MiniGit::new(tmpdir)
+        say { MiniGit::Capturing.git(:clone, clone_opts, git.git_dir, tmpdir) }
+        tmpgit = MiniGit.new(tmpdir)
+        #TODO: Silence/handle the stderr output from git-checkout
+        tmpgit.capturing.checkout({orphan: true}, branch_name) unless branch_exists
         tmpgit.fetch(git.git_dir, "refs/notes/vendor:refs/notes/vendor") if notes_exist
-        tmpgit.checkout({orphan: true}, branch_name) unless branch_exists
-        tmpgit.rm( { :r => true, :f => true, :q => true, :ignore_unmatch => true }, '.') if options[:clean] || !branch_exists
+        if options[:clean] || !branch_exists
+          tmpgit.rm({ :r => true, :f => true, :q => true, :ignore_unmatch => true }, '.')
+        end
 
         begin
           @git = tmpgit
@@ -185,6 +197,7 @@ module Vendorificator
           @git = nil
         end
 
+        #TODO: Silence/handle the stderr output from git-fetch
         git.fetch(tmpdir)
         git.fetch({tags: true}, tmpdir)
         git.fetch(tmpdir,
@@ -197,16 +210,16 @@ module Vendorificator
       case status
 
       when :up_to_date
-        shell.say_status 'up to date', self.to_s
+        say_status :default, 'up to date', self.to_s
 
       when :unpulled, :unmerged
-        shell.say_status 'merging', self.to_s, :yellow
+        say_status :default, 'merging', self.to_s, :yellow
         git.merge({:no_edit => true, :no_ff => true}, tagged_sha1)
         postprocess! if self.respond_to? :postprocess!
         compute_dependencies!
 
       when :outdated, :new
-        shell.say_status 'fetching', self.to_s, :yellow
+        say_status :default, 'fetching', self.to_s, :yellow
         begin
           shell.padding += 1
           before_conjure!
@@ -237,7 +250,7 @@ module Vendorificator
         end
 
       else
-        say_status self.status, "I'm unsure what to do.", :red
+        say_status :quiet, self.status, "I'm unsure what to do.", :red
       end
     end
 
@@ -245,30 +258,41 @@ module Vendorificator
       block.call(self) if block
     end
 
-    #
     # Hook points
     def git_add_extra_paths ; [] ; end
     def before_conjure! ; end
     def compute_dependencies! ; end
 
     def pushable_refs
-      created_tags.
-        map { |tag| '+' << tag }.
-        unshift("+refs/heads/#{branch_name}")
+      created_tags.unshift("refs/heads/#{branch_name}")
     end
 
     def metadata
       default = {
         :module_version => version,
-        :module_category => @category,
+        :module_group => @group,
       }
       default.merge @metadata
     end
 
+    def included_in_list?(module_list)
+      modpaths = module_list.map { |m| File.expand_path(m) }
+
+      module_list.include?(name) ||
+        module_list.include?("#{group}/#{name}") ||
+        modpaths.include?(File.expand_path(work_dir)) ||
+        module_list.include?(merged) ||
+        module_list.include?(branch_name)
+    end
+
     private
 
     def parse_initialize_args(args = {})
-      @category = args.delete(:category) if args.key?(:category)
+      @group = args.delete(:group) if args.key?(:group)
+      if args.key?(:category)
+        @group ||= args.delete(:category)
+        say_status :default, 'DEPRECATED', 'Using :category option is deprecated and will be removed in future versions. Use :group instead.'
+      end
 
       unless (hooks = Array(args.delete(:hooks))).empty?
         hooks.each do |hook|
@@ -282,7 +306,7 @@ module Vendorificator
     end
 
     def tag_name_base
-      _join('vendor', category, name)
+      _join('vendor', group, name)
     end
 
     def conjure_commit_message
@@ -294,7 +318,9 @@ module Vendorificator
     end
 
     def tagged_sha1
-      @tagged_sha1 ||= git.capturing.rev_parse({:verify => true, :quiet => true}, "refs/tags/#{tag_name}^{commit}").strip
+      @tagged_sha1 ||= git.capturing.rev_parse(
+        {:verify => true, :quiet => true}, "refs/tags/#{tag_name}^{commit}"
+      ).strip
     rescue MiniGit::GitError
       nil
     end
@@ -340,7 +366,7 @@ module Vendorificator
       git.capturing.commit :m => conjure_commit_message
       git.capturing.notes({:ref => 'vendor'}, 'add', {:m => conjure_note(environment_metadata)}, 'HEAD')
       git.capturing.tag( { :a => true, :m => tag_message }, tag_name )
-      shell.say_status :tag, tag_name
+      say_status :default, :tag, tag_name
     end
 
     # Private: Merges all the data we use for the commit note.

data/lib/vendorificator.rb

@@ -6,6 +6,7 @@ require 'vendorificator/config'
 require 'vendorificator/environment'
 require 'vendorificator/errors'
 require 'vendorificator/commit'
+require 'vendorificator/io_proxy'
 
 require 'vendorificator/vendor'
 require 'vendorificator/vendor/download'

data/spec/spec_helper.rb

@@ -44,8 +44,9 @@ class MiniTest::Spec
   include Vendorificator::Spec::Helpers::Wrong
 
   before do
-    _git = stub
-    _git.stubs(:capturing).returns(stub)
+    _git = stub('git')
+    _capturing = stub('git.capturing')
+    _git.stubs(:capturing).returns(_capturing)
     Vendorificator::Environment.any_instance.stubs(:git).returns(_git)
   end
 
@@ -55,7 +56,7 @@ class MiniTest::Spec
 
   def basic_environment
     @basic_environment ||= Vendorificator::Environment.new(
-      'spec/vendorificator/fixtures/vendorfiles/empty_vendor.rb'
+      Thor::Shell::Basic.new, :quiet, nil
     )
   end