gem-compile 0.0.3 → 0.0.4

data/README.md

@@ -13,18 +13,19 @@ It creates pre-compiled binary gems from gems with extensions.
 
     $ gem build gem-compile.gemspec
     $ gem install gem-compile-*.gem
-    or
+or
     $ gem install gem-compile
 
 
 ## Usage
 
     $ gem compile [options] GEMFILE -- --build-flags
-    or
+or
     $ gem-compile [options] GEMFILE -- --build-flags
-    
-    options:
-      -p, --platform PLATFORM          Output platform name
+
+options:
+    -p, --platform PLATFORM          Output platform name
+    -f, --fat VERSION:RUBY,...       Create fat binary (e.g. --fat 1.8:ruby,1.9:ruby19)
 
 
 ## Example
@@ -35,6 +36,9 @@ With above command line, **msgpack-0.3.4-x86-mingw32.gem** file will be created
     $ gem compile --platform mswin32 msgpack-0.3.4.gem
 With above command line, **msgpack-0.3.4-x86-mswin32.gem** file will be created.
 
+    $ gem compile --platform mswin32 --fat 1.8:/Ruby/bin/ruby,1.9:/Ruby19/bin/ruby msgpack-0.3.4.gem
+With --fat option, it creates a fat-binary. It's installable on both ruby-1.8 and ruby-1.9.
+
 
 ## License
 

data/bin/gem-compile

@@ -99,6 +99,9 @@ if fat
 	end
 end
 
+dest_path = File.join(gem_dir, spec.require_paths.first)
+FileUtils.rm_rf(dest_path) if File.exists?(dest_path)
+
 format.file_entries.each do |entry, file_data|
 	path = entry['path'].untaint
 	path = File.expand_path File.join(gem_dir, path)
@@ -117,7 +120,6 @@ end
 
 ran_rake = false
 start_dir = Dir.pwd
-built_paths = []
 
 spec.extensions.each do |extension|
 	break if ran_rake
@@ -137,51 +139,25 @@ spec.extensions.each do |extension|
 						end
 
 	begin
-		dest_path = File.join(gem_dir, File.dirname(extension))
+		build_dir = File.join(gem_dir, File.dirname(extension))
 		extension = File.expand_path(extension)
-		Dir.chdir dest_path
+		Dir.chdir build_dir
 
 		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)
+				dest_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 = %'require "rubygems/ext"; puts #{builder}.build(#{extension.dump},#{gem_dir.dump},#{dest_version_path.dump}, [])'
 
-				result = `#{command} -e #{Shellwords.escape script}`
+				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
-			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
+				raise result if $? != 0
 
-				built_paths << rb_path
+				FileUtils.rm Dir.glob("**/*.o")    # FIXME
 			end
-
 		end
 
 		puts results.join("\n")
@@ -200,14 +176,33 @@ Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
 		EOF
 
 		puts message
+
 	ensure
 		Dir.chdir start_dir
 	end
-
 end
 	
 spec.extensions = []
 
+unless fat_commands.empty?
+	fat_ext_files = fat_commands.keys.uniq.map do |version|
+		dest_version_path = File.join(dest_path, version)
+		fat_ext_paths = Dir.glob("#{dest_version_path}/**/*")
+		fat_ext_paths.map {|path| path[File.join(dest_version_path,'').length..-1] }
+	end.flatten.uniq
+
+	fat_ext_files.uniq.each do |ext_file|
+		ext_name = ext_file.sub(/\.[^\.]*$/, '')
+		rb_path = File.join(dest_path, "#{ext_name}.rb")
+		File.open(rb_path, "w") do |f|
+			f.write <<-EOF
+require File.join File.dirname(__FILE__), RUBY_VERSION.match(/\\d+\\.\\d+/)[0], #{ext_name.dump}
+			EOF
+		end
+	end
+end
+
+built_paths = Dir.glob("#{dest_path}/**/*")
 built_files = built_paths.map {|path| path[File.join(gem_dir,'').length..-1] }
 built_files.reject! {|path| path =~ /\.o$/ }  # FIXME
 

data/lib/rubygems/compiler.rb

@@ -26,6 +26,9 @@ class Gem::Compiler
 			raise Gem::Exception, "The package seems to be built already."
 		end
 
+		dest_path = File.join(gem_dir, spec.require_paths.first)
+		FileUtils.rm_rf(dest_path) if File.exists?(dest_path)
+
 		format.file_entries.each do |entry, file_data|
 			path = entry['path'].untaint
 			path = File.expand_path File.join(gem_dir, path)
@@ -44,7 +47,6 @@ class Gem::Compiler
 
 		ran_rake = false
 		start_dir = Dir.pwd
-		built_paths = []
 
 		spec.extensions.each do |extension|
 			break if ran_rake
@@ -64,51 +66,27 @@ class Gem::Compiler
 								end
 
 			begin
-				dest_path = File.join(gem_dir, File.dirname(extension))
-				Dir.chdir dest_path
+				build_dir = File.join(gem_dir, File.dirname(extension))
+				extension = File.expand_path(extension)
+				Dir.chdir build_dir
 
 				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)
+						dest_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!
+						script = %'require "rubygems/ext"; puts #{builder}.build(#{extension.dump},#{gem_dir.dump},#{dest_version_path.dump}, [])'
 
 						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
+						raise result if $? != 0
 
 						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
@@ -127,6 +105,7 @@ Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
 				EOF
 
 				raise Gem::Exception, message
+
 			ensure
 				Dir.chdir start_dir
 			end
@@ -134,6 +113,25 @@ Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
 
 		spec.extensions = []
 
+		unless fat_commands.empty?
+			fat_ext_files = fat_commands.keys.uniq.map do |version|
+				dest_version_path = File.join(dest_path, version)
+				fat_ext_paths = Dir.glob("#{dest_version_path}/**/*")
+				fat_ext_paths.map {|path| path[File.join(dest_version_path,'').length..-1] }
+			end.flatten.uniq
+
+			fat_ext_files.uniq.each do |ext_file|
+				ext_name = ext_file.sub(/\.[^\.]*$/, '')
+				rb_path = File.join(dest_path, "#{ext_name}.rb")
+				File.open(rb_path, "w") do |f|
+					f.write <<-EOF
+require File.join File.dirname(__FILE__), RUBY_VERSION.match(/\\d+\\.\\d+/)[0], #{ext_name.dump}
+					EOF
+				end
+			end
+		end
+
+		built_paths = Dir.glob("#{dest_path}/**/*")
 		built_files = built_paths.map {|path| path[File.join(gem_dir,'').length..-1] }
 		built_files.reject! {|path| path =~ /\.o$/ }  # FIXME
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gem-compile
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - FURUHASHI Sadayuki