Merge 5bdf8ab into 8c19023

lib/polisher/rpm/condition.rb

@@ -0,0 +1,17 @@
+# Polisher RPM Conditon (%if / %endif block
+#
+# Licensed under the MIT license
+# Copyright (C) 2016 Red Hat, Inc.
+
+module Polisher
+  module RPM
+    class Condition
+      attr_accessor :str, :parent
+
+      def initialize(args = {})
+        @str    = args[:str]
+        @parent = args[:parent]
+      end
+    end
+  end # module RPM
+end # module Polisher

lib/polisher/rpm/requirement.rb

@@ -32,6 +32,8 @@ def initialize(args = {})
         @condition = args[:condition]
         @version   = args[:version]
 
+        @spec_condition = args[:spec_condition]
+
         @name.strip!      unless @name.nil?
         @condition.strip! unless @condition.nil?
         @version.strip!   unless @version.nil?

lib/polisher/rpm/spec.rb

@@ -5,6 +5,7 @@
 
 require "active_support/core_ext/hash/except"
 
+require 'polisher/rpm/spec/conditions'
 require 'polisher/rpm/spec/requirements'
 require 'polisher/rpm/spec/files'
 require 'polisher/rpm/spec/subpackages'
@@ -21,6 +22,7 @@
 module Polisher
   module RPM
     class Spec
+      include SpecConditions
       include SpecRequirements
       include SpecFiles
       include SpecSubpackages
@@ -53,6 +55,8 @@ class Spec
       SPEC_GEM_REQ_MATCHER        = /^.*\s*#{requirement_prefix}\((.*)\)(\s*(.*))?$/
       SPEC_SUBPACKAGE_MATCHER     = /^%package\s(.*)$/
       SPEC_DOC_SUBPACKAGE_MATCHER = /^%package\sdoc$/
+      SPEC_CONDITION_MATCHER      = /^%if(.*)$/
+      SPEC_CONDITION_END_MATCHER  = /^%endif(.*)$/
       SPEC_CHANGELOG_MATCHER      = /^%changelog$/
       SPEC_FILES_MATCHER          = /^%files$/
       SPEC_SUBPKG_FILES_MATCHER   = /^%files\s*(.*)$/

lib/polisher/rpm/spec/conditions.rb

@@ -0,0 +1,19 @@
+# RPM Spec Conditions Mixin
+#
+# Licensed under the MIT license
+# Copyright (C) 2016 Red Hat, Inc.
+
+require 'polisher/rpm/condition'
+
+module Polisher
+  module RPM
+    module SpecConditions
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+      end
+    end # module SpecConditions
+  end # module RPM
+end # module Polisher

lib/polisher/rpm/spec/parser.rb

@@ -15,6 +15,7 @@ def self.included(base)
       module ClassMethods
         def default_metadata
           {:contents          => "",
+           :conditions        => [],
            :requires          => [],
            :build_requires    => [],
            :pkg_excludes      => {},
@@ -35,6 +36,7 @@ def parse(spec)
           subpkg_name   = nil
           meta          = default_metadata.merge(:contents => spec)
           macros        = {}
+          condition_stack = []
           spec.each_line do |l|
             if l =~ RPM::Spec::COMMENT_MATCHER
 
@@ -62,11 +64,23 @@ def parse(spec)
               subpkg_name = $1.strip
               in_subpackage = true
 
+            elsif l =~ RPM::Spec::SPEC_CONDITION_MATCHER
+              condition_string = $1.strip
+              parent = condition_stack.empty? ? nil : condition_stack.first
+              condition = Condition.new(:str    => condition_string,
+                                        :parent => parent)
+              meta[:conditions] << condition if condition_stack.empty?
+              condition_stack.unshift condition
+
+
+            elsif l =~ RPM::Spec::SPEC_CONDITION_END_MATCHER
+              condition_stack.shift
+
             elsif l =~ RPM::Spec::SPEC_REQUIRES_MATCHER && !in_subpackage
-              meta[:requires] << RPM::Requirement.parse($1.strip)
+              meta[:requires] << RPM::Requirement.parse($1.strip, :spec_condition => condition_stack.first)
 
             elsif l =~ RPM::Spec::SPEC_BUILD_REQUIRES_MATCHER && !in_subpackage
-              meta[:build_requires] << RPM::Requirement.parse($1.strip)
+              meta[:build_requires] << RPM::Requirement.parse($1.strip, :spec_condition => condition_stack.first)
 
             elsif l =~ RPM::Spec::SPEC_CHANGELOG_MATCHER
               in_changelog = true

lib/polisher/rpm/spec/requirements.rb

@@ -1,7 +1,7 @@
-# RPM Has Requirements Mixin
+# RPM RPM Spec Requirements Mixin
 #
 # Licensed under the MIT license
-# Copyright (C) 2013-2014 Red Hat, Inc.
+# Copyright (C) 2013-2016 Red Hat, Inc.
 
 require 'polisher/rpm/requirement'