vendorificator 0.1.1 → 0.2.0

data/lib/vendorificator/cli.rb

@@ -4,25 +4,38 @@ require 'vendorificator'
 
 module Vendorificator
   class CLI < Thor
-    include Vendorificator
+    attr_reader :environment
 
     check_unknown_options! :except => [:git, :diff, :log]
     stop_on_unknown_option! :git, :diff, :log
 
     default_task :help
 
-    class_option :file, :aliases => '-f', :type => :string, :banner => 'PATH'
-    class_option :debug, :aliases => '-d', :type => :boolean, :default => false
-    class_option :quiet, :aliases => ['-q'], :default => false, :type => :boolean
-    class_option :modules, :type => :string, :default => '',
+    class_option :file,    :aliases => '-f', :type => :string,
+      :banner => 'PATH'
+    class_option :debug,   :aliases => '-d', :type => :boolean, :default => false
+    class_option :quiet,   :aliases => '-q', :type => :boolean, :default => false
+    class_option :modules, :aliases => '-m', :type => :string,  :default => '',
       :banner => 'mod1,mod2,...,modN',
       :desc => 'Run only for specified modules (name or path, comma separated)'
+    class_option :version,                   :type => :boolean
+    class_option :help,    :aliases => '-h', :type => :boolean
 
-    def initialize(*args)
+    def initialize(args=[], options={}, config={})
       super
-      Grit.debug = true if options[:debug]
-      Vendorificator::Config.from_file(find_vendorfile)
-      Vendorificator::Config[:shell] = shell
+
+      if self.options[:version]
+        say "Vendorificator #{Vendorificator::VERSION}"
+        exit
+      end
+
+      if self.options[:help] && config[:current_task].name != 'help'
+        invoke :help, [ config[:current_task].name ]
+        exit
+      end
+
+      @environment = Vendorificator::Environment.new(self.options[:file])
+      environment.shell = shell
 
       class << shell
         # Make say_status always say it.
@@ -35,9 +48,9 @@ module Vendorificator
     desc :sync, "Download new or updated vendor files"
     method_option :update, :type => :boolean, :default => false
     def sync
-      ensure_clean_repo!
-      conf[:use_upstream_version] = options[:update]
-      Vendorificator::Config.each_module(*modules) do |mod|
+      ensure_clean!
+      environment.config[:use_upstream_version] = options[:update]
+      Vendorificator::Vendor.each(*modules) do |mod|
         say_status :module, mod.name
         begin
           shell.padding += 1
@@ -51,9 +64,9 @@ module Vendorificator
     desc "status", "List known vendor modules and their status"
     method_option :update, :type => :boolean, :default => false
     def status
-      say_status 'WARNING', 'Git repository is not clean', :red unless repo.clean?
-      conf[:use_upstream_version] = options[:update]
-      Vendorificator::Config.each_module(*modules) do |mod|
+      say_status 'WARNING', 'Git repository is not clean', :red unless environment.clean?
+      environment.config[:use_upstream_version] = options[:update]
+      Vendorificator::Vendor.each(*modules) do |mod|
         status_line = mod.to_s
 
         updatable = mod.updatable?
@@ -74,11 +87,11 @@ module Vendorificator
     method_option :remote, :aliases => ['-r'], :default => nil
     method_option :dry_run, :aliases => ['-n'], :default => false, :type => :boolean
     def pull
-      ensure_clean_repo!
-      remotes = options[:remote] ? options[:remote].split(',') : conf[:remotes]
+      ensure_clean!
+      remotes = options[:remote] ? options[:remote].split(',') : environment.config[:remotes]
       remotes.each do |remote|
         indent 'remote', remote do
-          repo.pull(remote, options)
+          environment.pull(remote, options)
         end
       end
     end
@@ -96,9 +109,8 @@ module Vendorificator
     vendor git log @MERGED@..HEAD -- @PATH@    # basic 'vendor log'
     vendor git diff --stat @MERGED@ -- @PATH@  # 'vendor diff', as diffstat
 EOF
