polisher 0.10.2 → 0.11.1

data/lib/polisher/git/pkg/attributes.rb

@@ -0,0 +1,60 @@
+# Polisher Git Package Attributes Mixin
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+require 'polisher/rpm/spec'
+require 'polisher/util/git_cache'
+
+module Polisher
+  module Git
+    module PkgAttributes
+      attr_accessor :name
+      attr_accessor :version
+
+      attr_accessor :dirty_spec
+
+      # Return full rpm name of package containing optional prefix
+      def rpm_name
+        @rpm_name ||= "#{rpm_prefix}#{name}"
+      end
+
+      # Return full srpm file name of package
+      def srpm
+        @srpm ||= "#{rpm_name}-#{version}-1.*.src.rpm"
+      end
+
+      # Return full spec file name
+      def spec_file
+        @spec_path ||= "#{rpm_name}.spec"
+      end
+
+      # Return boolean indicating if spec file exists
+      def spec?
+        include? spec_file
+      end
+
+      # Return handle to instance of Polisher::RPM::Spec corresponding to spec
+      def spec
+        @spec, @dirty_spec = nil, false if @dirty_spec
+        @spec ||= in_repo { Polisher::RPM::Spec.parse File.read(spec_file) }
+      end
+
+      # Files representing pkg tracked by git
+      def pkg_files
+        @pkg_files ||= [spec_file, 'sources', '.gitignore']
+      end
+
+      # Override path to reference pkg name
+      # @override
+      def path
+        GitCache.path_for(rpm_name)
+      end
+
+      # Return boolean indicating if package is marked as dead (retired/obsolete/etc)
+      def dead?
+        in_repo { File.exist?('dead.package') }
+      end
+    end # module PkgAttributes
+  end # module Git
+end # module Polisher

data/lib/polisher/git/pkg/builder.rb

@@ -0,0 +1,47 @@
+# Polisher Git Package Builder Mixin
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+module Polisher
+  module Git
+    module PkgBuilder
+      # Build the srpm
+      def build_srpm
+        require 'awesome_spawn'
+
+        require_cmd! pkg_cmd
+        in_repo do
+          begin
+            gem = spec.upstream_gem
+            FileUtils.rm_f gem.file_name if File.exist?(gem.file_name)
+            FileUtils.ln_s gem.gem_path, gem.file_name
+            result = AwesomeSpawn.run "#{pkg_cmd} srpm"
+            raise result.error unless result.exit_status == 0
+          ensure
+            FileUtils.rm_f gem.file_name if File.exist?(gem.file_name)
+          end
+        end
+        self
+      end
+
+      # Run a scratch build
+      def scratch_build
+        require 'polisher/targets/koji'
+
+        in_repo do
+          Koji.build :srpm    => srpm,
+                     :scratch => true
+        end
+        self
+      end
+
+      # Build the pkg
+      def build
+        build_srpm
+        scratch_build
+        self
+      end
+    end # module PkgBuilder
+  end # module Git
+end # module Polisher

data/lib/polisher/git/pkg/repo.rb

