rgem2rpm 1.0.1 → 1.1.0

data/lib/rgem2rpm/converter.rb

@@ -3,7 +3,6 @@ require 'fileutils'
 require 'zlib'
 require 'archive/tar/minitar'
 require 'erb'
-require 'rgem2rpm/ext'
 include Archive::Tar
 
 class RGem2Rpm::Converter < Gem::Installer
@@ -108,10 +107,19 @@ class RGem2Rpm::Converter < Gem::Installer
   def create_rpm
     # unpack gem software
     unpack @rpm_unpack_dir
+    # check if gem has extensions
+    unless @spec.extensions.empty?
+      # set rpm arch
+      @rpm_no_arch = false
+      # build extensions
+      build_extensions
+      # clean build
+      build_clean
+    end
+    # create file list with build files
+    generate_file_list
     # generate install
     generate_install
-    # generate post install
-    #generate_post
     # generate executable files
     generate_bin
     # create gemspec file
@@ -152,6 +160,32 @@ class RGem2Rpm::Converter < Gem::Installer
   end
 
   private
+  ##
+  # Get list of files generated during build operation
+  def generate_file_list
+    # check if gem has native extensions
+    if @spec.extensions.empty?
+      # use gemspec file list
+      @file_list = @spec.files
+    else
+      # initialize build files array
+      build_files = Array.new
+      # get required path
+      first_element = @spec.require_paths.first
+      require_path = if first_element.kind_of? Array then first_element.join("/") else first_element end
+      # start building make command
+      Dir.chdir("#{@rpm_tmp_dir}/#{@spec.full_name}/#{require_path}") do |path|
+        Dir.glob("**/*") do |file|
+          build_files << "#{require_path}/#{file}" unless File.directory?("#{path}/#{file}")
+        end
+      end
+      # include build files in the list of files
+      @file_list = @spec.files + build_files
+      # delete duplicate values
+      @file_list.uniq!
+    end
+  end
+
   ##
   # Create install string.
   def generate_install
@@ -164,7 +198,7 @@ class RGem2Rpm::Converter < Gem::Installer
     install_str << "install -p -m 644 %{name}-%{version}.gemspec %{buildroot}%{prefix}/specifications"
     files_str << "%{prefix}/specifications/%{name}-%{version}.gemspec"
     # get files list
