gem2rpm 0.8.1 → 0.8.2

data/README

@@ -48,7 +48,7 @@ Now, edit the template and then run gem2rpm to generate the spec file
 using the edited template:
   gem2rpm -t rubygem-GEM.spec.template > rubygem-GEM.spec
 
-With that, you can now build your RPM as ususal. When a new version of the
+With that, you can now build your RPM as usual. When a new version of the
 gem becomes available, you should edit the saved template and rerun
 gem2rpm over it.
 

data/lib/gem2rpm.rb

@@ -15,7 +15,7 @@ if HAS_REMOTE_INSTALLER
 end
 
 module Gem2Rpm
-  Gem2Rpm::VERSION = "0.8.1"
+  Gem2Rpm::VERSION = "0.8.2"
 
   if HAS_REMOTE_INSTALLER
     def self.find_download_url(name, version)
@@ -58,14 +58,15 @@ module Gem2Rpm
   # gem2spec).  Taken from RPM macros if present, constructed from system
   # username and hostname otherwise.
   def Gem2Rpm.packager()
-    packager = `rpmdev-packager`.chomp
+    packager = `rpmdev-packager`.chomp rescue ''
 
     if packager.empty?
-      packager = `rpm --eval '%{packager}'`.chomp
+      packager = `rpm --eval '%{packager}'`.chomp rescue ''
     end
 
     if packager.empty? or packager == '%{packager}'
-      packager = "#{Etc::getpwnam(Etc::getlogin).gecos} <#{Etc::getlogin}@#{Socket::gethostname}>"
+      passwd_entry = Etc::getpwnam(Etc::getlogin)
+      packager = "#{(passwd_entry && passwd_entry.gecos) || Etc::getlogin } <#{Etc::getlogin}@#{Socket::gethostname}>"
     end
 
     packager

data/lib/gem2rpm/distro.rb

@@ -10,7 +10,7 @@ module Gem2Rpm
 
         release_files.each do |file|
           /\d+/ =~ File.open(file).readline
-          versions << Regexp.last_match.to_s.to_i if Regexp.last_match
+          versions << Regexp.last_match.to_s if Regexp.last_match
         end
 
         versions.uniq!
@@ -20,7 +20,10 @@ module Gem2Rpm
         else # no version or more versions (=> don't know what to do)
           FEDORA
         end
-      elsif !release_files.grep(/SuSe/).empty?
+      elsif !release_files.grep(/redhat/).empty?
+        # Use Fedora's template for RHEL ATM.
+        FEDORA
+      elsif !release_files.grep(/SuSE/).empty?
         OPENSUSE
       else
         DEFAULT
@@ -34,6 +37,7 @@ module Gem2Rpm
 
     def self.template_by_os_version(os, version)
       Dir.new(Gem2Rpm::template_dir).each do |file|
+        next if file =~ /^\./
         /#{os}-([\w-]+).spec.erb/ =~ file
         return file.gsub('.spec.erb', '') if Regexp.last_match and in_range?(version, Regexp.last_match[1].to_s.split('-'))
       end
@@ -45,10 +49,10 @@ module Gem2Rpm
       return nil unless range
 
       if range.length == 1
-        return true if range.first.to_i == version
+        return true if range.first.to_s == version.to_s
       else # range: [xx, yy]
-        if range[0].to_i <= version
-          return true if range[1] == 'rawhide' or version <= range[1].to_i
+        if range[0].to_s <= version.to_s
+          return true if range[1] == 'rawhide' or version.to_s <= range[1].to_s
         end
       end
 

data/lib/gem2rpm/helpers.rb

