RubyGems - rgem2rpm - Versions diffs - 1.4.8 → 1.4.9 - Mend

rgem2rpm 1.4.8 → 1.4.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

data/bin/rgem2rpm +21 -21
data/lib/rgem2rpm/argumentparse.rb +81 -75
data/lib/rgem2rpm/converter.rb +27 -26
data/lib/rgem2rpm/gem.rb +154 -148
data/lib/rgem2rpm/rpm.rb +18 -16
data/lib/rgem2rpm/version.rb +4 -3
data/lib/rgem2rpm.rb +11 -6
data/rgem2rpm.gemspec +15 -22
metadata +5 -5

data/bin/rgem2rpm CHANGED Viewed

@@ -1,21 +1,21 @@
-#!/usr/bin/env jruby
-require 'rubygems'
-# set rgem2rpm path
-rgem2rpm_path = File.expand_path('../../lib', __FILE__)
-$:.unshift(rgem2rpm_path)
-require 'rgem2rpm'
-begin
-  # parse arguments
-  options = RGem2Rpm::ArgumentParse.parse(ARGV)
-  # check arguments
-  raise "Missing argument: gemfilename" unless ARGV.size == 1
-  # get filename
-  filename = ARGV[0]
-  # convert gem to rpm
-  RGem2Rpm::Converter.process(options, filename)
-rescue => e
-  puts e.message
-  exit
-end
+#!/usr/bin/env ruby
+require 'rubygems'
+# set rgem2rpm path
+rgem2rpm_path = File.expand_path('../../lib', __FILE__)
+$:.unshift(rgem2rpm_path)
+require 'rgem2rpm'
+begin
+  # parse arguments
+  options = RGem2Rpm::ArgumentParse.parse(ARGV)
+  # check arguments
+  raise "Missing argument: gemfilename" unless ARGV.size == 1
+  # get filename
+  filename = ARGV[0]
+  # convert gem to rpm
+  RGem2Rpm::Converter.process(options, filename)
+rescue => e
+  puts e.message
+  exit
+end

data/lib/rgem2rpm/argumentparse.rb CHANGED Viewed

