gem-compile 0.0.2 → 0.0.3

data/README.md

@@ -1,12 +1,12 @@
 gem-compile
 ===========
-Create binary gems from gems with extensions.
+A RubyGems command plugin that creates pre-compiled binary gems from gems with extensions.
 
 
 ## Overview
 
-gem-compile is a RubyGem command plugin that adds 'complie' command.
-It creates binary gems from gems with extensions.
+gem-compile is a RubyGems command plugin that adds 'compile' command.
+It creates pre-compiled binary gems from gems with extensions.
 
 
 ## Installation
@@ -30,10 +30,10 @@ It creates binary gems from gems with extensions.
 ## Example
 
     $ gem compile msgpack-0.3.4.gem
-With above command line, msgpack-0.3.4-x86-mingw32.gem file will be created on MinGW environment.
+With above command line, **msgpack-0.3.4-x86-mingw32.gem** file will be created on MinGW environment.
 
     $ gem compile --platform mswin32 msgpack-0.3.4.gem
-With above command line, msgpack-0.3.4-x86-mswin32.gem file will be created.
+With above command line, **msgpack-0.3.4-x86-mswin32.gem** file will be created.
 
 
 ## License

data/bin/gem-compile

@@ -33,12 +33,15 @@ if ARGV.include?('--')
 end
 
 config = {
-	:platform => nil
+	:platform => nil,
+	:fat => nil,
 }
 
 op = OptionParser.new
 op.on('-p', '--platform PLATFORM',
 			'Output platform name') {|s| config[:platform] = s }
+op.on('-f', '--fat VERSION:RUBY,...',
+			'Create fat binary (e.g. --fat 1.8:ruby,1.9:ruby19)') {|s| config[:fat] = s }
 
 op.banner += " GEMFILE -- --build-flags"
 
@@ -53,11 +56,13 @@ end
 require 'rubygems/format'
 require 'rubygems/ext'
 require 'rubygems/builder'
+require 'shellwords'
 
 Gem::Command.build_args = build_args if build_args
 
 gem = args.first
-platform = config[:platform] || Gem::Platform::RUBY
+platform = config[:platform] || Gem::Platform::CURRENT
+fat = config[:fat]
 
 
 gem_dir = "#{File.basename(gem)}.build"
@@ -82,10 +87,21 @@ if spec.platform != Gem::Platform::RUBY
 	exit 1
 end
 
+fat_commands = {}
+if fat
+	fat.split(',').each do |ver_cmd|
+		ver, cmd = ver_cmd.split(':', 2)
+		unless ver =~ /^\d+\.\d+$/
+			puts "Invalid version string #{ver.dump}"
+			exit 1
+		end
+		fat_commands[ver] = cmd
+	end
+end
 
 format.file_entries.each do |entry, file_data|
 	path = entry['path'].untaint
-  path = File.expand_path File.join(gem_dir, path)
+	path = File.expand_path File.join(gem_dir, path)
 
 	FileUtils.rm_rf(path) if File.exists?(path)
 	FileUtils.mkdir_p File.dirname(path)
@@ -101,7 +117,7 @@ end
 
 ran_rake = false
 start_dir = Dir.pwd
-dest_path = File.join gem_dir, spec.require_paths.first
+built_paths = []
 
 spec.extensions.each do |extension|
 	break if ran_rake
@@ -117,22 +133,66 @@ spec.extensions.each do |extension|
 							Gem::Ext::RakeBuilder
 						else
 							results = ["No builder for extension '#{extension}'"]
-							nil
+							raise results.last
 						end
 
 	begin
