polisher 0.10.2 → 0.11.1

data/spec/rpm/spec_spec.rb

@@ -3,8 +3,6 @@
 # Licensed under the MIT license
 # Copyright (C) 2014 Red Hat, Inc.
 
-require 'spec_helper'
-
 require 'polisher/rpm/spec'
 require 'polisher/gem'
 
@@ -13,195 +11,50 @@ module Polisher::RPM
     describe "#initialize" do
       it "sets gem metadata" do
         spec = described_class.new :version => '1.0.0'
-        spec.metadata.should == {:version => '1.0.0'}
+        spec.metadata.should == described_class.default_metadata.merge(:version => '1.0.0')
       end
     end
-  
+
     describe "#method_missing" do
       it "proxies lookup to metadata" do
         spec = described_class.new :version => '1.0.0'
         spec.version.should == '1.0.0'
       end
-    end
-  
-    describe "#has_check?" do
-      context "package spec has %check section" do
-        it "returns true" do
-          spec = described_class.new :has_check => true
-          spec.has_check?.should be_true
-        end
-      end
-  
-      context "package spec does not have a %check section" do
-        it "returns false" do
+
+      context "metadata key not set" do
+        it "returns nil" do
           spec = described_class.new
-          spec.has_check?.should be_false
+          spec.version.should be_nil
         end
       end
-    end
-  
-  
-    describe "#requirements_for_gem" do
-      it "returns requirements for specified gem name" do
-        spec = described_class.new :requires =>
-          [Requirement.new(:name => 'rubygem(rake)')]
-        spec.requirements_for_gem('rake').should == [spec.requires.first]
+
+      it "sets metadata" do
+        spec = described_class.new
+        spec.version = '1.0'
+        spec.version.should == '1.0'
+        spec.metadata[:version].should == '1.0'
       end
-  
-      context "spec has no requirement with specified name" do
-        it "returns empty array" do
-          spec = described_class.new
-          spec.requirements_for_gem('rake').should be_empty
+
+      context "method not a metadata key" do
+        it "dispatches to super" do
+          lambda{
+            described_class.new.foo
+          }.should raise_error
         end
       end
     end
-  
-    describe "#parse" do
-      before(:each) do
-        @spec  = Polisher::Test::RPM_SPEC
-      end
-  
-      it "returns new rpmspec instance" do
-        pspec = described_class.parse @spec[:contents]
-        pspec.should be_an_instance_of(described_class)
-      end
-  
-      it "parses contents from spec" do
-        pspec = described_class.parse @spec[:contents]
-        pspec.contents.should == @spec[:contents]
-      end
-  
-      it "parses name from spec" do
-        pspec = described_class.parse @spec[:contents]
-        pspec.gem_name.should == @spec[:name]
-      end
-  
-      it "parses version from spec" do
-        pspec = described_class.parse @spec[:contents]
-        pspec.version.should == @spec[:version]
-      end
-  
-      it "parses release from spec" do
-        pspec = described_class.parse @spec[:contents]
-        pspec.release.should == @spec[:release]
-      end
-  
-      it "parses requires from spec" do
-        pspec = described_class.parse @spec[:contents]
-        pspec.requires.should == @spec[:requires]
-      end
-  
-      it "parses build requires from spec" do
-        pspec = described_class.parse @spec[:contents]
-        pspec.build_requires.should == @spec[:build_requires]
-      end
-  
-      it "parses changelog from spec"
-  
-      it "parses unrpmized files from spec" do
-        pspec = described_class.parse @spec[:contents]
-        pspec.files.should == @spec[:files]
-      end
-  
-      it "parses %check from spec" do
-        pspec = described_class.parse @spec[:contents]
-        pspec.has_check?.should be_true
-  
-        pspec = described_class.parse ""
-        pspec.has_check?.should be_false
-      end
-    end
-  
-    describe "#update_to" do
-      it "updates dependencies from gem" do
-        spec = described_class.new :requires => [Requirement.parse('rubygem(rake)'),
-                                                 Requirement.parse('rubygem(activerecord)')],
-                                   :build_requires => []
-        gem  = Polisher::Gem.new :deps => [::Gem::Dependency.new('rake'),
-                                           ::Gem::Dependency.new('rails', '~> 10')],
-                                 :dev_deps => [::Gem::Dependency.new('rspec', :development)]
-  
-        # stub out a few methods
-        spec.should_receive(:excluded_deps).at_least(:once).and_return([])
-        spec.should_receive(:excluded_dev_deps).at_least(:once).and_return([])
-        spec.should_receive(:update_files_from)
 
-        spec.update_to(gem)
-          spec.requires.should == [Requirement.parse('rubygem(activerecord)'),
-                                   Requirement.parse('rubygem(rake) >= 0'),
-                                   Requirement.parse('rubygem(rails) => 10'),
-                                   Requirement.parse('rubygem(rails) < 11')]
-        spec.build_requires.should == [Requirement.parse('rubygem(rspec) >= 0', :br => true)]
-      end
-  
-      it "adds new files from gem" do
-        spec = described_class.new :files => {'pkg' => ['/foo']}
-        gem  = Polisher::Gem.new
-        gem.should_receive(:file_paths).at_least(:once).
-            and_return(['/foo', '/foo/bar', '/baz'])
-        spec.update_to(gem)
-        spec.new_files.should == ['%{gem_instdir}//baz']
-      end
-  
-      it "updates metadata from gem" do
-        spec = described_class.new
-        gem  = Polisher::Gem.new :version => '1.0.0'
-        spec.should_receive(:update_files_from) # stub out files update
-        spec.update_to(gem)
-        spec.version.should == '1.0.0'
-        spec.release.should == '1%{?dist}'
-      end
-  
-      it "adds changelog entry"
-    end
-  
     describe "#to_string" do
-      it "returns string representation of spec"
-    end
-  
-    describe "#compare" do
-      it "returns requirements in spec but not in gem" do
-        req  = Requirement.parse 'rubygem(rails) > 3.0.0'
-        spec = described_class.new :requires => [req]
-        gem  = Polisher::Gem.new
-  
-        spec.compare(gem).should ==
-          {:same => {}, :diff => {'rails' =>
-                  {:spec => '> 3.0.0', :upstream => nil}}}
-      end
-  
-      it "returns requirements in gem but not in spec" do
-        req = ::Gem::Dependency.new('rails', '> 3.0.0')
-        spec = described_class.new
-        gem  = Polisher::Gem.new :deps => [req]
-  
-        spec.compare(gem).should ==
-          {:same => {}, :diff => {'rails' =>
-                  {:spec => nil, :upstream => '> 3.0.0'}}}
-      end
-  
-      it "returns shared requirements with different specifiers" do
-        greq = ::Gem::Dependency.new('rails', '< 5.0.0')
-        gem  = Polisher::Gem.new :deps => [greq]
-  
-        sreq = Requirement.parse 'rubygem(rails) > 3.0.0'
-        spec = described_class.new :requires => [sreq]
-  
-        spec.compare(gem).should ==
-          {:same => {}, :diff => {'rails' =>
-                  {:spec => '> 3.0.0', :upstream => '< 5.0.0'}}}
+      it "returns string representation of spec" do
+        spec = described_class.new :contents => 'contents'
+        spec.to_string.should == "contents"
       end
-  
-      it "returns shared requirements" do
-        greq = ::Gem::Dependency.new('rails', '< 3.0.0')
-        gem  = Polisher::Gem.new :deps => [greq]
-  
-        sreq = Requirement.parse 'rubygem(rails) < 3.0.0'
-        spec = described_class.new :requires => [sreq]
-  
-        spec.compare(gem).should ==
-          {:diff => {}, :same => {'rails' =>
-                  {:spec => '< 3.0.0', :upstream => '< 3.0.0'}}}
+    end
+
+    describe "#length" do
+      it "returns the length of spec contents" do
+        spec = described_class.new :contents => 'contents'
+        spec.length.should == 8
       end
     end
   end # describe Spec

data/spec/spec_helper.rb

@@ -3,113 +3,13 @@
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
-SPEC_DIR = File.expand_path File.dirname(__FILE__)
-
-begin
-  require 'coveralls'
-  Coveralls.wear!
-rescue LoadError
-end
-
-require 'polisher/rpm/spec'
-require 'polisher/gem_cache'
-
-RSpec.configure do |config|
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-
-  config.after do
-    Polisher::GemCache.clear!
-  end
-end
-
 module Polisher
   module Test