@@ -1,75 +1,81 @@
-require 'optparse'
-class RGem2Rpm::ArgumentParse
-  #
-  # Return a structure describing the options.
-  #
-  def self.parse(args)
-    # The options specified on the command line will be collected in *options*.
-    # We set default values here.
-    options = {}
-    opts = OptionParser.new do |opt|
-      opt.banner = "Usage: rgem2rpm [options] [gemfilename]"
-      opt.separator "options:"
-      # Template argument
-      opt.on("--template TEMPLATE", "RPM spec template.") do |template|
-        options[:template] = template
-      end
-      # Release name
-      opt.on("--release RELEASE", "RPM spec release.") do |release|
-        options[:release] = release
-      end
-      # rpm group
-      opt.on("--group GROUP", "RPM spec group.") do |group|
-        options[:group] = group
-      end
-      # operating system install user
-      opt.on("--osuser OSUSER", "OS install user.") do |osuser|
-        options[:osuser] = osuser
-      end
-      # operating system install group
-      opt.on("--osgroup OSGROUP", "OS install group.") do |osgroup|
-        options[:osgroup] = osgroup
-      end
-      # operating system install dir
-      opt.on("--installdir INSTALLDIR", "OS install directory.") do |installdir|
-        options[:installdir] = installdir
-      end
-      # jruby gem
-      opt.on("--jruby", "Build RPM to jruby platform (only when gem has executables).") do
-        options[:platform] = 'jruby'
-      end
-      # No argument, shows at tail.  This will print an options summary.
-      # Try it and see!
-      opt.on_tail("--help", "Show this message.") do
-        puts opt
-        exit
-      end
-      # Another typical switch to print the version.
-      opt.on_tail("--version", "Show version.") do
-        puts RGem2Rpm::VERSION
-        exit
-      end
-    end
-    begin
-      # parse options
-      opts.parse!(args)
-      # return options
-      options
-    rescue => e
-      puts e.message
-      exit
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+require 'optparse'
+class RGem2Rpm::ArgumentParse
+  #
+  # Return a structure describing the options.
+  #
+  def self.parse(args)
+    # The options specified on the command line will be collected in *options*.
+    # We set default values here.
+    options = {}
+    opts = OptionParser.new do |opt|
+      opt.banner = "Usage: rgem2rpm [options] [gemfilename]"
+      opt.separator "options:"
+      # Template argument
+      opt.on("--template TEMPLATE", "RPM spec template.") do |template|
+        options[:template] = template
+      end
+      # Release name
+      opt.on("--release RELEASE", "RPM spec release.") do |release|
+        options[:release] = release
+      end
+      # rpm group
+      opt.on("--group GROUP", "RPM spec group.") do |group|
+        options[:group] = group
+      end
+      # operating system install user
+      opt.on("--osuser OSUSER", "OS install user.") do |osuser|
+        options[:osuser] = osuser
+      end
+      # operating system install group
+      opt.on("--osgroup OSGROUP", "OS install group.") do |osgroup|
+        options[:osgroup] = osgroup
+      end
+      # operating system install dir
+      opt.on("--installdir INSTALLDIR", "OS install directory.") do |installdir|
+        options[:installdir] = installdir
+      end
+      # jruby gem
+      opt.on("--jruby", "Build RPM to jruby platform (only when gem has executables).") do
+        options[:platform] = 'jruby'
+      end
+      #custom rpm name
+      opt.on("--rpmname RPMNAME", "Custom package name (in case you don't want it to be rubygem-gemname") do |rpmname|
+        options[:rpmname] = rpmname
+      end
+      # No argument, shows at tail.  This will print an options summary.
+      # Try it and see!
+      opt.on_tail("--help", "Show this message.") do
+        puts opt
+        exit
+      end
+      # Another typical switch to print the version.
+      opt.on_tail("--version", "Show version.") do
+        puts RGem2Rpm::VERSION
+        exit
+      end
+    end
+    begin
+      # parse options
+      opts.parse!(args)
+      # return options
+      options
+    rescue => e
+      puts e.message
+      exit
+    end
+  end
+end

data/lib/rgem2rpm/converter.rb CHANGED Viewed

@@ -1,26 +1,27 @@
-class RGem2Rpm::Converter
-  class << self
-    def process(options, filename)
-      objects = []
-      # execute gemfile installation
-      gem = RGem2Rpm::Gem.new :filename => filename, :platform => options[:platform]
-      objects << gem
-      gem.install
-      # build args to rpm
-      args = gem.spec
-      [:template, :release, :group, :osuser, :osgroup, :installdir].each {|key|
-        args[key] = options[key] unless options[key].nil?
-      }
-      # build rpm
-      rpm = RGem2Rpm::Rpm.new args
-      objects << rpm
-      rpm.create
-    rescue => e
-      # clean temporary files
-      objects.each { |obj| obj.clean }
-      # write error message
-      puts e.message
-      exit
-    end
-  end
-end
+# -*- encoding : utf-8 -*-
+class RGem2Rpm::Converter
+  class << self
+    def process(options, filename)
+      objects = []
+      # execute gemfile installation
+      gem = RGem2Rpm::Gem.new :filename => filename, :platform => options[:platform], :rpmname => options[:rpmname]
+      objects << gem
+      gem.install
+      # build args to rpm
+      args = gem.spec
+      [:template, :release, :group, :osuser, :osgroup, :installdir, :rpmname].each {|key|
+        args[key] = options[key] if options[key]
+      }
+      # build rpm
+      rpm = RGem2Rpm::Rpm.new args
+      objects << rpm
+      rpm.create
+    rescue => e
+      # clean temporary files
+      objects.each { |obj| obj.clean }
+      # write error message
+      puts e.message
+      exit
+    end
+  end
+end

data/lib/rgem2rpm/gem.rb CHANGED Viewed

