polisher 0.6.1 → 0.7.1

data/lib/polisher/upstream.rb

@@ -1,7 +1,7 @@
 # Polisher Upstream Operations
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/gem'
 require 'polisher/gemfile'

data/lib/polisher/vendor.rb

@@ -1,7 +1,7 @@
 # Polisher Vendor Operations
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 
 module Polisher
   class Vendor

data/lib/polisher/version.rb

@@ -1,3 +1,3 @@
-class Polisher
-  VERSION = "0.6.1"
+module Polisher
+  VERSION = "0.7.1"
 end

data/lib/polisher/version_checker.rb

@@ -1,7 +1,7 @@
 # Helpers to check versions
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/gem'
 require 'polisher/fedora'
@@ -17,6 +17,7 @@ module Polisher
     FEDORA_TARGET = :fedora
     GIT_TARGET    = :git
     YUM_TARGET    = :yum
+    BODHI_TARGET  = :bodhi # fedora dispatches to bodhi to not enabled by default
     ALL_TARGETS   = [GEM_TARGET, KOJI_TARGET, FEDORA_TARGET,
                      GIT_TARGET, YUM_TARGET]
 
@@ -63,6 +64,10 @@ module Polisher
         versions.merge! :yum => [Yum.version_for(name, &bl)]
       end
 
+      if @check_list.include?(BODHI_TARGET)
+        versions.merge! :bodhi => Bodhi.versions_for(name, &bl)
+      end
+
       #bodhi_version   = Bodhi.versions_for(name, &bl)
       #errata_version  = Errata.version_for('url?', name, &bl)
 

data/lib/polisher/yum.rb

@@ -1,7 +1,7 @@
 # Polisher Yum Operations
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'awesome_spawn'
 

data/spec/bodhi_spec.rb

@@ -1,7 +1,7 @@
 # Polisher Bodhi Spec
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/bodhi'
 

data/spec/core_spec.rb

@@ -1,7 +1,7 @@
 # Polisher Core Extensions Specs
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'spec_helper'
 require 'polisher/core'
@@ -52,13 +52,13 @@ describe String do
   describe "unrpmize" do
     it "returns string with rpm macros removed/replaced" do
       "%doc ".unrpmize.should == ""
-      "%{_bindir}".unrpmize.should == "/bin"
+      "%{_bindir}".unrpmize.should == "bin"
     end
   end
 
   describe "#rpmize" do
     it "returns string with rpm macros swapped in" do
-      "/bin".rpmize.should == "%{_bindir}"
+      "bin".rpmize.should == "%{_bindir}"
     end
   end
 end # describe String

data/spec/errata_spec.rb

@@ -1,7 +1,7 @@
 # Polisher Errata Spec
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/errata'
 

data/spec/fedora_spec.rb

@@ -1,7 +1,7 @@
 # Polisher Fedora Spec
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/fedora'
 

data/spec/gem_spec.rb

@@ -1,14 +1,16 @@
 # Polisher Gem Specs
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+require 'spec_helper'
 
 require 'polisher/gem'
 
 module Polisher
   describe Gem do
     describe "#initialize" do
-      it "sets gemfile attributes" do
+      it "sets gem attributes" do
         gem = Polisher::Gem.new :name => 'rails',
                                 :version => '4.0.0',
                                 :deps => ['activesupport', 'activerecord'],
@@ -20,6 +22,27 @@ module Polisher
       end
     end
 
+    describe "#ignorable_file?" do
+      context "args matches an ignorable file" do
+        it "returns true" do
+          Polisher::Gem.ignorable_file?('foo.gemspec').should be_true
+          Polisher::Gem.ignorable_file?('Gemfile').should be_true
+        end
+      end
+
+      context "args does not match an ignorable file" do
+        it "returns false" do
+          Polisher::Gem.ignorable_file?('.rvmra').should be_false
+          Polisher::Gem.ignorable_file?('foo.gemspoc').should be_false
+        end
+      end
+    end
+
+    describe "#local_versions_for" do
+      it "returns versions of specified gem in local db"
+      it "invokes cb with versions retrieved"
+    end
+
     describe "#parse" do
       it "returns new gem" do
         gem = Polisher::Gem.parse
@@ -47,20 +70,68 @@ module Polisher
       end
     end
 
-    describe "#retrieve" do
-      before(:each) do
-        @local_gem = Polisher::Test::LOCAL_GEM
 
