spec/spec_helper.rb in polisher-0.7.1 vs spec/spec_helper.rb in polisher-0.8.1

@@ -3,11 +3,11 @@
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
 SPEC_DIR = File.expand_path File.dirname(__FILE__)
 
-require 'polisher/rpmspec'
+require 'polisher/rpm/spec'
 require 'polisher/gem_cache'
 
 RSpec.configure do |config|
   config.after do
     Polisher::GemCache.clear!
@@ -65,37 +65,37 @@
       :path     => "#{SPEC_DIR}/data/rubygem-activesupport.spec",
       :contents => File.read("#{SPEC_DIR}/data/rubygem-activesupport.spec"),
       :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"]}
     }
   end # module Test
 end # module Polisher