polisher 0.8.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cde437d4b30595528a08d2127ed32d64458b9910
-  data.tar.gz: 2124dcabfc9cfda82bc6a481163e17e0ef0e6774
+  metadata.gz: 407eada91bec23c5a2cbd22754e8b726be64a761
+  data.tar.gz: 0de716cd95ae868f6800743752b59a537aedef9f
 SHA512:
-  metadata.gz: 46ed5242624caa97426ee83c6b37a21f14253ceab0ccaa026e2154c8936d9594e79c0383cfdb409ddc6a045129a62154b7ee5c695178ac402a9562b858644292
-  data.tar.gz: 029682eb264075bf04c12a8922bc58a3da54622d48bdac446501c87e58b9fe70a87e2ad3bb798c15f2b82a4b8278054e9bc65174b41c0497c078113a4b4184c6
+  metadata.gz: ae609d0fd5197edd33fdef131c8d142f6b0ab5667f823232d457c84a1ab68e7cd99c358a582b45de25d2c95c020889cecf6dc5f005e0fa3b66f8a642006b3111
+  data.tar.gz: 74548b607ed70c04d835ecf254d7bde099b849f2d54471f12ff88f2737270c725e02ea191b242b62da44716e4d2d99687084ea4122252f24972bc826bfdc0d7a

data/README.md

