polisher 0.7.1 → 0.8.1

data/lib/polisher/vendor.rb

@@ -6,4 +6,32 @@
 module Polisher
   class Vendor
   end
+
+  module HasVendoredDeps
+    # Return list of file paths marked as vendored
+    #
+    # Scope which this module is being mixed into
+    # must defined 'file_paths'
+    def vendored_file_paths
+      self.file_paths.select { |f| f.include?('vendor/') }
+    end
+
+    # Return list of vendered gems in file list
+    def vendored
+      vendored_file_paths.inject({}) do |v,fp|
+        vendored_file = fp.split('/')
+        vendor_index  = vendored_file.index('vendor')
+
+        # only process vendor'd dirs:
+        next v if vendor_index + 2 == vendored_file.size
+
+        vname = vendored_file[vendor_index + 1]
+        vversion = nil
+        # TODO set vversion from version.rb:
+        #vf.last.downcase == 'version.rb'
+        v[vname] = vversion
+        v
+      end
+    end
+  end
 end

data/lib/polisher/version.rb

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

data/lib/polisher/version_checker.rb

@@ -6,7 +6,7 @@
 require 'polisher/gem'
 require 'polisher/fedora'
 require 'polisher/koji'
-require 'polisher/git'
+require 'polisher/git/pkg'
 require 'polisher/bodhi'
 require 'polisher/yum'
 
@@ -32,6 +32,11 @@ module Polisher
       @check_list << target
     end
 
+    def self.should_check?(target)
+      @check_list ||= ALL_TARGETS
+      @check_list.include?(target)
+    end
+
     # Retrieve all the versions of the specified package using
     # the configured targets.
     #
@@ -41,30 +46,29 @@ module Polisher
     # @returns [Hash<target,Array<String>>] returns a hash of target to versions
     # available for specified package
     def self.versions_for(name, &bl)
-      @check_list ||= ALL_TARGETS
       versions = {}
 
-      if @check_list.include?(GEM_TARGET)
+      if should_check?(GEM_TARGET)
         versions.merge! :gem => Gem.local_versions_for(name, &bl)
       end
 
-      if @check_list.include?(FEDORA_TARGET)
+      if should_check?(FEDORA_TARGET)
         versions.merge! :fedora => Fedora.versions_for(name, &bl)
       end
 
-      if @check_list.include?(KOJI_TARGET)
+      if should_check?(KOJI_TARGET)
         versions.merge! :koji => Koji.versions_for(name, &bl)
       end
 
-      if @check_list.include?(GIT_TARGET)
-        versions.merge! :git => [GitPackage.version_for(name, &bl)]
+      if should_check?(GIT_TARGET)
+        versions.merge! :git => [Git::Pkg.version_for(name, &bl)]
       end
 
-      if @check_list.include?(YUM_TARGET)
+      if should_check?(YUM_TARGET)
         versions.merge! :yum => [Yum.version_for(name, &bl)]
       end
 
-      if @check_list.include?(BODHI_TARGET)
+      if should_check?(BODHI_TARGET)
         versions.merge! :bodhi => Bodhi.versions_for(name, &bl)
       end
 

data/spec/gem_spec.rb

@@ -84,14 +84,14 @@ module Polisher
     describe "#download_gem_path" do
       it "downloads gem" do
         gem = Polisher::Gem.new
-        gem.should_receive(:download_gem)
+        Polisher::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::Gem.should_receive(:download_gem)
         Polisher::GemCache.should_receive(:path_for).
                            with('rails', '1.0').
                            at_least(:once).
@@ -155,29 +155,6 @@ module Polisher
       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

data/spec/gemfile_spec.rb

@@ -3,6 +3,8 @@
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
+require 'spec_helper'
+
 require 'polisher/gemfile'
 
 module Bundler
@@ -41,5 +43,16 @@ module Polisher
         #pgemfile.dev_deps.should...
       end
     end
+
+    describe "#vendored" do
+      it "returns gemfile deps + dev_deps" do
+        gemfile = described_class.new :deps => ['rails'], :dev_deps => ['rake']
+        gemfile.vendored.should == ['rails', 'rake']
+      end
+    end
+
+    describe "#patched" do
+      it "..."
+    end
   end # describe Gemfile
 end # module Polisher

data/spec/git_spec.rb

@@ -6,7 +6,7 @@
 require 'polisher/git'
 
 module Polisher
-  describe GitRepo do
+  describe Git::Repo do
     describe "#initialize" do
       it "initializes url" do
         repo = described_class.new :url => 'repo_url'
@@ -73,6 +73,16 @@ module Polisher
       end
     end
 