@@ -1,148 +1,154 @@
-require 'pathname'
-require 'rubygems'
-require 'rubygems/installer'
-require 'rubygems/remote_fetcher'
-class RGem2Rpm::Gem
-  # define accessors
-  attr_accessor :spec
-  def initialize(args)
-    # initialize paramters
-    @filename = args[:filename]
-    @platform = args[:platform] || 'ruby'
-  end
-  # install gem to pwd
-  def install
-    # get spec information
-    @spec = compute_spec
-    # define name and platform
-    @spec[:installname] = name_and_platform(@spec[:name])
-    # set install dir
-    @installdir = "#{@spec[:installname]}-#{@spec[:version]}"
-    # install gem
-    Gem::Installer.new(@filename, :env_shebang => true, :ignore_dependencies => true, :install_dir => @installdir, :bin_dir => "#{@installdir}/bin", :wrappers => true).install
-    # install build files
-    install_build_files
-    # get file list
-    files
-    # build tar.gz
-    build_source
-  end
-  # clean temporary files
-  def clean
-    return if @installdir.nil?
-    FileUtils.rm_rf @installdir
-    FileUtils.rm_rf "#{@installdir}.tar.gz"
-  end
-  private
-    # get information from specification
-    def compute_spec
-      specinfo = {}
-      File.open(@filename, 'r') do |f|
-        Gem::Package.open(f, 'r') do |gem|
-          # spec info
-          metadata = gem.metadata
-          # name
-          specinfo[:name] = metadata.name
-          # version
-          specinfo[:version] = metadata.version
-          # summary
-          specinfo[:summary] = metadata.summary
-          # homepage
-          specinfo[:homepage] = metadata.homepage
-          # platform
-          specinfo[:platform] = metadata.platform
-          # description
-          specinfo[:description] = metadata.description
-          # if the gemspec has extensions defined, then this should be a 'native' arch.
-          specinfo[:architecture] = metadata.extensions.empty? ? 'all' : 'native'
-          # rubygem required version
-          specinfo[:rubygem] = metadata.required_rubygems_version
-          # dependencies
-          specinfo[:dependencies] = metadata.runtime_dependencies
-          # extensions
-          specinfo[:extensions] = metadata.extensions
-          # executables
-          specinfo[:executables] = metadata.executables
-        end
-      end
-      specinfo
-    end
-    # define name and platform
-    def name_and_platform(gemname)
-      name = gemname
-      if gemname =~ /jruby|jar|java/ or @spec[:platform].to_s == 'java'
-        @platform = 'jruby'
-        name = "jruby-#{gemname}" unless gemname =~ /jruby/
-      elsif @platform == 'jruby' and !@spec[:executables].nil? and !@spec[:executables].empty?
-        name = "jruby-#{gemname}"
-      end
-      "rubygem-#{name}"
-    end
-    # return hash with list of files and directories
-    def files
-      @spec[:files] = {:directories => [], :files => [], :executables => []}
-      Dir.chdir(@installdir) do
-        # create gem directory structure
-        @spec[:files][:directories] << 'gems'
-        @spec[:files][:directories] << 'specifications'
-        @spec[:files][:directories] << 'bin'
-        # get files and directories
-        Dir.glob("gems/**/*") do |file|
-          key = File.directory?(file) ? :directories : (File.executable?(file) || file.end_with?('.sh') ? :executables : :files)
-          @spec[:files][key] << file
-        end
-        # get gem path
-        Dir.glob("gems/*") do |file|
-          @spec[:files][:gempath] = file
-        end
-        # get specification filename
-        Dir.glob("specifications/*") do |file|
-          @spec[:files][:specification] = file
-        end
-        # get executable files
-        Dir.glob("bin/*") do |file|
-          @spec[:files][:executables] << file
-          shebang(file)
-        end
-      end
-    end
-    def shebang(filename)
-      # alter first line of all executables
-      file_arr = File.readlines(filename)
-      file_arr[0] = "#!/usr/bin/env #{@platform}\n"
-      File.open(filename, 'w') { |f| f.write(file_arr.join) }
-    end
-    def build_source
-      # create tar.gz
-      res = system "tar czf #{@installdir}.tar.gz #{@installdir}"
-      # check errors
-      raise "Error creating archive #{@installdir}.tar.gz" unless res
-      # clean temporary files
-      FileUtils.rm_rf @installdir
-    end
-    def install_build_files
-      # get current directory
-      pwd = FileUtils.pwd
-      # clean build if gem has extensions
-      @spec[:extensions].each { |extension|
-        path = File.dirname("#{pwd}/#{@installdir}/gems/#{@filename[0, @filename.size-4]}/#{extension}")
-        FileUtils.cp_r "#{path}/#{@installdir}", "#{pwd}/"
-        FileUtils.rm_rf "#{path}/#{@installdir}"
-        FileUtils.rm_rf Dir.glob("#{path}/*.o")
-        FileUtils.rm_rf Dir.glob("#{path}/*.so")
-        FileUtils.rm_rf "#{path}/Makefile"
-      }
-      # delete directories
-      Dir["#{@installdir}/*"].each {|name| FileUtils.rm_rf(name) unless name =~ /bin|gems|specifications/ }
-    end
-end
+# -*- encoding : utf-8 -*-
+require 'pathname'
+require 'rubygems'
+require 'rubygems/installer'
+require 'rubygems/remote_fetcher'
+class RGem2Rpm::Gem
+  # define accessors
+  attr_accessor :spec
+  def initialize(args)
+    # initialize paramters
+    @filename    = args[:filename]
+    @platform    = args[:platform] || 'ruby'
+    @installname = args[:rpmname]
+  end
+  # install gem to pwd
+  def install
+    # get spec information
+    @spec = compute_spec
+    # define name and platform
+    if @installname
+        @spec[:installname] = @installname
+    else
+        @spec[:installname] = name_and_platform(@spec[:name])
+    end
+    # set install dir
+    @installdir = "#{@spec[:installname]}-#{@spec[:version]}"
+    # install gem
+    Gem::Installer.new(@filename, :env_shebang => true, :ignore_dependencies => true, :install_dir => @installdir, :bin_dir => "#{@installdir}/bin", :wrappers => true).install
+    # install build files
+    install_build_files
+    # get file list
+    files
+    # build tar.gz
+    build_source
+  end
+  # clean temporary files
+  def clean
+    return if @installdir.nil?
+    FileUtils.rm_rf @installdir
+    FileUtils.rm_rf "#{@installdir}.tar.gz"
+  end
+  private
+    # get information from specification
+    def compute_spec
+      specinfo = {}
+      File.open(@filename, 'r') do |f|
+        Gem::Package.open(f, 'r') do |gem|
+          # spec info
+          metadata = gem.metadata
+          # name
+          specinfo[:name] = metadata.name
+          # version
+          specinfo[:version] = metadata.version
+          # summary
+          specinfo[:summary] = metadata.summary
+          # homepage
+          specinfo[:homepage] = metadata.homepage
+          # platform
+          specinfo[:platform] = metadata.platform
+          # description
+          specinfo[:description] = metadata.description
+          # if the gemspec has extensions defined, then this should be a 'native' arch.
+          specinfo[:architecture] = metadata.extensions.empty? ? 'all' : 'native'
+          # rubygem required version
+          specinfo[:rubygem] = metadata.required_rubygems_version
+          # dependencies
+          specinfo[:dependencies] = metadata.runtime_dependencies
+          # extensions
+          specinfo[:extensions] = metadata.extensions
+          # executables
+          specinfo[:executables] = metadata.executables
+        end
+      end
+      specinfo
+    end
+    # define name and platform
+    def name_and_platform(gemname)
+      name = gemname
+      if gemname =~ /jruby|jar|java/ or @spec[:platform].to_s == 'java'
+        @platform = 'jruby'
+        name = "jruby-#{gemname}" unless gemname =~ /jruby/
+      elsif @platform == 'jruby' and !@spec[:executables].nil? and !@spec[:executables].empty?
+        name = "jruby-#{gemname}"
+      end
+      "rubygem-#{name}"
+    end
+    # return hash with list of files and directories
+    def files
+      @spec[:files] = {:directories => [], :files => [], :executables => []}
+      Dir.chdir(@installdir) do
+        # create gem directory structure
+        @spec[:files][:directories] << 'gems'
+        @spec[:files][:directories] << 'specifications'
+        @spec[:files][:directories] << 'bin'
+        # get files and directories
+        Dir.glob("gems/**/*") do |file|
+          key = File.directory?(file) ? :directories : (File.executable?(file) || file.end_with?('.sh') ? :executables : :files)
+          @spec[:files][key] << file
+        end
+        # get gem path
+        Dir.glob("gems/*") do |file|
+          @spec[:files][:gempath] = file
+        end
+        # get specification filename
+        Dir.glob("specifications/*") do |file|
+          @spec[:files][:specification] = file
+        end
+        # get executable files
+        Dir.glob("bin/*") do |file|
+          @spec[:files][:executables] << file
+          shebang(file)
+        end
+      end
+    end
+    def shebang(filename)
+      # alter first line of all executables
+      file_arr = File.readlines(filename)
+      file_arr[0] = "#!/usr/bin/env #{@platform}\n"
+      File.open(filename, 'w') { |f| f.write(file_arr.join) }
+    end
+    def build_source
+      # create tar.gz
+      res = system "tar czf #{@installdir}.tar.gz #{@installdir}"
+      # check errors
+      raise "Error creating archive #{@installdir}.tar.gz" unless res
+      # clean temporary files
+      FileUtils.rm_rf @installdir
+    end
+    def install_build_files
+      # get current directory
+      pwd = FileUtils.pwd
+      # clean build if gem has extensions
+      @spec[:extensions].each { |extension|
+        path = File.dirname("#{pwd}/#{@installdir}/gems/#{@filename[0, @filename.size-4]}/#{extension}")
+        FileUtils.cp_r "#{path}/#{@installdir}", "#{pwd}/"
+        FileUtils.rm_rf "#{path}/#{@installdir}"
+        FileUtils.rm_rf Dir.glob("#{path}/*.o")
+        FileUtils.rm_rf Dir.glob("#{path}/*.so")
+        FileUtils.rm_rf "#{path}/Makefile"
+      }
+      # delete directories
+      Dir["#{@installdir}/*"].each {|name| FileUtils.rm_rf(name) unless name =~ /bin|gems|specifications/ }
+    end
+end