-        # stub out expected calls to curl
-        @curl1 = Curl::Easy.new
-        @curl2 = Curl::Easy.new
+    describe "#download_gem" do
+      context "gem in GemCache" do
+        it "returns GemCache gem"
+      end
+
+      it "uses curl to download gem"
+      it "sets gem in gem cached"
+      it "returns downloaded gem binary contents"
+    end
+
+    describe "#download_gem_path" do
+      it "downloads gem" do
+        gem = Polisher::Gem.new
+        gem.should_receive(:download_gem)
+        gem.downloaded_gem_path
+      end
+
+      it "returns gem cache path for gem" do
+        # stub out d/l
+        gem = Polisher::Gem.new :name => 'rails', :version => '1.0'
+        gem.should_receive(:download_gem)
+        Polisher::GemCache.should_receive(:path_for).
+                           with('rails', '1.0').
+                           at_least(:once).
+                           and_return('rails_path')
+        gem.downloaded_gem_path.should == 'rails_path'
+      end
+    end
+
+    describe "#gem_path" do
+      it "returns specified path" do
+        gem = Polisher::Gem.new :path => 'gem_path'
+        gem.gem_path.should == 'gem_path'
+      end
 
-        Curl::Easy.should_receive(:http_get).with(@local_gem[:json_url]).and_return(@curl1)
-        @curl1.should_receive(:body_str).and_return(@local_gem[:json])
+      context "specified path is null" do
+        it "returns downloaded gem path" do
+          gem = Polisher::Gem.new
+          gem.should_receive(:downloaded_gem_path).and_return('gem_path')
+          gem.gem_path.should == 'gem_path'
+        end
+      end
+    end
 
-        Curl::Easy.should_receive(:new).with(@local_gem[:url]).and_return(@curl2)
-        @curl2.should_receive(:http_get)
-        @curl2.should_receive(:body_str).and_return(@local_gem[:contents])
+    describe "#unpack" do
+      it "unpacks gem at gem_path into temp dir"
+      it "returns tmp dir"
+      context "block specified" do
+        it "invokes block with tmp dir"
+        it "removes tmp dir"
+        it "returns nil"
+      end
+    end
+
+    describe "#file_paths" do
+      it "returns list of file paths in gem"
+    end
+
+    describe "#retrieve" do
+      before(:each) do
+        @local_gem = Polisher::Test::LOCAL_GEM
       end
 
       it "returns gem retrieved from rubygems" do
@@ -71,12 +142,83 @@ module Polisher
         gem.deps.should     == @local_gem[:deps]
         gem.dev_deps.should == @local_gem[:dev_deps]
       end
+    end
 
-      it "sets gem files" do
-        gem = Polisher::Gem.retrieve(@local_gem[:name])
-        gem.should be_an_instance_of(Polisher::Gem)
-        gem.files.should == @local_gem[:files]
+    describe "#versions" do
+      it "looks up and returns versions for gemname in polisher version checker"
+
+      context "recursive is true" do
+        it "appends versions of gem dependencies to versions list"
+        context "dev_deps is true" do
+          it "appends versions of gem dev dependencies to versions list"
+        end
       end
     end