-    @spec.files.each { |file|
+    @file_list.each { |file|
       if File.file? "#{@rpm_unpack_dir}/#{file}"
         install_str << "\ninstall -p -D -m 644 %{name}-%{version}/\"#{file}\" %{buildroot}%{prefix}/gems/%{name}-%{version}/\"#{file}\""
         files_str << "\n\"%{prefix}/gems/%{name}-%{version}/#{file}\""
@@ -181,41 +215,6 @@ class RGem2Rpm::Converter < Gem::Installer
     @files = files_str.string
   end
 
-  ##
-  # Builds extensions.  Valid types of extensions are extconf.rb files,
-  # configure scripts and rakefiles or mkrf_conf files.
-  def generate_post
-    return if @spec.extensions.empty?
-    @rpm_post = "echo \"Building native extensions.  This could take a while...\"\n"
-    # initialize make command string
-    build_cmd = StringIO.new
-    # start building make command
-    dest_path = File.join @os_install_dir, "gems", "#{name}-#{version}", @spec.require_paths.first
-    ran_rake = false # only run rake once
-
-    @spec.extensions.each do |extension|
-      break if ran_rake
-
-      builder = case extension
-                when /extconf/ then
-                  RGem2Rpm::Ext::ExtConfBuilder
-                when /configure/ then
-                  RGem2Rpm::Ext::ConfigureBuilder
-                when /rakefile/i, /mkrf_conf/i then
-                  ran_rake = true
-                  RGem2Rpm::Ext::RakeBuilder
-                else
-                  nil
-                end
-      # get build
-      build_cmd << builder.build(extension, dest_path)
-    end
-    # set rpm no arch to false
-    @rpm_no_arch = false
-    # return set post install
-    @rpm_post = "#{@rpm_post}#{build_cmd.string}"
-  end
-
   def generate_bin
     return if @spec.executables.nil? or @spec.executables.empty?
 
@@ -273,6 +272,18 @@ load Gem.bin_path('#{@spec.name}', '#{bin_file_name}', version)
 TEXT
   end
 
+  def build_clean
+    # clean each build
+    @spec.extensions.each do |extension|
+      Dir.chdir(File.dirname("#{@rpm_tmp_dir}/#{@spec.full_name}/#{extension}")) do |path|
+        # delete intermediate build files
+        system "make clean"
+        # delete makefile
+        FileUtils.rm_rf("#{path}/Makefile")
+      end
+    end
+  end
+
   def create_rpm_env
     FileUtils.mkdir_p "#{@rpm_top_dir}/SPECS" unless File.exists?("#{@rpm_top_dir}/SPECS")
     FileUtils.mkdir_p "#{@rpm_top_dir}/BUILD" unless File.exists?("#{@rpm_top_dir}/BUILD")

data/lib/rgem2rpm/version.rb

@@ -1,3 +1,3 @@
 module RGem2Rpm
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/rgem2rpm.rb

@@ -4,8 +4,3 @@ module RGem2Rpm; end
 require 'rgem2rpm/argumentparse'
 require 'rgem2rpm/converter'
 require 'rgem2rpm/version'
-require 'rgem2rpm/ext'
-require 'rgem2rpm/ext/builder'
-require 'rgem2rpm/ext/configure_builder'
-require 'rgem2rpm/ext/ext_conf_builder'
-require 'rgem2rpm/ext/rake_builder'

data/rgem2rpm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
    s.name = %q{rgem2rpm}
-   s.version = "1.0.1"
+   s.version = "1.1.0"
    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{2011-04-26}
@@ -18,12 +18,7 @@ Gem::Specification.new do |s|
               "lib/rgem2rpm.rb",
               "lib/rgem2rpm/argumentparse.rb",
               "lib/rgem2rpm/converter.rb",
-              "lib/rgem2rpm/ext.rb",
               "lib/rgem2rpm/version.rb",
-              "lib/rgem2rpm/ext/builder.rb",
-              "lib/rgem2rpm/ext/configure_builder.rb",
-              "lib/rgem2rpm/ext/ext_conf_builder.rb",
-              "lib/rgem2rpm/ext/rake_builder.rb",
               "conf/template.spec"]
    s.add_dependency 'minitar', '>= 0.5.3'
 end

metadata

@@ -2,7 +2,7 @@
 name: rgem2rpm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors: 
   - Joao Peixoto
@@ -38,12 +38,7 @@ files:
   - lib/rgem2rpm.rb
   - lib/rgem2rpm/argumentparse.rb
   - lib/rgem2rpm/converter.rb
-  - lib/rgem2rpm/ext.rb
   - lib/rgem2rpm/version.rb
-  - lib/rgem2rpm/ext/builder.rb
-  - lib/rgem2rpm/ext/configure_builder.rb
-  - lib/rgem2rpm/ext/ext_conf_builder.rb
-  - lib/rgem2rpm/ext/rake_builder.rb
   - conf/template.spec
 homepage: https://github.com/jppeixoto/rgem2rpm
 licenses: []
@@ -68,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Convert ruby gems into rpm

data/lib/rgem2rpm/ext/builder.rb

@@ -1,23 +0,0 @@
-require 'rubygems/ext/builder'
-
-class RGem2Rpm::Ext::Builder < Gem::Ext::Builder
-
-  def self.make_str(dest_path)
-    # create make command strings
-    make = StringIO.new
-    # change makefile variables
-    make << "sed -i 's/RUBYARCHDIR\s*=\s*\$[^$]*/RUBYARCHDIR = #{dest_path.gsub(/\//, '\/')}/g' Makefile\n"
-    make << "sed -i 's/RUBYLIBDIR\s*=\s*\$[^$]*/RUBYLIBDIR = #{dest_path.gsub(/\//, '\/')}/g' Makefile\n"
-    make << "make #{redirector}\n"
-    # create make command strings
-    make << "make install #{redirector}"
-    # return make string
-    return make.string
-  end
-
-  def self.redirector
-    '2>&1'
-  end
-
-end
-

data/lib/rgem2rpm/ext/configure_builder.rb

@@ -1,20 +0,0 @@
-require 'rgem2rpm/ext/builder'
-
-class RGem2Rpm::Ext::ConfigureBuilder < RGem2Rpm::Ext::Builder
-
-  def self.build(extension, dest_path)
-    # create make string
-    build = StringIO.new
-    unless File.exist?('Makefile') then
-      build << "sh ./configure --prefix=#{dest_path}"
-      build << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
-      build << "\n"
-    end
-    # get make commands
-    build << make_str(dest_past)
-    # return make string
-    return build.string
-  end
-
-end
-

data/lib/rgem2rpm/ext/ext_conf_builder.rb

@@ -1,17 +0,0 @@
-require 'rgem2rpm/ext/builder'
-
-class RGem2Rpm::Ext::ExtConfBuilder < RGem2Rpm::Ext::Builder
-
-  def self.build(extension, dest_path)
-    # create build string
-    build = StringIO.new
-    build << "cd %{prefix}/gems/%{name}-%{version}/#{File.dirname extension}\n"
-    build << "#{File.basename Gem.ruby} #{File.basename extension}"
-    build << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
-    build << " #{redirector}\n"
-    # get make commands
-    build << make_str(dest_path)
-    return build.string
-  end
-
-end

data/lib/rgem2rpm/ext/rake_builder.rb

@@ -1,32 +0,0 @@
-require 'rgem2rpm/ext/builder'
-
-class RGem2Rpm::Ext::RakeBuilder < RGem2Rpm::Ext::Builder
-
-  def self.build(extension, dest_path)
-    # create build string
-    build = StringIO.new
-    if File.basename(extension) =~ /mkrf_conf/i then
-      build << "#{File.basename Gem.ruby} #{extension}"
-      build << " #{Gem::Command.build_args.join " "}" unless Gem::Command.build_args.empty?
-      build << "\n"
-    end
-
-    # Deal with possible spaces in the path, e.g. C:/Program Files
-    dest_path = '"' + dest_path + '"' if dest_path.include?(' ')
-
-    rake = ENV['rake']
-
-    rake ||= begin
-               "\"#{File.basename Gem.ruby}\" -rubygems #{Gem.bin_path('rake')}"
-             rescue Gem::Exception
-             end
-
-    rake ||= Gem.default_exec_format % 'rake'
-
-    build << "#{rake} RUBYARCHDIR=#{dest_path} RUBYLIBDIR=#{dest_path}" # ENV is frozen
-    # return build string
-    return build.string
-  end
-
-end
-

data/lib/rgem2rpm/ext.rb

@@ -1,12 +0,0 @@
-require 'rubygems'
-
-##
-# Classes for building C extensions live here.
-
-module RGem2Rpm::Ext; end
-
-require 'rubygems/ext/builder'
-require 'rubygems/ext/configure_builder'
-require 'rubygems/ext/ext_conf_builder'
-require 'rubygems/ext/rake_builder'
-