@@ -0,0 +1,82 @@
+# Polisher Git Package Repo Mixin
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+require 'fileutils'
+require 'polisher/util/error'
+
+module Polisher
+  module Git
+    module PkgRepo
+      # Alias orig clone method to git_clone
+      alias :git_clone :clone
+
+      # Override clone to use PKG_PCMD
+      # @override
+      def clone
+        require_dep! 'awesome_spawn'
+        require_cmd! pkg_cmd
+
+        clobber!
+        Dir.mkdir path unless File.directory? path
+        in_repo do
+          result = AwesomeSpawn.run "#{pkg_cmd} clone #{rpm_name}"
+          raise PolisherError,
+                "could not clone #{rpm_name}" unless result.exit_status == 0
+
+          # pkg_cmd will clone into the rpm_name subdir,
+          # move everything up a dir
+          Dir.foreach("#{rpm_name}/") do |f|
+            orig = "#{rpm_name}/#{f}"
+            skip = ['.', '..'].include?(f)
+            FileUtils.move orig, '.' unless skip
+          end
+
+          FileUtils.rm_rf rpm_name
+        end
+
+        self
+      end
+
+      # Fetch specified target or configured fetch_tgt if not specified
+      def fetch(target = nil)
+        target = self.class.fetch_tgts.first if target.nil?
+        clone unless cloned?
+        raise Exception, "Dead package detected" if dead?
+        checkout target
+        reset!
+        pull
+
+        self
+      end
+
+      # Return the valid targets, eg those which we can fetch
+      def valid_targets
+        valid = []
+        self.class.fetch_tgts.collect do |target|
+          begin
+            fetch target
+            valid << target
+          rescue
+            # noop
+          end
+        end
+        valid
+      end
+
+      alias :valid_branches :valid_targets
+
+      # Override commit, generate a default msg, always add pkg files
+      # @override
+      def commit(msg = nil)
+        require_dep! 'awesome_spawn'
+        require_cmd! git_cmd
+
+        in_repo { AwesomeSpawn.run "#{git_cmd} add #{pkg_files.join(' ')}" }
+        super(msg.nil? ? "updated to #{version}" : msg)
+        self
+      end
+    end # module PkgRepo
+  end # module Git
+end # module Polisher

data/lib/polisher/git/pkg/updater.rb

@@ -0,0 +1,53 @@
+# Polisher Git Package Updater Mixin
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+module Polisher
+  module Git
+    module PkgUpdater
+      def update_metadata(gem)
+        @version = gem.version
+      end
+
+      # Update the local spec to the specified gem version
+      def update_spec_to(gem)
+        in_repo do
+          spec.update_to(gem)
+          File.write(spec_file, spec.to_string)
+          @dirty_spec = true
+        end
+      end
+
+      # Generate new sources file
+      def gen_sources_for(gem)
+        require_dep! 'awesome_spawn'
+        require_cmd! md5sum_cmd
+        in_repo do
+          AwesomeSpawn.run "#{md5sum_cmd} #{gem.gem_path} > sources"
+          File.write('sources', File.read('sources').gsub("#{GemCache::DIR}/", ''))
+        end
+      end
+
+      # Update git ignore to ignore gem
+      def ignore(gem)
+        in_repo do
+          nl = File.exist?('.gitignore') ? "\n" : ''
+          content = "#{nl}#{gem.name}-#{gem.version}.gem"
+          File.open(".gitignore", 'a') { |f| f.write content }
+        end
+      end
+
+      # Update the local pkg to specified gem
+      #
+      # @param [Polisher::Gem] gem instance of gem containing metadata to update to
+      def update_to(gem)
+        update_metadata gem
+        update_spec_to gem
+        gen_sources_for gem
+        ignore gem
+        self
+      end
+    end # module PkgUpdate
+  end # module Git
+end # module Polisher

data/lib/polisher/git/pkg/versions.rb

@@ -0,0 +1,40 @@
+# Polisher Git Package Versions Mixin
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+require 'polisher/util/logger'
+
+module Polisher
+  module Git
+    module PkgVersions
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        # Retrieve list of the versions of the specified package in git
+        #
+        # @param [String] name name of package to lookup
+        # @param [Callable] bl optional block to invoke with version retrieved
+        # @return [Array<String>] versions retrieved, or empty array if none found
+        def versions_for(name, &bl)
+          gitpkg = new :name => name
+          gitpkg.url = "#{dist_git_url}#{gitpkg.rpm_name}.git"
+          versions = []
+          fetch_tgts.each do |tgt|
+            begin
+              gitpkg.fetch tgt
+              versions << gitpkg.spec.version
+            rescue => e
+              logger.warn "error retrieving #{name} from #{gitpkg.url}/#{tgt}(distgit): #{e}"
+            end
+          end
+
+          bl.call(:git, name, versions) unless bl.nil?
+          versions
+        end
+      end # module ClassMethods
+    end # module PkgVersions
+  end # module Git
+end # module Polisher

data/lib/polisher/git/project.rb

@@ -3,7 +3,7 @@
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
-require 'polisher/vendor'
+require 'polisher/mixins/vendored_deps'
 require 'polisher/git/repo'
 
 module Polisher

data/lib/polisher/git/repo.rb

