polisher 0.9.1 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 407eada91bec23c5a2cbd22754e8b726be64a761
-  data.tar.gz: 0de716cd95ae868f6800743752b59a537aedef9f
+  metadata.gz: 5357e407b962cb5b7f70b9c9d6ab2b5f99fa5c89
+  data.tar.gz: 4c76786d10e7fe1d61fef4a0f7894ff9d136c5f7
 SHA512:
-  metadata.gz: ae609d0fd5197edd33fdef131c8d142f6b0ab5667f823232d457c84a1ab68e7cd99c358a582b45de25d2c95c020889cecf6dc5f005e0fa3b66f8a642006b3111
-  data.tar.gz: 74548b607ed70c04d835ecf254d7bde099b849f2d54471f12ff88f2737270c725e02ea191b242b62da44716e4d2d99687084ea4122252f24972bc826bfdc0d7a
+  metadata.gz: 0d3c78d82e8f5e7bcfe74b5880f4081b039405c79bcb4afba9c195cd0a85d50847b7716b11c0866665cb7515377575638fde0f4dfbbf012843efa92e8e349549
+  data.tar.gz: 0d7b15ce8b04c18e291811054e41ec2111173899b4c8459d969360140a640c8ab084c35045fa446062b86a6a6cccc56d33c26d4c6dbeb81c21eebc54b4508cd8

data/bin/gem_dependency_checker.rb

@@ -18,24 +18,26 @@ require 'optparse'
 require 'colored'
 require 'polisher/gem'
 require 'polisher/gemfile'
+require 'polisher/core'
 
 ##########################################################
 
-conf = {:format            => nil,
-        :gemfile           => './Gemfile',
-        :gemspec           => nil,
-        :gemname           => nil,
-        :groups            => [],
-        :devel_deps        => false,
-        :highlight_missing => false,
-        :check_fedora      => false,
-        :check_git         => false,
-        :check_koji        => false,
-        :check_rhn         => false,
-        :check_yum         => false,
-        :check_bugzilla    => false,
-        :check_errata      => false,
-        :check_bodhi       => false}
+conf = {:format         => nil,
+        :log_level      => :info,
+        :gemfile        => './Gemfile',
+        :gemspec        => nil,
+        :gemname        => nil,
+        :prefix         => nil,
+        :groups         => [],
+        :devel_deps     => false,
+        :check_fedora   => false,
+        :check_git      => false,
+        :check_koji     => false,
+        :check_rhn      => false,
+        :check_yum      => false,
+        :check_bugzilla => false,
+        :check_errata   => false,
+        :check_bodhi    => false}
 
 optparse = OptionParser.new do |opts|
   opts.on('-h', '--help', 'Display this help screen') do
@@ -47,6 +49,10 @@ optparse = OptionParser.new do |opts|
     conf[:format] = f
   end
 
+  opts.on("--log-level level", "Log verbosity") do |l|
+    conf[:log_level] = l.to_sym
+  end
+
   opts.on('--gemfile file', 'Location of the gemfile to parse') do |g|
     conf[:gemfile] = g
   end
@@ -63,12 +69,12 @@ optparse = OptionParser.new do |opts|
     conf[:gemname] = g
   end
 
-  opts.on('--[no-]devel', 'Include development dependencies') do |d|
-    conf[:devel_deps] = d
+  opts.on('-p', '--prefix prefix', 'Prefix to append to gem name') do |p|
+    conf[:prefix] = p
   end
 
-  opts.on('-m', '--[no-]missing', 'Highlight missing packages') do |m|
-    conf[:highlight_missing] = m
+  opts.on('--[no-]devel', 'Include development dependencies') do |d|
+    conf[:devel_deps] = d
   end
 
   opts.on('-f', '--[no-]fedora', 'Check fedora for packages') do |f|
@@ -80,7 +86,7 @@ optparse = OptionParser.new do |opts|
   end
 
   opts.on('-k', '--koji [url]', 'Check koji for packages') do |k|
-    conf[:check_koji] = k || 'koji.fedoraproject.org/kojihub'
+    conf[:check_koji] = k || true
   end
 
   opts.on('-t', '--koji-tag tag', 'Koji tag to query') do |t|
@@ -122,6 +128,9 @@ if conf[:gemfile].nil? &&
    end
 end
 
+Polisher::Logging.level = conf[:log_level]
+Polisher::Config.set
+
 targets = []
 targets << Polisher::VersionChecker::GEM_TARGET    if conf[:check_gem]
 targets << Polisher::VersionChecker::KOJI_TARGET   if conf[:check_koji]
