polisher 0.7.1 → 0.8.1

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@
 
 SPEC_DIR = File.expand_path File.dirname(__FILE__)
 
-require 'polisher/rpmspec'
+require 'polisher/rpm/spec'
 require 'polisher/gem_cache'
 
 RSpec.configure do |config|
@@ -67,34 +67,34 @@ module Polisher
       :name     => "activesupport",
       :version  => "4.0.0",
       :release  => "1%{?dist}",
-      :requires => [Polisher::RPMSpec::Requirement.parse("ruby(rubygems)"),
-                    Polisher::RPMSpec::Requirement.parse("ruby(release)"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(bigdecimal)"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(dalli)"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(i18n) >= 0.6"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(i18n) < 1.0"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(minitest) >= 4.2"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(minitest) < 5"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(multi_json) >= 1.0"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(multi_json) < 2"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(rack)"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(thread_safe)"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(tzinfo) >= 0.3.37"),
-                    Polisher::RPMSpec::Requirement.parse("rubygem(tzinfo) < 0.4.0")],
-      :build_requires => [Polisher::RPMSpec::Requirement.parse("rubygems-devel"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(bigdecimal)"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(builder)"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(dalli)"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(i18n) >= 0.6"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(i18n) < 1.0"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(minitest)"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(mocha)"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(multi_json) >= 1.0"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(multi_json) < 2"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(rack)"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(thread_safe)"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(tzinfo) >= 0.3.37"),
-                          Polisher::RPMSpec::Requirement.parse("rubygem(tzinfo) < 0.4.0")],
+      :requires => [Polisher::RPM::Requirement.parse("ruby(rubygems)"),
+                    Polisher::RPM::Requirement.parse("ruby(release)"),
+                    Polisher::RPM::Requirement.parse("rubygem(bigdecimal)"),
+                    Polisher::RPM::Requirement.parse("rubygem(dalli)"),
+                    Polisher::RPM::Requirement.parse("rubygem(i18n) >= 0.6"),
+                    Polisher::RPM::Requirement.parse("rubygem(i18n) < 1.0"),
+                    Polisher::RPM::Requirement.parse("rubygem(minitest) >= 4.2"),
+                    Polisher::RPM::Requirement.parse("rubygem(minitest) < 5"),
+                    Polisher::RPM::Requirement.parse("rubygem(multi_json) >= 1.0"),
+                    Polisher::RPM::Requirement.parse("rubygem(multi_json) < 2"),
+                    Polisher::RPM::Requirement.parse("rubygem(rack)"),
+                    Polisher::RPM::Requirement.parse("rubygem(thread_safe)"),
+                    Polisher::RPM::Requirement.parse("rubygem(tzinfo) >= 0.3.37"),
+                    Polisher::RPM::Requirement.parse("rubygem(tzinfo) < 0.4.0")],
+      :build_requires => [Polisher::RPM::Requirement.parse("rubygems-devel"),
+                          Polisher::RPM::Requirement.parse("rubygem(bigdecimal)"),
+                          Polisher::RPM::Requirement.parse("rubygem(builder)"),
+                          Polisher::RPM::Requirement.parse("rubygem(dalli)"),
+                          Polisher::RPM::Requirement.parse("rubygem(i18n) >= 0.6"),
+                          Polisher::RPM::Requirement.parse("rubygem(i18n) < 1.0"),
+                          Polisher::RPM::Requirement.parse("rubygem(minitest)"),
+                          Polisher::RPM::Requirement.parse("rubygem(mocha)"),
+                          Polisher::RPM::Requirement.parse("rubygem(multi_json) >= 1.0"),
+                          Polisher::RPM::Requirement.parse("rubygem(multi_json) < 2"),
+                          Polisher::RPM::Requirement.parse("rubygem(rack)"),
+                          Polisher::RPM::Requirement.parse("rubygem(thread_safe)"),
+                          Polisher::RPM::Requirement.parse("rubygem(tzinfo) >= 0.3.37"),
+                          Polisher::RPM::Requirement.parse("rubygem(tzinfo) < 0.4.0")],
       :changelog => "",
       :files     => {"activesupport"=>["%{gem_instdir}", "CHANGELOG.md", "lib", "MIT-LICENSE", "README.rdoc", "%{gem_docdir}", "%{gem_cache}", "%{gem_spec}", "test"]}
     }

