polisher 0.9.1 → 0.10.1

data/spec/git_spec.rb

@@ -1,9 +1,9 @@
-# Polisher Git Spec
 #
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/git'
+require 'polisher/gem'
 require 'pathname'
 
 module Polisher
@@ -28,7 +28,7 @@ module Polisher
     describe "#clone" do
       it "runs git clone" do
         expected = "/usr/bin/git clone repo_url repo_path"
-        AwesomeSpawn.should_receive(:run).with(expected)
+        AwesomeSpawn.should_receive(:run!).with(expected)
 
         repo = described_class.new :url => 'repo_url'
         repo.should_receive(:path).and_return('repo_path')
@@ -91,7 +91,7 @@ module Polisher
         expected = "/usr/bin/git reset HEAD~ --hard"
         repo = described_class.new
         repo.should_receive(:in_repo).and_yield
-        AwesomeSpawn.should_receive(:run).with(expected)
+        AwesomeSpawn.should_receive(:run!).with(expected)
         repo.reset!
       end
     end
@@ -101,7 +101,7 @@ module Polisher
         expected = "/usr/bin/git pull"
         repo = described_class.new
         repo.should_receive(:in_repo).and_yield
-        AwesomeSpawn.should_receive(:run).with(expected)
+        AwesomeSpawn.should_receive(:run!).with(expected)
         repo.pull
       end
     end
@@ -111,7 +111,7 @@ module Polisher
         expected = "/usr/bin/git checkout master"
         repo = described_class.new
         repo.should_receive(:in_repo).and_yield
-        AwesomeSpawn.should_receive(:run).with(expected)
+        AwesomeSpawn.should_receive(:run!).with(expected)
         repo.checkout('master')
       end
     end
@@ -121,7 +121,7 @@ module Polisher
         expected = "/usr/bin/git commit -m 'msg'"
         repo = described_class.new
         repo.should_receive(:in_repo).and_yield
-        AwesomeSpawn.should_receive(:run).with(expected)
+        AwesomeSpawn.should_receive(:run!).with(expected)
         repo.commit('msg')
       end
     end
@@ -185,6 +185,7 @@ module Polisher
 
         pkg = described_class.new :name => 'rails'
         pkg.should_receive(:in_repo).and_yield
+        pkg.should_receive(:require_cmd!).with('/usr/bin/fedpkg').and_return(true)
 
         expected = '/usr/bin/fedpkg clone rubygem-rails'
         result   = AwesomeSpawn::CommandResult.new '', '', '', 0
@@ -204,14 +205,14 @@ module Polisher
 
       context "dead.package exists" do
         it "returns true" do
-          File.should_receive(:exists?).with('dead.package').and_return(true)
+          File.should_receive(:exist?).with('dead.package').and_return(true)
           @pkg.should be_dead
         end
       end
 
       context "dead.package does not exist" do
         it "returns false" do
-          File.should_receive(:exists?).with('dead.package').and_return(false)
+          File.should_receive(:exist?).with('dead.package').and_return(false)
           @pkg.should_not be_dead
         end
       end
@@ -290,7 +291,16 @@ module Polisher
       end
     end
 
+    describe "#update_metadata" do
+      it "sets pkg version" do
+        pkg = described_class.new
+        pkg.update_metadata(Polisher::Gem.new(:version => '5.0'))
+        pkg.version.should == '5.0'
+      end
+    end
+
     describe "#update_spec_to" do
+      it "updates spec metadata"
       it "updates spec version"
       it "updates spec release"
     end
@@ -317,6 +327,7 @@ module Polisher
         expected = "/usr/bin/git add pkg_files"
         AwesomeSpawn.should_receive(:run).with(expected)
         AwesomeSpawn.should_receive(:run).at_least(:once)
+                    .and_return(AwesomeSpawn::CommandResult.new('', '', '', 0))
         pkg.commit
       end
 
@@ -324,27 +335,53 @@ module Polisher
         pkg = described_class.new(:name => 'rails', :version => '1.0.0')
         pkg.should_receive(:in_repo).at_least(:once).and_yield
         expected = "/usr/bin/git commit -m 'updated to 1.0.0'"
-        AwesomeSpawn.should_receive(:run).with(expected)
+        AwesomeSpawn.should_receive(:run!).with(expected)
         AwesomeSpawn.should_receive(:run).at_least(:once)
+                    .and_return(AwesomeSpawn::CommandResult.new('', '', '', 0))
         pkg.commit
       end
     end
 
     describe "#build_srpm" do
       it "uses package command to build srpm" do
