vendorificator 0.1.1 → 0.2.0

data/lib/vendorificator/vendor.rb

@@ -17,9 +17,7 @@ module Vendorificator
         _cls = self # for self is obscured in define_method block's body
         ( class << Vendorificator::Config ; self ; end ).
             send(:define_method, @method_name ) do |name, *args, &block|
-          mod = _cls.new(name.to_s, *args, &block)
-          self[:modules] << mod
-          mod
+          _cls.new(self.environment, name.to_s, *args, &block)
         end
       end
 
@@ -30,26 +28,71 @@ module Vendorificator
           end
         end
       end
-    end
 
-    attr_reader :name, :args, :block
-    arg_reader :version, :path
+      def [](*key)
+        return key.map { |k| self[k] }.flatten if key.length > 1
 
-    def path
-      args[:path] || _join(category, name)
+        key = key.first
+
+        if key.is_a?(Fixnum)
+          self.instances[key]
+        else
+          instances.select { |i| i === key }
+        end
+      end
+
+      def each(*modules)
+        modpaths = modules.map { |m| File.expand_path(m) }
+
+        # We don't use 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.
+        i = 0
+        while true
+          break if i >= instances.length
+          mod = instances[i]
+          yield mod if modules.empty? ||
+            modules.include?(mod.name) ||
+            modpaths.include?(mod.work_dir)
+          i += 1
+        end
+      end
+
+      def instances
+        Vendorificator::Vendor.instance_eval { @instances ||= [] }
+      end
+
+      def compute_dependencies!
+        self.instances.each(&:compute_dependencies!)
+      end
     end
 
-    def initialize(name, args={}, &block)
+    attr_reader :environment, :name, :args, :block
+    arg_reader :version
+
+    def initialize(environment, name, args={}, &block)
+      @environment = environment
       @category = args.delete(:category) if args.key?(:category)
 
       @name = name
       @args = args
       @block = block
+
+      self.class.instances << self
+    end
+
+    def ===(other)
+      other === self.name or File.expand_path(other.to_s) == self.work_dir
+    end
+
+    def path
+      args[:path] || _join(category, name)
     end
 
     def shell
       @shell ||=
-        Vendorificator::Config[:shell] || Thor::Shell::Basic.new
+        environment.config[:shell] || Thor::Shell::Basic.new
     end
 
     def category
@@ -61,7 +104,7 @@ module Vendorificator
     end
 
     def branch_name
-      _join(Vendorificator::Config[:branch_prefix], category, name)
+      _join(environment.config[:branch_prefix], category, name)
     end
 
     def to_s
@@ -73,26 +116,29 @@ module Vendorificator
     end
 
     def work_subdir
-      File.join(Vendorificator::Config[:basedir], path)
+      _join(environment.config[:basedir], path)
     end
 
     def work_dir
-      File.join(Vendorificator::Config[:root_dir], work_subdir)
+      _join(environment.config[:root_dir], work_subdir)
     end
 
     def head
-      repo.get_head(branch_name)
+      environment.git.capturing.rev_parse({:verify => true}, "refs/heads/#{branch_name}").strip
+    rescue MiniGit::GitError
+      nil
     end
 
-    def tag
-      repo.tags.find { |t| t.name == tag_name }
+    def tagged_sha1
+      @tagged_sha1 ||= environment.git.capturing.rev_parse({:verify => true}, "refs/tags/#{tag_name}^{commit}").strip
+    rescue MiniGit::GitError
+      nil
     end
 
     def merged
       unless @_has_merged
-        if head
-          merged = repo.git.
-            merge_base({}, head.commit.sha, repo.head.commit.sha).strip
+        if ( head = self.head )
+          merged = environment.git.capturing.merge_base(head, 'HEAD').strip
           @merged = merged unless merged.empty?
         end
         @_has_merged = true
@@ -103,7 +149,7 @@ module Vendorificator
     def merged_tag
       unless @_has_merged_tag
         if merged