@@ -1,25 +1,32 @@
-Polisher
-======================
+# Polisher
+
+[![Gem Version](https://badge.fury.io/rb/polisher.png)](http://badge.fury.io/rb/polisher)
+[![Build Status](https://travis-ci.org/ManageIQ/polisher.png)](https://travis-ci.org/ManageIQ/polisher)
+[![Code Climate](https://codeclimate.com/github/ManageIQ/polisher.png)](https://codeclimate.com/github/ManageIQ/polisher)
+[![Coverage Status](https://coveralls.io/repos/ManageIQ/polisher/badge.png?branch=master)](https://coveralls.io/r/ManageIQ/polisher)
+[![Dependency Status](https://gemnasium.com/ManageIQ/polisher.png)](https://gemnasium.com/ManageIQ/polisher)
+
+
 Ruby Post-Publishing Processor - Polish your Ruby projects with ease!
 
 <pre>
- .77                                                                 7.         
-  +$                                                                 =~         
-+?ZZZII                                                           .Z$$$$$$      
-$~~:,.$Z                                                           $~~:,.7      
- ?~:,, .......................................redmine...............=~:,,.      
-  ~::,..rails.......................................................~~:,.      
-  ~~:,, .........rack................json...........................=~:,,      
-  =~::,.....................sass............activerecord..............~::,.     
-   ~~:,.=....eruby...................................................~~:,.~    
-   +~:,,.................haml......................eventmachine.......?~::,.    
-    ~::,. ........................rspec................................~~:,.:   
-    =~:,,:.........................................bundler.............~~:,,    
-     ~I7I..........rvm..................rake...........................,~7?II   
-    $$$$$$$O                                                           $$$$$$$$ 
-     .ZO7Z,                                                             .+ZIZ.  
-        7                                                                  7    
-        $I                                                                 ZI   
+ .77                                                                 7.
+  +$                                                                 =~
++?ZZZII                                                           .Z$$$$$$
+$~~:,.$Z                                                           $~~:,.7
+ ?~:,, .......................................redmine...............=~:,,.
+  ~::,..rails.......................................................~~:,.
+  ~~:,, .........rack................json...........................=~:,,
+  =~::,.....................sass............activerecord..............~::,.
+   ~~:,.=....eruby...................................................~~:,.~
+   +~:,,.................haml......................eventmachine.......?~::,.
+    ~::,. ........................rspec................................~~:,.:
+    =~:,,:.........................................bundler.............~~:,,
+     ~I7I..........rvm..................rake...........................,~7?II
+    $$$$$$$O                                                           $$$$$$$$
+     .ZO7Z,                                                             .+ZIZ.
+        7                                                                  7
+        $I                                                                 ZI
 </pre>
 
 Polisher is a Ruby module and set of utilities aimed to assisting the post-publishing
@@ -55,7 +62,6 @@ Various polisher subcomponents depend on various command line utilities, these i
 * /usr/bin/git - to checkout git repos
 * /usr/bin/koji - to query and build against koji
 * /usr/bin/yum - to query yum
-* /usr/bin/sed - to manipulated metadata
 * /usr/bin/md5sum - to generate required metadata
 * /usr/bin/fedpkg - to query fedora
 
@@ -70,7 +76,7 @@ To install the latest release and all ruby dependencies simply run:
     gem install polisher
 
 See the bin/ directory for all executables available, pass '-h' to any to
-see specific command line options. To run any command from a local git checkout 
+see specific command line options. To run any command from a local git checkout
 of polisher, run the following beforehand:
 
     export RUBYLIB='lib'
@@ -100,6 +106,16 @@ Simply specify the name of the gem to update like so:
 Alternatively if "-u" is specified with a Fedora username, all the packages the
 user owns will be checked out and updated.
 
+### git_gem_diff
+
+A script that does a source comparison between a gem maintained in git against
+its corresponding rubygems.org gem.
+
+Simply specify the url to the git repo and the tool will automatically detect
+the version of the gem to retrieve and run the diff on
+
+    git_gem_diff.rb -g https://github.com/ManageIQ/polisher.git
+
 ### ruby_rpm_spec_updater
 
 A tool to update a given ruby gem or application based rpm spec to the specified
@@ -111,10 +127,15 @@ to STDOUT.
 
     ruby_rpm_spec_updater.rb ~/rpmbuild/SPECS/rubygem-rails.spec rails-5.0.0.gem
 
-### Other
+### check_ruby_spec
+
+A tool to compare the given ruby based rpm spec against the specified source
+and/or the corresponding gem retrieved from rubygems.org
+
+    check_ruby_spec.rb ~/rpmbuild/SPECS/rubygem-polisher.spec
 
-There are various other tools and utilities provided and in conceptual phases.
-See the bin dir and TODO document for more detailed listing. 
+This will retrieve the gem and check the spec for consistency, reporting
+any discrepancies.
 
 ### polisher
 

data/Rakefile

@@ -5,11 +5,9 @@
 
 begin
   require "rspec/core/rake_task"
-  desc "Run all specs"
-  RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = 'specs/**/*_spec.rb'
-    spec.rspec_opts = ['--backtrace', '-fd', '-c']
-  end
+  RSpec::Core::RakeTask.new(:spec)
+  task :test => :spec
+  task :default => :spec
 rescue LoadError
 end
 

data/bin/gem_dependency_checker.rb

@@ -21,20 +21,21 @@ require 'polisher/gemfile'
 
 ##########################################################
 
-conf = { :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,
+        :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}
 
 optparse = OptionParser.new do |opts|
   opts.on('-h', '--help', 'Display this help screen') do
@@ -42,6 +43,10 @@ optparse = OptionParser.new do |opts|
     exit
   end
 
+  opts.on("--format val", 'Format which to render output') do |f|
+    conf[:format] = f
+  end
+
   opts.on('--gemfile file', 'Location of the gemfile to parse') do |g|
     conf[:gemfile] = g
   end
@@ -127,22 +132,83 @@ targets << Polisher::VersionChecker::BODHI_TARGET  if conf[:check_bodhi]
 targets  = Polisher::VersionChecker::ALL_TARGETS   if targets.empty?
 Polisher::VersionChecker.check targets
 
+@format = conf[:format]
+
+def format_dep(dep)
+  if @format.nil?
+    dep.to_s.blue.bold
+  elsif @format == 'xml'
+    "<#{dep}>"
+  elsif @format == 'json'
+    "'#{dep}':{"
+  end
+end
+
+def format_end_dep(dep)
+  if @format.nil?
+    "\n"
+  elsif @format == 'xml'
+    "\n</#{dep}>"
+  elsif @format == 'json'
+    "\n}"
+  end
+end
+
+def format_tgt(tgt)
+  if @format.nil?
+    "#{tgt.to_s.red.bold} "
+  elsif @format == 'xml'
+    "<#{tgt}/>"
+  elsif @format == 'json'
+    "'#{tgt}':null,"
+  end
+end
+
+def format_tgt_with_versions(tgt, versions)
+  if @format.nil?
+    "#{tgt.to_s.green.bold}: #{versions.join(', ').yellow} "
+  elsif @format == 'xml'
+    "<#{tgt}>#{versions.join(', ')}</#{tgt}>"
+  elsif @format == 'json'
+    "'#{tgt}':['#{versions.join('\', \'')}'],"
+  end
+end
+
+def print_header
+  if @format == 'xml'
+    puts '<dependencies>'
+  elsif @format == 'json'
+    puts '{'
+  end
+end
+
+def print_footer
+  if @format == 'xml'
+    puts "</dependencies>"
+  elsif @format == 'json'
+    puts "}"
+  end
+end
+
 def print_dep(tgt, dep, versions)
   # XXX little bit hacky but works for now
   @last_dep ||= nil
   if @last_dep != dep
-    puts "\n#{dep}".blue.bold
+    puts format_end_dep(@last_dep) unless @last_dep.nil?
+    puts format_dep(dep)
     @last_dep = dep
   end
 
   if versions.nil? || versions.empty? ||
      versions.size == 1 && versions[0].nil?
-    print " #{tgt.to_s.red.bold} "
+    print format_tgt(tgt)
   else
-    print " #{tgt.to_s.green.bold}: #{versions.join(', ').yellow}"
+    print format_tgt_with_versions(tgt, versions)
   end
 end
 
+print_header
+
 if conf[:gemname]
   gem = Polisher::Gem.retrieve(conf[:gemname])
   gem.versions(:recursive => true, :dev_deps => true) do |tgt, dep, versions|
@@ -169,3 +235,6 @@ elsif conf[:gemfile]
     print_dep(tgt, dep, versions)
   end
 end
+
+puts format_end_dep(@last_dep) unless @last_dep.nil? # XXX
+print_footer

data/lib/polisher/core.rb

@@ -3,14 +3,6 @@
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
-class Object
-  def eigenclass
-    class << self
-      self
-    end
-  end
-end
-
 module ConfHelpers
   # Defines a 'config attribute' or attribute on the class
   # which this is defined in. Accessors to the single shared
@@ -33,8 +25,8 @@ module ConfHelpers
       nvar = "@#{name}".intern
       current = self.instance_variable_get(nvar)
       envk    = "POLISHER_#{name.to_s.upcase}"
-      self.instance_variable_set(nvar, default)    unless current
-      self.instance_variable_set(ENV[envk])        if ENV.has_key?(envk)
+      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)
@@ -46,8 +38,6 @@ module ConfHelpers
   end
 end
 
-require 'polisher/rpm/spec'
-
 class String
   # Return bool indicating if self is a path to a gem
   def gem?
@@ -68,6 +58,7 @@ class String
   # macro correspondents. If no rpm macro is specified macro will
   # 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, '') }
@@ -78,6 +69,7 @@ class String
   # Replace all occurrances of non-rpm macro strings in self
   # 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]) }
   end

data/lib/polisher/errata.rb

@@ -6,30 +6,50 @@
 require 'json'
 require 'curb'
 
+require 'polisher/core'
+
 module Polisher
   class Errata
-    # Initialize/return singleton curl handle to
-    # query errata and set url
-    def self.client(url)
+    extend ConfHelpers
+
+    conf_attr :advisory_url, ''
+    conf_attr :package_prefix, 'rubygem-'
+
+    # Initialize/return singleton curl handle to query errata
+    def self.client
       @curl ||= begin
-        c = Curl::Easy.new
-        c.ssl_verify_peer = false
-        c.ssl_verify_host = false
-        c.http_auth_types = :negotiate
-        c.userpwd = ':'
+        curl = Curl::Easy.new
+        curl.ssl_verify_peer = false
+        curl.ssl_verify_host = false
+        curl.http_auth_types = :negotiate
+        curl.userpwd = ':'
+        curl
       end
+    end
 
-      @curl.url = url
-      @curl
+    def self.clear!
+      @cached_url = nil
+      @cached_builds = nil
+      self
     end
 
-    def self.versions_for(advisory_url, name, &bl)
-      result = self.client("#{advisory_url}/builds").get
-      versions =
-        JSON.parse(result.body_str).collect { |tag, builds|
-          ErrataBuild.builds_matching(builds, name)
-        }.flatten
+    def self.builds
+      @cached_url    ||= advisory_url
+      @cached_builds ||= nil
+
+      if @cached_url != advisory_url || @cached_builds.nil?
+        client.url     = "#{advisory_url}/builds"
+        @cached_builds = client.get
+        @cached_builds = JSON.parse(client.body_str)
+      end
+
+      @cached_builds
+    end
 
+    def self.versions_for(name, &bl)
+      versions = builds.collect do |tag, builds|
+        ErrataBuild.builds_matching(builds, name)
+      end.flatten
       bl.call(:errata, name, versions) unless(bl.nil?) 
       versions
     end
@@ -44,12 +64,12 @@ module Polisher
 
     def self.build_matches?(build, name)
       pkg,meta = *build.flatten
-      pkg =~ /^rubygem-#{name}-([^-]*)-.*$/
+      pkg =~ /^#{Errata.package_prefix}#{name}-([^-]*)-.*$/
     end
 
     def self.build_version(build, name)
       pkg,meta = *build.flatten
-      pkg.split('-')[2]
+      pkg.gsub(Errata.package_prefix, '').split('-')[1]
     end
   end
 end

data/lib/polisher/gem.rb

@@ -61,7 +61,9 @@ module Polisher
     # @param [Callable] bl optional block to invoke with versions retrieved
     # @return [Array<String>] list of versions of gem installed locally
     def self.local_versions_for(name, &bl)
-      @local_db ||= ::Gem::Specification.all
+      silence_warnings do
+        @local_db ||= ::Gem::Specification.all
+      end
       versions = @local_db.select { |s| s.name == name }.collect { |s| s.version }
       bl.call(:local_gem, name, versions) unless(bl.nil?) 
       versions

data/lib/polisher/gemfile.rb

@@ -22,6 +22,8 @@ module Polisher
     # always empty array, for interface compatability
     attr_accessor :file_paths
 
+    attr_accessor :definition
+
     def initialize(args={})
       @version  = nil
       @deps     = args[:deps]
@@ -50,7 +52,6 @@ module Polisher
       metadata = {}
       metadata[:deps] =
         definition.dependencies.select { |d|
-           d.groups.include?(:default)  ||                  # dep in all groups
            groups.nil? || groups.empty? ||                  # groups not specified
            groups.any? { |g| d.groups.include?(g.intern) }  # dep in any group
         }.collect { |d| d.name }

data/lib/polisher/git/pkg.rb

@@ -123,7 +123,9 @@ module Polisher
       # Update git ignore to ignore gem
       def ignore(gem)
         in_repo do
-          File.open(".gitignore", "w") { |f| f.write "#{gem.name}-#{gem.version}.gem" }
+          nl = File.exists?('.gitignore') ? "\n" : ''
+          content = "#{nl}#{gem.name}-#{gem.version}.gem"
+          File.open(".gitignore", 'a') { |f| f.write content }
         end
       end
 

data/lib/polisher/koji.rb

@@ -4,8 +4,11 @@
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'xmlrpc/client'
-XMLRPC::Config::ENABLE_NIL_PARSER = true
-XMLRPC::Config::ENABLE_NIL_CREATE = true
+require 'active_support/core_ext/kernel/reporting'
+silence_warnings do
+  XMLRPC::Config::ENABLE_NIL_PARSER = true
+  XMLRPC::Config::ENABLE_NIL_CREATE = true
+end
 
 require 'polisher/core'
 
@@ -15,10 +18,13 @@ module Polisher
 
     # TODO Koji#build (on class or instance?)
 
-    # TODO Koji#diff(tag1, tag2)
-
     conf_attr :koji_url, 'koji.fedoraproject.org/kojihub'
     conf_attr :koji_tag, 'f21'
+    conf_attr :package_prefix, 'rubygem-'
+
+    def self.koji_tags
+      [koji_tag].flatten
+    end
 
     # Retrieve shared instance of xmlrpc client to use
     def self.client
@@ -45,20 +51,56 @@ module Polisher
       }
     end
 
-    # Retrieve list of the version of the specified package in koji
+    # Return list of tags for which a package exists
+    #
+    # @param [String] name of package to lookup
+    # @return [Hash<String,String>] hash of tag names to package versions for tags
+    # which package was found in
+    def self.tagged_in(name)
+      #                               tagid  userid         pkgid  prefix inherit with_dups
+      pkgs = client.call('listPackages', nil, nil, "rubygem-#{name}", nil, false, true)
+      pkgs.collect { |pkg| pkg['tag_name'] }
+    end
+
+    # Retrieve list of the versions of the specified package in koji
     #
     # @param [String] name name of package to lookup
     # @param [Callable] bl optional block to invoke with versions retrieved
-    # @return [String] versions retrieved, or nil if none found
+    # @return [Array<String>] versions retrieved, empty array if none found
     def self.versions_for(name, &bl)
       # koji xmlrpc call
       builds =
-        self.client.call('listTagged',
-          koji_tag, nil, false, nil, false,
-          "rubygem-#{name}")
+        koji_tags.collect do |tag|
+          client.call('listTagged', tag, nil, false, nil, false,
+                      "#{package_prefix}#{name}")
+        end.flatten
       versions = builds.collect { |b| b['version'] }
       bl.call(:koji, name, versions) unless(bl.nil?) 
       versions
     end
+
+    # Return diff between list of packages in two tags in koji
+    def self.diff(tag1, tag2)
+      builds1 = client.call('listTagged', tag1, nil, false, nil, false)
+      builds2 = client.call('listTagged', tag2, nil, false, nil, false)
+      builds  = {}
+      builds1.each do |build|
+        name         = build['package_name']
+        build2       = builds2.find { |b| b['name'] == name }
+        version1     = build['version']
+        version2     = build2 && build2['version']
+        builds[name] = {tag1 => version1, tag2 => version2}
+      end
+
+      builds2.each do |build|
+        name = build['package_name']
+        next if builds.key?(name)
+
+        version = build['version']
+        builds[name] = {tag1 => nil, tag2 => version}
+      end
+
+      builds
+    end
   end
 end

data/lib/polisher/missing.rb

@@ -0,0 +1,12 @@
+# Polisher "Missing" Component
+#
+# Licensed under the MIT license
+# Copyright (C) 2014 Red Hat, Inc.
+
+module Polisher
+  class MissingComponent
+    def method_missing(method_id, *args, &bl)
+      raise "polisher is missing a dependency - cannot invoke #{method_id} on #{self}"
+    end
+  end # class MissingComponent
+end # module Polisher

data/lib/polisher/version.rb

@@ -1,3 +1,3 @@
 module Polisher
-  VERSION = "0.8.1"
+  VERSION = "0.9.1"
 end

data/lib/polisher/version_checker.rb

@@ -4,11 +4,6 @@
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/gem'
-require 'polisher/fedora'
-require 'polisher/koji'
-require 'polisher/git/pkg'
-require 'polisher/bodhi'
-require 'polisher/yum'
 
 module Polisher
   class VersionChecker
@@ -17,19 +12,15 @@ module Polisher
     FEDORA_TARGET = :fedora
     GIT_TARGET    = :git
     YUM_TARGET    = :yum
-    BODHI_TARGET  = :bodhi # fedora dispatches to bodhi to not enabled by default
+    BODHI_TARGET  = :bodhi  # fedora dispatches to bodhi so not enabled by default
+    ERRATA_TARGET = :errata # not enabled by default
     ALL_TARGETS   = [GEM_TARGET, KOJI_TARGET, FEDORA_TARGET,
                      GIT_TARGET, YUM_TARGET]
 
     # Enable the specified target(s) in the list of target to check
-    def self.check(target)
+    def self.check(*target)
       @check_list ||= []
-      if target.is_a?(Array)
-        target.each { |t| self.check(t) }
-        return
-      end
-
-      @check_list << target
+      target.each { |t| @check_list << t }
     end
 
     def self.should_check?(target)
@@ -53,27 +44,34 @@ module Polisher
       end
 
       if should_check?(FEDORA_TARGET)
+        require 'polisher/fedora'
         versions.merge! :fedora => Fedora.versions_for(name, &bl)
       end
 
       if should_check?(KOJI_TARGET)
+        require 'polisher/koji'
         versions.merge! :koji => Koji.versions_for(name, &bl)
       end
 
       if should_check?(GIT_TARGET)
+        require 'polisher/git/pkg'
         versions.merge! :git => [Git::Pkg.version_for(name, &bl)]
       end
 
       if should_check?(YUM_TARGET)
+        require 'polisher/yum'
         versions.merge! :yum => [Yum.version_for(name, &bl)]
       end
 
       if should_check?(BODHI_TARGET)
+        require 'polisher/bodhi'
         versions.merge! :bodhi => Bodhi.versions_for(name, &bl)
       end
 
-      #bodhi_version   = Bodhi.versions_for(name, &bl)
-      #errata_version  = Errata.version_for('url?', name, &bl)
+      if should_check?(ERRATA_TARGET)
+        require 'polisher/errata'
+        versions.merge! :errata => Errata.versions_for(name, &bl)
+      end
 
       versions
     end
@@ -97,11 +95,12 @@ module Polisher
     # of gem names representing component dependencies. List
     # will be iterated over, versions will be looked up
     # recursively and returned
-    def dependency_versions(&bl)
+    def dependency_versions(args = {}, &bl)
+      args = {:recursive => true, :dev_deps  => true}.merge(args)
       versions = {}
       self.deps.each do |dep|
         gem = Polisher::Gem.retrieve(dep)
-        versions.merge!(gem.versions(:recursive => true, :dev_deps => true, &bl))
+        versions.merge!(gem.versions(args, &bl))
       end
       versions
     end

data/spec/errata_spec.rb

@@ -9,34 +9,43 @@ module Polisher
   describe Errata do
     describe "#versions_for" do
       before(:each) do
-        @result = double(Curl::Easy.new)
-        @result.should_receive(:body_str).and_return({'tag' => [['rubygem-rails-1.0.0-1']]}.to_json)
+        @result = {'tag' => [['rubygem-rails-1.0.0-1']]}.to_json
+        @orig_url = described_class.advisory_url
+      end
+
+      after(:each) do
+        described_class.advisory_url @orig_url
+        described_class.clear!
       end
 
       it "uses curl to retreive updates" do
         client = Curl::Easy.new
-        described_class.should_receive(:client).with('http://errata.url/builds').and_return(client)
-        client.should_receive(:get).and_return(@result)
+        described_class.should_receive(:client).at_least(:once).and_return(client)
+        client.should_receive(:url=).with('http://errata.url/builds')
+        client.should_receive(:get)
+        client.should_receive(:body_str).and_return(@result)
 
-        described_class.versions_for('http://errata.url', 'rails')
+        described_class.advisory_url 'http://errata.url'
+        described_class.versions_for('rails')
       end
 
       it "returns versions" do
         client = Curl::Easy.new
-        described_class.should_receive(:client).and_return(client)
-        client.should_receive(:get).and_return(@result)
-
-        described_class.versions_for('http://errata.url', 'rails').should == ['1.0.0']
+        described_class.should_receive(:client).at_least(:once).and_return(client)
+        client.stub(:get)
+        client.should_receive(:body_str).and_return(@result)
+        described_class.versions_for('rails').should == ['1.0.0']
       end
 
       it "invokes block with versions" do
         client = Curl::Easy.new
-        described_class.should_receive(:client).and_return(client)
-        client.should_receive(:get).and_return(@result)
+        described_class.should_receive(:client).at_least(:once).and_return(client)
+        client.stub(:get)
+        client.should_receive(:body_str).and_return(@result)
 
         cb = proc {}
         cb.should_receive(:call).with(:errata, 'rails', ['1.0.0'])
-        described_class.versions_for('http://errata.url', 'rails', &cb)
+        described_class.versions_for('rails', &cb)
       end
     end
   end # describe Koji

data/spec/git_spec.rb

@@ -4,6 +4,7 @@
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/git'
+require 'pathname'
 
 module Polisher
   describe Git::Repo do
@@ -61,10 +62,12 @@ module Polisher
         repo = described_class.new
         Dir.mktmpdir do |dir|
           repo.should_receive(:path).and_return(dir)
+
+          expected = Pathname.new(dir).realpath.to_s
           invoked = false
           orig = Dir.pwd
           repo.in_repo do
-            Dir.pwd.should == dir
+            Dir.pwd.should == expected
             invoked = true
           end
           Dir.pwd.should == orig

data/spec/koji_spec.rb

@@ -39,12 +39,31 @@ module Polisher
       end
     end
 
-    describe "#versions_for" do
+    describe "#tagged_in" do
       before(:each) do
         @client = double(XMLRPC::Client)
         described_class.should_receive(:client).and_return(@client)
       end
 
+      it "uses xmlrpc client to retrieve packages" do
+        expected = ['listPackages', nil, nil, "rubygem-rails", nil, false, true]
+        @client.should_receive(:call).with(*expected).and_return([])
+        described_class.tagged_in 'rails'
+      end
+
+      it "returns tags" do
+        tags = [{'tag_name' => 'tag1'}, {'tag_name' => 'tag2'}]
+        @client.should_receive(:call).and_return(tags)
+        described_class.tagged_in('rails').should == ['tag1', 'tag2']
+      end
+    end
+
+    describe "#versions_for" do
+      before(:each) do
+        @client = double(XMLRPC::Client)
+        described_class.should_receive(:client).at_least(:once).and_return(@client)
+      end
+
       it "uses xmlrpc client to retreive versions" do
         expected = ['listTagged', described_class.koji_tag, nil, false,
                     nil, false, "rubygem-rails"]
@@ -52,6 +71,17 @@ module Polisher
         described_class.versions_for 'rails'
       end
 
+      it "handles multiple koji tags" do
+        described_class.should_receive(:koji_tags).and_return(['tag1', 'tag2'])
+        expected1 = ['listTagged', 'tag1', nil, false,
+                     nil, false, "rubygem-rails"]
+        expected2 = ['listTagged', 'tag2', nil, false,
+                     nil, false, "rubygem-rails"]
+        @client.should_receive(:call).with(*expected1).and_return([])
+        @client.should_receive(:call).with(*expected2).and_return([])
+        described_class.versions_for 'rails'
+      end
+
       it "returns versions" do
         versions = [{'version' => '1.0.0'}]
         @client.should_receive(:call).and_return(versions)

data/spec/{rpmspec_spec.rb → rpm/requirement_spec.rb}

@@ -1,15 +1,15 @@
-# Polisher RPMSpec Specs
+# Polisher RPM Requirement Specs
 #
 # Licensed under the MIT license
-# Copyright (C) 2013-2014 Red Hat, Inc.
+# Copyright (C) 2014 Red Hat, Inc.
 
 require 'spec_helper'
 
-require 'polisher/rpm/spec'
+require 'polisher/rpm/requirement'
 require 'polisher/gem'
 
-module Polisher
-  describe RPM::Requirement do
+module Polisher::RPM
+  describe Requirement do
     describe "#str" do
       it "returns requirement in string format" do
         req = described_class.new :name => 'rubygem(activesupport)'
@@ -343,198 +343,5 @@ module Polisher
         end
       end
     end
-  end
-
-  describe RPM::Spec do
-    describe "#initialize" do
-      it "sets gem metadata" do
-        spec = Polisher::RPM::Spec.new :version => '1.0.0'
-        spec.metadata.should == {:version => '1.0.0'}
-      end
-    end
-
-    describe "#method_missing" do
-      it "proxies lookup to metadata" do
-        spec = Polisher::RPM::Spec.new :version => '1.0.0'
-        spec.version.should == '1.0.0'
-      end
-    end
-
-    describe "#has_check?" do
-      context "package spec has %check section" do
-        it "returns true" do
-          spec = described_class.new :has_check => true
-          spec.has_check?.should be_true
-        end
-      end
-
-      context "package spec does not have a %check section" do
-        it "returns false" do
-          spec = described_class.new
-          spec.has_check?.should be_false
-        end
-      end
-    end
-
-
-    describe "#requirements_for_gem" do
-      it "returns requirements for specified gem name" do
-        spec = Polisher::RPM::Spec.new :requires =>
-          [Polisher::RPM::Requirement.new(:name => 'rubygem(rake)')]
-        spec.requirements_for_gem('rake').should == [spec.requires.first]
-      end
-
-      context "spec has no requirement with specified name" do
-        it "returns empty array" do
-          spec = Polisher::RPM::Spec.new
-          spec.requirements_for_gem('rake').should be_empty
-        end
-      end
-    end
-
-    describe "#parse" do
-      before(:each) do
-        @spec  = Polisher::Test::RPM_SPEC
-      end
-
-      it "returns new rpmspec instance" do
-        pspec = Polisher::RPM::Spec.parse @spec[:contents]
-        pspec.should be_an_instance_of(Polisher::RPM::Spec)
-      end
-
-      it "parses contents from spec" do
-        pspec = Polisher::RPM::Spec.parse @spec[:contents]
-        pspec.contents.should == @spec[:contents]
-      end
-
-      it "parses name from spec" do
-        pspec = Polisher::RPM::Spec.parse @spec[:contents]
-        pspec.gem_name.should == @spec[:name]
-      end
-
-      it "parses version from spec" do
-        pspec = Polisher::RPM::Spec.parse @spec[:contents]
-        pspec.version.should == @spec[:version]
-      end
-
-      it "parses release from spec" do
-        pspec = Polisher::RPM::Spec.parse @spec[:contents]
-        pspec.release.should == @spec[:release]
-      end
-
-      it "parses requires from spec" do
-        pspec = Polisher::RPM::Spec.parse @spec[:contents]
-        pspec.requires.should == @spec[:requires]
-      end
-
-      it "parses build requires from spec" do
-        pspec = Polisher::RPM::Spec.parse @spec[:contents]
-        pspec.build_requires.should == @spec[:build_requires]
-      end
-
-      it "parses changelog from spec"
-
-      it "parses unrpmized files from spec" do
-        pspec = Polisher::RPM::Spec.parse @spec[:contents]
-        pspec.files.should == @spec[:files]
-      end
-
-      it "parses %check from spec" do
-        pspec = Polisher::RPM::Spec.parse @spec[:contents]
-        pspec.has_check?.should be_true
-
-        pspec = Polisher::RPM::Spec.parse ""
-        pspec.has_check?.should be_false
-      end
-    end
-
-    describe "#update_to" do
-      it "updates dependencies from gem" do
-        spec = Polisher::RPM::Spec.new :requires => [Polisher::RPM::Requirement.parse('rubygem(rake)'),
-                                                     Polisher::RPM::Requirement.parse('rubygem(activerecord)')],
-                                     :build_requires => []
-        gem  = Polisher::Gem.new :deps => [::Gem::Dependency.new('rake'),
-                                           ::Gem::Dependency.new('rails', '~> 10')],
-                                 :dev_deps => [::Gem::Dependency.new('rspec', :development)]
-
-        spec.should_receive(:update_files_from) # stub out files update
-        spec.update_to(gem)
-          spec.requires.should == [Polisher::RPM::Requirement.parse('rubygem(activerecord)'),
-                                   Polisher::RPM::Requirement.parse('rubygem(rake) >= 0'),
-                                   Polisher::RPM::Requirement.parse('rubygem(rails) => 10'),
-                                   Polisher::RPM::Requirement.parse('rubygem(rails) < 11')]
-        spec.build_requires.should == [Polisher::RPM::Requirement.parse('rubygem(rspec) >= 0', :br => true)]
-      end
-
-      it "adds new files from gem" do
-        spec = Polisher::RPM::Spec.new :files => {'pkg' => ['/foo']}
-        gem  = Polisher::Gem.new
-        gem.should_receive(:file_paths).at_least(:once).
-            and_return(['/foo', '/foo/bar', '/baz'])
-        spec.update_to(gem)
-        spec.new_files.should == ['/baz']
-      end
-
-      it "updates metadata from gem" do
-        spec = Polisher::RPM::Spec.new
-        gem  = Polisher::Gem.new :version => '1.0.0'
-        spec.should_receive(:update_files_from) # stub out files update
-        spec.update_to(gem)
-        spec.version.should == '1.0.0'
-        spec.release.should == '1%{?dist}'
-      end
-
-      it "adds changelog entry"
-    end
-
-    describe "#to_string" do
-      it "returns string representation of spec"
-    end
-
-    describe "#compare" do
-      it "returns requirements in spec but not in gem" do
-        req  = Polisher::RPM::Requirement.parse 'rubygem(rails) > 3.0.0'
-        spec = Polisher::RPM::Spec.new :requires => [req]
-        gem  = Polisher::Gem.new
-
-        spec.compare(gem).should ==
-          {:same => {}, :diff => {'rails' =>
-                  {:spec => '> 3.0.0', :upstream => nil}}}
-      end
-
-      it "returns requirements in gem but not in spec" do
-        req = ::Gem::Dependency.new('rails', '> 3.0.0')
-        spec = Polisher::RPM::Spec.new
-        gem  = Polisher::Gem.new :deps => [req]
-
-        spec.compare(gem).should ==
-          {:same => {}, :diff => {'rails' =>
-                  {:spec => nil, :upstream => '> 3.0.0'}}}
-      end
-
-      it "returns shared requirements with different specifiers" do
-        greq = ::Gem::Dependency.new('rails', '< 5.0.0')
-        gem  = Polisher::Gem.new :deps => [greq]
-
-        sreq = Polisher::RPM::Requirement.parse 'rubygem(rails) > 3.0.0'
-        spec = Polisher::RPM::Spec.new :requires => [sreq]
-
-        spec.compare(gem).should ==
-          {:same => {}, :diff => {'rails' =>
-                  {:spec => '> 3.0.0', :upstream => '< 5.0.0'}}}
-      end
-
-      it "returns shared requirements" do
-        greq = ::Gem::Dependency.new('rails', '< 3.0.0')
-        gem  = Polisher::Gem.new :deps => [greq]
-
-        sreq = Polisher::RPM::Requirement.parse 'rubygem(rails) < 3.0.0'
-        spec = Polisher::RPM::Spec.new :requires => [sreq]
-
-        spec.compare(gem).should ==
-          {:diff => {}, :same => {'rails' =>
-                  {:spec => '< 3.0.0', :upstream => '< 3.0.0'}}}
-      end
-    end
-  end # describe RPM::Spec
-end # module Polisher
+  end # describe Requirement
+end # module Polisher::RPM

data/spec/rpm/spec_spec.rb

@@ -0,0 +1,204 @@
+# Polisher RPM Spec Specs
+#
+# Licensed under the MIT license
+# Copyright (C) 2014 Red Hat, Inc.
+
+require 'spec_helper'
+
+require 'polisher/rpm/spec'
+require 'polisher/gem'
+
+module Polisher::RPM
+  describe Spec do
+    describe "#initialize" do
+      it "sets gem metadata" do
+        spec = described_class.new :version => '1.0.0'
+        spec.metadata.should == {:version => '1.0.0'}
+      end
+    end
+  
+    describe "#method_missing" do
+      it "proxies lookup to metadata" do
+        spec = described_class.new :version => '1.0.0'
+        spec.version.should == '1.0.0'
+      end
+    end
+  
+    describe "#has_check?" do
+      context "package spec has %check section" do
+        it "returns true" do
+          spec = described_class.new :has_check => true
+          spec.has_check?.should be_true
+        end
+      end
+  
+      context "package spec does not have a %check section" do
+        it "returns false" do
+          spec = described_class.new
+          spec.has_check?.should be_false
+        end
+      end
+    end
+  
+  
+    describe "#requirements_for_gem" do
+      it "returns requirements for specified gem name" do
+        spec = described_class.new :requires =>
+          [Requirement.new(:name => 'rubygem(rake)')]
+        spec.requirements_for_gem('rake').should == [spec.requires.first]
+      end
+  
+      context "spec has no requirement with specified name" do
+        it "returns empty array" do
+          spec = described_class.new
+          spec.requirements_for_gem('rake').should be_empty
+        end
+      end
+    end
+  
+    describe "#parse" do
+      before(:each) do
+        @spec  = Polisher::Test::RPM_SPEC
+      end
+  
+      it "returns new rpmspec instance" do
+        pspec = described_class.parse @spec[:contents]
+        pspec.should be_an_instance_of(described_class)
+      end
+  
+      it "parses contents from spec" do
+        pspec = described_class.parse @spec[:contents]
+        pspec.contents.should == @spec[:contents]
+      end
+  
+      it "parses name from spec" do
+        pspec = described_class.parse @spec[:contents]
+        pspec.gem_name.should == @spec[:name]
+      end
+  
+      it "parses version from spec" do
+        pspec = described_class.parse @spec[:contents]
+        pspec.version.should == @spec[:version]
+      end
+  
+      it "parses release from spec" do
+        pspec = described_class.parse @spec[:contents]
+        pspec.release.should == @spec[:release]
+      end
+  
+      it "parses requires from spec" do
+        pspec = described_class.parse @spec[:contents]
+        pspec.requires.should == @spec[:requires]
+      end
+  
+      it "parses build requires from spec" do
+        pspec = described_class.parse @spec[:contents]
+        pspec.build_requires.should == @spec[:build_requires]
+      end
+  
+      it "parses changelog from spec"
+  
+      it "parses unrpmized files from spec" do
+        pspec = described_class.parse @spec[:contents]
+        pspec.files.should == @spec[:files]
+      end
+  
+      it "parses %check from spec" do
+        pspec = described_class.parse @spec[:contents]
+        pspec.has_check?.should be_true
+  
+        pspec = described_class.parse ""
+        pspec.has_check?.should be_false
+      end
+    end
+  
+    describe "#update_to" do
+      it "updates dependencies from gem" do
+        spec = described_class.new :requires => [Requirement.parse('rubygem(rake)'),
+                                                 Requirement.parse('rubygem(activerecord)')],
+                                     :build_requires => []
+        gem  = Polisher::Gem.new :deps => [::Gem::Dependency.new('rake'),
+                                           ::Gem::Dependency.new('rails', '~> 10')],
+                                 :dev_deps => [::Gem::Dependency.new('rspec', :development)]
+  
+        spec.should_receive(:update_files_from) # stub out files update
+        spec.update_to(gem)
+          spec.requires.should == [Requirement.parse('rubygem(activerecord)'),
+                                   Requirement.parse('rubygem(rake) >= 0'),
+                                   Requirement.parse('rubygem(rails) => 10'),
+                                   Requirement.parse('rubygem(rails) < 11')]
+        spec.build_requires.should == [Requirement.parse('rubygem(rspec) >= 0', :br => true)]
+      end
+  
+      it "adds new files from gem" do
+        spec = described_class.new :files => {'pkg' => ['/foo']}
+        gem  = Polisher::Gem.new
+        gem.should_receive(:file_paths).at_least(:once).
+            and_return(['/foo', '/foo/bar', '/baz'])
+        spec.update_to(gem)
+        spec.new_files.should == ['/baz']
+      end
+  
+      it "updates metadata from gem" do
+        spec = described_class.new
+        gem  = Polisher::Gem.new :version => '1.0.0'
+        spec.should_receive(:update_files_from) # stub out files update
+        spec.update_to(gem)
+        spec.version.should == '1.0.0'
+        spec.release.should == '1%{?dist}'
+      end
+  
+      it "adds changelog entry"
+    end
+  
+    describe "#to_string" do
+      it "returns string representation of spec"
+    end
+  
+    describe "#compare" do
+      it "returns requirements in spec but not in gem" do
+        req  = Requirement.parse 'rubygem(rails) > 3.0.0'
+        spec = described_class.new :requires => [req]
+        gem  = Polisher::Gem.new
+  
+        spec.compare(gem).should ==
+          {:same => {}, :diff => {'rails' =>
+                  {:spec => '> 3.0.0', :upstream => nil}}}
+      end
+  
+      it "returns requirements in gem but not in spec" do
+        req = ::Gem::Dependency.new('rails', '> 3.0.0')
+        spec = described_class.new
+        gem  = Polisher::Gem.new :deps => [req]
+  
+        spec.compare(gem).should ==
+          {:same => {}, :diff => {'rails' =>
+                  {:spec => nil, :upstream => '> 3.0.0'}}}
+      end
+  
+      it "returns shared requirements with different specifiers" do
+        greq = ::Gem::Dependency.new('rails', '< 5.0.0')
+        gem  = Polisher::Gem.new :deps => [greq]
+  
+        sreq = Requirement.parse 'rubygem(rails) > 3.0.0'
+        spec = described_class.new :requires => [sreq]
+  
+        spec.compare(gem).should ==
+          {:same => {}, :diff => {'rails' =>
+                  {:spec => '> 3.0.0', :upstream => '< 5.0.0'}}}
+      end
+  
+      it "returns shared requirements" do
+        greq = ::Gem::Dependency.new('rails', '< 3.0.0')
+        gem  = Polisher::Gem.new :deps => [greq]
+  
+        sreq = Requirement.parse 'rubygem(rails) < 3.0.0'
+        spec = described_class.new :requires => [sreq]
+  
+        spec.compare(gem).should ==
+          {:diff => {}, :same => {'rails' =>
+                  {:spec => '< 3.0.0', :upstream => '< 3.0.0'}}}
+      end
+    end
+  end # describe Spec
+end # module Polisher::RPM

data/spec/spec_helper.rb

@@ -5,10 +5,22 @@
 
 SPEC_DIR = File.expand_path File.dirname(__FILE__)
 
+begin
+  require 'coveralls'
+  Coveralls.wear!
+rescue LoadError
+end
+
 require 'polisher/rpm/spec'
 require 'polisher/gem_cache'
 
 RSpec.configure do |config|
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
   config.after do
     Polisher::GemCache.clear!
   end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: polisher
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.1
 platform: ruby
 authors:
 - Jason Frey
 - Mo Morsi
 - Joe Rafaniello
 - Ken Dreyer
+- Achilleas Pipinellis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -167,13 +168,28 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: General API and utility scripts to manipulate and query ruby gems and
   projects after being published
 email:
-- Fryguy@users.noreply.github.com
+- fryguy9@gmail.com
 - mo@morsi.org
 - jrafanie@redhat.com
 - ktdreyer@ktdreyer.com
+- axilleas@archlinux.gr
 executables:
 - binary_gem_resolver.rb
 - gem_dependency_checker.rb
@@ -206,6 +222,7 @@ files:
 - lib/polisher/koji.rb
 - lib/polisher/gem_cache.rb
 - lib/polisher/rhn.rb
+- lib/polisher/missing.rb
 - lib/polisher/yum.rb
 - lib/polisher.rb
 - spec/git_spec.rb
@@ -213,11 +230,12 @@ files:
 - spec/spec_helper.rb
 - spec/errata_spec.rb
 - spec/gemfile_spec.rb
+- spec/rpm/spec_spec.rb
+- spec/rpm/requirement_spec.rb
 - spec/koji_spec.rb
 - spec/gem_spec.rb
 - spec/yum_spec.rb
 - spec/upstream_spec.rb
-- spec/rpmspec_spec.rb
 - spec/vendor_spec.rb
 - spec/fedora_spec.rb
 - spec/core_spec.rb
@@ -254,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby Project Post-Publishing Processor