-        pkg = described_class.new
+        gem  = Polisher::Gem.new
+        spec = RPM::Spec.new
+        pkg  = described_class.new
         pkg.should_receive(:in_repo).and_yield
-        AwesomeSpawn.should_receive(:run).with("/usr/bin/fedpkg srpm")
+        pkg.should_receive(:require_cmd!).with('/usr/bin/fedpkg').and_return(true)
+        pkg.should_receive(:spec).and_return(spec)
+        spec.should_receive(:upstream_gem).and_return(gem)
+        FileUtils.stub(:ln_s) # stub out ln
+        result = AwesomeSpawn::CommandResult.new "", "", "", 0
+        AwesomeSpawn.should_receive(:run)
+                    .with("/usr/bin/fedpkg srpm")
+                    .and_return(result)
         pkg.build_srpm
       end
+
+      context "package command fails" do
+        it "raises RuntimeError with the command stderr" do
+          gem  = Polisher::Gem.new
+          spec = RPM::Spec.new
+          pkg  = described_class.new
+          pkg.should_receive(:in_repo).and_yield
+          pkg.should_receive(:require_cmd!).with('/usr/bin/fedpkg').and_return(true)
+          pkg.should_receive(:spec).and_return(spec)
+          spec.should_receive(:upstream_gem).and_return(gem)
+          FileUtils.stub(:ln_s) # stub out ln
+          result = AwesomeSpawn::CommandResult.new "", "", "cmd_error", 1
+          AwesomeSpawn.should_receive(:run)
+                      .and_return(result)
+          expect { pkg.build_srpm }.to raise_error(RuntimeError, "cmd_error")
+        end
+      end
     end
 
     describe "#scratch_build" do
-      it "uses build command to build srpm" do
+      it "uses koji to build srpm" do
         pkg = described_class.new(:name => 'rails', :version => '1.0.0')
         pkg.should_receive(:in_repo).and_yield
-        expected = "/usr/bin/koji build --scratch rawhide rubygem-rails-1.0.0-1.*.src.rpm"
-        AwesomeSpawn.should_receive(:run).with(expected)
+        Koji.should_receive(:build).with(:srpm => pkg.srpm, :scratch => true)
         pkg.scratch_build
       end
     end
@@ -358,37 +395,36 @@ module Polisher
       end
     end
 
-    describe "#version_for" do
-      it "uses git to retrieve the package" do
-        pkg = "#{described_class.dist_git_url}rubygem-rails.git"
-        dir = Polisher::GitCache.path_for('rubygem-rails')
-        expected = "/usr/bin/git clone #{pkg} #{dir}"
-        AwesomeSpawn.should_receive(:run).with(expected)
-        described_class.version_for 'rails'
+    describe "#versions_for" do
+      it "git fetches the package" do
+        pkg = described_class.new
+        described_class.should_receive(:new)
+                       .with(:name => 'rails')
+                       .and_return(pkg)
+        pkg.should_receive(:fetch).with(described_class.fetch_tgt)
+        described_class.versions_for 'rails'
       end
 
       it "returns version of the package" do
-        AwesomeSpawn.should_receive(:run) # stub out run
-
         spec = Polisher::RPM::Spec.new :version => '1.0.0'
         pkg  = described_class.new
+        pkg.should_receive(:fetch) # stub out fetch
         described_class.should_receive(:new).and_return(pkg)
         pkg.should_receive(:spec).and_return(spec)
 
-        described_class.version_for('rails').should == '1.0.0'
+        described_class.versions_for('rails').should == ['1.0.0']
       end
 
       it "invokes callback with version of package" do
-        AwesomeSpawn.should_receive(:run) # stub out run
-
         spec = Polisher::RPM::Spec.new :version => '1.0.0'
         pkg  = described_class.new
+        pkg.should_receive(:fetch) # stub out fetch
         described_class.should_receive(:new).and_return(pkg)
         pkg.should_receive(:spec).and_return(spec)
 
         cb = proc {}
         cb.should_receive(:call).with(:git, 'rails', ['1.0.0'])
-        described_class.version_for('rails', &cb)
+        described_class.versions_for('rails', &cb)
       end
     end
   end # describe Git::Pkg

data/spec/koji_spec.rb

@@ -65,7 +65,7 @@ module Polisher
       end
 
       it "uses xmlrpc client to retreive versions" do