@@ -6,24 +6,37 @@ module Gem2Rpm
       text.gsub(/\n/, "\n\n").gsub(/(.{1,#{line_width}})(\s+|$)/, "\\1\n").strip
     end
 
-    # Expands the pesimistic version operator '~>' into equivalent '>=' and
-    # '<' pair.
-    def self.expand_pessimistic_requirement(requirements)
+    # Expands '~>' and '!=' gem requirements.
+    def self.expand_requirement(requirements)
       requirements.inject([]) do |output, r|
-        if r.first == '~>'
-	  next_version = Gem::Version.create(r.last).bump
-	  output << ['=>', r.last]
-	  output << ['<', next_version]
-	else
-	  output << r
-	end
+        output.concat case r.first
+        when '~>'
+          expand_pessimistic_requirement(r)
+        when '!='
+          expand_not_equal_requirement(r)
+        else
+          [r]
+        end
       end
     end
 
+    # Expands the pessimistic version operator '~>' into equivalent '>=' and
+    # '<' pair.
+    def self.expand_pessimistic_requirement(requirement)
+      next_version = Gem::Version.create(requirement.last).bump
+      return ['=>', requirement.last], ['<', next_version]
+    end
+
+    # Expands the not equal version operator '!=' into equivalent '<' and
+    # '>' pair.
+    def self.expand_not_equal_requirement(requirement)
+      return ['<', requirement.last], ['>', requirement.last]
+    end
+
     # Converts Gem::Requirement into array of requirements strings compatible
     # with RPM .spec file.
     def self.requirement_versions_to_rpm(requirement)
-      self.expand_pessimistic_requirement(requirement.requirements).map do |op, version|
+      self.expand_requirement(requirement.requirements).map do |op, version|
         version == Gem::Version.new(0) ? "" : "#{op} #{version}"
       end
     end

data/templates/{fedora-17-rawhide.spec.erb → fedora-17-18.spec.erb}

@@ -1,13 +1,14 @@
 # Generated from <%= File::basename(format.gem_path) %> by gem2rpm -*- rpm-spec -*-
 %global gem_name <%= spec.name %>
+<%# TODO: Try to check against spec.required_ruby_version -%>
 %global rubyabi 1.9.1
 
-Summary: <%= spec.summary.gsub(/\.$/, "") %>
 Name: rubygem-%{gem_name}
 Version: <%= spec.version %>
 Release: 1%{?dist}
+Summary: <%= spec.summary.gsub(/\.$/, "") %>
 Group: Development/Languages
-License: <%= spec.licenses.empty? ? "GPLv2+ or Ruby" : spec.licenses.join(" and ") %>
+License: <%= spec.licenses.join(" and ") %>
 <% if spec.homepage -%>
 URL: <%= spec.homepage %>
 <% end -%>
@@ -16,10 +17,6 @@ Requires: ruby(abi) = %{rubyabi}
 <% for req in spec.required_rubygems_version -%>
 Requires: ruby(rubygems) <%= req %>
 <% end -%>
-<%# TODO: Unfortunatelly this do not match with ruby(abi) yet -%>
-<% for req in spec.required_ruby_version -%>
-Requires: ruby <%= req %>
-<% end -%>
 <% for d in spec.runtime_dependencies -%>
 <% for req in d.requirement -%>
 Requires: rubygem(<%= d.name %>) <%= req  %>
@@ -31,7 +28,7 @@ BuildRequires: rubygems-devel <%= req %>
 <% end -%>
 <%# TODO: Unfortunatelly this do not match with ruby(abi) yet -%>
 <% for req in spec.required_ruby_version -%>
-BuildRequires: ruby <%= req %>
+BuildRequires: ruby<%= "-devel" unless spec.extensions.empty? %> <%= req %>
 <% end -%>
 <% if spec.extensions.empty? -%>
 BuildArch: noarch
@@ -53,36 +50,47 @@ Documentation for %{name}
 <% end # if doc_subpackage -%>
 
 %prep
-%setup -q -c -T
+gem unpack %{SOURCE0}
+
+%setup -q -D -T -n  %{gem_name}-%{version}
+
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+
+%build
 mkdir -p .%{gem_dir}
+
+# Create the gem as gem install only works on a gem file
+gem build %{gem_name}.gemspec
+
 <% unless spec.extensions.empty? -%>
+# gem install compiles any C extensions
 export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
 <% end -%>
-gem install --local --install-dir .%{gem_dir} \
+
+# gem install installs into a directory.  We set that to be a local
+# directory so that we can move it into the buildroot in %%install
+gem install --local --install-dir ./%{gem_dir} \
 <% unless spec.executables.nil? or spec.executables.empty? -%>
-            --bindir .%{_bindir} \
+            --bindir ./%{_bindir} \
 <% end -%>
 <% unless spec.extensions.empty? -%>
             -V \
 <% end -%>
-            --force %{SOURCE0}
-
-%build
+            --force --rdoc %{gem_name}-%{version}.gem
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
-cp -a .%{gem_dir}/* \
+cp -pa .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 <% unless spec.extensions.empty? -%>
 mkdir -p %{buildroot}%{gem_extdir}/<%= spec.require_paths.first %>
-# TODO: move the extensions
-##mv %{buildroot}%{gem_instdir}/<%= spec.require_paths.first %>/shared_object.so %{buildroot}%{gem_extdir}/<%= spec.require_paths.first %>/
+mv %{buildroot}%{gem_instdir}/<%= spec.require_paths.first %>/shared_object.so %{buildroot}%{gem_extdir}/<%= spec.require_paths.first %>/
 <% end -%>
 
 <% unless spec.executables.nil? or spec.executables.empty? -%>
 mkdir -p %{buildroot}%{_bindir}
-cp -a .%{_bindir}/* \
+cp -pa .%{_bindir}/* \
         %{buildroot}%{_bindir}/
 <% end -%>
 
@@ -90,12 +98,6 @@ cp -a .%{_bindir}/* \
 find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 <% end -%>
 
-<% unless spec.extensions.empty? -%>
-<%# TODO: Is it possible to delete the folder specified by the spec.extensions? -%>
-# Remove the binary extension sources and build leftovers.
-rm -rf %{buildroot}%{geminstdir}/ext
-<% end -%>
-
 %files
 %dir %{gem_instdir}
 <% unless spec.executables.nil? or spec.executables.empty? -%>
@@ -106,6 +108,7 @@ rm -rf %{buildroot}%{geminstdir}/ext
 <% end -%>
 %{gem_libdir}
 <% unless spec.extensions.empty? -%>
+%exclude %{gem_instdir}/ext
 %{gem_extdir}
 <% end -%>
 <% unless doc_subpackage -%>

data/templates/fedora-19-rawhide.spec.erb

@@ -0,0 +1,118 @@
+# Generated from <%= File::basename(format.gem_path) %> by gem2rpm -*- rpm-spec -*-
+%global gem_name <%= spec.name %>
+
+Name: rubygem-%{gem_name}
+Version: <%= spec.version %>
+Release: 1%{?dist}
+Summary: <%= spec.summary.gsub(/\.$/, "") %>
+Group: Development/Languages
+License: <%= spec.licenses.join(" and ") %>
+<% if spec.homepage -%>
+URL: <%= spec.homepage %>
+<% end -%>
+Source0: <%= download_path %>%{gem_name}-%{version}.gem
+Requires: ruby(release)
+<% for req in spec.required_rubygems_version -%>
+Requires: ruby(rubygems) <%= req %>
+<% end -%>
+<% for d in spec.runtime_dependencies -%>
+<% for req in d.requirement -%>
+Requires: rubygem(<%= d.name %>) <%= req  %>
+<% end -%>
+<% end -%>
+BuildRequires: ruby(abi) = %{rubyabi}
+<% for req in spec.required_rubygems_version -%>
+BuildRequires: rubygems-devel <%= req %>
+<% end -%>
+<%# TODO: Unfortunatelly this do not match with ruby(abi) yet -%>
+<% for req in spec.required_ruby_version -%>
+BuildRequires: ruby<%= "-devel" unless spec.extensions.empty? %> <%= req %>
+<% end -%>
+<% if spec.extensions.empty? -%>
+BuildArch: noarch
+<% end -%>
+Provides: rubygem(%{gem_name}) = %{version}
+
+%description
+<%= spec.description %>
+
+<% if doc_subpackage -%>
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+Documentation for %{name}
+<% end # if doc_subpackage -%>
+
+%prep
+gem unpack %{SOURCE0}
+
+%setup -q -D -T -n  %{gem_name}-%{version}
+
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+
+%build
+# Create the gem as gem install only works on a gem file
+gem build %{gem_name}.gemspec
+
+# %%gem_install compiles any C extensions and installs the gem into ./%gem_dir
+# by default, so that we can move it into the buildroot in %%install
+%gem_install
+
+%install
+mkdir -p %{buildroot}%{gem_dir}
+cp -pa .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
+
+<% unless spec.extensions.empty? -%>
+mkdir -p %{buildroot}%{gem_extdir}/<%= spec.require_paths.first %>
+# TODO: move the extensions
+mv %{buildroot}%{gem_instdir}/<%= spec.require_paths.first %>/shared_object.so %{buildroot}%{gem_extdir}/<%= spec.require_paths.first %>/
+<% end -%>
+
+<% unless spec.executables.nil? or spec.executables.empty? -%>
+mkdir -p %{buildroot}%{_bindir}
+cp -pa .%{_bindir}/* \
+        %{buildroot}%{_bindir}/
+<% end -%>
+
+<% unless spec.executables.empty? -%>
+find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
+<% end -%>
+
+%files
+%dir %{gem_instdir}
+<% unless spec.executables.nil? or spec.executables.empty? -%>
+<% for f in spec.executables -%>
+%{_bindir}/<%= f %>
+<% end -%>
+%{gem_instdir}/bin
+<% end -%>
+%{gem_libdir}
+<% unless spec.extensions.empty? -%>
+%exclude %{gem_instdir}/ext
+%{gem_extdir}
+<% end -%>
+<% unless doc_subpackage -%>
+%doc %{gem_docdir}
+<% for f in spec.extra_rdoc_files -%>
+%doc %{gem_instdir}/<%= f %>
+<% end -%>
+<% end -%>
+%exclude %{gem_cache}
+%{gem_spec}
+
+<% if doc_subpackage -%>
+%files doc
+%doc %{gem_docdir}
+<% for f in spec.extra_rdoc_files -%>
+%doc %{gem_instdir}/<%= f %>
+<% end -%>
+<% end # if doc_subpackage -%>
+
+%changelog
+* <%= Time.now.strftime("%a %b %d %Y") %> <%= packager %> - <%= spec.version %>-1
+- Initial package

data/templates/fedora.spec.erb

@@ -6,6 +6,7 @@
 <% end -%>
 %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+<%# TODO: Try to check against spec.required_ruby_version -%>
 %global rubyabi 1.8
 
 Summary: <%= spec.summary.gsub(/\.$/, "") %>
@@ -13,7 +14,7 @@ Name: rubygem-%{gemname}
 Version: <%= spec.version %>
 Release: 1%{?dist}
 Group: Development/Languages
-License: <%= spec.licenses.empty? ? "GPLv2+ or Ruby" : spec.licenses.join(" and ") %>
+License: <%= spec.licenses.join(" and ") %>
 <% if spec.homepage -%>
 URL: <%= spec.homepage %>
 <% end -%>
@@ -22,10 +23,6 @@ Requires: ruby(abi) = %{rubyabi}
 <% for req in spec.required_rubygems_version -%>
 Requires: ruby(rubygems) <%= req %>
 <% end -%>
-<%# TODO: Unfortunatelly this do not match with ruby(abi) yet -%>
-<% for req in spec.required_ruby_version -%>
-Requires: ruby <%= req %>
-<% end -%>
 <% for d in spec.runtime_dependencies -%>
 <% for req in d.requirement -%>
 Requires: rubygem(<%= d.name %>) <%= req  %>
@@ -37,7 +34,7 @@ BuildRequires: ruby(rubygems) <%= req %>
 <% end -%>
 <%# TODO: Unfortunatelly this do not match with ruby(abi) yet -%>
 <% for req in spec.required_ruby_version -%>
-BuildRequires: ruby <%= req %>
+BuildRequires: ruby<%= "-devel" unless spec.extensions.empty? %> <%= req %>
 <% end -%>
 <% if spec.extensions.empty? -%>
 BuildArch: noarch
@@ -89,12 +86,12 @@ gem install --local --install-dir .%{gemdir} \
 
 %install
 mkdir -p %{buildroot}%{gemdir}
-cp -a .%{gemdir}/* \
+cp -pa .%{gemdir}/* \
         %{buildroot}%{gemdir}/
 <% unless spec.executables.nil? or spec.executables.empty? -%>
 
 mkdir -p %{buildroot}%{_bindir}
-cp -a .%{_bindir}/* \
+cp -pa .%{_bindir}/* \
         %{buildroot}%{_bindir}/
 <% end -%>
 
@@ -107,11 +104,6 @@ mkdir -p %{buildroot}%{ruby_sitelib}
 ln -s %{gemdir}/gems/%{gemname}-%{version}/<%= p %> %{buildroot}%{ruby_sitelib}
 <% end -%>
 <% end # if nongem -%>
-<% unless spec.extensions.empty? -%>
-<%# TODO: Is it possible to delete the folder specified by the spec.extensions? -%>
-# Remove the binary extension sources and build leftovers.
-rm -rf %{buildroot}%{geminstdir}/ext
-<% end -%>
 
 %files
 %dir %{geminstdir}
@@ -122,6 +114,10 @@ rm -rf %{buildroot}%{geminstdir}/ext
 %{geminstdir}/bin
 <% end -%>
 %{geminstdir}/lib
+<% unless spec.extensions.empty? -%>
+<%# TODO: Is it possible to delete the folder specified by the spec.extensions? -%>
+%exclude %{geminstdir}/ext
+<% end -%>
 <% unless doc_subpackage -%>
 %doc %{gemdir}/doc/%{gemname}-%{version}
 <% for f in spec.extra_rdoc_files -%>

metadata

@@ -1,80 +1,64 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gem2rpm
-version: !ruby/object:Gem::Version 
-  hash: 61
+version: !ruby/object:Gem::Version
+  version: 0.8.2
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 1
-  version: 0.8.1
 platform: ruby
-authors: 
+authors:
 - David Lutterkort
 - Vit Ondruch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-09 00:00:00 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies: []
-
-description: "  Generate source rpms and rpm spec files from a Ruby Gem. \n  The spec file tries to follow the gem as closely as possible\n"
+description: ! "  Generate source rpms and rpm spec files from a Ruby Gem. \n  The
+  spec file tries to follow the gem as closely as possible\n"
 email: gem2rpm-devel@rubyforge.org
-executables: 
+executables:
 - gem2rpm
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - AUTHORS
 - README
 - LICENSE
-files: 
+files:
 - bin/gem2rpm
-- lib/gem2rpm/specification.rb
-- lib/gem2rpm/helpers.rb
+- lib/gem2rpm.rb
 - lib/gem2rpm/dependency.rb
 - lib/gem2rpm/distro.rb
-- lib/gem2rpm.rb
+- lib/gem2rpm/helpers.rb
+- lib/gem2rpm/specification.rb
+- templates/default.spec.erb
+- templates/fedora-17-18.spec.erb
+- templates/fedora-19-rawhide.spec.erb
 - templates/fedora.spec.erb
 - templates/opensuse.spec.erb
-- templates/default.spec.erb
-- templates/fedora-17-rawhide.spec.erb
 - LICENSE
 - README
 - AUTHORS
 homepage: https://github.com/lutter/gem2rpm/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Generate rpm specfiles from gems
 test_files: []
-