@@ -132,6 +141,13 @@ targets << Polisher::VersionChecker::BODHI_TARGET  if conf[:check_bodhi]
 targets  = Polisher::VersionChecker::ALL_TARGETS   if targets.empty?
 Polisher::VersionChecker.check targets
 
+if conf[:check_koji]
+  require 'polisher/koji'
+  Polisher::Koji.koji_url conf[:check_koji] if conf[:koji_url].is_a?(String)
+  Polisher::Koji.koji_tag conf[:koji_tag] if conf[:koji_tag]
+  Polisher::Koji.package_prefix conf[:prefix] if conf[:prefix]
+end
+
 @format = conf[:format]
 
 def format_dep(dep)
@@ -164,6 +180,14 @@ def format_tgt(tgt)
   end
 end
 
+def format_unknown_tgt(tgt)
+  if @format.nil?
+    "#{tgt.to_s.red.bold}: " + "unknown".yellow
+  else
+    format_tgt("#{tgt} (unknown)")
+  end
+end
+
 def format_tgt_with_versions(tgt, versions)
   if @format.nil?
     "#{tgt.to_s.green.bold}: #{versions.join(', ').yellow} "
@@ -199,9 +223,12 @@ def print_dep(tgt, dep, versions)
     @last_dep = dep
   end
 
-  if versions.nil? || versions.empty? ||
-     versions.size == 1 && versions[0].nil?
+  if versions.blank? || (versions.size == 1 && versions.first.blank?)
     print format_tgt(tgt)
+
+  elsif versions.size == 1 && versions.first == :unknown
+    print format_unknown_tgt(tgt)
+
   else
     print format_tgt_with_versions(tgt, versions)
   end
@@ -211,13 +238,15 @@ print_header
 
 if conf[:gemname]
   gem = Polisher::Gem.retrieve(conf[:gemname])
-  gem.versions(:recursive => true, :dev_deps => true) do |tgt, dep, versions|
+  gem.versions(:recursive => true,
+               :dev_deps  => conf[:devel_deps]) do |tgt, dep, versions|
     print_dep(tgt, dep, versions)
   end
 
 elsif conf[:gemspec]
   gem = Polisher::Gem.from_gemspec(conf[:gemspec])
-  gem.versions(:recursive => true, :dev_deps => true) do |tgt, dep, versions|
+  gem.versions(:recursive => true,
+               :dev_deps  => conf[:devel_deps]) do |tgt, dep, versions|
     print_dep(tgt, dep, versions)
   end
 
@@ -231,7 +260,8 @@ elsif conf[:gemfile]
     exit 1
   end
 
-  gemfile.dependency_versions do |tgt, dep, versions|
+  gemfile.dependency_versions :recursive => true,
+                              :dev_deps  => conf[:devel_deps] do |tgt, dep, versions|
     print_dep(tgt, dep, versions)
   end
 end

data/bin/git_gem_updater.rb

@@ -11,13 +11,11 @@
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'colored'
-require 'curb'
-require 'json'
 require 'optparse'
-require 'nokogiri'
 
 require 'polisher/git'
 require 'polisher/gem'
+require 'polisher/core'
 
 ORIG_DIR = Dir.pwd
 
@@ -45,9 +43,18 @@ optparse = OptionParser.new do|opts|
   end
 end
  
- optparse.parse!
+optparse.parse!
 
-conf[:gems] += Polisher::Fedora.gems_owned_by(conf[:user]) unless conf[:user].nil?
+Polisher::Config.set
+
+unless conf[:user].nil?
+  begin
+    conf[:gems] += Polisher::Fedora.gems_owned_by(conf[:user])
+  rescue
+    puts "Could not retrieve gems owned by #{conf[:user]}".red
+    exit 1
+  end
+end
 
 if conf[:gems].empty?
   puts "must specify a gem name or user name!".red
@@ -61,7 +68,7 @@ Dir.chdir conf[:dir]
 conf[:gems].each do |gem_name|
   pkg =
     begin
-      Polisher::Git::Pkg.new(:name => gem_name).clone
+      Polisher::Git::Pkg.new(:name => gem_name).fetch
     rescue => e
       puts "Problem Cloning Package, Skipping: #{e}"
       next