-		Dir.chdir File.join(gem_dir, File.dirname(extension))
-		results = builder.build(extension, gem_dir, dest_path, results)
+		dest_path = File.join(gem_dir, File.dirname(extension))
+		extension = File.expand_path(extension)
+		Dir.chdir dest_path
+
+		if fat_commands.empty?
+			results = builder.build(extension, gem_dir, dest_path, results)
+
+			built_paths.concat Dir.glob("#{dest_path}/**/*")
+
+		else
+			ext_files = []
+
+			fat_commands.each_pair do |version, command|
+				version_path = File.join(dest_path, version)
+
+				script = <<-EOF
+require 'rubygems/ext'
+puts #{builder}.build(#{extension.dump},#{gem_dir.dump},#{version_path.dump}, [])
+				EOF
+
+				result = `#{command} -e #{Shellwords.escape script}`
+				results << result
+				if $? != 0
+					raise result
+				end
+
+				paths = Dir.glob("#{version_path}/**/*")
+				files = paths.map {|path| path[File.join(version_path,'').length..-1] }
+				ext_files.concat files
+
+				built_paths.concat paths
+			end
+
+			ext_files.uniq.each do |ext_name|
+				ext_basename = ext_name.sub(/\.[^\.]*$/, '')
+				rb_path = File.join(dest_path, "#{ext_basename}.rb")
+				File.open(rb_path, "w") do |f|
+					f.write <<-EOF
+require File.join File.dirname(__FILE__), RUBY_VERSION.match(/\\d+\\.\\d+/)[0], #{ext_basename.dump}
+					EOF
+				end
+
+				built_paths << rb_path
+			end
+
+		end
 
 		puts results.join("\n")
 
 	rescue => ex
 		results = results.join "\n"
 
-		File.open('gem_make.out', 'wb') { |f| f.puts results }
+		File.open('gem_make.out', 'wb') {|f| f.puts results }
 
-		mesage = <<-EOF
-ERROR: Failed to build gem native extension."
+		message = <<-EOF
+ERROR: Failed to build gem native extension.
 
 #{results}
 
@@ -148,9 +208,8 @@ end
 	
 spec.extensions = []
 
-built_files = Dir.glob("#{dest_path}/**/*")
-basedir = File.join gem_dir, ""
-built_files.each {|path| path.slice!(0, basedir.length) }
+built_files = built_paths.map {|path| path[File.join(gem_dir,'').length..-1] }
+built_files.reject! {|path| path =~ /\.o$/ }  # FIXME
 
 spec.files = (spec.files + built_files).sort.uniq
 spec.platform = platform if platform

data/lib/rubygems/commands/compile_command.rb

@@ -4,11 +4,16 @@ require 'rubygems/compiler'
 class Gem::Commands::CompileCommand < Gem::Command
 	def initialize
 		super 'compile', 'Create binary gems from gems with extensions',
-			:platform => Gem::Platform::CURRENT
+			:platform => Gem::Platform::CURRENT,
+			:fat => ""
 
 		add_option('-p', '--platform PLATFORM', 'Output platform name') do |value, options|
 			options[:platform] = value
 		end
+
+		add_option('-f', '--fat VERSION:RUBY,...', 'Create fat binary (e.g. --fat 1.8:ruby,1.9:ruby19)') do |value, options|
+			options[:fat] = value
+		end
 	end
 
 	def arguments # :nodoc:
@@ -23,11 +28,21 @@ class Gem::Commands::CompileCommand < Gem::Command
     gem = options[:args].shift
 
     unless gem then
-      raise Gem::CommandLineError,
-            "Please specify a gem name or file on the command line"
+			raise Gem::CommandLineError,
+						"Please specify a gem name or file on the command line"
     end
 
-		Gem::Compiler.compile(gem, options[:platform])
+		fat_commands = {}
+		options[:fat].split(',').each do |ver_cmd|
+			ver, cmd = ver_cmd.split(':', 2)
+			unless ver =~ /^\d+\.\d+$/ then
+				raise Gem::CommandLineError,
+							"Invalid version string #{ver.dump}"
+			end
+			fat_commands[ver] = cmd
+		end
+
+		Gem::Compiler.compile(gem, options[:platform], fat_commands)
 	end
 end
 

data/lib/rubygems/compiler.rb

@@ -4,12 +4,13 @@ require 'rubygems/builder'
 require 'rubygems/exceptions'
 require 'rubygems/user_interaction'
 require 'fileutils'