-    GEM_SPEC = {
-      :path     => "#{SPEC_DIR}/data/mysql-2.9.1.gemspec",
-      :name     => 'mysql',
-      :version  => '2.9.1',
-      :deps     => [],
-      :dev_deps => [::Gem::Dependency.new('rdoc', '~> 3.10', :development),
-                    ::Gem::Dependency.new('rake-compiler', '~> 0.8.1', :development),
-                    ::Gem::Dependency.new('hoe', '~> 3.5', :development)]
-    }
-
-    GEM_JSON = {
-      :url      => "https://rubygems.org/api/v1/gems/rails.json",
-      :json     => File.read("#{SPEC_DIR}/data/rails.json"),
-      :name     => 'rails',
-      :version  => '4.0.1',
-      :deps     => [::Gem::Dependency.new("actionmailer", '= 4.0.1'),
-                    ::Gem::Dependency.new("actionpack", '= 4.0.1'),
-                    ::Gem::Dependency.new("activerecord", '= 4.0.1'),
-                    ::Gem::Dependency.new("activesupport", '= 4.0.1'),
-                    ::Gem::Dependency.new("bundler", "< 2.0", ">= 1.3.0"),
-                    ::Gem::Dependency.new("railties", '= 4.0.1'),
-                    ::Gem::Dependency.new("sprockets-rails", '~> 2.0.0')],
-      :dev_deps => []
-    }
-
-    LOCAL_GEM = {
-      :json_url =>  "https://rubygems.org/api/v1/gems/rspec.json",
-      :json     => File.read("#{SPEC_DIR}/data/rspec.json"),
-      :url      => "https://rubygems.org/gems/rspec-2.12.0.gem",
-      :contents => File.read("#{SPEC_DIR}/data/rspec-2.12.0.gem"),
-      :name     => 'rspec',
-      :version  => '2.14.1',
-      :deps     => [::Gem::Dependency.new('rspec-core', '~> 2.14.0'),
-                    ::Gem::Dependency.new('rspec-expectations', '~> 2.14.0'),
-                    ::Gem::Dependency.new('rspec-mocks', '~> 2.14.0')],
-      :dev_deps => [],
-      :files    => ['License.txt', 'README.md', 'lib', 'lib/rspec', 'lib/rspec/version.rb', 'lib/rspec.rb']
-    }
-
-    GEMFILE = {
-      :path     => "#{SPEC_DIR}/data/Gemfile",
-      :contents => File.read("#{SPEC_DIR}/data/Gemfile"),
-      :deps     => [::Gem::Dependency.new("rubygems", ::Gem::Requirement.new([">= 0"]), :runtime),
-                    ::Gem::Dependency.new("cinch", ::Gem::Requirement.new([">= 0"]), :runtime)]
-    }
+  end
+end
 
-    RPM_SPEC = {
-      :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::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
+require 'support/paths'
+require 'support/rspec'
+require 'support/vcr'
+require 'support/coveralls'
+require 'support/fixtures'

data/spec/support/coveralls.rb

@@ -0,0 +1,10 @@
+# Polisher Spec Coveralls Integration
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+begin
+  require 'coveralls'
+  Coveralls.wear!
+rescue LoadError
+end

data/spec/support/fixtures.rb

@@ -0,0 +1,8 @@
+# Polisher Spec Fixtures
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+# TODO parameterize fixtures w/ defaults loaded from yaml
+
+Dir.glob("#{spec_dir}/fixtures/*.rb") { |mod| require mod }

data/spec/support/paths.rb

@@ -0,0 +1,20 @@
+# Polisher Spec Path Helpers
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+def spec_support_dir
+  @spec_support_dir ||= File.expand_path(File.dirname(__FILE__))
+end
+
+def spec_dir
+  @spec_dir ||= File.expand_path(File.join(spec_support_dir, '..'))
+end
+
+def lib_dir
+  @lib_dir ||= File.expand_path(File.join(spec_dir, '..'))
+end
+
+def data_dir
+  @data_dir ||= File.expand_path(File.join(spec_dir, 'data'))
+end

data/spec/support/rspec.rb

@@ -0,0 +1,20 @@
+# Polisher Spec RSpec Integration
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+require 'polisher/util/gem_cache'
+
+RSpec.configure do |config|
+  config.include Polisher::Test
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
+  config.after do
+    Polisher::GemCache.clear!
+  end
+end

data/spec/support/vcr.rb

@@ -0,0 +1,11 @@
+# Polisher Spec VCR Integration
+#
+# Licensed under the MIT license
+# Copyright (C) 2013-2014 Red Hat, Inc.
+
+require 'vcr'
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/vcr_cassettes'
+  c.hook_into :webmock
+  c.allow_http_connections_when_no_cassette = false
+end

data/spec/{bodhi_spec.rb → targets/bodhi_spec.rb}

@@ -3,7 +3,9 @@
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
-require 'polisher/bodhi'
+require 'polisher/targets/bodhi'
+
+require 'pkgwat'
 
 module Polisher
   describe Bodhi do

data/spec/{errata_spec.rb → targets/errata_spec.rb}

@@ -3,7 +3,7 @@
 # Licensed under the MIT license
 # Copyright (C) 2013-2014 Red Hat, Inc.
 
-require 'polisher/errata'
+require 'polisher/targets/errata'
 
 module Polisher
   describe Errata do
@@ -48,5 +48,5 @@ module Polisher
         described_class.versions_for('rails', &cb)
       end
     end
-  end # describe Koji
+  end # describe Errata
 end # module Polisher