+    describe "#file_paths" do
+      it "returns list of all first paths in git repo" do
+        expected = ['file1', 'dir1/file2', 'dir2']
+        repo = described_class.new
+        repo.should_receive(:in_repo).and_yield
+        Dir.should_receive(:[]).with('**/*').and_return(expected)
+        repo.file_paths.should == expected
+      end
+    end
+
     describe "#reset!" do
       it "resets git repo to head" do
         expected = "/usr/bin/git reset HEAD~ --hard"
@@ -114,7 +124,7 @@ module Polisher
     end
   end
 
-  describe GitPackage do
+  describe Git::Pkg do
     describe "#initialize" do
       it "initializes name" do
         pkg = described_class.new :name => 'pkg_name'
@@ -149,7 +159,7 @@ module Polisher
     end
 
     describe "#spec" do
-      it "returns handle to parsed Polisher::RPMSpec"
+      it "returns handle to parsed Polisher::RPM::Spec"
     end
 
     describe "#pkg_files" do
@@ -167,14 +177,15 @@ module Polisher
     describe "#clone" do
       it "clones package" do
         # stub out glob / rm_rf
-        Dir.should_receive(:glob).and_return([])
+        Dir.should_receive(:foreach).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)
+        result   = AwesomeSpawn::CommandResult.new '', '', '', 0
+        AwesomeSpawn.should_receive(:run).with(expected).and_return(result)
         pkg.clone
       end
 
@@ -346,7 +357,7 @@ module Polisher
 
     describe "#version_for" do
       it "uses git to retrieve the package" do
-        pkg = "#{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)
@@ -356,7 +367,7 @@ module Polisher
       it "returns version of the package" do
         AwesomeSpawn.should_receive(:run) # stub out run
 
-        spec = Polisher::RPMSpec.new :version => '1.0.0'
+        spec = Polisher::RPM::Spec.new :version => '1.0.0'
         pkg  = described_class.new
         described_class.should_receive(:new).and_return(pkg)
         pkg.should_receive(:spec).and_return(spec)
@@ -367,7 +378,7 @@ module Polisher
       it "invokes callback with version of package" do
         AwesomeSpawn.should_receive(:run) # stub out run
 
-        spec = Polisher::RPMSpec.new :version => '1.0.0'
+        spec = Polisher::RPM::Spec.new :version => '1.0.0'
         pkg  = described_class.new
         described_class.should_receive(:new).and_return(pkg)
         pkg.should_receive(:spec).and_return(spec)
@@ -377,6 +388,19 @@ module Polisher
         described_class.version_for('rails', &cb)
       end
     end
-
-  end # describe GitPackage
+  end # describe Git::Pkg
+
+  describe Git::Project do
+    describe "#vendored" do
+      context "repo not cloned" do
+        it "clones repo" do
+          git = described_class.new
+          git.should_receive(:cloned?).and_return(false)
+          git.should_receive(:clone)
+          git.should_receive(:vendored_file_paths).and_return([]) # stub out
+          git.vendored
+        end
+      end
+    end
+  end
 end # module Polisher

data/spec/rpmspec_spec.rb

@@ -5,11 +5,11 @@
 
 require 'spec_helper'
 
-require 'polisher/rpmspec'
+require 'polisher/rpm/spec'
 require 'polisher/gem'
 
 module Polisher
-  describe RPMSpec::Requirement do
+  describe RPM::Requirement do
     describe "#str" do
       it "returns requirement in string format" do
         req = described_class.new :name => 'rubygem(activesupport)'
@@ -345,17 +345,17 @@ module Polisher
     end
   end
 
-  describe RPMSpec do
+  describe RPM::Spec do
     describe "#initialize" do
       it "sets gem metadata" do
-        spec = Polisher::RPMSpec.new :version => '1.0.0'
+        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::RPMSpec.new :version => '1.0.0'
+        spec = Polisher::RPM::Spec.new :version => '1.0.0'
         spec.version.should == '1.0.0'
       end
     end
@@ -379,14 +379,14 @@ module Polisher
 
     describe "#requirements_for_gem" do
       it "returns requirements for specified gem name" do
-        spec = Polisher::RPMSpec.new :requires =>
-          [Polisher::RPMSpec::Requirement.new(:name => 'rubygem(rake)')]
+        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::RPMSpec.new
+          spec = Polisher::RPM::Spec.new
           spec.requirements_for_gem('rake').should be_empty
         end
       end
@@ -398,60 +398,60 @@ module Polisher
       end
 
       it "returns new rpmspec instance" do
