polisher 0.10.2 → 0.11.1

data/lib/polisher/{vendor.rb → mixins/vendored_deps.rb}

@@ -4,21 +4,18 @@
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
 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/') }
+      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_paths.inject({}) do |v, fp|
         vendored_file = fp.split('/')
         vendor_index  = vendored_file.index('vendor')
 
@@ -27,8 +24,8 @@ module Polisher
 
         vname = vendored_file[vendor_index + 1]
         vversion = nil
-        # TODO set vversion from version.rb:
-        #vf.last.downcase == 'version.rb'
+        # TODO: set vversion from version.rb:
+        # vf.last.downcase == 'version.rb'
         v[vname] = vversion
         v
       end

data/lib/polisher/mixins/versioned_dependencies.rb

@@ -0,0 +1,86 @@
+# VersionedDependencies Mixin
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+module Polisher
+  # Mixin included in components that contain lists of dependencies
+  # which include version information
+  #
+  # Requires module define 'deps' method which returns list
+  # of gem names representing component dependencies. List
+  # will be iterated over, versions will be looked up
+  # recursively and returned
+  module VersionedDependencies
+    # Return specified dependency
+    def dependency_for(name)
+      deps.detect { |dep| dep.name == name }
+    end
+
+    # Return list of versions of dependencies of component.
+    def dependency_versions(args = {}, &bl)
+      versions = {}
+      args = {:recursive => true, :dev_deps  => true, :versions => versions}.merge(args)
+      deps.each do |dep|
+        gem = Polisher::Gem.retrieve(dep.name)
+        versions.merge!(gem.versions(args, &bl))
+      end
+      versions
+    end
+
+    # Return mapping of gems to dependency versions
+    def dependency_tree(args = {}, &bl)
+      dependencies = {}
+      args = {:recursive    => true,
+              :dev_deps     => true,
+              :matching     => :latest,
+              :dependencies => dependencies}.merge(args)
+
+      process = []
+      deps.each do |dep|
+        resolved = nil
+        begin
+          resolved = Polisher::Gem.matching(dep, args[:matching])
+        rescue
+        end
+        yield self, dep, resolved
+        process << resolved unless resolved.nil?
+      end
+
+      process.each { |dep|
+        dependencies.merge!(dep.dependency_tree(args, &bl))
+      }
+
+      dependencies
+    end
+
+    # Return missing dependencies
+    def missing_dependencies
+      missing = []
+      dependency_versions(:recursive => false).each do |pkg, target_versions|
+        found = false
+        target_versions.each do |_target, versions|
+          dependency = dependency_for(pkg)
+          found = versions.any? { |version| dependency.match?(pkg, version) }
+        end
+        missing << pkg unless found
+      end
+      missing
+    end
+
+    # Return bool indicating if all dependencies are satisfied
+    def dependencies_satisfied?
+      missing_dependencies.empty?
+    end
+
+    # Return list of states which gem dependencies are in
+    def dependency_states
+      states = {}
+      deps.each do |dep|
+        gem = Polisher::Gem.new :name => dep.name
+        states.merge dep.name => gem.state(:check => dep)
+      end
+      states
+    end
+  end
+end

data/lib/polisher/record.rb

@@ -0,0 +1,2 @@
+# TODO use vcr / camcorder to record all requests & playback when needed
+# (to optimize testing, development, w/ large data sets etc)

data/lib/polisher/rpm.rb

@@ -0,0 +1,23 @@
+# RPM Module
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+require 'polisher/rpm/spec'
+
+module Polisher
+  module RPM
+    # Use rpmdev-packager if it's available
+    def self.packager
+      require 'awesome_spawn'
+
+      @packager ||= AwesomeSpawn.run('/usr/bin/rpmdev-packager').output.chop
+    rescue AwesomeSpawn::NoSuchFileError
+    end
+
+    # Return the currently configured author
+    def self.current_author
+      ENV['POLISHER_AUTHOR'] || packager || Spec::AUTHOR
+    end
+  end # module RPM
+end # module Polisher

data/lib/polisher/rpm/patch.rb

@@ -9,35 +9,37 @@ module Polisher
       attr_accessor :title
       attr_accessor :content
 
-      def initialize(args={})
+      def initialize(args = {})
         @title   = args[:title]
         @content = args[:content]
       end
 
-      def spec_line(n=0)
+      def spec_line(n = 0)
         "Patch#{n}: #{title}"
       end
 
       def self.from(diff)
-        return diff.collect { |d| self.from(d) } if diff.is_a?(Array)
+        return diff.collect { |d| from(d) } if diff.is_a?(Array)
 
         result = {}
 
+
         in_diff = nil