@@ -3,85 +3,88 @@
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
-require 'polisher/core'
-require 'polisher/git_cache'
-require 'polisher/component'
+require 'awesome_spawn'
+require 'polisher/util/conf_helpers'
+require 'polisher/util/git_cache'
 
 module Polisher
   module Git
-    Component.verify("Git::Repo", 'awesome_spawn') do
-      # Git Repository
-      class Repo
-        include ConfHelpers
-
-        # TODO use ruby git api
-        conf_attr :git_cmd, '/usr/bin/git'
-
-        attr_accessor :url
-        attr_accessor :path
-
-        def initialize(args={})
-          @url   = args[:url]
-          @path  = args[:path]
-        end
-
-        def path
-          @path || GitCache.path_for(@url)
-        end
-
-        # Clobber the git repo
-        def clobber!
-          FileUtils.rm_rf path
-        end
-
-        def clone
-          require_cmd! git_cmd
-          AwesomeSpawn.run! "#{git_cmd} clone #{url} #{path}"
-        end
-
-        def cloned?
-          File.directory?(path)
-        end
-
-        def in_repo
-          Dir.chdir path do
-            yield
-          end
-        end
-
-        def file_paths
-          in_repo { Dir['**/*'] }
-        end
-
-        def include?(file)
-          file_paths.include?(file)
-        end
-
-        # Note be careful when invoking:
-        def reset!
-          require_cmd! git_cmd
-          in_repo { AwesomeSpawn.run! "#{git_cmd} reset HEAD~ --hard" }
-          self
-        end
-
-        def pull
-          require_cmd! git_cmd
-          in_repo { AwesomeSpawn.run! "#{git_cmd} pull" }
-          self
-        end
-
-        def checkout(tgt)
-          require_cmd! git_cmd
-          in_repo { AwesomeSpawn.run! "#{git_cmd} checkout #{tgt}" }
-          self
-        end
-
-        def commit(msg)
-          require_cmd! git_cmd
-          in_repo { AwesomeSpawn.run! "#{git_cmd} commit -m '#{msg}'" }
-          self
+    # Git Repository
+    class Repo
+      include ConfHelpers
+
+      # TODO: use ruby git api
+      conf_attr :git_cmd, '/usr/bin/git'
+
+      attr_accessor :url
+      attr_accessor :path
+
+      def initialize(args = {})
+        @url   = args[:url]
+        @path  = args[:path]
+      end
+
+      def path
+        @path || GitCache.path_for(@url)
+      end
+
+      # Clobber the git repo
+      def clobber!
+        FileUtils.rm_rf path
+      end
+
+      def clone
+        require_dep! 'awesome_spawn'
+        require_cmd! git_cmd
+        AwesomeSpawn.run! "#{git_cmd} clone #{url} #{path}"
+      end
+
+      def cloned?
+        File.directory?(path)
+      end
+
+      def in_repo
+        Dir.chdir path do
+          yield
         end
-      end # class Repo
-    end # Component.verify("Git::Repo")
+      end
+
+      def file_paths
+        in_repo { Dir['**/*'] }
+      end
+
+      def include?(file)
+        file_paths.include?(file)
+      end
+
+      # Note be careful when invoking:
+      def reset!
+        require_dep! 'awesome_spawn'
+        require_cmd! git_cmd
+        in_repo { AwesomeSpawn.run! "#{git_cmd} reset HEAD~ --hard" }
+        self
+      end
+
+      def pull
+        require_dep! 'awesome_spawn'
+        require_cmd! git_cmd
+        in_repo { AwesomeSpawn.run! "#{git_cmd} pull" }
+        self
+      end
+
+      def checkout(tgt)
+        require_dep! 'awesome_spawn'
+        require_cmd! git_cmd
+        in_repo { AwesomeSpawn.run! "#{git_cmd} checkout #{tgt}" }
+        self
+      end
+
+      def commit(msg)
+        require_dep! 'awesome_spawn'
+        require_cmd! git_cmd
+        in_repo { AwesomeSpawn.run! "#{git_cmd} commit -m '#{msg}'" }
+        self
+      end
+    end # class Repo
   end # module Git
 end # module Polisher