data/lib/rgem2rpm/rpm.rb CHANGED Viewed

@@ -1,25 +1,27 @@
+# -*- encoding : utf-8 -*-
 require 'erb'
 class RGem2Rpm::Rpm
   attr_accessor :name, :version, :release, :license, :summary, :group, :packager, :description, :installdir
   def initialize(args)
-    @template = args[:template] || File.dirname(__FILE__) + '/../../conf/template.spec'
-    @name = args[:installname]
-    @gemname = args[:name]
-    @version = args[:version]
-    @release = args[:release] || '1'
-    @license = "See #{args[:homepage]}"
-    @summary = args[:summary]
-    @packager = args[:packager] || 'rgem2rpm'
-    @group = args[:group] || 'System Environment/Libraries'
-    @osuser = args[:osuser] || 'root'
-    @osgroup = args[:osgroup] || 'root'
-    @description = process_description(args[:description])
-    @installdir = args[:installdir] || '/usr/share/gems'
-    @arch = args[:architecture]
-    @files = args[:files]
-    @rubygem = args[:rubygem]
+    @template     = args[:template] || File.dirname(__FILE__) + '/../../conf/template.spec'
+    @name         = args[:installname]
+    @rpmname      = args[:rpmname] || args[:installname]
+    @gemname      = args[:name]
+    @version      = args[:version]
+    @release      = args[:release] || '1'
+    @license      = "See #{args[:homepage]}"
+    @summary      = args[:summary]
+    @packager     = args[:packager] || 'rgem2rpm'
+    @group        = args[:group] || 'System Environment/Libraries'
+    @osuser       = args[:osuser] || 'root'
+    @osgroup      = args[:osgroup] || 'root'
+    @description  = process_description(args[:description])
+    @installdir   = args[:installdir] || '/usr/share/gems'
+    @arch         = args[:architecture]
+    @files        = args[:files]
+    @rubygem      = args[:rubygem]
     @dependencies = args[:dependencies]
   end