-        pspec = Polisher::RPMSpec.parse @spec[:contents]
-        pspec.should be_an_instance_of(Polisher::RPMSpec)
+        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::RPMSpec.parse @spec[:contents]
+        pspec = Polisher::RPM::Spec.parse @spec[:contents]
         pspec.contents.should == @spec[:contents]
       end
 
       it "parses name from spec" do
-        pspec = Polisher::RPMSpec.parse @spec[:contents]
+        pspec = Polisher::RPM::Spec.parse @spec[:contents]
         pspec.gem_name.should == @spec[:name]
       end
 
       it "parses version from spec" do
-        pspec = Polisher::RPMSpec.parse @spec[:contents]
+        pspec = Polisher::RPM::Spec.parse @spec[:contents]
         pspec.version.should == @spec[:version]
       end
 
       it "parses release from spec" do
-        pspec = Polisher::RPMSpec.parse @spec[:contents]
+        pspec = Polisher::RPM::Spec.parse @spec[:contents]
         pspec.release.should == @spec[:release]
       end
 
       it "parses requires from spec" do
-        pspec = Polisher::RPMSpec.parse @spec[:contents]
+        pspec = Polisher::RPM::Spec.parse @spec[:contents]
         pspec.requires.should == @spec[:requires]
       end
 
       it "parses build requires from spec" do
-        pspec = Polisher::RPMSpec.parse @spec[:contents]
+        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::RPMSpec.parse @spec[:contents]
+        pspec = Polisher::RPM::Spec.parse @spec[:contents]
         pspec.files.should == @spec[:files]
       end
 
       it "parses %check from spec" do
-        pspec = Polisher::RPMSpec.parse @spec[:contents]
+        pspec = Polisher::RPM::Spec.parse @spec[:contents]
         pspec.has_check?.should be_true
 
-        pspec = Polisher::RPMSpec.parse ""
+        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::RPMSpec.new :requires => [Polisher::RPMSpec::Requirement.parse('rubygem(rake)'),
-                                                   Polisher::RPMSpec::Requirement.parse('rubygem(activerecord)')],
+        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')],
@@ -459,15 +459,15 @@ module Polisher
 
         spec.should_receive(:update_files_from) # stub out files update
         spec.update_to(gem)
-          spec.requires.should == [Polisher::RPMSpec::Requirement.parse('rubygem(activerecord)'),
-                                   Polisher::RPMSpec::Requirement.parse('rubygem(rake) >= 0'),
-                                   Polisher::RPMSpec::Requirement.parse('rubygem(rails) => 10'),
-                                   Polisher::RPMSpec::Requirement.parse('rubygem(rails) < 11')]
-        spec.build_requires.should == [Polisher::RPMSpec::Requirement.parse('rubygem(rspec) >= 0', :br => true)]
+          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::RPMSpec.new :files => {'pkg' => ['/foo']}
+        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'])
@@ -476,7 +476,7 @@ module Polisher
       end
 
       it "updates metadata from gem" do
-        spec = Polisher::RPMSpec.new
+        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)
@@ -493,8 +493,8 @@ module Polisher
 
     describe "#compare" do
       it "returns requirements in spec but not in gem" do
-        req  = Polisher::RPMSpec::Requirement.parse 'rubygem(rails) > 3.0.0'
-        spec = Polisher::RPMSpec.new :requires => [req]
+        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 ==
@@ -504,7 +504,7 @@ module Polisher
 
       it "returns requirements in gem but not in spec" do
         req = ::Gem::Dependency.new('rails', '> 3.0.0')
-        spec = Polisher::RPMSpec.new
+        spec = Polisher::RPM::Spec.new
         gem  = Polisher::Gem.new :deps => [req]
 
         spec.compare(gem).should ==
@@ -516,8 +516,8 @@ module Polisher
         greq = ::Gem::Dependency.new('rails', '< 5.0.0')
         gem  = Polisher::Gem.new :deps => [greq]
 
-        sreq = Polisher::RPMSpec::Requirement.parse 'rubygem(rails) > 3.0.0'
-        spec = Polisher::RPMSpec.new :requires => [sreq]
+        sreq = Polisher::RPM::Requirement.parse 'rubygem(rails) > 3.0.0'
+        spec = Polisher::RPM::Spec.new :requires => [sreq]
 
         spec.compare(gem).should ==
           {:same => {}, :diff => {'rails' =>
@@ -528,13 +528,13 @@ module Polisher
         greq = ::Gem::Dependency.new('rails', '< 3.0.0')
         gem  = Polisher::Gem.new :deps => [greq]
 
-        sreq = Polisher::RPMSpec::Requirement.parse 'rubygem(rails) < 3.0.0'
-        spec = Polisher::RPMSpec.new :requires => [sreq]
+        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 RPMSpec
+  end # describe RPM::Spec
 end # module Polisher