+
+    describe "#vendored_file_paths" do
+      it "returns file marks in gem marked as vendored" do
+        expected = [ 'vendor/foo.rb', 'vendor/bar/foo.rb']
+        paths    = ['foo.rb'] + expected
+        gem = Polisher::Gem.new
+        gem.should_receive(:file_paths).and_return(paths)
+        gem.vendored_file_paths.should == expected
+      end
+    end
+
+    describe "#vendored" do
+      it "returns list of vendored modules in gem" do
+        gem = Polisher::Gem.new
+        vendored = ['vendor/thor.rb', 'vendor/thor/foo.rb', 'vendor/biz/baz.rb']
+        gem.should_receive(:vendored_file_paths).and_return(vendored)
+        gem.vendored.should == {'thor' => nil, 'biz' => nil}
+      end
+
+      context "vendored module has VERSION.rb file" do
+        it "returns version of vendored gems"
+      end
+    end
+
+    describe "#diff" do
+      before(:each) do
+        @gem1 = Polisher::Gem.new
+        @gem2 = Polisher::Gem.new
+
+        @result = AwesomeSpawn::CommandResult.new '', 'diff_out', '', 0
+      end
+
+      it "runs diff against unpacked local and other gems and returns output" do
+        @gem1.should_receive(:unpack).and_return('dir1')
+        @gem2.should_receive(:unpack).and_return('dir2')
+        AwesomeSpawn.should_receive(:run).
+          with("#{Polisher::Gem::DIFF_CMD} -r dir1 dir2").
+          and_return(@result)
+        @gem1.diff(@gem2).should == @result.output
+      end
+
+      it "removes unpacked gem dirs" do
+        @gem1.should_receive(:unpack).and_return('dir1')
+        @gem2.should_receive(:unpack).and_return('dir2')
+        AwesomeSpawn.should_receive(:run).and_return(@result)
+        FileUtils.should_receive(:rm_rf).with('dir1')
+        FileUtils.should_receive(:rm_rf).with('dir2')
+        # XXX for the GemCache dir cleaning:
+        FileUtils.should_receive(:rm_rf).at_least(:once)
+        @gem1.diff(@gem2)
+      end
+
+      context "error during operations" do
+        it "removes unpacked gem dirs" do
+          @gem1.should_receive(:unpack).and_return('dir1')
+          @gem2.should_receive(:unpack).and_return('dir2')
+          AwesomeSpawn.should_receive(:run).
+            and_raise(AwesomeSpawn::CommandResultError.new('', ''))
+          FileUtils.should_receive(:rm_rf).with('dir1')
+          FileUtils.should_receive(:rm_rf).with('dir2')
+          FileUtils.should_receive(:rm_rf).at_least(:once)
+          @gem1.diff(@gem2)
+        end
+      end
+    end
+
   end # describe Gem
 end # module Polisher

data/spec/gemfile_spec.rb

@@ -1,7 +1,7 @@
 # Polisher Gemfile Specs
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/gemfile'
 
@@ -23,7 +23,7 @@ module Polisher
       it "sets default gemfile version,files" do
         gemfile = Polisher::Gemfile.new
         gemfile.version.should be_nil
-        gemfile.files.should == []
+        gemfile.file_paths.should == []
       end
     end
 

data/spec/git_spec.rb

@@ -1,172 +1,376 @@
 # Polisher Git Spec
 #
 # Licensed under the MIT license
-# Copyright (C) 2013 Red Hat, Inc.
+# Copyright (C) 2013-2014 Red Hat, Inc.
 
 require 'polisher/git'
 
 module Polisher
+  describe GitRepo do
+    describe "#initialize" do
+      it "initializes url" do
+        repo = described_class.new :url => 'repo_url'
+        repo.url.should == 'repo_url'
+      end
+    end
+
+    describe "#path" do
+      it "returns git cache path for url" do
+        repo = described_class.new :url => 'repo_url'
+        Polisher::GitCache.should_receive(:path_for).
+                                    with('repo_url').
+                             and_return('repo_path')
+        repo.path.should == 'repo_path'
+      end
+    end
+
+    describe "#clone" do
+      it "runs git clone" do
+        expected = "/usr/bin/git clone repo_url repo_path"
+        AwesomeSpawn.should_receive(:run).with(expected)
+
+        repo = described_class.new :url => 'repo_url'
+        repo.should_receive(:path).and_return('repo_path')
+        repo.clone
+      end
+    end
+
+    describe "#cloned?" do
+      before(:each) do
+        @repo = described_class.new
+        @repo.should_receive(:path).and_return('repo_path')
+      end
+
+      context "repo path directory exists" do
+        it "returns true" do
+          File.should_receive(:directory?).with('repo_path').and_return(true)
+          @repo.should be_cloned
+        end
+      end
+
+      context "repo path directory does not exist" do
+        it "returns false" do
+          File.should_receive(:directory?).with('repo_path').and_return(false)
+          @repo.should_not be_cloned
+        end
+      end
+    end
+
+    describe "#in_repo" do
+      it "chdir to repo path, invokes block, restores dir" do
+        repo = described_class.new
+        Dir.mktmpdir do |dir|
+          repo.should_receive(:path).and_return(dir)
+          invoked = false
+          orig = Dir.pwd
+          repo.in_repo do
+            Dir.pwd.should == dir
+            invoked = true
+          end
+          Dir.pwd.should == orig
+          invoked.should be_true
+        end
+      end
+    end
+
+    describe "#reset!" do
+      it "resets git repo to head" do
+        expected = "/usr/bin/git reset HEAD~ --hard"
+        repo = described_class.new
+        repo.should_receive(:in_repo).and_yield
+        AwesomeSpawn.should_receive(:run).with(expected)
+        repo.reset!
+      end
+    end
+
+    describe "#pull" do
+      it "git pulls" do
+        expected = "/usr/bin/git pull"
+        repo = described_class.new
+        repo.should_receive(:in_repo).and_yield
+        AwesomeSpawn.should_receive(:run).with(expected)
+        repo.pull
+      end
+    end
+
+    describe "#checkout" do
+      it "git checks out target" do
+        expected = "/usr/bin/git checkout master"
+        repo = described_class.new
+        repo.should_receive(:in_repo).and_yield
+        AwesomeSpawn.should_receive(:run).with(expected)
+        repo.checkout('master')
+      end
+    end
+
+    describe "#commit" do
+      it "git commits with message" do
+        expected = "/usr/bin/git commit -m 'msg'"
+        repo = described_class.new
+        repo.should_receive(:in_repo).and_yield
+        AwesomeSpawn.should_receive(:run).with(expected)
+        repo.commit('msg')
+      end
+    end
+  end
+
   describe GitPackage do