+        diff_lines = ''
         diff.each_line do |line|
           if line =~ /diff -r ([^\s]+)+ ([^\s]+)+$/
-            result[in_diff] = diff if in_diff
+            result[in_diff] = diff_lines if in_diff
             in_diff = $1.gsub(/a\//, '')
-            diff    = ''
+            diff_lines    = ''
           elsif line =~ /Only in.*$/
-            in_diff = nil
 
           else
-             diff += line
+            diff_lines += line
           end
         end
+        result[in_diff] = diff_lines if in_diff
 
-        result.collect { |t,c| self.new :title => t, :content => c }
+        result.collect { |t, c| new :title => t, :content => c }
       end
     end
   end

data/lib/polisher/rpm/requirement.rb

@@ -1,197 +1,41 @@
-# Polisher RPM Requirement Represenation
+# Polisher RPM Requirement
 #
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
-require 'polisher/gem'
-require 'polisher/core'
-require 'polisher/component'
+require 'polisher/util/conf_helpers'
 
-module Polisher
-  deps = ['gem2rpm', 'versionomy', 'active_support/core_ext']
-  Component.verify("RPM::Requirement", *deps) do
-    module RPM
-      class Requirement
-        include ConfHelpers
-
-        conf_attr :rubygem_prefix, 'rubygem'
-        conf_attr :scl_prefix, '' # set to %{?scl_prefix} to enable scl's
-
-        def self.prefix
-          "#{scl_prefix}#{rubygem_prefix}"
-        end
-
-        # 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
-
-        # Instantiate / return new rpm spec requirements from string
-        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
-
-        # Instantiate / return new rpm spec requirements from gem dependency.
-        #
-        # Because a gem dependency may result in multiple spec requirements
-        # this will always return an array of Requirement instances
-        def self.from_gem_dep(gem_dep, br=false)
-          gem_dep.requirement.to_s.split(',').collect { |req|
-            expanded = Gem2Rpm::Helpers.expand_requirement [req.split]
-            expanded.collect { |e|
-              new :name      => "#{prefix}(#{gem_dep.name})",
-                  :condition => e.first.to_s,
-                  :version   => e.last.to_s,
-                  :br        => br
-            }
-          }.flatten
-        end
+require 'polisher/rpm/requirement/attributes'
+require 'polisher/rpm/requirement/parser'
+require 'polisher/rpm/requirement/comparison'
 
-        def initialize(args={})
-          @br        = args[:br] || false
-          @name      = args[:name]
-          @condition = args[:condition]
-          @version   = args[:version]
+require 'polisher/rpm/requirement/gem_reference'
 
-          @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
-
-        # Return bool indicating if requirement matches specified
-        # depedency.
-        #
-        # Comparison mechanism will depend on type of class
-        # passed to this. Valid types include
-        # - Polisher::RPM::Requirements
-        # - ::Gem::Dependency
-        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
-
-        # Whether or not this requirement specified a ruby gem dependency
-        def gem?
-          !!(self.str =~ RPM::Spec::SPEC_GEM_REQ_MATCHER)
-        end
-
-        # Return the name of the gem which this requirement is for.
-        # Returns nil if this is not a gem requirement
-        def gem_name
-          # XXX need to explicitly run regex here to get $1
-          !!(self.str =~ RPM::Spec::SPEC_GEM_REQ_MATCHER) ? $1 : nil
-        end
-      end # class Requirement
-    end # module RPM
-  end # Component.verify("RPM::Requirement")
+module Polisher
+  module RPM
+    class Requirement
+      include ConfHelpers
+
+      include RequirementAttributes
+      include RequirementParser
+      include RequirementComparison
+
+      # TODO: make this mixin optional depending on if requirement corresponds to gem
+      include RequirementGemReference
+
+      conf_attr :rubygem_prefix, 'rubygem'
+      conf_attr :scl_prefix, '' # set to %{?scl_prefix} to enable scl's
+
+      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
+    end # class Requirement
+  end # module RPM
 end # module Polisher

data/lib/polisher/rpm/requirement/attributes.rb

@@ -0,0 +1,43 @@
+# Polisher RPM Requirement Attributes Mixin
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+module Polisher
+  module RPM
+    module RequirementAttributes
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def prefix
+          "#{scl_prefix}#{rubygem_prefix}"
+        end
+      end
+
+      # 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 = specifier
+        sp.nil? ? "#{@name}" : "#{@name} #{sp}"
+      end
+
+      # Specified string
+      def specifier
+        @version.nil? ? nil : "#{@condition} #{@version}"
+      end
+    end # module RequirementAttributes
+  end # module RPM
+end # module Polisher