@@ -71,7 +78,11 @@ conf[:gems].each do |gem_name|
   pkg.update_to(gem)
   # TODO append gem dependencies to conf[:gems] list
 
-  pkg.build
+  begin
+    pkg.build
+  rescue => e
+    puts "Warning: scratch build failed: #{e}".bold.red
+  end
 
   unless pkg.spec.has_check?
     puts "Warning: no %check section in spec, "\

data/lib/polisher/bodhi.rb

@@ -5,18 +5,19 @@
 
 # XXX issue w/ retreiving packages from pkgwat causing sporadic issues:
 # https://github.com/fedora-infra/fedora-packages/issues/55
-
-# fedora pkgwat provides a frontend to bodhi
-require 'pkgwat'
+require 'polisher/component'
 
 module Polisher
-  class Bodhi
-    def self.versions_for(name, &bl)
-      versions = Pkgwat.get_updates("rubygem-#{name}", 'all', 'all').
-                   select  { |update| update['stable_version']  != 'None' }.
-                   collect { |update| update['stable_version'] }
-      bl.call(:bodhi, name, versions) unless(bl.nil?) 
-      versions
+  # fedora pkgwat provides a frontend to bodhi
+  Component.verify("Bodhi", "pkgwat") do
+    class Bodhi
+      def self.versions_for(name, &bl)
+        versions = Pkgwat.get_updates("rubygem-#{name}", 'all', 'all').
+                     select  { |update| update['stable_version']  != 'None' }.
+                     collect { |update| update['stable_version'] }
+        bl.call(:bodhi, name, versions) unless(bl.nil?)
+        versions
+      end
     end
   end
 end

data/lib/polisher/component.rb

@@ -0,0 +1,43 @@
+# Polisher Components & Component Helpers
+#
+# Licensed under the MIT license
+# Copyright (C) 2014 Red Hat, Inc.
+
+require 'active_support'
+require 'active_support/core_ext'
+
+module Polisher
+  module Component
+    class Missing
+      def initialize(*args)
+        raise "polisher is missing a dependency - cannot instantiate"
+      end
+
+      def method_missing(method_id, *args, &bl)
+        raise "polisher is missing a dependency - cannot invoke #{method_id} on #{self}"
+      end
+    end # class MissingComponent
+
+    def self.verify(polisher_klass, *dependencies)
+      all_required = dependencies.all? do |dep|
+        require_dependency(polisher_klass, dep)
+      end
+
+      yield if all_required
+    end
+
+    def self.require_dependency(polisher_klass, dependency)
+      require dependency
+      true
+    rescue LoadError
+      klasses = polisher_klass.split("::")
+      desired_namespace = Polisher
+
+      klasses.each do |k|
+        desired_namespace.const_set(k, Missing) unless desired_namespace.const_defined?(k)
+        desired_namespace = "#{desired_namespace.name}::#{k}".constantize
+      end
+      warn "Failed to require #{dependency}.  Added runtime exception in Polisher::#{polisher_klass}"
+    end
+  end # module Component
+end # module Polisher

data/lib/polisher/config.rb

@@ -0,0 +1,32 @@
+# Polisher Config Operations
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+require 'yaml'
+require 'active_support'
+require 'active_support/core_ext'
+
+module Polisher
+  class Config
+    CONF    = "#{ENV['HOME']}/.polisher/config"
+    TARGETS = [['koji',    'polisher/koji',    'Koji'],
+               ['distgit', 'polisher/git/pkg', 'Git::Pkg'],
+               ['rpm',     'polisher/rpm/spec', 'RPM::Requirement'],
+               ['tags',    'polisher/tag_mapper', 'TagMapper']]
+
+    def self.opts
+      @opts ||=  File.exist?(CONF) ? YAML.load_file(CONF) : {}
+    end
+
+    def self.set
+      TARGETS.each do |target, req, polisher_class|
+        if opts[target]
+          require req
+          target_class = "Polisher::#{polisher_class}".constantize
+          opts[target].each { |k, v| target_class.send(k.intern, v) }
+        end
+      end
+    end
+  end # class Config
+end # module Polisher

data/lib/polisher/core.rb

@@ -3,38 +3,58 @@
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
+require 'polisher/config'
+
 module ConfHelpers