+    describe "#initialize" do
+      it "initializes name" do
+        pkg = described_class.new :name => 'pkg_name'
+        pkg.name.should == 'pkg_name'
+      end
+
+      it "initializes version" do
+        pkg = described_class.new :version => 'pkg_version'
+        pkg.version.should == 'pkg_version'
+      end
+    end
+
     describe "#rpm_name" do
       it "returns rubygem-gem_name" do
-        pkg = Polisher::GitPackage.new :name => 'rails'
+        pkg = described_class.new :name => 'rails'
         pkg.rpm_name.should == 'rubygem-rails'
       end
     end
 
     describe "#srpm" do
       it "returns name of srpm" do
-        pkg = Polisher::GitPackage.new :name => 'rails', :version => '1.0.0'
+        pkg = described_class.new :name => 'rails', :version => '1.0.0'
         pkg.srpm.should == 'rubygem-rails-1.0.0-1.*.src.rpm'
       end
     end
 
+    describe "#spec_file" do
+      it "returns name of spec file" do
+        pkg = described_class.new :name => 'rails'
+        pkg.spec_file.should == 'rubygem-rails.spec'
+      end
+    end
+
     describe "#spec" do
-      it "returns name of spec" do
-        pkg = Polisher::GitPackage.new :name => 'rails'
-        pkg.spec.should == 'rubygem-rails.spec'
+      it "returns handle to parsed Polisher::RPMSpec"
+    end
+
+    describe "#pkg_files" do
+      it "returns spec, .gitignore, sources"
+    end
+
+    describe "#path" do
+      it "returns Git Cache path for rpm name"
+    end
+
+    describe "#git_clone" do
+      it "is an alias for superclass#clone"
+    end
+
+    describe "#clone" do
+      it "clones package" do
+        # stub out glob / rm_rf
+        Dir.should_receive(:glob).and_return([])
+        FileUtils.should_receive(:rm_rf).at_least(:once)
+
+        pkg = described_class.new :name => 'rails'
+        pkg.should_receive(:in_repo).and_yield
+
+        expected = '/usr/bin/fedpkg clone rubygem-rails'
+        AwesomeSpawn.should_receive(:run).with(expected)
+        pkg.clone
       end
+
+      it "moves files from pkg subdir to current dir"
+      it "rm's pkg subdir"
     end
 
-    describe "::clone" do
-      context "package directory does not exist" do
-        it "uses package command to clone package" do
-          File.should_receive(:directory?).with('rubygem-rails').and_return(false)
-          AwesomeSpawn.should_receive(:run).with("/usr/bin/fedpkg clone rubygem-rails")
-          Dir.should_receive(:chdir) # stub out chdir
-          AwesomeSpawn.should_receive(:run).at_least(3).times
-          described_class.clone "rails"
+    describe "#dead?" do
+      before(:each) do
+        @pkg = described_class.new
+        @pkg.should_receive(:in_repo).and_yield
+      end
+
+      context "dead.package exists" do
+        it "returns true" do
+          File.should_receive(:exists?).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)
+          @pkg.should_not be_dead
+        end
+      end
+    end
+
+    describe "#fetch" do
+      before(:each) do
+        @pkg = described_class.new
+      end
+
+      context "pkg not cloned" do
+        it "clones package" do
+          @pkg.should_receive(:dead?).and_return(false)
+          @pkg.should_receive(:reset!)
+          @pkg.should_receive(:checkout)
+          @pkg.should_receive(:pull)
+
+          @pkg.should_receive(:cloned?).and_return(false)
+          @pkg.should_receive(:clone)
+          @pkg.fetch
         end
       end
 