+require 'shellwords'
 
 class Gem::Compiler
 
 	extend Gem::UserInteraction
 
-	def self.compile(gem, platform = Gem::Platform::CURRENT)
+	def self.compile(gem, platform = Gem::Platform::CURRENT, fat_commands = {})
 		gem_dir = "#{File.basename(gem)}.build"
 		gem_dir = File.expand_path(gem_dir)
 
@@ -43,7 +44,7 @@ class Gem::Compiler
 
 		ran_rake = false
 		start_dir = Dir.pwd
-		dest_path = File.join gem_dir, spec.require_paths.first
+		built_paths = []
 
 		spec.extensions.each do |extension|
 			break if ran_rake
@@ -59,29 +60,73 @@ class Gem::Compiler
 									Gem::Ext::RakeBuilder
 								else
 									results = ["No builder for extension '#{extension}'"]
-									nil
+									raise results.last
 								end
 
 			begin
-				Dir.chdir File.join(gem_dir, File.dirname(extension))
-				results = builder.build(extension, gem_dir, dest_path, results)
+				dest_path = File.join(gem_dir, File.dirname(extension))
+				Dir.chdir dest_path
+
+				if fat_commands.empty?
+					results = builder.build(extension, gem_dir, dest_path, results)
+
+					built_paths.concat Dir.glob("#{dest_path}/**/*")
+
+				else
+					ext_files = []
+
+					fat_commands.each_pair do |version, command|
+						version_path = File.join(dest_path, version)
+
+						script = <<-EOF
+require "rubygems/ext"; puts #{builder}.build(#{extension.dump},#{gem_dir.dump},#{version_path.dump}, [])
+						EOF
+						script.strip!
+
+						result = `#{command} -e '#{script}'`
+						results << result
+						if $? != 0
+							raise result
+						end
+
+						paths = Dir.glob("#{version_path}/**/*")
+						files = paths.map {|path| path[File.join(version_path,'').length..-1] }
+						ext_files.concat files
+
+						built_paths.concat paths
+
+						FileUtils.rm Dir.glob("**/*.o")    # FIXME
+					end
+
+					ext_files.uniq.each do |ext_name|
+						ext_basename = ext_name.sub(/\.[^\.]*$/, '')
+						rb_path = File.join(dest_path, "#{ext_basename}.rb")
+						File.open(rb_path, "w") do |f|
+							f.write <<-EOF
+require File.join File.dirname(__FILE__), RUBY_VERSION.match(/\\d+\\.\\d+/)[0], #{ext_basename.dump}
+							EOF
+						end
+						built_paths << rb_path
+					end
+
+				end
 
 				say results.join("\n") if Gem.configuration.really_verbose
 
 			rescue => ex
 				results = results.join "\n"
 
-				File.open('gem_make.out', 'wb') { |f| f.puts results }
+				File.open('gem_make.out', 'wb') {|f| f.puts results }
 
 				message = <<-EOF
-ERROR: Failed to build gem native extension."
+ERROR: Failed to build gem native extension.
 
 				#{results}
 
 Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
 				EOF
 
-raise Gem::Exception, message
+				raise Gem::Exception, message
 			ensure
 				Dir.chdir start_dir
 			end
@@ -89,9 +134,8 @@ raise Gem::Exception, message
 
 		spec.extensions = []
 
-		built_files = Dir.glob("#{dest_path}/**/*")
-		basedir = File.join gem_dir, ""
-		built_files.each {|path| path.slice!(0, basedir.length) }
+		built_files = built_paths.map {|path| path[File.join(gem_dir,'').length..-1] }
+		built_files.reject! {|path| path =~ /\.o$/ }  # FIXME
 
 		spec.files = (spec.files + built_files).sort.uniq
 		spec.platform = platform if platform

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gem-compile
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 +09:00
+date: 2010-04-02 00:00:00 +09:00
 default_executable: 
 dependencies: []