data/lib/rgem2rpm/version.rb CHANGED Viewed

@@ -1,3 +1,4 @@
-module RGem2Rpm
-  VERSION = '1.4.8'
-end
+# -*- encoding : utf-8 -*-
+module RGem2Rpm
+  VERSION = '1.4.9'
+end

data/lib/rgem2rpm.rb CHANGED Viewed

@@ -1,6 +1,11 @@
-# initialize module RGem2Rpm
-require 'rgem2rpm/version'
-require 'rgem2rpm/argumentparse'
-require 'rgem2rpm/converter'
-require 'rgem2rpm/gem'
-require 'rgem2rpm/rpm'
+# -*- encoding : utf-8 -*-
+# initialize module RGem2Rpm
+# added ruby 1.9 combatibility for gem build
+#
+lib = File.dirname(__FILE__)
+require lib + '/rgem2rpm/version'
+require lib + '/rgem2rpm/argumentparse'
+require lib + '/rgem2rpm/converter'
+require lib + '/rgem2rpm/gem'
+require lib + '/rgem2rpm/rpm'

data/rgem2rpm.gemspec CHANGED Viewed

@@ -1,26 +1,19 @@
-require 'lib/rgem2rpm/version'
+# -*- encoding : utf-8 -*-
+require File.dirname(__FILE__) + '/lib/rgem2rpm/version'
 Gem::Specification.new do |s|