-      it "changes dir to the pkg dir" do
-        File.should_receive(:directory?).and_return(true) # stub out pull
-        Dir.should_receive(:chdir).with('rubygem-rails')
-        AwesomeSpawn.should_receive(:run).at_least(3).times # stub out calls to run
-        described_class.clone "rails"
+      context "pkg cloned" do
+        it "does not clone pkg" do
+          @pkg.should_receive(:dead?).and_return(false)
+          @pkg.should_receive(:reset!)
+          @pkg.should_receive(:checkout)
+          @pkg.should_receive(:pull)
+
+          @pkg.should_receive(:cloned?).and_return(true)
+          @pkg.should_not_receive(:clone)
+          @pkg.fetch
+        end
       end
 
-      context "dead.package file exists" do
+      context "pkg dead" do
         it "raises Exception" do
-          File.should_receive(:directory?).and_return(true) # stub out pull
-          Dir.should_receive(:chdir) # stub out chdir
-          File.should_receive(:exists?).with('dead.package').and_return(true)
+          @pkg.should_receive(:cloned?).and_return(true)
+          @pkg.should_receive(:dead?).and_return(true)
           lambda{
-            described_class.clone "rails"
+            @pkg.fetch
           }.should raise_error(Exception)
         end
       end
 
-      it "checks out master branch" do
-        File.should_receive(:directory?).and_return(true) # stub out pull
-        Dir.should_receive(:chdir).with('rubygem-rails')
-        AwesomeSpawn.should_receive(:run).with("/usr/bin/git checkout master")
-        AwesomeSpawn.should_receive(:run).at_least(2).times # stub out calls to run
-        described_class.clone "rails"
-      end
+      it "checks out master" do
+        @pkg.should_receive(:cloned?).and_return(true)
+        @pkg.should_receive(:dead?).and_return(false)
+        @pkg.should_receive(:reset!)
+        @pkg.should_receive(:pull)
 
-      it "resets head" do
-        File.should_receive(:directory?).and_return(true) # stub out pull
-        Dir.should_receive(:chdir).with('rubygem-rails')
-        AwesomeSpawn.should_receive(:run).with("/usr/bin/git reset HEAD~ --hard")
-        AwesomeSpawn.should_receive(:run).at_least(2).times # stub out calls to run
-        described_class.clone "rails"
+        @pkg.should_receive(:checkout).with('master')
+        @pkg.fetch
       end
 
-      it "pulls from remote" do
-        File.should_receive(:directory?).and_return(true) # stub out pull
-        Dir.should_receive(:chdir).with('rubygem-rails')
-        AwesomeSpawn.should_receive(:run).with("/usr/bin/git pull")
-        AwesomeSpawn.should_receive(:run).at_least(2).times # stub out calls to run
-        described_class.clone "rails"
+      it "resets HEAD" do
+        @pkg.should_receive(:cloned?).and_return(true)
+        @pkg.should_receive(:dead?).and_return(false)
+        @pkg.should_receive(:checkout)
+        @pkg.should_receive(:pull)
+
+        @pkg.should_receive(:reset!)
+        @pkg.fetch
       end
 
-      it "returns new GitPackage instance" do
-        File.should_receive(:directory?).and_return(true) # stub out pull
-        Dir.should_receive(:chdir).with('rubygem-rails')
-        AwesomeSpawn.should_receive(:run).at_least(3).times # stub out calls to run
-        pkg = described_class.clone("rails")
-        pkg.should be_an_instance_of(described_class)
-        pkg.name.should == 'rails'
+      it "pulls repo" do
+        @pkg.should_receive(:cloned?).and_return(true)
+        @pkg.should_receive(:dead?).and_return(false)
+        @pkg.should_receive(:reset!)
+        @pkg.should_receive(:checkout)
+
+
+        @pkg.should_receive(:pull)
+        @pkg.fetch
       end
     end
 
+    describe "#update_spec_to" do
+      it "updates spec version"
+      it "updates spec release"
+    end
+
+    describe "#gen_sources_for" do
+      it "writes gem md5sum to sources file"
+    end
+
+    describe "#ignore" do
+      it "adds gem to .gitignore file"
+    end
+
     describe "#update_to" do
       it "updates rpm spec"
-      it "updates sources file"
-      it "updates .gitignore file"
+      it "generates new sources file"
+      it "ignores gem"
     end
 