-        expected = ['listTagged', described_class.koji_tag, nil, false,
+        expected = ['listTagged', described_class.koji_tag, nil, true,
                     nil, false, "rubygem-rails"]
         @client.should_receive(:call).with(*expected).and_return([])
         described_class.versions_for 'rails'
@@ -73,15 +73,34 @@ module Polisher
 
       it "handles multiple koji tags" do
         described_class.should_receive(:koji_tags).and_return(['tag1', 'tag2'])
-        expected1 = ['listTagged', 'tag1', nil, false,
+        expected1 = ['listTagged', 'tag1', nil, true,
                      nil, false, "rubygem-rails"]
-        expected2 = ['listTagged', 'tag2', nil, false,
+        expected2 = ['listTagged', 'tag2', nil, true,
                      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 "handles multiple koji prefixes" do
+        @prefix = ['rubygem-', 'ruby193-rubygem-']
+        described_class.should_receive(:package_prefix).twice.and_return(['rubygem-', 'ruby193-rubygem-'])
+        described_class.should_receive(:koji_tags).and_return(['tag1', 'tag2'])
+        expected1 = ['listTagged', 'tag1', nil, true,
+                     nil, false, "rubygem-rails"]
+        expected2 = ['listTagged', 'tag2', nil, true,
+                     nil, false, "rubygem-rails"]
+        expected3 = ['listTagged', 'tag1', nil, true,
+                     nil, false, "ruby193-rubygem-rails"]
+        expected4 = ['listTagged', 'tag2', nil, true,
+                     nil, false, "ruby193-rubygem-rails"]
+        @client.should_receive(:call).with(*expected1).and_return([])
+        @client.should_receive(:call).with(*expected2).and_return([])
+        @client.should_receive(:call).with(*expected3).and_return([])
+        @client.should_receive(:call).with(*expected4).and_return([])
+        described_class.versions_for 'rails'
+      end
+
       it "returns versions" do
         versions = [{'version' => '1.0.0'}]
         @client.should_receive(:call).and_return(versions)
@@ -96,6 +115,44 @@ module Polisher
         cb.should_receive(:call).with(:koji, 'rails', ['1.0.0'])
         described_class.versions_for('rails', &cb)
       end
+    end # describe versions_for
+
+    describe "#build" do
+      it "runs build_cmd" do
+        result = AwesomeSpawn::CommandResult.new "", "", "", 0
+        expected = "#{described_class.build_cmd} build  #{described_class.build_tgt} srpm"
+        AwesomeSpawn.should_receive(:run).with(expected).and_return(result)
+        described_class.should_receive(:require_cmd!)
+                       .with(described_class.build_cmd).and_return(true)
+        described_class.build :srpm => 'srpm'
+      end
+
+      it "runs scratch build" do
+        described_class.should_receive(:require_cmd!)
+                       .with(described_class.build_cmd).and_return(true)
+        result = AwesomeSpawn::CommandResult.new "", "", "", 0
+        expected = "#{described_class.build_cmd} build --scratch f20 srpm"
+        AwesomeSpawn.should_receive(:run).with(expected).and_return(result)
+        described_class.build :target => 'f20', :srpm => 'srpm', :scratch => true
+      end
+
+      it "parses & returns url from build output" do
+        described_class.should_receive(:require_cmd!).and_return(true)
+        result = AwesomeSpawn::CommandResult.new "", "output", "", 0
+        AwesomeSpawn.should_receive(:run).and_return(result)
+        described_class.should_receive(:parse_url).with('output').and_return('url')
+        described_class.build.should == 'url'
+      end
+
+      describe "non-zero build exit status" do
+        it "raises runtime error with build url" do
+          described_class.should_receive(:require_cmd!).and_return(true)
+          result = AwesomeSpawn::CommandResult.new "", "", "", 1
+          AwesomeSpawn.should_receive(:run).and_return(result)
+          described_class.should_receive(:parse_url).and_return('url')
+          lambda { described_class.build }.should raise_error(RuntimeError, 'url')
+        end
+      end
     end
   end # describe Koji
 end # module Polisher

data/spec/rpm/spec_spec.rb

@@ -116,12 +116,16 @@ module Polisher::RPM
       it "updates dependencies from gem" do
         spec = described_class.new :requires => [Requirement.parse('rubygem(rake)'),
                                                  Requirement.parse('rubygem(activerecord)')],
-                                     :build_requires => []
+                                   :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
+        # stub out a few methods
+        spec.should_receive(:excluded_deps).at_least(:once).and_return([])
+        spec.should_receive(:excluded_dev_deps).at_least(:once).and_return([])
+        spec.should_receive(:update_files_from)
+
         spec.update_to(gem)
           spec.requires.should == [Requirement.parse('rubygem(activerecord)'),
                                    Requirement.parse('rubygem(rake) >= 0'),
@@ -136,7 +140,7 @@ module Polisher::RPM
         gem.should_receive(:file_paths).at_least(:once).
             and_return(['/foo', '/foo/bar', '/baz'])
         spec.update_to(gem)
-        spec.new_files.should == ['/baz']
+        spec.new_files.should == ['%{gem_instdir}//baz']
       end
   
       it "updates metadata from gem" do

data/spec/spec_helper.rb

@@ -70,7 +70,8 @@ module Polisher
     GEMFILE = {
       :path     => "#{SPEC_DIR}/data/Gemfile",
       :contents => File.read("#{SPEC_DIR}/data/Gemfile"),
-      :deps     => ['rubygems', 'cinch']
+      :deps     => [::Gem::Dependency.new("rubygems", ::Gem::Requirement.new([">= 0"]), :runtime),
+                    ::Gem::Dependency.new("cinch", ::Gem::Requirement.new([">= 0"]), :runtime)]
     }
 
     RPM_SPEC = {

data/spec/version_checker_spec.rb

@@ -0,0 +1,97 @@
+# Polisher Version Checker Spec
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+require 'polisher/version_checker'
+
+module Polisher
+  describe VersionChecker do
+    describe "#check" do
+      it "adds target to check to list"
+    end
+
+    describe "#should_check?" do
+      context "target is on check list" do
+        it "returns true"
+      end
+
+      context "target is not on check list" do
+        it "returns false"
+      end
+    end
+
+    describe "#versions_for" do
+      context "should check gem target" do
+        it "checks gem target"
+        it "invokes block w/ gem versions retrieved"
+      end
+
+      context "should check fedora target" do
+        it "checks fedora target"
+        it "invokes block w/ fedora versions retrieved"
+        context "error retrieving versions from fedora" do
+          it "invokes block w/ 'unknown' version"
+          it "returns 'unknown' fedora version"
+        end
+      end
+
+      context "should check koji target" do
+        it "checks koji target"
+        it "invokes block w/ koji versions retrieved"
+        context "error retrieving versions from koji" do
+          it "invokes block w/ 'unknown' version"
+          it "returns 'unknown' koji version"
+        end
+      end
+
+      context "should check git target" do
+        it "checks git target"
+        it "invokes block w/ git versions retrieved"
+        context "error retrieving versions from git" do
+          it "invokes block w/ 'unknown' version"
+          it "returns 'unknown' git version"
+        end
+      end
+
+      context "should check yum target" do
+        it "checks yum target"
+        it "invokes block w/ yum versions retrieved"
+        context "error retrieving versions from yum" do
+          it "invokes block w/ 'unknown' version"
+          it "returns 'unknown' yum version"
+        end
+      end
+
+      context "should check bodhi target" do
+        it "checks bodhi target"
+        it "invokes block w/ bodhi versions retrieved"
+        context "error retrieving versions from bodhi" do
+          it "invokes block w/ 'unknown' version"
+          it "returns 'unknown' bodhi version"
+        end
+      end
+
+      context "should check errata target" do
+        it "checks errata target"
+        it "checks errata target"
+        it "invokes block w/ errata versions retrieved"
+        context "error retrieving versions from errata" do
+          it "invokes block w/ 'unknown' version"
+          it "returns 'unknown' errata version"
+        end
+      end
+
+      it "returns all versions retrieved"
+    end
+
+    describe "version for" do
+      it "retrieves most relevant version of package in configured targets"
+    end
+  end # describe VersionChecker
+
+  describe VersionedDependencies do
+    it "retrieves versions of each dependency in configured targets"
+    it "invokes block with targets / versions"
+  end # described VersionedDependencies
+end # module Polisher

data/spec/yum_spec.rb

@@ -12,6 +12,8 @@ module Polisher
       end
 
       it "uses yum to retreive versions" do
+        described_class.should_receive(:require_cmd!)
+                       .with('/usr/bin/yum').and_return(true)
         expected = "/usr/bin/yum info rubygem-rails"
         result = AwesomeSpawn::CommandResult.new expected, "", "", 0
         AwesomeSpawn.should_receive(:run).with(expected).and_return(result)
@@ -19,12 +21,15 @@ module Polisher
       end
 
       it "returns versions" do
+        described_class.should_receive(:require_cmd!).and_return(true)
         result = AwesomeSpawn::CommandResult.new "", "Version: 1.0.0", "", 0
         AwesomeSpawn.should_receive(:run).and_return(result)
         described_class.version_for("rails") == '1.0.0'
       end
 
       it "invokes block with versions" do
+        described_class.should_receive(:require_cmd!).and_return(true)
+
         cb = proc {}
         cb.should_receive(:call).with(:yum, 'rails', ['1.0.0'])