-    method_option :only_changed, :default => false, :type => :boolean
     def git(command, *args)
-      Vendorificator::Config.each_module(*modules) do |mod|
+      Vendorificator::Vendor.each(*modules) do |mod|
         unless mod.merged
           say_status 'unmerged', mod.to_s, :red unless options[:only_changed]
           next
@@ -110,26 +122,19 @@ EOF
             gsub('@PATH@', mod.work_dir)
         end
 
-        output = repo.git.native(command, {}, *actual_args)
-        if output.empty?
-          say_status 'unchanged', mod.to_s, :green unless options[:only_changed]
-        else
-          say_status 'changed', mod.to_s, :yellow
-        end
-        puts output unless options[:quiet] || output.empty?
+        say_status command, mod.to_s
+        output = environment.git.git(command, *actual_args)
       end
     end
 
     desc "diff [OPTIONS] [GIT OPTIONS]",
          "Show differences between work tree and upstream module(s)"
-    method_option :only_changed, :default => false, :type => :boolean
     def diff(*args)
       invoke :git, %w'diff' + args + %w'@MERGED@ -- @PATH@'
     end
 
     desc "log [OPTIONS] [GIT OPTIONS]",
          "Show git log of commits added to upstream module(s)"
-    method_option :only_changed, :default => false, :type => :boolean
     def log(*args)
       invoke :git, %w'log' + args + %w'@MERGED@..HEAD -- @PATH@'
     end
@@ -175,14 +180,6 @@ EOF
       options[:modules].split(',').map(&:strip)
     end
 
-    def conf
-      Vendorificator::Config
-    end
-
-    def repo
-      Vendorificator::Config.repo
-    end
-
     def fail!(message, exception_message='I give up.')
       say_status('FATAL', message, :red)
       raise Thor::Error, 'I give up.'
@@ -196,30 +193,8 @@ EOF
       shell.padding -= 1
     end
 
-    # Find proper Vendorfile
-    def find_vendorfile
-      given = options.file || ENV['VENDORFILE']
-      return Pathname.new(given).expand_path if given && !given.empty?
-
-      Pathname.pwd.ascend do |dir|
-        vf = dir.join('Vendorfile')
-        return vf if vf.exist?
-
-        vf = dir.join('config/vendor.rb')
-        return vf if vf.exist?
-
-        # avoid stepping above the tmp directory when testing
-        if ENV['VENDORIFICATOR_SPEC_RUN'] &&
-            dir.join('vendorificator.gemspec').exist?
-          raise RuntimeError, "Vendorfile not found"
-        end
-      end
-
-      raise RuntimeError, "Vendorfile not found"
-    end
-
-    def ensure_clean_repo!
-      unless repo.clean?
+    def ensure_clean!
+      unless environment.clean?
         fail!('Repository is not clean.')
       end
     end

data/lib/vendorificator/config.rb

@@ -2,21 +2,22 @@ require 'pathname'
 
 require 'mixlib/config'
 
-require 'vendorificator/repo'
-
 module Vendorificator
   class Config
     extend Mixlib::Config
 
+    attr_accessor :environment
+
     configure do |c|
       c[:basedir] = 'vendor'
       c[:branch_prefix] = 'vendor'
-      c[:modules] = []
       c[:remotes] = %w(origin)
     end
 
     def self.from_file(filename)
       pathname = Pathname.new(filename).cleanpath.expand_path
+
+      self[:vendorfile_path] = pathname
       self[:root_dir] =
         if ( pathname.basename.to_s == 'vendor.rb' &&
                pathname.dirname.basename.to_s == 'config' )
@@ -25,46 +26,8 @@ module Vendorificator
         else
           pathname.dirname
         end
-      self[:vendorfile_path] = pathname
-      super(pathname.to_s)
-    end
 
-    def self.repo
-      @repo ||= begin
-                  git_root_path = self[:repo_dir] || _find_git_root
-                  raise "Can't find Git repository" unless git_root_path
-                  Vendorificator::Repo.new( git_root_path.to_s )
-                end
-    end
-
-    def self.each_module(*modules)
-      module_paths = modules.map { |m| File.expand_path(m) }
-
-      # We don't use self[:modules].each here, because mod.run! is
-      # explicitly allowed to append to Config[:modules], and #each
-      # fails to catch up on some Ruby implementations.
-      i = 0
-      while true
-        break if i >= Vendorificator::Config[:modules].length
-        mod = Vendorificator::Config[:modules][i]
-        yield mod if
-          modules.empty? ||
-          modules.include?(mod.name) ||
-          module_paths.include?(mod.work_dir)
-        i += 1
-
-        # Add dependencies
-        work_dirs = Vendorificator::Config[:modules].map(&:work_dir)
-        Vendorificator::Config[:modules] +=
-          mod.dependencies.reject { |dep| work_dirs.include?(dep.work_dir) }
-      end
-    end
-
-    def self._find_git_root
-      self[:root_dir].ascend do |dir|
-        return dir if dir.join('.git').exist?
-      end
+      super(pathname.to_s)
     end
-    private_class_method :_find_git_root
   end
 end

data/lib/vendorificator/environment.rb

@@ -0,0 +1,111 @@
+require 'pathname'
+
+require 'minigit'
+
+require 'vendorificator/config'
+
+module Vendorificator
+  class Environment
+    attr_reader :config
+    attr_accessor :shell
+
+    def initialize(vendorfile=nil)
+      @config = Vendorificator::Config
+      config.environment = self
+      config.from_file(self.class.find_vendorfile(vendorfile))
+      Vendorificator::Vendor.compute_dependencies!
+    end
+
+    def say_status(*args)
+      shell.say_status(*args) if shell
+    end
+
+    # Main MiniGit instance
+    def git
+      @git ||= MiniGit::new(config[:vendorfile_path])
+    end
+
+    # Git helpers
+    def remotes
+      @remotes ||= git.capturing.remote.lines.map(&:strip)
+    end
+
+    def current_branch
+      git.capturing.rev_parse({:abbrev_ref => true}, 'HEAD').strip
+    end
+
+    def fast_forwardable?(to, from)
+      git.capturing.merge_base(to, from).strip == from
+    end
+
+    def clean?
+      # copy code from http://stackoverflow.com/a/3879077/16390
+      git.update_index :q => true, :ignore_submodules => true, :refresh => true
+      git.diff_files '--quiet', '--ignore-submodules', '--'
+      git.diff_index '--cached', '--quiet', 'HEAD', '--ignore-submodules', '--'
+      true
+    rescue MiniGit::GitError
+      false
+    end
+
+    def pull(remote, options={})
+      raise RuntimeError, "Unknown remote #{remote}" unless remotes.include?(remote)
+
+      git.fetch(remote)
+      git.fetch({:tags => true}, remote)
+
+      ref_rx = /^refs\/remotes\/#{Regexp.quote(remote)}\//
+      remote_branches = Hash[ git.capturing.show_ref.
+        lines.
+        map(&:split).
+        map { |sha, name| name =~ ref_rx ? [$', sha] : nil }.
+        compact ]
+
+      Vendorificator::Vendor.each do |mod|
+        ours = mod.head
+        theirs = remote_branches[mod.branch_name]
+        if theirs
+          if not ours
+            say_status 'new', mod.branch_name, :yellow
+            git.branch({:track=>true}, mod.branch_name, remote_head.name) unless options[:dry_run]
+          elsif ours == theirs
+            say_status 'unchanged', mod.branch_name
+          elsif fast_forwardable?(theirs, ours)
+            say_status '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
+          else
+            say_status 'complicated', mod.branch_name, :red
+          end
+        else
+          say_status 'unknown', mod.branch_name
+        end
+      end
+
+    end
+
+    def self.find_vendorfile(given=nil)
+      given = [ given, ENV['VENDORFILE'] ].find do |candidate|
+        candidate && !(candidate.respond_to?(:empty?) && candidate.empty?)
+      end
+      return given if given
+
+      Pathname.pwd.ascend do |dir|
+        vf = dir.join('Vendorfile')
+        return vf if vf.exist?
+
+        vf = dir.join('config/vendor.rb')
+        return vf if vf.exist?
+
+        # avoid stepping above the tmp directory when testing
+        if ENV['VENDORIFICATOR_SPEC_RUN'] &&
+            dir.join('vendorificator.gemspec').exist?
+          raise ArgumentError, "Vendorfile not found"
+        end
+      end
+
+      raise ArgumentError, "Vendorfile not found"
+    end
+  end
+end

data/lib/vendorificator/hooks/chef_cookbook.rb

@@ -1,36 +1,72 @@
 module Vendorificator::Hooks
   module ChefCookbookDependencies
+    class FakeMetadata
+      attr_reader :dependencies
+      def initialize ; @dependencies = [] ; end
+      def from_file(filename) ; self.instance_eval(IO.read(filename), filename, 1) ; end
+      def depends(*args) ; @dependencies << args ; end
+      def method_missing(method, *args) ; end
+    end
+
     def initialize(*args)
-      require 'chef/cookbook/metadata'
+      begin
+      end
       super
     end
 
-    # Add required Chef cookbooks to vendor modules
-    def dependencies
-      ignored =
-        args.key?(:ignore_dependencies) ?
-          args[:ignore_dependencies] :
-            Vendorificator::Config[:chef_cookbook_ignore_dependencies]
-      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
-        return super
-      end
+    def compute_dependencies!
+      super
+
+      # Dependencies
+      ign = self.args.key?(:ignore_dependencies) ?
+        args[:ignore_dependencies] :
+          environment.config[:chef_cookbook_ignore_dependencies]
+
+      if !ign || ign.respond_to?(:include?)
+        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
+          return super
+        end
 
-      cbmd = Chef::Cookbook::Metadata.new
-      cbmd.from_file(metadata)
+        cbmd = Vendorificator::Hooks::ChefCookbookDependencies.metadata_class.new
+        cbmd.from_file(metadata)
 
-      if ignored && !ignored.respond_to?(:include?)
-        # ignored is a truthy value that's not a set-like thing, so we
-        # ignore all dependencies altogether.
-        super
-      else
+        basedir = Pathname.new(work_dir).dirname
+
+        # All of cookbook's dependencies
         deps = cbmd.dependencies.map(&:first)
-        deps.reject! { |n| ignored.include?(n) } if ignored.respond_to?(:include?)
-        deps.map! { |n| Vendorificator::Vendor::ChefCookbook.new(n) }
-        super + deps
+
+        # Reject ignored dependencies, if there's a list
+        deps.reject! { |dep| ign.include?(dep) } if ign
+
+        # Reject dependencies that already have a module
+        deps.reject! do |dep|
+          dir = basedir.join(dep).to_s
+          Vendorificator::Vendor.instances.any? do |vi|
+            vi.work_dir == dir
+          end
+        end
+
+        # Create module for the dependencies
+        deps.each do |dep|
+          Vendorificator::Vendor::ChefCookbook.new(environment, dep)
+        end
       end
     end
+
+    private
+
+    def self.metadata_class
+      @metadata_class ||=
+        begin
+          require 'chef/cookbook/metadata' unless defined?(Chef::Cookbook::Metadata)
+          Chef::Cookbook::Metadata
+        rescue LoadError
+          # FIXME: warn
+          FakeMetadata
+        end
+    end
   end
 end

data/lib/vendorificator/vendor/archive.rb

@@ -11,7 +11,7 @@ class Vendorificator::Vendor::Archive < Vendorificator::Vendor
   arg_reader :url, :strip_root, :type, :checksum, :filename, :basename, :extname, :unpack
   attr_reader :conjured_checksum
 
-  def initialize(name, args={}, &block)
+  def initialize(environment, name, args={}, &block)
     no_url_given = !args[:url]
 
     args[:url] ||= name
@@ -48,7 +48,7 @@ class Vendorificator::Vendor::Archive < Vendorificator::Vendor
 
     name = args[:basename] if no_url_given
 
-    super(name, args, &block)
+    super(environment, name, args, &block)
   end
 
   def conjure!

data/lib/vendorificator/vendor/chef_cookbook.rb

@@ -13,11 +13,11 @@ class Vendorificator::Vendor::ChefCookbook < Vendorificator::Vendor::Archive
 
   API_PREFIX = 'http://cookbooks.opscode.com/api/v1/cookbooks/'
 
-  def initialize(name, args={}, &block)
+  def initialize(environment, name, args={}, &block)
     args[:url] ||= true         # to avoid having name treated as url
     args[:filename] ||= "#{name}.tgz"
 
-    super(name, args, &block)
+    super(environment, name, args, &block)
   end
 
   def api_data(v=nil)

data/lib/vendorificator/vendor/download.rb

@@ -0,0 +1,44 @@
+require 'digest'
+require 'open-uri'
+require 'tempfile'
+require 'uri'
+
+require 'vendorificator/vendor'
+
+class Vendorificator::Vendor::Download < Vendorificator::Vendor
+  arg_reader :url
+  attr_reader :conjured_checksum
+
+  def initialize(environment, name, args={}, &block)
+    no_url_given = !args[:url]
+
+    args[:url] ||= name
+    name = URI::parse(args[:url]).path.split('/').last if no_url_given
+
+    super(environment, name, args, &block)
+  end
+
+  def path
+    args[:path] || category
+  end
+
+  def conjure!
+    shell.say_status :download, url
+    File.open name, 'w' do |outf|
+      outf.write( open(url).read )
+    end
+    @conjured_checksum = Digest::SHA256.file(name).hexdigest
+  end
+
+  def upstream_version
+    conjured_checksum || Digest::SHA256.hexdigest( open(url).read )
+  end
+
+  def conjure_commit_message
+    rv = "Conjured #{name} from #{url}\nChecksum: #{conjured_checksum}"
+    rv << "Version: #{args[:version]}" if args[:version]
+    rv
+  end
+
+  install!
+end

data/lib/vendorificator/vendor/git.rb

@@ -1,34 +1,32 @@
 require 'fileutils'
-
-require 'grit'
-
 require 'vendorificator/vendor'
 
 class Vendorificator::Vendor::Git < Vendorificator::Vendor
   arg_reader :repository, :revision, :branch
-  attr_reader :module_repo, :conjured_revision
+  attr_reader :git, :conjured_revision
 
-  def initialize(name, args={}, &block)
+  def initialize(environment, name, args={}, &block)
     unless args.include?(:repository)
       args[:repository] = name
       name = name.split('/').last.sub(/\.git$/, '')
     end
-    super(name, args, &block)
+    super(environment, name, args, &block)
   end
 
   def conjure!
     shell.say_status :clone, repository
-    Grit::Git.new('.').clone({}, repository, '.')
-    @module_repo = Grit::Repo.new('.')
+    MiniGit.git :clone, repository, '.'
+    @git = MiniGit.new('.')
 
     if revision
-      module_repo.git.checkout({:b => 'vendorified'}, revision)
+      git.checkout({:b => 'vendorified'}, revision)
     elsif branch
-      module_repo.git.checkout({:b => 'vendorified'}, "origin/#{branch}")
+      git.checkout({:b => 'vendorified'}, "origin/#{branch}")
     end
 
     super
-    @conjured_revision = module_repo.head.commit.id
+
+    @conjured_revision = git.capturing.rev_parse('HEAD').strip
     FileUtils::rm_rf '.git'
   end