-   s.name = %q{rgem2rpm}
-   s.version = RGem2Rpm::VERSION
-   s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
+   s.name                      = %q{rgem2rpm}
+   s.version                   = RGem2Rpm::VERSION
+   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 = Time.now.strftime("%Y-%m-%d")
-   s.authors = ["Joao Peixoto"]
-   s.email = %q{peixoto.joao@gmail.com}
-   s.summary = %q{Convert ruby gems into rpm}
-   s.homepage = %q{https://github.com/jppeixoto/rgem2rpm}
-   s.description = %q{Application that enables conversion of rubygems to rpms.}
-   s.bindir = 'bin'
-   s.executables = 'rgem2rpm'
-   s.files = ["Rakefile",
-              "bin/rgem2rpm",
-              "rgem2rpm.gemspec",
-              "lib/rgem2rpm.rb",
-              "lib/rgem2rpm/argumentparse.rb",
-              "lib/rgem2rpm/converter.rb",
-              "lib/rgem2rpm/gem.rb",
-              "lib/rgem2rpm/rpm.rb",
-              "lib/rgem2rpm/version.rb",
-              "conf/template.spec"]
+   s.date                      = Time.now.strftime("%Y-%m-%d")
+   s.authors                   = ["Joao Peixoto"]
+   s.email                     = %q{peixoto.joao@gmail.com}
+   s.summary                   = %q{Convert ruby gems into rpm}
+   s.homepage                  = %q{https://github.com/jppeixoto/rgem2rpm}
+   s.description               = %q{Application that enables conversion of rubygems to rpms.}
+   s.bindir                    = 'bin'
+   s.require_path              = "lib"
+   s.executables               = 'rgem2rpm'
+   s.files                     = Dir.glob("{lib}/**/*") + Dir.glob("{bin}/*") + Dir.glob("{conf}/*") + [__FILE__, 'Rakefile']
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgem2rpm
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies: []
 description: Application that enables conversion of rubygems to rpms.
 email: peixoto.joao@gmail.com
@@ -18,16 +18,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- Rakefile
-- bin/rgem2rpm
-- rgem2rpm.gemspec
 - lib/rgem2rpm.rb
 - lib/rgem2rpm/argumentparse.rb
 - lib/rgem2rpm/converter.rb
 - lib/rgem2rpm/gem.rb
 - lib/rgem2rpm/rpm.rb
 - lib/rgem2rpm/version.rb
+- bin/rgem2rpm
 - conf/template.spec
+- rgem2rpm.gemspec
+- Rakefile
 homepage: https://github.com/jppeixoto/rgem2rpm
 licenses: []
 post_install_message: