rgem2rpm 1.3.0 → 1.3.1

data/lib/rgem2rpm/converter.rb

@@ -44,10 +44,14 @@ class RGem2Rpm::Converter < Gem::Installer
     create_rpm_env
   end
 
+  def prefix
+    "rubygem"
+  end
+  
   # return gem name
   def name
-    name = "rubygems-#{@spec.name}"
-    name = "#{name}-#{@spec.platform}" unless @spec.platform.nil?
+    name = "#{prefix}-#{@spec.name}"
+    name = "#{name}-#{@spec.platform}" if @spec.platform == 'java'
     name
   end
 
@@ -147,12 +151,22 @@ class RGem2Rpm::Converter < Gem::Installer
   # return gem runtime dependencies
   def requires
     req_str = StringIO.new
-    # get ruby dependency
+    # set ruby dependency
     req_str << "ruby #{@spec.required_ruby_version || ">= 0" }"
-    # get rubygems dependency
+    # set rubygems dependency
     req_str << ", rubygems #{@spec.required_rubygems_version}" unless @spec.required_rubygems_version.nil?
-    # get runtime dependencies
-    req_str << ", #{@spec.runtime_dependencies.join(', ').gsub(', runtime', '').gsub(')', '').gsub('(', '').gsub('~>', '>=')}" unless @spec.runtime_dependencies.empty?
+    # set runtime dependencies
+    @spec.runtime_dependencies.each { |d|
+      if d.requirement.to_s =~ /~>/
+        req_str << ", #{d.name} #{d.requirement.to_s.gsub('~>', '>=')}"
+        version = d.requirement.to_s.delete('~>').strip.split('.')
+        version[version.size - 1] = "0"
+        version[version.size - 2] = (version[version.size - 2].to_i + 1).to_s
+        req_str << ", #{d.name} < #{version.join('.')}"
+      else
+        req_str << ", #{d.name} #{d.requirement}"
+      end
+    }
     # return string with dependencies
     return req_str.string
   end

data/rgem2rpm.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
    s.name = %q{rgem2rpm}
-   s.version = "1.3.0"
+   s.version = "1.3.1"
    s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
    s.required_rubygems_version = Gem::Requirement.new(">= 1.4.2") if s.respond_to?(:required_rubygems_version=)
-   s.date = %q{2012-01-19}
+   s.date = %q{2012-01-20}
    s.authors = ["Joao Peixoto"]
    s.email = %q{peixoto.joao@gmail.com}
    s.summary = %q{Convert ruby gems into rpm}

metadata

@@ -2,7 +2,7 @@
 name: rgem2rpm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
   - Joao Peixoto
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-19 00:00:00 Z
+date: 2012-01-20 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: minitar