data/spec/vendor_spec.rb

@@ -0,0 +1,41 @@
+# Polisher Vendor Specs
+#
+# Licensed under the MIT license
+# Copyright (C) 2014 Red Hat, Inc.
+
+require 'spec_helper'
+
+require 'polisher/vendor'
+
+module Polisher
+  describe HasVendoredDeps do
+    before(:each) do
+      @obj = Object.new
+      @obj.extend(HasVendoredDeps)
+    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
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polisher
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.1
 platform: ruby
 authors:
 - Jason Frey
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -192,16 +192,20 @@ files:
 - lib/polisher/errata.rb
 - lib/polisher/git_cache.rb
 - lib/polisher/gem.rb
+- lib/polisher/rpm/spec.rb
+- lib/polisher/rpm/patch.rb
+- lib/polisher/rpm/requirement.rb
 - lib/polisher/git.rb
+- lib/polisher/error.rb
 - lib/polisher/upstream.rb
 - lib/polisher/bugzilla.rb
 - lib/polisher/gemfile.rb
-- lib/polisher/formatter.rb
+- lib/polisher/git/project.rb
+- lib/polisher/git/pkg.rb
+- lib/polisher/git/repo.rb
 - lib/polisher/koji.rb
-- lib/polisher/rpmspec.rb
 - lib/polisher/gem_cache.rb
 - lib/polisher/rhn.rb
-- lib/polisher/gemspec.rb
 - lib/polisher/yum.rb
 - lib/polisher.rb
 - spec/git_spec.rb
@@ -214,6 +218,7 @@ files:
 - spec/yum_spec.rb
 - spec/upstream_spec.rb
 - spec/rpmspec_spec.rb
+- spec/vendor_spec.rb
 - spec/fedora_spec.rb
 - spec/core_spec.rb
 - spec/data/rails.json

data/lib/polisher/formatter.rb

@@ -1 +0,0 @@
-# TODO

data/lib/polisher/gemspec.rb

@@ -1,32 +0,0 @@
-# Polisher Gemspec Represenation
-#
-# Licensed under the MIT license
-# Copyright (C) 2013-2014 Red Hat, Inc.
-
-require 'polisher/version_checker'
-
-module Polisher
-  class Gemspec
-    include VersionedDependencies
-
-    attr_accessor :deps
-
-    def initialize(args={})
-      @deps     = args[:deps]
-    end
-
-    # Parse the specified gemspec & return new Gemspec instance from metadata
-    #
-    # @param [String] path to gemspec to parse
-    # @return [Polisher::Gemspec] gemspec instantiated from parsed metadata
-    def self.parse(path)
-      parser = Gemnasium::Parser.gemspec(File.read(path))
-      metadata = {:deps => [], :dev_deps => []}
-      parser.dependencies.each { |dep|
-        metadata[:deps] << dep.name
-      }
-
-      self.new metadata
-    end
-  end
-end

data/lib/polisher/rpmspec.rb

