gemjam 0.0.6 → 0.0.8

data/README.md

@@ -16,6 +16,14 @@ Or install it yourself as:
 
     $ gem install gemjam
 
+
+## Dependencies
+
+On fedora, for the java `jar` command:
+
+	yum install java-devel-openjdk
+
+
 ## Usage
 
 Package up a specific version of one gem, and latest version of another
@@ -76,20 +84,6 @@ How this is used practically aftwards
 	 23:36:22 up 133 days,  9:23,  0 users,  load average: 0.06, 0.05, 0.05
 
 
-or
-
-	$ gemjam -g warbler
-	{:jruby=>"jruby", :gems=>["warbler"]}
-	Successfully installed rake-10.1.0
-	Successfully installed jruby-jars-1.7.4
-	Successfully installed warbler-1.3.8
-	3 gems installed
-	Created d20130723-24956-4o39ld.jar
-	$ jruby -r ./d20130723-24956-4o39ld.jar -S warble
-	rm -f hurp.war
-	Creating hurp.war
-
-
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -11,7 +11,7 @@ def git_rev
   `git rev-parse --short HEAD`.chomp
 end
 
-@dist = ENV["dist"] || ".fc16"
+@dist = ENV["dist"] || ".el6"
 @d_dist = " --define 'dist #{@dist}'"
 
 @rpmname = "jrubygem-gemjam"

data/bin/gemjam

@@ -2,6 +2,5 @@
 
 require "gemjam"
 
-include Gemjam
-main(ARGV)
+Gemjam.main(ARGV)
 

data/lib/gemjam.rb

@@ -11,6 +11,7 @@ require "optparse"
 require "rbconfig"
 require "tmpdir"
 require "fileutils"
+require "stringio"
 
 module Gemjam
   def parse_args(args)
@@ -24,6 +25,9 @@ module Gemjam
       opts.on("-o", "--output FILENAME", "output to jar FILENAME") do |o|
         options[:output] = o
       end
+      opts.on("--keep", "preserve the temp working directory (for debugging)") do |o|
+        options[:keep] = o
+      end
       opts.on("-c", "--cache", "preserve the cach/*.gem files in the jar") do |o|
         options[:cache] = o
       end
@@ -55,21 +59,23 @@ module Gemjam
     end.parse!(args)
     return options
   end
+  module_function :parse_args
 
   # runs +cmd+, and sets $? with that commands return value
-  def cmd(cmd_str, quiet = false)
+  def cmd(cmd_str, quiet = false, io = $stdout)
     p cmd_str unless quiet
     IO.popen(cmd_str) do |f|
       loop do
         buf = f.read(1)
         break if buf.nil?
         unless quiet
-          print buf
-          $stdout.flush
+          io.print buf
+          io.flush
         end
       end
     end
   end
+  module_function :cmd
 
   # install rubygem +gemname+ to directory +basedir+ using jruby command +jruby+
   # 
@@ -82,6 +88,7 @@ module Gemjam
       cmd("#{jruby} -S gem install -i #{basedir} #{gemname}", quiet)
     end
   end
+  module_function :gem_install
 
   # pack up the installed gems in +dirname+, to jar file +jarname+
   # 
@@ -89,6 +96,7 @@ module Gemjam
   def make_jar(jarname, dirname, quiet = false)
     cmd("jar cf #{jarname} -C #{dirname} .", quiet)
   end
+  module_function :make_jar
 
   # install the bundle, using jruby command +jruby+
   # 
@@ -97,14 +105,20 @@ module Gemjam
     ex_opts = opts.map {|k,v| [k,v] }.join(" ")
     cmd("#{jruby} -S bundle install --path ./vendor/bundle/ #{ex_opts}", quiet)
   end
-
-  def bundler_vendor_dir
-    return ["vendor","bundle",
-            RbConfig::CONFIG["ruby_install_name"],
-            RbConfig::CONFIG["ruby_version"]].join("/")
-
+  module_function :bundle_install
+
+  def bundler_vendor_dir(jruby)
+    return @bundler_vendor_dir if @bundler_vendor_dir
+    sio = StringIO.new
+    cmd("#{jruby} -e \"print ['vendor/bundle',RbConfig::CONFIG['ruby_install_name'], RbConfig::CONFIG['ruby_version'] ].join('/')\"",
+        false,
+        sio)
+    sio.seek(0)
+    @bundler_vendor_dir = sio.read()
   end
+  module_function :bundler_vendor_dir
 
+  # run(parse_args("-q","-o",jarname,"-b","Gemfile"))
   def run(opts)
     tmpdir = Dir.mktmpdir
     begin
@@ -115,31 +129,44 @@ module Gemjam
         b_opts["--with"] = opts[:bundle_with] if opts[:bundle_with]
         b_opts["--without"] = opts[:bundle_without] if opts[:bundle_without]
 
-        FileUtils.cd tmpdir
-        FileUtils.cp opts[:bundle], "Gemfile"
-        if FileTest.file?("#{opts[:bundle]}.lock")
-          FileUtils.cp "#{opts[:bundle]}.lock", "Gemfile.lock"
-          b_opts["--deployment"] = ""
-          bundle_install(opts[:jruby], opts[:quiet], b_opts)
-        else
+        begin
+          FileUtils.cd tmpdir, :verbose => !opts[:quiet]
+          FileUtils.cp opts[:bundle], "Gemfile"
+
+          # If there is a bundler lockfile, then use it too
+          if FileTest.file?("#{opts[:bundle]}.lock")
+            FileUtils.cp "#{opts[:bundle]}.lock", "Gemfile.lock"
+
+            # ensure these timestamps match the original
+            File.utime(File.atime(opts[:bundle]),
+                       File.mtime(opts[:bundle]),
+                       "Gemfile")
+            File.utime(File.atime("#{opts[:bundle]}.lock"),
+                       File.mtime("#{opts[:bundle]}.lock"),
+                       "Gemfile.lock")
+
+            b_opts["--deployment"] = ""
+          end
+
           bundle_install(opts[:jruby], opts[:quiet], b_opts)
+          abort("FAIL: bundler returned: #{$?}") if $? != 0
+        ensure
+          FileUtils.cd cwd, :verbose => !opts[:quiet]
         end
-        FileUtils.cd cwd
-        abort("FAIL: bundler returned: #{$?}") if $? != 0
       end
 
       opts[:gems].each do |gem|
-        gem_install(opts[:jruby], File.join(tmpdir, bundler_vendor_dir), gem, opts[:quiet])
+        gem_install(opts[:jruby], File.join(tmpdir, bundler_vendor_dir(opts[:jruby])), gem, opts[:quiet])
         abort("FAIL: gem install returned: #{$?}") if $? != 0
       end
 
       # the ./cache/*.gems just duplicates the size of this jar
       unless opts[:cache]
-        FileUtils.remove_entry_secure(File.join(tmpdir, bundler_vendor_dir, "cache"), true)
+        FileUtils.remove_entry_secure(File.join(tmpdir, bundler_vendor_dir(opts[:jruby]), "cache"), true)
       end
 
       jarname = opts[:output] ? opts[:output] : File.basename(tmpdir) + ".jar"
-      make_jar(jarname, File.join(tmpdir, bundler_vendor_dir), opts[:quiet])
+      make_jar(jarname, File.join(tmpdir, bundler_vendor_dir(opts[:jruby])), opts[:quiet])
       abort("FAIL: jar packaging returned: #{$?}") if $? != 0
 
       if opts[:quiet]
@@ -149,9 +176,10 @@ module Gemjam
       end
     ensure
       # remove the directory.
-      FileUtils.remove_entry_secure(tmpdir, true)
+      FileUtils.remove_entry_secure(tmpdir, true) unless opts[:keep]
     end
   end
+  module_function :run
 
   def main(args)
     o = parse_args(args)
@@ -159,4 +187,5 @@ module Gemjam
 
     run(o)
   end
+  module_function :main
 end

data/lib/gemjam/version.rb

@@ -1,3 +1,3 @@
 module Gemjam
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemjam
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies: []
 description: Create java jar, for jRuby, from gems or a bundler Gemfile
 email: