polisher 0.5.1 → 0.6.1

data/lib/polisher/rpmspec.rb

@@ -3,6 +3,9 @@
 # Licensed under the MIT license
 # Copyright (C) 2013 Red Hat, Inc.
 
+require 'gem2rpm'
+require 'active_support/core_ext'
+
 require 'polisher/core'
 
 module Polisher
@@ -16,7 +19,7 @@ module Polisher
     SPEC_RELEASE_MATCHER        = /^Release:\s*(.*)$/
     SPEC_REQUIRES_MATCHER       = /^Requires:\s*(.*)$/
     SPEC_BUILD_REQUIRES_MATCHER = /^BuildRequires:\s*(.*)$/
-    SPEC_GEM_REQ_MATCHER        = /^.*\s*rubygem\((.*)\)$/
+    SPEC_GEM_REQ_MATCHER        = /^.*\s*rubygem\((.*)\)(\s*(.*))?$/
     SPEC_SUBPACKAGE_MATCHER     = /^%package\s(.*)$/
     SPEC_CHANGELOG_MATCHER      = /^%changelog$/
     SPEC_FILES_MATCHER          = /^%files$/
@@ -144,8 +147,10 @@ module Polisher
       @metadata[:requires].each { |r|
         if r !~ SPEC_GEM_REQ_MATCHER
           non_gem_requires << r
-        elsif !new_source.deps.include?($1)
+        elsif !new_source.deps.any? { |d| d.name == $1 }
           extra_gem_requires << r
+        #else
+        #  spec_version = $2
         end
       }
 
@@ -153,18 +158,33 @@ module Polisher
       @metadata[:build_requires].each { |r|
         if r !~ SPEC_GEM_REQ_MATCHER
           non_gem_brequires << r
-        elsif !new_source.dev_deps.include?($1)
+        elsif !new_source.deps.any? { |d| d.name == $1 }
           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| "rubygem(#{r})" }
+        new_source.deps.collect { |r|
+          r.requirement.to_s.split(',').collect { |req|
+           expanded = Gem2Rpm::Helpers.expand_requirement [req.split]
+           expanded.collect { |e|
+             "rubygem(#{r.name}) #{e.first} #{e.last}"
+           }
+          }
+        }.flatten
 
       @metadata[:build_requires] =
         non_gem_brequires + extra_gem_brequires +
-        new_source.dev_deps.collect { |r| "rubygem(#{r})" }
+        new_source.dev_deps.collect { |r|
+          r.requirement.to_s.split(',').collect { |req|
+            "rubygem(#{r.name}) #{req}"
+          }
+        }.flatten
     end
 
     def update_files_from(new_source)

data/lib/polisher/version.rb

@@ -0,0 +1,3 @@
+class Polisher
+  VERSION = "0.6.1"
+end

data/lib/polisher/yum.rb

@@ -3,7 +3,7 @@
 # Licensed under the MIT license
 # Copyright (C) 2013 Red Hat, Inc.
 
-require 'pkgwat'
+require 'awesome_spawn'
 
 module Polisher
   class Yum
@@ -16,7 +16,9 @@ module Polisher
     # @returns [String] version of gem in yum or nil if not found
     def self.version_for(name, &bl)
       version = nil
-      out=`#{YUM_CMD} info rubygem-#{name} 2> /dev/null`
+      result  = AwesomeSpawn.run "#{YUM_CMD} info rubygem-#{name}"
+      out = result.output
+
       if out.include?("Version")
         version = out.lines.to_a.find { |l| l =~ /^Version.*/ }
         version = version.split(':').last.strip

data/spec/bodhi_spec.rb

