vendorificator 0.2.0 → 0.3.0

data/lib/vendorificator/environment.rb

@@ -7,13 +7,16 @@ require 'vendorificator/config'
 module Vendorificator
   class Environment
     attr_reader :config
-    attr_accessor :shell
+    attr_accessor :shell, :vendor_instances
 
     def initialize(vendorfile=nil)
-      @config = Vendorificator::Config
-      config.environment = self
-      config.from_file(self.class.find_vendorfile(vendorfile))
-      Vendorificator::Vendor.compute_dependencies!
+      @vendor_instances = []
+
+      @config = Vendorificator::Config.new
+      @config.environment = self
+      @config.read_file(find_vendorfile(vendorfile).to_s)
+
+      self.each_vendor_instance{ |mod| mod.compute_dependencies! }
     end
 
     def say_status(*args)
@@ -38,16 +41,26 @@ module Vendorificator
       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
+    # Public: Pulls all the remotes specified in options[:remote] or the config.
+    #
+    # options - The Hash of options.
+    #
+    # Returns nothing.
+    def pull_all(options = {})
+      ensure_clean!
+      remotes = options[:remote] ? options[:remote].split(',') : config[:remotes]
+      remotes.each do |remote|
+        indent 'remote', remote do
+          pull(remote, options)
+        end
+      end
     end
 
+    # Public: Pulls a single remote and updates the branches.
+    #
+    # options - The Hash of options.
+    #
+    # Returns nothing.
     def pull(remote, options={})
       raise RuntimeError, "Unknown remote #{remote}" unless remotes.include?(remote)
 
@@ -61,13 +74,13 @@ module Vendorificator
         map { |sha, name| name =~ ref_rx ? [$', sha] : nil }.
         compact ]
 
-      Vendorificator::Vendor.each do |mod|
+      each_vendor_instance 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]
+            git.branch({:track => true}, mod.branch_name, theirs) unless options[:dry_run]
           elsif ours == theirs
             say_status 'unchanged', mod.branch_name
           elsif fast_forwardable?(theirs, ours)
@@ -82,10 +95,85 @@ module Vendorificator
           say_status 'unknown', mod.branch_name
         end
       end
+    end
+
+    # Public: Push changes on module branches.
+    #
+    # options - The Hash containing options
+    #
+    # Returns nothing.
+    def push(options = {})
+      ensure_clean!
+
+      pushable = []
+      each_vendor_instance{ |mod| pushable += mod.pushable_refs }
+
+      remotes = options[:remote] ? options[:remote].split(',') : config[:remotes]
+      remotes.each{ |remote| git.push remote, pushable }
 
+      git.push :tags => true
+    end
+
+    # Public: Runs all the vendor modules.
+    #
+    # options - The Hash of options.
+    #
+    # Returns nothing.
+    def sync(options = {})
+      ensure_clean!
+      config[:use_upstream_version] = options[:update]
+
+      each_vendor_instance(*options[:modules]) do |mod|
+        say_status :module, mod.name
+        indent do
+          mod.run!
+        end
+      end
     end
 
-    def self.find_vendorfile(given=nil)
+    # Public: Goes through all the Vendor instances and runs the block
+    #
+    # modules - ?
+    #
+    # 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.
+      i = 0
+      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)
+        i += 1
+      end
+    end
+
+    # Public: Checks if the repository is clean.
+    #
+    # Returns boolean answer to the question.
+    def clean?
+      # copy code from http://stackoverflow.com/a/3879077/16390
+      git.update_index '-q', '--ignore-submodules', '--refresh'
+      git.diff_files '--quiet', '--ignore-submodules', '--'
+      git.diff_index '--cached', '--quiet', 'HEAD', '--ignore-submodules', '--'
+      true
+    rescue MiniGit::GitError
+      false
+    end
+
+    private
+
+    # Private: Finds the vendorfile to use.
+    #
+    # 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|
         candidate && !(candidate.respond_to?(:empty?) && candidate.empty?)
       end
@@ -107,5 +195,24 @@ module Vendorificator
 
       raise ArgumentError, "Vendorfile not found"
     end
+
+    # Private: Aborts on a dirty repository.
+    #
+    # Returns nothing.
+    def ensure_clean!
+      raise DirtyRepoError unless clean?
+    end
+
+    # Private: Indents the output.
+    #
+    # Returns nothing.
+    def indent(*args, &block)
+      say_status *args unless args.empty?
+      shell.padding += 1 if shell
+      yield
+    ensure
+      shell.padding -= 1 if shell
+    end
+
   end
 end

data/lib/vendorificator/errors.rb

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

data/lib/vendorificator/hooks/chef_cookbook.rb

@@ -44,7 +44,7 @@ module Vendorificator::Hooks
         # Reject dependencies that already have a module
         deps.reject! do |dep|
           dir = basedir.join(dep).to_s
-          Vendorificator::Vendor.instances.any? do |vi|
+          environment.vendor_instances.any? do |vi|
             vi.work_dir == dir
           end
         end

data/lib/vendorificator/vendor/archive.rb

@@ -7,84 +7,88 @@ require 'escape'
 
 require 'vendorificator/vendor'
 
-class Vendorificator::Vendor::Archive < Vendorificator::Vendor
-  arg_reader :url, :strip_root, :type, :checksum, :filename, :basename, :extname, :unpack
-  attr_reader :conjured_checksum
+module Vendorificator
+  class Vendor::Archive < Vendor
+    arg_reader :url, :strip_root, :type, :checksum, :filename, :basename, :extname, :unpack
+    attr_reader :conjured_checksum
 
-  def initialize(environment, name, args={}, &block)
-    no_url_given = !args[:url]
+    def initialize(environment, name, args={}, &block)
+      no_url_given = !args[:url]
 
-    args[:url] ||= name
-    args[:filename] ||= URI::parse(args[:url]).path.split('/').last
+      args[:url] ||= name
+      args[:filename] ||= URI::parse(args[:url]).path.split('/').last
 
-    case args[:filename]
-    when /\.(tar\.|t)gz$/
-      args[:type] ||= :targz
-      args[:unpack] ||= 'tar -xzf'
-    when /\.tar\.bz2$/
-      args[:type] ||= :tarbz2
-      args[:unpack] ||= 'tar -xjf'
-    when /\.zip$/
-      args[:type] ||= :zip
-      args[:unpack] ||= 'unzip'
-    when /\.[^\.][^\.]?[^\.]?[^\.]?$/
-      args[:type] ||=
-        begin
-          unless args[:unpack]
-            raise RuntimeError,
-            "Unknown file type #{$&.inspect}, please provide :unpack argument"
+      case args[:filename]
+      when /\.(tar\.|t)gz$/
+        args[:type] ||= :targz
+        args[:unpack] ||= 'tar -xzf'
+      when /\.tar\.bz2$/
+        args[:type] ||= :tarbz2
+        args[:unpack] ||= 'tar -xjf'
+      when /\.zip$/
+        args[:type] ||= :zip
+        args[:unpack] ||= 'unzip'
+      when /\.[^\.][^\.]?[^\.]?[^\.]?$/
+        args[:type] ||=
+          begin
+            unless args[:unpack]
+              raise RuntimeError,
+              "Unknown file type #{$&.inspect}, please provide :unpack argument"
+            end
+            $&
           end
-          $&
+      else
+        args[:basename] ||= args[:filename]
+        args[:extname] ||= ''
+        unless args[:unpack] || [:targz, :tarbz2, :zip].include?(args[:type])
+          raise RuntimeError, "Unknown file type for #{args[:filename].inspect}, please provide :unpack or :type argument"
         end
-    else
-      args[:basename] ||= args[:filename]
-      args[:extname] ||= ''
-      unless args[:unpack] || [:targz, :tarbz2, :zip].include?(args[:type])
-        raise RuntimeError, "Unknown file type for #{args[:filename].inspect}, please provide :unpack or :type argument"
       end
-    end
-    args[:basename] ||= $`
-    args[:extname] ||= $&
+      args[:basename] ||= $`
+      args[:extname] ||= $&
 
-    name = args[:basename] if no_url_given
+      name = args[:basename] if no_url_given
 
-    super(environment, name, args, &block)
-  end
+      super(environment, name, args, &block)
+    end
 
-  def conjure!
-    shell.say_status :download, url
-    archive = Tempfile.new([basename, extname])
-    archive.write( open(url).read )
-    archive.close
-    @conjured_checksum = Digest::SHA256.file(archive.path).hexdigest
-    raise RuntimeError, "Checksum error" if checksum && checksum!=conjured_checksum
-    shell.say_status :unpack, filename
-    system "#{unpack} #{Escape.shell_single_word archive.path}"
-    if Dir.entries('.').length == 3 && !args[:no_strip_root]
-      root = (Dir.entries('.') - %w(.. .)).first
-      root_entries = Dir.entries(root) - %w(.. .)
-      while root_entries.include?(root)
-        FileUtils::mv root, root+"~"
-        root << "~"
+    def conjure!
+      shell.say_status :download, url
+      archive = Tempfile.new([basename, extname])
+      archive.write( open(url).read )
+      archive.close
+      @conjured_checksum = Digest::SHA256.file(archive.path).hexdigest
+      raise RuntimeError, "Checksum error" if checksum && checksum!=conjured_checksum
+      shell.say_status :unpack, filename
+      system "#{unpack} #{Escape.shell_single_word archive.path}"
+      if Dir.entries('.').length == 3 && !args[:no_strip_root]
+        root = (Dir.entries('.') - %w(.. .)).first
+        root_entries = Dir.entries(root) - %w(.. .)
+        while root_entries.include?(root)
+          FileUtils::mv root, root+"~"
+          root << "~"
+        end
+        FileUtils::mv root_entries.map { |e| File.join(root, e) }, '.'
+        FileUtils::rmdir root
       end
-      FileUtils::mv root_entries.map { |e| File.join(root, e) }, '.'
-      FileUtils::rmdir root
+      super
+    ensure
+      archive.close
+      archive.unlink
     end
-    super
-  ensure
-    archive.close
-    archive.unlink
-  end
 
-  def upstream_version
-    filename
-  end
+    def upstream_version
+      filename
+    end
 
-  def conjure_commit_message
-    rv = "Conjured archive #{name} from #{filename}\nOrigin: #{url}\nChecksum: #{conjured_checksum}\n"
-    rv << "Version: #{version}\n" if version
-    rv
+    def conjure_commit_message
+      rv = "Conjured archive #{name} from #{filename}\nOrigin: #{url}\nChecksum: #{conjured_checksum}\n"
+      rv << "Version: #{version}\n" if version
+      rv
+    end
   end
 
-  install!
+  class Config
+    register_module :archive, Vendor::Archive
+  end
 end

data/lib/vendorificator/vendor/chef_cookbook.rb

@@ -1,58 +1,64 @@
 require 'net/http'
 require 'uri'
-require 'json'
+autoload :MultiJson, 'multi_json'
 
 require 'vendorificator/vendor/archive'
 require 'vendorificator/hooks/chef_cookbook'
 
-class Vendorificator::Vendor::ChefCookbook < Vendorificator::Vendor::Archive
-  include Vendorificator::Hooks::ChefCookbookDependencies
+module Vendorificator
+  class Vendor::ChefCookbook < Vendor::Archive
+    include Hooks::ChefCookbookDependencies
 
-  @method_name = :chef_cookbook
-  @category = :cookbooks
+    @method_name = :chef_cookbook
+    @category = :cookbooks
 
-  API_PREFIX = 'http://cookbooks.opscode.com/api/v1/cookbooks/'
+    API_PREFIX = 'http://cookbooks.opscode.com/api/v1/cookbooks/'
 
-  def initialize(environment, name, args={}, &block)
-    args[:url] ||= true         # to avoid having name treated as url
-    args[:filename] ||= "#{name}.tgz"
+    def initialize(environment, name, args={}, &block)
+      args[:url] ||= true         # to avoid having name treated as url
+      args[:filename] ||= "#{name}.tgz"
 
-    super(environment, name, args, &block)
-  end
+      super(environment, name, args, &block)
+    end
 
-  def api_data(v=nil)
-    v = v.gsub(/[^0-9]/, '_') if v
-    @api_data ||= {}
-    @api_data[v] ||=
-      begin
-        url = "#{API_PREFIX}#{name}"
-        url << "/versions/#{v}" if v
-        JSON::load(Net::HTTP.get_response(URI.parse(url)).body)
-      end
-  end
+    def api_data(v=nil)
+      v = v.gsub(/[^0-9]/, '_') if v
+      @api_data ||= {}
+      @api_data[v] ||=
+        begin
+          url = "#{API_PREFIX}#{name}"
+          url << "/versions/#{v}" if v
+          MultiJson::load(Net::HTTP.get_response(URI.parse(url)).body)
+        end
+    end
 
-  def cookbook_data
-    @cookbook_data ||= api_data(version)
-  end
+    def cookbook_data
+      @cookbook_data ||= api_data(version)
+    end
 
-  def upstream_version
-    URI::parse(api_data['latest_version']).path.split('/').last.gsub('_', '.')
-  end
+    def upstream_version
+      URI::parse(api_data['latest_version']).path.split('/').last.gsub('_', '.')
+    end
 
-  def url
-    cookbook_data['file']
-  end
+    def url
+      cookbook_data['file']
+    end
 
-  def conjure!
-    super
-    # Some Opscode Community tarballs include a confusing .git file,
-    # we don't want this.
-    FileUtils::rm_f '.git'
-  end
+    def conjure!
+      super
+      # Some Opscode Community tarballs include a confusing .git file,
+      # we don't want this.
+      FileUtils::rm_f '.git'
+    end
+
+    def conjure_commit_message
+      "Conjured cookbook #{name} version #{version}\nOrigin: #{url}\nChecksum: #{conjured_checksum}\n"
+    end
 
-  def conjure_commit_message
-    "Conjured cookbook #{name} version #{version}\nOrigin: #{url}\nChecksum: #{conjured_checksum}\n"
   end
 
-  install!
+  class Config
+    register_module :chef_cookbook, Vendor::ChefCookbook
+    option :chef_cookbook_ignore_dependencies
+  end
 end

data/lib/vendorificator/vendor/download.rb

@@ -5,40 +5,44 @@ require 'uri'
 
 require 'vendorificator/vendor'
 
-class Vendorificator::Vendor::Download < Vendorificator::Vendor
-  arg_reader :url
-  attr_reader :conjured_checksum
+module Vendorificator
+  class Vendor::Download < Vendor
+    arg_reader :url
+    attr_reader :conjured_checksum
 
-  def initialize(environment, name, args={}, &block)
-    no_url_given = !args[:url]
+    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
+      args[:url] ||= name
+      name = URI::parse(args[:url]).path.split('/').last if no_url_given
 
-    super(environment, name, args, &block)
-  end
+      super(environment, name, args, &block)
+    end
 
-  def path
-    args[:path] || category
-  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 )
+    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
-    @conjured_checksum = Digest::SHA256.file(name).hexdigest
-  end
 
-  def upstream_version
-    conjured_checksum || Digest::SHA256.hexdigest( open(url).read )
-  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
+    def conjure_commit_message
+      rv = "Conjured #{name} from #{url}\nChecksum: #{conjured_checksum}"
+      rv << "Version: #{args[:version]}" if args[:version]
+      rv
+    end
   end
 
-  install!
+  class Config
+    register_module :download, Vendor::Download
+  end
 end

data/lib/vendorificator/vendor/git.rb

@@ -1,45 +1,56 @@
 require 'fileutils'
 require 'vendorificator/vendor'
 
-class Vendorificator::Vendor::Git < Vendorificator::Vendor
-  arg_reader :repository, :revision, :branch
-  attr_reader :git, :conjured_revision
-
-  def initialize(environment, name, args={}, &block)
-    unless args.include?(:repository)
-      args[:repository] = name
-      name = name.split('/').last.sub(/\.git$/, '')
+module Vendorificator
+  class Vendor::Git < Vendor
+    arg_reader :repository, :revision, :tag, :branch
+    attr_reader :conjured_revision
+
+    def initialize(environment, name, args={}, &block)
+      args[:version] ||= args[:tag] if args[:tag]
+      if [:revision, :tag, :branch].select { |key| args.key?(key) }.count > 1
+        raise ArgumentError, "You can provide only one of: :revision, :tag, :branch"
+      end
+
+      unless args.include?(:repository)
+        args[:repository] = name
+        name = name.split('/').last.sub(/\.git$/, '')
+      end
+      super(environment, name, args, &block)
     end
-    super(environment, name, args, &block)
-  end
 
-  def conjure!
-    shell.say_status :clone, repository
-    MiniGit.git :clone, repository, '.'
-    @git = MiniGit.new('.')
+    def conjure!
+      shell.say_status :clone, repository
+      MiniGit.git :clone, repository, '.'
+      local_git = MiniGit.new('.')
 
-    if revision
-      git.checkout({:b => 'vendorified'}, revision)
-    elsif branch
-      git.checkout({:b => 'vendorified'}, "origin/#{branch}")
-    end
+      if tag||revision
+        local_git.checkout({:b => 'vendorified'}, tag||revision)
+      elsif branch
+        local_git.checkout({:b => 'vendorified'}, "origin/#{branch}")
+      end
 
-    super
+      super
 
-    @conjured_revision = git.capturing.rev_parse('HEAD').strip
-    FileUtils::rm_rf '.git'
-  end
+      @conjured_revision = local_git.capturing.rev_parse('HEAD').strip
+      FileUtils::rm_rf '.git'
+    end
 
-  def upstream_version
-    conjured_revision
-  end
+    def upstream_version
+      tag || conjured_revision
+    end
 
-  def conjure_commit_message
-    rv = "Conjured git module #{name} "
-    rv << "version #{version} " if version
-    rv << "revision #{conjured_revision}"
-    rv
+    def conjure_commit_message
+      rv = "Conjured git module #{name} "
+      rv << "version #{version} " if version
+      rv << "from tag #{tag} " if tag
+      rv << "from branch #{branch} " if branch
+      rv << "at revision #{conjured_revision}"
+      rv
+    end
   end
 
-  install!
+  class Config
+    register_module :git, Vendor::Git
+  end
 end