-    describe "#build" do
-      it "uses package command to build srpm" do
-        AwesomeSpawn.should_receive(:run).with("/usr/bin/fedpkg srpm")
+    describe "#commit" do
+      it "git adds the pkg_files" do
+        pkg = described_class.new(:name => 'rails')
+        pkg.should_receive(:in_repo).at_least(:once).and_yield
+        pkg.should_receive(:pkg_files).and_return(['pkg_files'])
+        expected = "/usr/bin/git add pkg_files"
+        AwesomeSpawn.should_receive(:run).with(expected)
         AwesomeSpawn.should_receive(:run).at_least(:once)
-        described_class.new.build
+        pkg.commit
       end
 
-      it "uses build command to build srpm" do
-        AwesomeSpawn.should_receive(:run).with("/usr/bin/koji build --scratch rawhide rubygem-rails-1.0.0-1.*.src.rpm")
+      it "commits the package with default msg" do
+        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).at_least(:once)
-        described_class.new(:name => 'rails', :version => '1.0.0').build
+        pkg.commit
       end
     end
 
-    describe "#has_check?" do
-      context "package spec has %check section" do
-        it "returns true" do
-          File.should_receive(:open).with("rubygem-rails.spec", "r").and_yield("%check")
-          described_class.new(:name => "rails").has_check?.should be_true
-        end
-      end
-
-      context "package spec does not have a %check section" do
-        it "returns false" do
-          File.should_receive(:open).with("rubygem-rails.spec", "r").and_yield("")
-          described_class.new(:name => "rails").has_check?.should be_false
-        end
+    describe "#build_srpm" do
+      it "uses package command to build srpm" do
+        pkg = described_class.new
+        pkg.should_receive(:in_repo).and_yield
+        AwesomeSpawn.should_receive(:run).with("/usr/bin/fedpkg srpm")
+        pkg.build_srpm
       end
     end
 
-    describe "#commit" do
-      it "git adds the sources, .gitignore, and spec files" do
-        AwesomeSpawn.should_receive(:run).with("/usr/bin/git add rubygem-rails.spec sources .gitignore")
-        AwesomeSpawn.should_receive(:run).at_least(:once)
-        described_class.new(:name => 'rails').commit
+    describe "#scratch_build" do
+      it "uses build command 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)
+        pkg.scratch_build
       end
+    end
 
-      it "commits the package" do
-        AwesomeSpawn.should_receive(:run).with("/usr/bin/git commit -m 'updated to 1.0.0'")
-        AwesomeSpawn.should_receive(:run).at_least(:once)
-        described_class.new(:name => 'rails', :version => '1.0.0').commit
+    describe "#build" do
+      it "builds srpm and runs scratch build" do
+        pkg = described_class.new
+        pkg.should_receive(:build_srpm)
+        pkg.should_receive(:scratch_build)
+        pkg.build
       end
     end
 
     describe "#version_for" do
       it "uses git to retrieve the package" do
-        AwesomeSpawn.should_receive(:run).with("/usr/bin/git clone #{described_class::DIST_GIT_URL}rubygem-rails.git .")
+        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'
       end
 
-      it "parses version from spec in git" do
+      it "returns version of the package" do
         AwesomeSpawn.should_receive(:run) # stub out run
-        File.should_receive(:read).with("rubygem-rails.spec").and_return("contents")
-        Polisher::RPMSpec.should_receive(:parse).with("contents").and_return(Polisher::RPMSpec.new)
-        described_class.version_for 'rails'
-      end
 
-      it "returns version of the package" do
         spec = Polisher::RPMSpec.new :version => '1.0.0'
-        AwesomeSpawn.should_receive(:run) # stub out run
-        File.should_receive(:read).with("rubygem-rails.spec") # stub out read
-        Polisher::RPMSpec.should_receive(:parse).and_return(spec)
+        pkg  = described_class.new
+        described_class.should_receive(:new).and_return(pkg)
+        pkg.should_receive(:spec).and_return(spec)
+
         described_class.version_for('rails').should == '1.0.0'
       end
 
       it "invokes callback with version of package" do
-        spec = Polisher::RPMSpec.new :version => '1.0.0'
         AwesomeSpawn.should_receive(:run) # stub out run
-        File.should_receive(:read).with("rubygem-rails.spec") # stub out read
-        Polisher::RPMSpec.should_receive(:parse).and_return(spec)
+
+        spec = Polisher::RPMSpec.new :version => '1.0.0'
+        pkg  = described_class.new
+        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'])