-          tag = repo.git.describe( {
+          tag = environment.git.capturing.describe( {
               :exact_match => true,
               :match => _join(tag_name_base, '*') },
             merged).strip
@@ -119,7 +165,7 @@ module Vendorificator
     end
 
     def version
-      @args[:version] || (!conf[:use_upstream_version] && merged_version) || upstream_version
+      @args[:version] || (!environment.config[:use_upstream_version] && merged_version) || upstream_version
     end
 
     def upstream_version
@@ -129,9 +175,8 @@ module Vendorificator
     def updatable?
       return nil if self.status == :up_to_date
       return false if !head
-      return false if head && merged == head.commit.sha
-      head_tag = repo.tags.find { |t| t.name == repo.recent_tag_name(head.name) }
-      return head_tag || true
+      return false if head && merged == head
+      environment.git.describe({:abbrev => 0, :always => true}, branch_name)
     end
 
     def status
@@ -140,16 +185,16 @@ module Vendorificator
 
       # If there's a branch but no tag, it's a known module that's not
       # been updated for the new definition yet.
-      return :outdated unless tag
+      return :outdated unless tagged_sha1
 
       # Well, this is awkward: branch is in config and exists, but is
       # not merged into current branch at all.
       return :unmerged unless merged
 
       # Merge base is tagged with our tag. We're good.
-      return :up_to_date if tag.commit.sha == merged
+      return :up_to_date if tagged_sha1 == merged
 
-      return :unpulled if repo.fast_forwardable?(tag.commit.sha, merged)
+      return :unpulled if environment.fast_forwardable?(tagged_sha1, merged)
 
       return :unknown
     end
@@ -159,26 +204,26 @@ module Vendorificator
     end
 
     def in_branch(options={}, &block)
-      orig_head = repo.head
+      orig_branch = environment.current_branch
 
       # We want to be in repository's root now, as we may need to
       # remove stuff and don't want to have removed directory as cwd.
-      Dir::chdir repo.working_dir do
+      Dir::chdir environment.git.git_work_tree do
         # If our branch exists, check it out; otherwise, create a new
         # orphaned branch.
         if self.head
-          repo.git.checkout( {}, branch_name )
-          repo.git.rm( { :r => true, :f => true }, '.') if options[:clean]
+          environment.git.checkout branch_name
+          environment.git.rm( { :r => true, :f => true, :q => true, :ignore_unmatch => true }, '.') if options[:clean]
         else
-          repo.git.checkout( { :orphan => true }, branch_name )
-          repo.git.rm( { :r => true, :f => true }, '.')
+          environment.git.checkout( { :orphan => true }, branch_name )
+          environment.git.rm( { :r => true, :f => true, :q => true, :ignore_unmatch => true }, '.')
         end
       end
 
       yield
     ensure
-      # We should make sure we're back on original branch
-      repo.git.checkout( {}, orig_head.name ) if defined?(orig_head) rescue nil
+      # We should try to ensure we're back on original branch
+      environment.git.checkout orig_branch if defined?(orig_branch) rescue nil
     end
 
     def run!
@@ -189,7 +234,8 @@ module Vendorificator
 
       when :unpulled, :unmerged
         shell.say_status 'merging', self.to_s, :yellow
-        repo.git.merge({}, tag.name)
+        environment.git.merge({:no_edit => true, :no_ff => true}, tagged_sha1)
+        compute_dependencies!
 
       when :outdated, :new
         shell.say_status 'fetching', self.to_s, :yellow
@@ -206,16 +252,21 @@ module Vendorificator
               ensure
                 shell.padding -= 1
               end
+
+              subdir = args[:subdirectory]
+              make_subdir_root subdir if subdir && !subdir.empty?
             end
 
+
             # Commit and tag the conjured module
-            repo.add(work_dir)
-            repo.commit_index(conjure_commit_message)
-            repo.git.tag( { :a => true, :m => tag_message }, tag_name )
+            environment.git.add work_dir
+            environment.git.commit :m => conjure_commit_message
+            environment.git.tag( { :a => true, :m => tag_message }, tag_name )
             shell.say_status :tag, tag_name
           end
           # Merge back to the original branch
-          repo.git.merge( {}, branch_name )
+          environment.git.merge( {}, branch_name )
+          compute_dependencies!
         ensure
           shell.padding -= 1
         end
@@ -245,20 +296,26 @@ module Vendorificator
       block.call(self) if block
     end
 
-    def dependencies ; [] ; end
+    def compute_dependencies! ; end
 
     private
 
-    def conf
-      Vendorificator::Config
+    def _join(*parts)
+      parts.compact.map(&:to_s).join('/')
     end
 
-    def repo
-      Vendorificator::Config.repo
-    end
+    def make_subdir_root(subdir_path)
+      curdir = Pathname.pwd
+      tmpdir = Pathname.pwd.dirname.join("#{Pathname.pwd.basename}.tmp")
+      subdir = Pathname.pwd.join(subdir_path)
 
-    def _join(*parts)
-      parts.compact.map(&:to_s).join('/')
+      Dir.chdir('..')
+
+      subdir.rename(tmpdir.to_s)
+      curdir.rmtree
+      tmpdir.rename(curdir.to_s)
+    ensure
+      Dir.chdir(curdir.to_s) if curdir.exist?
     end
 
     install!

data/lib/vendorificator/version.rb

@@ -1,3 +1,3 @@
 module Vendorificator
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/vendorificator.rb

@@ -3,8 +3,10 @@
 require "vendorificator/version"
 
 require 'vendorificator/config'
+require 'vendorificator/environment'
 
 require 'vendorificator/vendor'
+require 'vendorificator/vendor/download'
 require 'vendorificator/vendor/archive'
 require 'vendorificator/vendor/git'
 require 'vendorificator/vendor/chef_cookbook'

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ Bundler.setup
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'vcr'
+require 'mocha/setup'
 require 'wrong'
 require 'wrong/adapters/minitest'
 

data/spec/vendorificator/vendor_spec.rb

@@ -40,22 +40,30 @@ module Vendorificator
 
     describe '#category' do
       it 'defaults to class attribute' do
-        assert { Vendor.new('test').category == nil }
-        assert { Vendor::Categorized.new('test').category == :test }
+        assert { Vendor.new(nil, 'test').category == nil }
+        assert { Vendor::Categorized.new(nil, 'test').category == :test }
       end
 
       it 'can be overriden by option' do
-        assert { Vendor.new('test', :category => :foo).category == :foo }
-        assert { Vendor::Categorized.new('test', :category => :foo).category == :foo }
+        assert { Vendor.new(nil, 'test', :category => :foo).category == :foo }
+        assert { Vendor::Categorized.new(nil, 'test', :category => :foo).category == :foo }
       end
 
       it 'can be reset to nil by option' do
-        assert { Vendor::Categorized.new('test', :category => nil).category == nil }
+        assert { Vendor::Categorized.new(nil, 'test', :category => nil).category == nil }
       end
 
       it 'is inserted into paths and other names' do
-        uncategorized = Vendor.new('test')
-        categorized   = Vendor.new('test', :category => :cat)
+        env = stub(
+          :git => stub(
+            :capturing => stub(
+              :rev_parse => 'cafe',
+              :merge_base => 'cafe',
+              :describe => '')),
+          :config => Vendorificator::Config)
+
+        uncategorized = Vendor.new(env, 'test')
+        categorized   = Vendor.new(env, 'test', :category => :cat)
 
         deny { uncategorized.branch_name.include? 'cat' }
         assert { categorized.branch_name.include? 'cat' }

data/vendorificator.gemspec

@@ -16,14 +16,14 @@ Gem::Specification.new do |gem|
   gem.version       = Vendorificator::VERSION
 
   gem.add_dependency 'escape'
-  gem.add_dependency 'grit'
   gem.add_dependency 'thor', '>= 0.17.0'
   gem.add_dependency 'mixlib-config'
+  gem.add_dependency 'minigit', '>= 0.0.3'
 
+  gem.add_development_dependency 'aruba'
   gem.add_development_dependency 'cucumber'
-  gem.add_development_dependency 'git'
-  gem.add_development_dependency 'mixlib-shellout'
-  gem.add_development_dependency 'chef', '>= 10.16.0'
+  gem.add_development_dependency 'mocha'
+  gem.add_development_dependency 'chef', '>= 10.16.0' unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
   gem.add_development_dependency 'vcr'
   gem.add_development_dependency 'webmock'
   gem.add_development_dependency 'wrong', '>= 0.7.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendorificator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: grit
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +42,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,15 +58,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: minigit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,9 +74,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: git
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -248,24 +248,26 @@ files:
 - features/needed.feature
 - features/smoke.feature
 - features/status.feature
+- features/step_definitions/aruba_ext.rb
 - features/step_definitions/basic.rb
 - features/step_definitions/git.rb
 - features/step_definitions/vendorificator.rb
+- features/support/aruba_ext.rb
 - features/support/env.rb
+- features/support/minigit.rb
 - features/support/transform_pattern.rb
-- features/support/world_git.rb
-- features/support/world_runs.rb
 - features/tarball.feature
 - features/tarball_edit.feature
 - features/vendor.feature
 - lib/vendorificator.rb
 - lib/vendorificator/cli.rb
 - lib/vendorificator/config.rb
+- lib/vendorificator/environment.rb
 - lib/vendorificator/hooks/chef_cookbook.rb
-- lib/vendorificator/repo.rb
 - lib/vendorificator/vendor.rb
 - lib/vendorificator/vendor/archive.rb
 - lib/vendorificator/vendor/chef_cookbook.rb
+- lib/vendorificator/vendor/download.rb
 - lib/vendorificator/vendor/git.rb
 - lib/vendorificator/version.rb
 - spec/smoke_spec.rb
@@ -286,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1910323854215610577
+      hash: 2433899310770864262
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -295,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1910323854215610577
+      hash: 2433899310770864262
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -329,13 +331,14 @@ test_files:
 - features/needed.feature
 - features/smoke.feature
 - features/status.feature
+- features/step_definitions/aruba_ext.rb
 - features/step_definitions/basic.rb
 - features/step_definitions/git.rb
 - features/step_definitions/vendorificator.rb
+- features/support/aruba_ext.rb
 - features/support/env.rb
+- features/support/minigit.rb
 - features/support/transform_pattern.rb
-- features/support/world_git.rb
-- features/support/world_runs.rb
 - features/tarball.feature
 - features/tarball_edit.feature
 - features/vendor.feature

data/features/support/world_git.rb

@@ -1,40 +0,0 @@
-require 'fileutils'
-require 'git'
-
-module Vendorificator
-  module TestSupport
-    module Git
-      def git(*args)
-        @git ||= {}
-        @git[args] ||= ::Git.init(*args)
-      end
-
-      def commit_file(path, contents, message=nil)
-        message ||= "Added #{path}"
-        FileUtils.mkdir_p(File.dirname(path))
-        File.open(path, 'w') { |f| f.puts(contents) }
-        git.add(path)
-        git.commit(message)
-      end
-
-      def repo_clean?
-        # FIXME: How to do that with ruby-git?
-        `git status --porcelain` == ""
-      end
-
-      def branch
-        git.current_branch
-      end
-
-      def branches
-        git.branches.map(&:to_s)
-      end
-
-      def tags
-        git.tags.map(&:name)
-      end
-    end
-  end
-end
-
-World(Vendorificator::TestSupport::Git)

data/features/support/world_runs.rb

@@ -1,93 +0,0 @@
-require 'mixlib/shellout'
-
-class String
-  def strip_console_escapes
-    self.gsub(/\e\[[^m]{1,5}m/,'')
-  end
-
-  def indent(amount, char=' ')
-    prefix = char * amount
-    lines.map { |ln| ln =~ /^\s*$/ ? ln : prefix+ln }.join
-  end
-end
-
-module Vendorificator
-  module TestSupport
-    module RunsCommands
-      def command
-        raise RuntimeError, "No command has run yet!" unless @command
-        @command
-      end
-
-      def run(*command_args)
-        opts = {}
-        opts = command_args.pop if command_args.last.is_a?(Hash)
-
-        # We need to clear out Git environment variables left here by
-        # the Git gem.
-        opts[:environment] ||= {}
-        opts[:environment].merge!(
-          'GIT_DIR' => nil,
-          'GIT_INDEX_FILE' => nil,
-          'GIT_WORK_TREE' => nil)
-
-        command_args.push opts
-        @command = Mixlib::ShellOut.new(*command_args)
-
-        command.run_command
-        print_command_result if ENV['VERBOSE']
-      end
-
-      def command_succeeded(print_failed=true)
-        begin
-          command.error!
-        rescue Mixlib::ShellOut::ShellCommandFailed
-          print_command_result if print_failed
-          false
-        else
-          true
-        end
-      end
-
-      def command_stdout
-        command.stdout.strip_console_escapes
-      end
-
-      def command_stderr
-        command.stderr.strip_console_escapes
-      end
-
-      # Depending on stream, returns:
-      # when 'stdout': command_stdout
-      # when 'stderr': command_stderr
-      # otherwise: command.stdout + "\n" + command_stderr
-      def command_output(stream=nil)
-        case stream
-        when 'stdout'
-          command_stdout
-        when 'stderr'
-          command_stderr
-        else
-          "#{command_stdout}\n#{command_stderr}"
-        end
-      end
-
-      def print_command_result
-        puts <<EOF
-
--------- BEGIN #{command.command.inspect} --------
-Exit status: #{command.exitstatus}
-Execution time: #{command.execution_time}
-Stdout:
-#{command_stdout.indent(4)}
-Stderr:
-#{command_stderr.indent(4)}
---------  END #{command.command.inspect}  --------
-
-EOF
-      end
-    end
-  end
-end
-
-World(Vendorificator::TestSupport::RunsCommands)