@@ -0,0 +1,32 @@
+# Polisher Bodhi Spec
+#
+# Licensed under the MIT license
+# Copyright (C) 2013 Red Hat, Inc.
+
+require 'polisher/bodhi'
+
+module Polisher
+  describe Bodhi do
+    describe "#versions_for" do
+      before(:each) do
+      end
+
+      it "uses pkgwat to retreive updates" do
+        Pkgwat.should_receive(:get_updates).with("rubygem-rails", "all", "all").and_return([])
+        described_class.versions_for "rails"
+      end
+
+      it "returns versions" do
+        Pkgwat.should_receive(:get_updates).and_return([{'stable_version' => '1.0.0'}])
+        described_class.versions_for("rails").should == ['1.0.0']
+      end
+
+      it "invokes block with versions" do
+        cb = proc {}
+        cb.should_receive(:call).with(:bodhi, 'rails', ['1.0.0'])
+        Pkgwat.should_receive(:get_updates).and_return([{'stable_version' => '1.0.0'}])
+        described_class.versions_for("rails", &cb)
+      end
+    end
+  end # describe Koji
+end # module Polisher

data/spec/data/Gemfile

@@ -0,0 +1,5 @@
+source :rubygems
+
+# only this really need to be present on the system
+gem 'rubygems'
+gem 'cinch'

data/spec/data/mysql-2.9.1.gemspec

@@ -0,0 +1,40 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "mysql"
+  s.version = "2.9.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["TOMITA Masahiro"]
+  s.date = "2013-02-16"
+  s.description = "This is the MySQL API module for Ruby. It provides the same functions for Ruby\nprograms that the MySQL C API provides for C programs.\n\nThis package is offered as gem for easy installation using RubyGems. It wraps\nunmodified tmtm's mysql-ruby extension into a proper gem.\n\nPlease note that tmtm (Tomita Mashahiro) has deprecated development of this\nextension and only update it for bug fixes."
+  s.email = ["tommy@tmtm.org"]
+  s.extensions = ["ext/mysql_api/extconf.rb"]
+  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
+  s.files = ["History.txt", "Manifest.txt", "README.txt", "ext/mysql_api/extconf.rb"]
+  s.homepage = "http://github.com/luislavena/mysql-gem"
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
+  s.rubyforge_project = "mysql-win"
+  s.rubygems_version = "1.8.24"
+  s.summary = "This is the MySQL API module for Ruby"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_development_dependency(%q<rake-compiler>, ["~> 0.8.1"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.5"])
+    else
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<rake-compiler>, ["~> 0.8.1"])
+      s.add_dependency(%q<hoe>, ["~> 3.5"])
+    end
+  else
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<rake-compiler>, ["~> 0.8.1"])
+    s.add_dependency(%q<hoe>, ["~> 3.5"])
+  end
+end

data/spec/data/rails.json

@@ -0,0 +1 @@
+{"name":"rails","downloads":29534537,"version":"4.0.1","version_downloads":113942,"platform":"ruby","authors":"David Heinemeier Hansson","info":"Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.","licenses":["MIT"],"project_uri":"http://rubygems.org/gems/rails","gem_uri":"http://rubygems.org/gems/rails-4.0.1.gem","homepage_uri":"http://www.rubyonrails.org","wiki_uri":"http://wiki.rubyonrails.org","documentation_uri":"http://api.rubyonrails.org","mailing_list_uri":"http://groups.google.com/group/rubyonrails-talk","source_code_uri":"http://github.com/rails/rails","bug_tracker_uri":"http://github.com/rails/rails/issues","dependencies":{"development":[],"runtime":[{"name":"actionmailer","requirements":"= 4.0.1"},{"name":"actionpack","requirements":"= 4.0.1"},{"name":"activerecord","requirements":"= 4.0.1"},{"name":"activesupport","requirements":"= 4.0.1"},{"name":"bundler","requirements":"< 2.0, >= 1.3.0"},{"name":"railties","requirements":"= 4.0.1"},{"name":"sprockets-rails","requirements":"~> 2.0.0"}]}}

data/spec/data/rspec.json

@@ -0,0 +1 @@
+{"name":"rspec","downloads":11691288,"version":"2.12.0","version_downloads":1133260,"platform":"ruby","authors":"Steven Baker, David Chelimsky","info":"BDD for Ruby","licenses":["MIT"],"project_uri":"http://rubygems.org/gems/rspec","gem_uri":"http://rubygems.org/gems/rspec-2.14.1.gem","homepage_uri":"http://github.com/rspec","wiki_uri":"","documentation_uri":"http://relishapp.com/rspec","mailing_list_uri":"http://rubyforge.org/mailman/listinfo/rspec-users","source_code_uri":"http://github.com/rspec/rspec","bug_tracker_uri":"","dependencies":{"development":[],"runtime":[{"name":"rspec-core","requirements":"~> 2.14.0"},{"name":"rspec-expectations","requirements":"~> 2.14.0"},{"name":"rspec-mocks","requirements":"~> 2.14.0"}]}}

data/spec/data/rubygem-activesupport.spec

@@ -0,0 +1,238 @@
+%global gem_name activesupport
+
+Summary: Support and utility classes used by the Rails framework
+Name: rubygem-%{gem_name}
+Epoch: 1
+Version: 4.0.0
+Release: 1%{?dist}
+Group: Development/Languages
+License: MIT
+URL: http://www.rubyonrails.org
+
+Source0: http://rubygems.org/downloads/activesupport-%{version}.gem
+
+# Also the activesupport gem doesn't ship with the test suite like the other
+# Rails rpms, you may check it out like so
+# git clone http://github.com/rails/rails.git
+# cd rails/activesupport/
+# git checkout v4.0.0
+# tar czvf activesupport-4.0.0-tests.tgz test/
+Source2: activesupport-%{version}-tests.tgz
+
+# Removes code which breaks the test suite due to a
+# dependency on a file in the greater rails proj
+Patch1: activesupport-tests-fix.patch
+
+# We need to add the bigdecimal dependency to gemspec, otherwise it won't be
+# loaded. The reason for this is unbundling it from ruby libdir and moving
+# it under %%{gem_dir} (therefore if not in Gemfile, it won't be found).
+Patch4: activesupport-add-bigdecimal-dependency.patch
+
+Requires: ruby(rubygems)
+Requires: ruby(release)
+# Let's keep Requires and BuildRequires sorted alphabeticaly
+Requires: rubygem(bigdecimal)
+Requires: rubygem(dalli)
+Requires: rubygem(i18n) >= 0.6
+Requires: rubygem(i18n) < 1.0
+Requires: rubygem(minitest) >= 4.2
+Requires: rubygem(minitest) < 5
+Requires: rubygem(multi_json) >= 1.0
+Requires: rubygem(multi_json) < 2
+Requires: rubygem(rack)
+Requires: rubygem(thread_safe)
+Requires: rubygem(tzinfo) >= 0.3.37
+Requires: rubygem(tzinfo) < 0.4.0
+BuildRequires: rubygems-devel
+BuildRequires: rubygem(bigdecimal)
+BuildRequires: rubygem(builder)
+BuildRequires: rubygem(dalli)
+BuildRequires: rubygem(i18n) >= 0.6
+BuildRequires: rubygem(i18n) < 1.0
+BuildRequires: rubygem(minitest)
+BuildRequires: rubygem(mocha)
+BuildRequires: rubygem(multi_json) >= 1.0
+BuildRequires: rubygem(multi_json) < 2
+BuildRequires: rubygem(rack)
+BuildRequires: rubygem(thread_safe)
+BuildRequires: rubygem(tzinfo) >= 0.3.37
+BuildRequires: rubygem(tzinfo) < 0.4.0
+BuildArch: noarch
+Provides: rubygem(%{gem_name}) = %{version}
+
+%description
+Utility library which carries commonly used classes and
+goodies from the Rails framework
+
+%prep
+%setup -q -c -T
+%gem_install -n %{SOURCE0}
+
+# move the tests into place
+tar xzvf %{SOURCE2} -C .%{gem_instdir}
+
+
+pushd .%{gem_instdir}
+%patch1 -p0
+popd
+
+pushd .%{gem_dir}
+#%%patch4 -p1
+popd
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}
+
+%check
+pushd %{buildroot}%{gem_instdir}
+
+ruby -Ilib:test -e "Dir.glob('./test/**/*_test.rb').each {|t| require t}"
+popd
+
+%files
+%dir %{gem_instdir}
+%doc %{gem_instdir}/CHANGELOG.md
+%{gem_libdir}
+%doc %{gem_instdir}/MIT-LICENSE
+%doc %{gem_instdir}/README.rdoc
+%doc %{gem_docdir}
+%{gem_cache}
+%{gem_spec}
+%{gem_instdir}/test
+
+
+%changelog
+* Fri Aug 09 2013 Josef Stribny <jstribny@redhat.com> - 1:4.0.0-2
+- Fix: add minitest to requires
+
+* Tue Jul 30 2013 Josef Stribny <jstribny@redhat.com> - 1:4.0.0-1
+- Update to ActiveSupport 4.0.0.
+
+* Tue Mar 19 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.13-1
+- Update to ActiveSupport 3.2.13.
+
+* Fri Mar 01 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.12-2
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
+* Tue Feb 12 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.12-1
+- Update to ActiveSupport 3.2.12.
+
+* Wed Jan 09 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.11-1
+- Update to ActiveSupport 3.2.11.
+
+* Thu Jan 03 2013 Vít Ondruch <vondruch@redhat.com> - 1:3.2.10-1
+- Update to ActiveSupport 3.2.10.
+
+* Mon Aug 13 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.2.8-1
+- Update to ActiveSupport 3.2.8.
+
+* Mon Jul 30 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.2.7-1
+- Update to ActiveSupport 3.2.7.
+
+* Wed Jul 18 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.2.6-1
+- Update to ActiveSupport 3.2.6.
+- Removed unneeded BuildRoot tag.
+- Tests no longer fail with newer versions of Mocha, remove workaround.
+
+* Fri Jun 15 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.0.15-1
+- Update to ActiveSupport 3.0.15.
+
+* Fri Jun 01 2012 Vít Ondruch <vondruch@redhat.com> - 1:3.0.13-1
+- Update to ActiveSupport 3.0.13.
+
+* Wed Apr 18 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.0.11-5
+- Add the bigdecimal dependency to gemspec.
+
+* Fri Mar 16 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.0.11-4
+- The CVE patch name now contains the CVE id.
+
+* Mon Mar 05 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.0.11-3
+- Patch for CVE-2012-1098
+
+* Tue Jan 24 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 1:3.0.11-1
+- Rebuilt for Ruby 1.9.3.
+- Update to ActiveSupport 3.0.11.
+
+* Mon Aug 22 2011 Vít Ondruch <vondruch@redhat.com> - 1:3.0.10-1
+- Update to ActiveSupport 3.0.10
+
+* Fri Jul 01 2011 Vít Ondruch <vondruch@redhat.com> - 1:3.0.9-1
+- Update to ActiveSupport 3.0.9
+- Changed %%define into %%global
+- Removed unnecessary %%clean section
+
+* Thu Jun 16 2011 Mo Morsi <mmorsi@redhat.com> - 1:3.0.5-3
+- Reverting accidental change adding a few gem flags
+
+* Thu Jun 16 2011 Mo Morsi <mmorsi@redhat.com> - 1:3.0.5-2
+- Include fix for CVE-2011-2197
+
+* Thu Mar 24 2011 Vít Ondruch <vondruch@redhat.com> - 1:3.0.5-1
+- Update to ActiveSupport 3.0.5
+- Remove Rake dependnecy
+
+* Mon Feb 14 2011 Mohammed Morsi <mmorsi@redhat.com> - 1:3.0.3-4
+- fix bad dates in the spec changelog
+
+* Thu Feb 10 2011 Mohammed Morsi <mmorsi@redhat.com> - 1:3.0.3-3
+- include i18n runtime dependency
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Jan 10 2011 Mohammed Morsi <mmorsi@redhat.com> - 1:3.0.3-1
+- update to rails 3
+
+* Wed Aug 25 2010 Mohammed Morsi <mmorsi@redhat.com> - 1:2.3.8-2
+- bumped version
+
+* Wed Aug 04 2010 Mohammed Morsi <mmorsi@redhat.com> - 1:2.3.8-1
+- Update to 2.3.8
+- Added check section with rubygem-mocha dependency
+- Added upsteam Rakefile and test suite to run tests
+
+* Thu Jan 28 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:2.3.5-1
+- Update to 2.3.5
+
+* Wed Oct  7 2009 David Lutterkort <lutter@redhat.com> - 1:2.3.4-2
+- Bump Epoch to ensure upgrade path from F-11
+
+* Mon Sep 7 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 2.3.4-1
+- Update to 2.3.4 (bug 520843, CVE-2009-3009)
+
+* Sun Jul 26 2009 Jeroen van Meeuwen <j.van.meeuwen@ogd.nl> - 2.3.3-1
+- New upstream version
+
+* Mon Mar 16 2009 Jeroen van Meeuwen <kanarip@fedoraproject.org> - 2.3.2-1
+- New upstream version
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Mon Nov 24 2008 Jeroen van Meeuwen <kanarip@fedoraproject.org> - 2.2.2-1
+- New upstream version
+
+* Tue Sep 16 2008 David Lutterkort <dlutter@redhat.com> - 2.1.1-1
+- New version (fixes CVE-2008-4094)
+
+* Thu Jul 31 2008 Michael Stahnke <stahnma@fedoraproject.org> - 2.1.0-1
+- New Upstream
+
+* Mon Apr 07 2008 David Lutterkort <dlutter@redhat.com> - 2.0.2-1
+- New version
+
+* Mon Dec 10 2007 David Lutterkort <dlutter@redhat.com> - 2.0.1-1
+- New version
+
+* Wed Nov 28 2007 David Lutterkort <dlutter@redhat.com> - 1.4.4-3
+- Fix buildroot
+
+* Tue Nov 13 2007 David Lutterkort <dlutter@redhat.com> - 1.4.4-2
+- Install README and CHANGELOG in _docdir
+
+* Tue Oct 30 2007 David Lutterkort <dlutter@redhat.com> - 1.4.4-1
+- Initial package