-  # Defines a 'config attribute' or attribute on the class
-  # which this is defined in. Accessors to the single shared
-  # attribute will be added to the class as well as instances
-  # of the class. Specify the default value with the attr name
-  # or via an env variable
-  #
-  # @example
-  #   class Custom
-  #     extend ConfHelpers
-  #     conf_attr :data_dir, '/etc/'
-  #   end
-  #   Custom.data_dir # => '/etc/'
-  #   ENV['POLISHER_DATA_DIR'] = '/usr/'
-  #   Custom.data_dir # => '/usr/'
-  #   Custom.data_dir == Custom.new.data_dir # => true
-  #
-  def conf_attr(name, default=nil)
-    self.send(:define_singleton_method, name) do |*args|
-      nvar = "@#{name}".intern
-      current = self.instance_variable_get(nvar)
-      envk    = "POLISHER_#{name.to_s.upcase}"
-      instance_variable_set(nvar, default)    unless current
-      instance_variable_set(nvar, ENV[envk])  if ENV.key?(envk)
-      # TODO also allow vars to be able to be set from a conf file
-      self.instance_variable_set(nvar, args.first) unless args.empty?
-      self.instance_variable_get(nvar)
+  module ClassMethods
+    # Defines a 'config attribute' or attribute on the class
+    # which this is defined in. Accessors to the single shared
+    # attribute will be added to the class as well as instances
+    # of the class. Specify the default value with the attr name
+    # or via an env variable
+    #
+    # @example
+    #   class Custom
+    #     extend ConfHelpers
+    #     conf_attr :data_dir, '/etc/'
+    #   end
+    #   Custom.data_dir # => '/etc/'
+    #   ENV['POLISHER_DATA_DIR'] = '/usr/'
+    #   Custom.data_dir # => '/usr/'
+    #   Custom.data_dir == Custom.new.data_dir # => true
+    #
+    def conf_attr(name, default=nil)
+      self.send(:define_singleton_method, name) do |*args|
+        nvar = "@#{name}".intern
+        current = self.instance_variable_get(nvar)
+        envk    = "POLISHER_#{name.to_s.upcase}"
+        instance_variable_set(nvar, default)    unless current
+        instance_variable_set(nvar, ENV[envk])  if ENV.key?(envk)
+        # TODO also allow vars to be able to be set from a conf file
+        self.instance_variable_set(nvar, args.first) unless args.empty?
+        self.instance_variable_get(nvar)
+      end
+
+      self.send(:define_method, name) do
+        self.class.send(name)
+      end
     end
 
-    self.send(:define_method, name) do
-      self.class.send(name)
+    def cmd_available?(cmd)
+      File.exist?(cmd) && File.executable?(cmd)
     end
+
+    def require_cmd!(cmd)
+      raise "command #{cmd} not available" unless cmd_available?(cmd)
+    end # module ClassMethods
+  end
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+  def require_cmd!(cmd)
+    self.class.require_cmd!(cmd)
   end
 end
 
@@ -59,10 +79,10 @@ class String
   # simply be removed
   def unrpmize
     require 'polisher/rpm/spec'
-    fmm = Polisher::RPM::Spec::FILE_MACRO_MATCHERS
-    fmr = Polisher::RPM::Spec::FILE_MACRO_REPLACEMENTS
-    f = fmm.inject(self) { |file, matcher| file.gsub(matcher, '') }
-    f = fmr.keys.inject(f) { |file, r| file.gsub(Regexp.new(r), fmr[r]) }
+    matchers = Polisher::RPM::Spec::FILE_MACRO_MATCHERS
+    replacements = Polisher::RPM::Spec::FILE_MACRO_REPLACEMENTS
+    f = matchers.inject(self) { |file, matcher| file.gsub(matcher, '') }
+    f = replacements.keys.inject(f) { |file, r| file.gsub(Regexp.new(r), replacements[r]) }
     f
   end
 
@@ -70,7 +90,12 @@ class String
   # with their macro correspondences
   def rpmize
     require 'polisher/rpm/spec'
-    fmr = Polisher::RPM::Spec::FILE_MACRO_REPLACEMENTS.invert
-    fmr.keys.inject(self) { |file, r| file.gsub(r, fmr[r]) }
+    matchers = Polisher::RPM::Spec::FILE_MACRO_MATCHERS
+    replacements = Polisher::RPM::Spec::FILE_MACRO_REPLACEMENTS.invert
+    f = replacements.keys.inject(self) { |file, r| file.gsub(r, replacements[r]) }
+
+    special = (matchers + replacements.values).any? { |matcher| f =~ /^#{matcher}.*/ }
+    f = special ? f : "%{gem_instdir}/#{f}"
+    f
   end
 end