@@ -1,512 +0,0 @@
-# Polisher RPM Spec Represenation
-#
-# Licensed under the MIT license
-# Copyright (C) 2013-2014 Red Hat, Inc.
-
-require 'gem2rpm'
-require 'versionomy'
-require 'active_support/core_ext'
-
-require 'polisher/core'
-require 'polisher/gem'
-
-module Polisher
-  class RPMSpec
-    class Requirement
-      # Bool indiciating if req is a BR
-      attr_accessor :br
-
-      # Name of requirement
-      attr_accessor :name
-
-      # Condition, eg >=, =, etc
-      attr_accessor :condition
-
-      # Version number
-      attr_accessor :version
-
-      # Requirement string
-      def str
-        sp = self.specifier
-        sp.nil? ? "#{@name}" : "#{@name} #{sp}"
-      end
-
-      # Specified string
-      def specifier
-        @version.nil? ? nil : "#{@condition} #{@version}"
-      end
-
-      def self.parse(str, opts={})
-        stra   = str.split
-        br = str.include?('BuildRequires')
-        name = condition = version = nil
-
-        if str.include?('Requires')
-          name      = stra[1] 
-          condition = stra[2]
-          version   = stra[3]
-
-        else
-          name      = stra[0]
-          condition = stra[1]
-          version   = stra[2]
-
-        end
-
-        req = self.new({:name      => name,
-                        :condition => condition,
-                        :version   => version,
-                        :br        => br}.merge(opts))
-        req
-      end
-
-      def initialize(args={})
-        @br        = args[:br] || false
-        @name      = args[:name]
-        @condition = args[:condition]
-        @version   = args[:version]
-
-        @name.strip!      unless @name.nil?
-        @condition.strip! unless @condition.nil?
-        @version.strip!   unless @version.nil?
-      end
-
-      def ==(other)
-        @br        == other.br &&
-        @name      == other.name &&
-        @condition == other.condition &&
-        @version   == other.version
-      end
-
-      # Greatest Common Denominator,
-      # Max version in list that is less than the local version
-      def gcd(versions)
-        lversion = Versionomy.parse(self.version)
-        versions.collect { |v| Versionomy.parse(v) }.
-                 sort { |a,b| a <=> b }.reverse.
-                 find { |v| v < lversion }.to_s
-      end
-
-      # Minimum gem version which satisfies this dependency
-      def min_satisfying_version
-        return "0.0"        if self.version.nil?      ||
-                               self.condition == '<'  ||
-                               self.condition == '<='
-        return self.version if self.condition == '='  ||
-                               self.condition == '>='
-        Versionomy.parse(self.version).bump(:tiny).to_s # self.condition == '>'
-      end
-
-      # Max gem version which satisfies this dependency
-      #
-      # Can't automatically deduce in '<' case, so if that is the conditional
-      # we require a version list, and will return the gcd from it
-      def max_satisfying_version(versions=nil)
-        return Float::INFINITY if self.version.nil?      ||
-                                  self.condition == '>'  ||
-                                  self.condition == '>='
-        return self.version    if self.condition == '='  ||
-                                  self.condition == '<='
-
-        raise ArgumentError    if versions.nil?
-        self.gcd(versions)
-      end
-
-      # Minimum gem version for which this dependency fails
-      def min_failing_version
-        raise ArgumentError if self.version.nil?
-        return "0.0"        if self.condition == '>'  ||
-                               self.condition == '>='
-        return self.version if self.condition == '<'
-        Versionomy.parse(self.version).bump(:tiny).to_s # self.condition == '<=' and '='
-      end
-
-      # Max gem version for which this dependency fails
-      #
-      # Can't automatically deduce in '>=', and '=' cases, so if that is the
-      # conditional we require a version list, and will return the gcd from it
-      def max_failing_version(versions=nil)
-        raise ArgumentError if self.version.nil?      ||
-                               self.condition == '<=' ||
-                               self.condition == '<'
-        return self.version if self.condition == '>'
-
-        raise ArgumentError if versions.nil?
-        self.gcd(versions)
-      end
-
-      def matches?(dep)
-        return self == dep      if dep.is_a?(self.class)
-        raise ArgumentError unless dep.is_a?(::Gem::Dependency)
-
-        return false if !self.gem? || self.gem_name != dep.name
-        return true  if  self.version.nil?
-
-        Gem2Rpm::Helpers.expand_requirement([dep.requirement.to_s.split]).
-          any?{ |req|
-            req.first == self.condition && req.last.to_s == self.version
-          }
-      end
-
-      def gem?
-        !!(self.str =~ SPEC_GEM_REQ_MATCHER)
-      end
-
-      def gem_name
-        # XXX need to explicitly run regex here to get $1
-        !!(self.str =~ SPEC_GEM_REQ_MATCHER) ? $1 : nil
-      end
-    end
-
-    AUTHOR = "#{ENV['USER']} <#{ENV['USER']}@localhost.localdomain>"
-
-    COMMENT_MATCHER             = /^\s*#.*/
-    GEM_NAME_MATCHER            = /^%global\s*gem_name\s(.*)$/
-    SPEC_NAME_MATCHER           = /^Name:\s*rubygem-(.*)$/
-    SPEC_VERSION_MATCHER        = /^Version:\s*(.*)$/
-    SPEC_RELEASE_MATCHER        = /^Release:\s*(.*)$/
-    SPEC_REQUIRES_MATCHER       = /^Requires:\s*(.*)$/
-    SPEC_BUILD_REQUIRES_MATCHER = /^BuildRequires:\s*(.*)$/
-    SPEC_GEM_REQ_MATCHER        = /^.*\s*rubygem\((.*)\)(\s*(.*))?$/
-    SPEC_SUBPACKAGE_MATCHER     = /^%package\s(.*)$/
-    SPEC_CHANGELOG_MATCHER      = /^%changelog$/
-    SPEC_FILES_MATCHER          = /^%files$/
-    SPEC_SUBPKG_FILES_MATCHER   = /^%files\s*(.*)$/
-    SPEC_CHECK_MATCHER          = /^%check$/
-    
-    FILE_MACRO_MATCHERS         =
-      [/^%doc\s/,     /^%config\s/,  /^%attr\s/,
-       /^%verify\s/,  /^%docdir.*/,  /^%dir\s/,
-       /^%defattr.*/, /^%exclude\s/, /^%{gem_instdir}\/+/]
-    
-    FILE_MACRO_REPLACEMENTS =
-      {"%{_bindir}"    => 'bin',
-       "%{gem_libdir}" => 'lib'}
-
-    attr_accessor :metadata
-
-    # Return the currently configured author
-    def self.current_author
-      ENV['POLISHER_AUTHOR'] || AUTHOR
-    end
-
-    def initialize(metadata={})
-      @metadata = metadata
-    end
-
-    # Dispatch all missing methods to lookup calls in rpm spec metadata
-    def method_missing(method, *args, &block)
-      # proxy to metadata
-      if @metadata.has_key?(method)
-        @metadata[method]
-
-      else
-        super(method, *args, &block)
-      end
-    end
-
-    def has_check?
-      @metadata.has_key?(:has_check) && @metadata[:has_check]
-    end
-
-    # Return all the requirements for the specified gem
-    def requirements_for_gem(gem_name)
-      @metadata[:requires].nil? ? [] :
-      @metadata[:requires].select { |r| r.gem_name == gem_name }
-    end
-
-    # Return bool indicating if this spec specifies all the
-    # requirements in the specified gem dependency
-    def has_all_requirements_for?(gem_dep)
-      reqs = self.requirements_for_gem gem_dep.name
-      # create a spec requirement dependency for each expanded subrequirement,
-      # verify we can find a match for that
-      gem_dep.requirement.to_s.split(',').all? { |greq|
-        Gem2Rpm::Helpers.expand_requirement([greq.split]).all? { |ereq|
-          tereq = Requirement.new :name      => "rubygem(#{gem_dep.name})",
-                                  :condition => ereq.first,
-                                  :version   => ereq.last.to_s
-          reqs.any? { |req| req.matches?(tereq)}
-        }
-      }
-    end
-
-    # Parse the specified rpm spec and return new RPMSpec instance from metadata
-    #
-    # @param [String] string contents of spec to parse
-    # @return [Polisher::RPMSpec] spec instantiated from rpmspec metadata
-    def self.parse(spec)
-      in_subpackage = false
-      in_changelog  = false
-      in_files      = false
-      subpkg_name   = nil
-      meta = {:contents => spec}
-      spec.each_line { |l|
-        if l =~ COMMENT_MATCHER
-          ;
-    
-        # TODO support optional gem prefix
-        elsif l =~ GEM_NAME_MATCHER
-          meta[:gem_name] = $1.strip
-          meta[:gem_name] = $1.strip
-    
-        elsif l =~ SPEC_NAME_MATCHER &&
-              $1.strip != "%{gem_name}"
-          meta[:gem_name] = $1.strip
-    
-        elsif l =~ SPEC_VERSION_MATCHER
-          meta[:version] = $1.strip
-    
-        elsif l =~ SPEC_RELEASE_MATCHER
-          meta[:release] = $1.strip
-    
-        elsif l =~ SPEC_SUBPACKAGE_MATCHER
-          subpkg_name = $1.strip
-          in_subpackage = true
-    
-        elsif l =~ SPEC_REQUIRES_MATCHER &&
-              !in_subpackage
-          meta[:requires] ||= []
-          meta[:requires] << RPMSpec::Requirement.parse($1.strip)
-    
-        elsif l =~ SPEC_BUILD_REQUIRES_MATCHER &&
-              !in_subpackage
-          meta[:build_requires] ||= []
-          meta[:build_requires] << RPMSpec::Requirement.parse($1.strip)
-    
-        elsif l =~ SPEC_CHANGELOG_MATCHER
-          in_changelog = true
-    
-        elsif l =~ SPEC_FILES_MATCHER
-          subpkg_name = nil
-          in_files = true
-    
-        elsif l =~ SPEC_SUBPKG_FILES_MATCHER
-          subpkg_name = $1.strip
-          in_files = true
-
-        elsif l =~ SPEC_CHECK_MATCHER
-          meta[:has_check] = true
-    
-        elsif in_changelog
-          meta[:changelog] ||= ""
-          meta[:changelog] << l
-    
-        elsif in_files
-          tgt = subpkg_name.nil? ? meta[:gem_name] : subpkg_name
-          meta[:files] ||= {}
-          meta[:files][tgt] ||= []
-    
-          sl = l.strip.unrpmize
-          meta[:files][tgt] << sl unless sl.blank?
-        end
-      }
-    
-      meta[:changelog_entries] = meta[:changelog] ?
-                                 meta[:changelog].split("\n\n") : []
-      meta[:changelog_entries].collect! { |c| c.strip }.compact!
-
-      self.new meta
-    end
-
-    # Update RPMSpec metadata to new gem
-    #
-    # TODO add option to enable/disable certain aspects
-    # from being updates
-    #
-    # @param [Polisher::Gem] new_source new gem to update rpmspec to
-    def update_to(new_source)
-      update_deps_from(new_source)
-      update_files_from(new_source)
-      update_metadata_from(new_source)
-    end
-
-    private
-
-    def update_deps_from(new_source)
-      non_gem_requires    = []
-      non_gem_brequires   = []
-      extra_gem_requires  = []
-      extra_gem_brequires = []
-
-      @metadata[:requires] ||= []
-      @metadata[:requires].each { |r|
-        if !r.gem?
-          non_gem_requires << r
-        elsif !new_source.deps.any? { |d| d.name == r.gem_name }
-          extra_gem_requires << r
-        #else
-        #  spec_version = $2
-        end
-      }
-
-      @metadata[:build_requires] ||= []
-      @metadata[:build_requires].each { |r|
-        if !r.gem?
-          non_gem_brequires << r
-        elsif !new_source.deps.any? { |d| d.name == r.gem_name }
-          extra_gem_brequires << r
-        #else
-        #  spec_version = $2
-        end
-      }
-
-      # TODO detect if req is same as @version, swap out w/ %{version} macro ?
-
-      @metadata[:requires] =
-        non_gem_requires + extra_gem_requires +
-        new_source.deps.collect { |r|
-          r.requirement.to_s.split(',').collect { |req|
-            expanded = Gem2Rpm::Helpers.expand_requirement [req.split]
-            expanded.collect { |e|
-              RPMSpec::Requirement.new :name      => "rubygem(#{r.name})",
-                                       :condition => e.first.to_s,
-                                       :version   => e.last.to_s,
-                                       :br        => false
-            }
-          }
-        }.flatten
-
-      @metadata[:build_requires] =
-        non_gem_brequires + extra_gem_brequires +
-        new_source.dev_deps.collect { |r|
-          r.requirement.to_s.split(',').collect { |req|
-            expanded = Gem2Rpm::Helpers.expand_requirement [req.split]
-            expanded.collect { |e|
-              RPMSpec::Requirement.new :name      => "rubygem(#{r.name})",
-                                       :condition => e.first.to_s,
-                                       :version   => e.last.to_s,
-                                       :br        => true
-            }
-          }
-        }.flatten
-    end
-
-    def update_files_from(new_source)
-      to_add = new_source.file_paths
-      @metadata[:files] ||= {}
-      @metadata[:files].each { |pkg,spec_files|
-        (new_source.file_paths & to_add).each { |gem_file|
-          # skip files already included in spec or in dir in spec
-          has_file = spec_files.any? { |sf|
-                       gem_file.gsub(sf,'') != gem_file
-                     }
-
-          to_add.delete(gem_file)
-          to_add << gem_file.rpmize if !has_file &&
-                                       !Gem.ignorable_file?(gem_file)
-        }
-      }
-
-      @metadata[:new_files] = to_add
-    end
-
-    def update_metadata_from(new_source)
-      # update to new version
-      @metadata[:version] = new_source.version
-      @metadata[:release] = "1%{?dist}"
-
-      # add changelog entry
-      changelog_entry = <<EOS
-* #{Time.now.strftime("%a %b %d %Y")} #{RPMSpec.current_author} - #{@metadata[:version]}-1
-- Update to version #{new_source.version}
-EOS
-      @metadata[:changelog_entries] ||= []
-      @metadata[:changelog_entries].unshift changelog_entry.rstrip
-    end
-
-    public
-
-    # Return properly formatted rpmspec as string
-    # 
-    # @return [String] string representation of rpm spec
-    def to_string
-      contents = @metadata[:contents]
-
-      # replace version / release
-      contents.gsub!(SPEC_VERSION_MATCHER, "Version: #{@metadata[:version]}")
-      contents.gsub!(SPEC_RELEASE_MATCHER, "Release: #{@metadata[:release]}")
-
-      # add changelog entry
-      cp  = contents.index SPEC_CHANGELOG_MATCHER
-      cpn = contents.index "\n", cp
-      contents = contents[0...cpn+1] +
-                 @metadata[:changelog_entries].join("\n\n")
-
-      # update requires/build requires
-      rp   = contents.index SPEC_REQUIRES_MATCHER
-      brp  = contents.index SPEC_BUILD_REQUIRES_MATCHER
-      tp   = rp < brp ? rp : brp
-
-      pp   = contents.index SPEC_SUBPACKAGE_MATCHER
-      pp   = -1 if pp.nil?
-
-      lrp  = contents.rindex SPEC_REQUIRES_MATCHER, pp
-      lbrp = contents.rindex SPEC_BUILD_REQUIRES_MATCHER, pp
-      ltp  = lrp > lbrp ? lrp : lbrp
-
-      ltpn = contents.index "\n", ltp
-
-      contents.slice!(tp...ltpn)
-      contents.insert tp,
-        (@metadata[:requires].collect { |r| "Requires: #{r.str}" } +
-         @metadata[:build_requires].collect { |r| "BuildRequires: #{r.str}" }).join("\n")
-
-      # add new files
-       fp = contents.index SPEC_FILES_MATCHER
-      lfp = contents.index SPEC_SUBPKG_FILES_MATCHER, fp + 1
-      lfp = contents.index SPEC_CHANGELOG_MATCHER if lfp.nil?
-
-      contents.insert lfp - 1, @metadata[:new_files].join("\n") + "\n"
-
-      # return new contents
-      contents
-    end
-
-    def compare(upstream_source)
-      same = {}
-      diff = {}
-      upstream_source.deps.each do |d|
-        spec_reqs = self.requirements_for_gem(d.name)
-        spec_reqs_specifier = spec_reqs.empty? ? nil :
-             spec_reqs.collect { |req| req.specifier }
-
-        if spec_reqs.nil?
-          diff[d.name] = {:spec     => nil,
-                          :upstream => d.requirement.to_s}
-
-        elsif !spec_reqs.any? { |req| req.matches?(d) } ||
-              !self.has_all_requirements_for?(d)
-          diff[d.name] = {:spec     => spec_reqs_specifier,
-                          :upstream => d.requirement.to_s}
-
-        elsif !diff.has_key?(d.name)
-          same[d.name] = {:spec     => spec_reqs_specifier,
-                          :upstream => d.requirement.to_s }
-        end
-      end
-
-      @metadata[:requires].each do |req|
-        next unless req.gem?
-
-        upstream_dep = upstream_source.deps.find { |d| d.name == req.gem_name }
-
-        if upstream_dep.nil?
-          diff[req.gem_name] = {:spec     => req.specifier,
-                                :upstream => nil}
-
-        elsif !req.matches?(upstream_dep)
-          diff[req.gem_name] = {:spec     => req.specifier,
-                                :upstream => upstream_dep.requirement.to_s }
-
-        elsif !diff.has_key?(req.gem_name)
-          same[req.gem_name] = {:spec     => req.specifier,
-                                :upstream => upstream_dep.requirement.to_s }
-        end
-      end unless @metadata[:requires].nil?
-
-      {:same => same, :diff => diff}
-    end
-
-  end # class RPMSpec
-end # module Polisher