data/spec/errata_spec.rb

@@ -0,0 +1,43 @@
+# Polisher Errata Spec
+#
+# Licensed under the MIT license
+# Copyright (C) 2013 Red Hat, Inc.
+
+require 'polisher/errata'
+
+module Polisher
+  describe Errata do
+    describe "#versions_for" do
+      before(:each) do
+        @result = double(Curl::Easy.new)
+        @result.should_receive(:body_str).and_return({'tag' => [['rubygem-rails-1.0.0-1']]}.to_json)
+      end
+
+      it "uses curl to retreive updates" do
+        client = Curl::Easy.new
+        described_class.should_receive(:client).with('http://errata.url/builds').and_return(client)
+        client.should_receive(:get).and_return(@result)
+
+        described_class.versions_for('http://errata.url', 'rails')
+      end
+
+      it "returns versions" do
+        client = Curl::Easy.new
+        described_class.should_receive(:client).and_return(client)
+        client.should_receive(:get).and_return(@result)
+
+        described_class.versions_for('http://errata.url', 'rails').should == ['1.0.0']
+      end
+
+      it "invokes block with versions" do
+        client = Curl::Easy.new
+        described_class.should_receive(:client).and_return(client)
+        client.should_receive(:get).and_return(@result)
+
+        cb = proc {}
+        cb.should_receive(:call).with(:errata, 'rails', ['1.0.0'])
+        described_class.versions_for('http://errata.url', 'rails', &cb)
+      end
+    end
+  end # describe Koji
+end # module Polisher