gemjam 0.0.5 → 0.0.6

data/Rakefile

@@ -1,29 +1,48 @@
 #!/usr/bin/env rake
 
 require "bundler/gem_tasks"
+require 'find'
+require 'fileutils'
+require 'erb'
 require "rake/clean"
 require File.expand_path('../lib/gemjam/version', __FILE__)
 
-def git_rev                                                                     
-  `git rev-parse --short HEAD`.chomp                                         
-end                                                                             
+def git_rev
+  `git rev-parse --short HEAD`.chomp
+end
 
 @dist = ENV["dist"] || ".fc16"
 @d_dist = " --define 'dist #{@dist}'"
-@d_version = " --define 'version #{Gemjam::VERSION}'"
-@d_gitrev = "--define 'gitrev #{git_rev}'"
 
-@gemfile = "pkg/gemjam-#{Gemjam::VERSION}.gem" 
-@srpmfile = "rpmbuild/SRPMS/jrubygem-gemjam-#{Gemjam::VERSION}-#{git_rev}#{@dist}.src.rpm" 
+@rpmname = "jrubygem-gemjam"
+@gemfile = "pkg/gemjam-#{Gemjam::VERSION}.gem"
+@rpmspecfile = "rpmbuild/SPECS/#{@rpmname}.spec"
+@srpmfile = "rpmbuild/SRPMS/#{@rpmname}-#{Gemjam::VERSION}-#{git_rev}#{@dist}.src.rpm"
 
 task :default => :build
 
-CLEAN.include 'pkg/'
-CLEAN.include 'rpmbuild/'
+%w{ ./pkg/ ./rpmbuild/ }.each do |dir|
+  if FileTest.directory? dir                                                     
+    Find.find(dir) do |path|
+      CLEAN.include path if FileTest.file? path
+    end
+  end
+end
+
+desc "RPM spec from erb"
+task @rpmspecfile do
+  t = ERB.new(File.read("#{@rpmname}.spec.erb"))
+  FileUtils.mkdir_p(File.dirname(@rpmspecfile))
+  File.open(@rpmspecfile, "w") do |file|
+    @version = Gemjam::VERSION
+    @gitrev = git_rev()
+    file.write(t.result(binding))
+  end
+end
 
 desc "Build a SRPM for brew"
-task :srpm => [:build] do
-  cmd = "rpmbuild -bs --nodeps #{@d_dist} #{@d_version} #{@d_gitrev} --define '_sourcedir ./pkg/' --define '_srcrpmdir rpmbuild/SRPMS' ./jrubygem-gemjam.spec"
+task :srpm => [@rpmspecfile, :build] do
+  cmd = "rpmbuild -bs --nodeps #{@d_dist} --define '_sourcedir ./pkg/' --define '_srcrpmdir rpmbuild/SRPMS' ./#{@rpmspecfile}"
   puts cmd
   system cmd
 end
@@ -31,7 +50,7 @@ end
 
 desc "Build an RPM (Optional: set 'dist' env)"
 task :rpm => [:srpm] do
-  cmd = "rpmbuild --rebuild #{@d_dist} #{@d_version} #{@d_gitrev} --define '_rpmdir rpmbuild/RPMS' ./#{@srpmfile}"
+  cmd = "rpmbuild --rebuild #{@d_dist} --define '_rpmdir rpmbuild/RPMS' ./#{@srpmfile}"
   puts cmd
   system cmd
 end

data/gemjam.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["vbatts@redhat.com"]
   gem.description   = %q{Create java jar, for jRuby, from gems or a bundler Gemfile}
   gem.summary       = %q{Create java jar, for jRuby, from gems or a bundler Gemfile}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/vbatts/gemjam"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/{jrubygem-gemjam.spec → jrubygem-gemjam.spec.erb}

@@ -6,12 +6,10 @@
 %global gemdir %(%{ruby_exec} -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
-%define rel %{?gitrev}%{!?gitrev:1}
-
 Summary: Tool for packing rubygem dependencies, into a java jar
 Name: jrubygem-%{gemname}
-Version:  %{?version}%{!?version:0.0.2}
-Release: %{rel}%{?dist}
+Version:  <%= @version || "0.0.5" %>
+Release: <%= @gitrev || "1" %>%{?dist}
 Group: Development/Languages
 License: GPLv2+ or Ruby
 URL: http://git.corp.redhat.com/cgit/dev/towers/engineering/gems/gemjam/
@@ -54,7 +52,7 @@ rm -rf %{buildroot}
 %{geminstdir}/lib
 %{geminstdir}/LICENSE
 %{geminstdir}/README.md
-%exclude %{geminstdir}/%{name}.spec
+%exclude %{geminstdir}/%{name}.spec.erb
 %exclude %{geminstdir}/%{gemname}.gemspec
 %exclude %{geminstdir}/Gemfile
 %exclude %{geminstdir}/Rakefile

data/lib/gemjam.rb

@@ -21,6 +21,12 @@ module Gemjam
     }
     opts = OptionParser.new do |opts|
       opts.banner = File.basename(__FILE__) + "[-b [Gemfile]] [-g gem[,version]]..."
+      opts.on("-o", "--output FILENAME", "output to jar FILENAME") do |o|
+        options[:output] = o
+      end
+      opts.on("-c", "--cache", "preserve the cach/*.gem files in the jar") do |o|
+        options[:cache] = o
+      end
       opts.on("-q", "--quiet", "less output") do |o|
         options[:quiet] = o
       end
@@ -40,6 +46,12 @@ module Gemjam
                              File.expand_path(o)
                            end
       end
+      opts.on("--with WITH", "bundle install --with 'foo bar' (if needed)") do |o|
+        options[:bundle_with] = o
+      end
+      opts.on("--without WITHOUT", "bundle install --without 'foo bar' (if needed)") do |o|
+        options[:bundle_without] = o
+      end
     end.parse!(args)
     return options
   end
@@ -81,8 +93,9 @@ module Gemjam
   # install the bundle, using jruby command +jruby+
   # 
   # sets $? with that commands return value
-  def bundle_install(jruby, quiet = false)
-    cmd("#{jruby} -S bundle install --path ./vendor/bundle/", quiet)
+  def bundle_install(jruby, quiet = false, opts = {})
+    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
@@ -92,31 +105,44 @@ module Gemjam
 
   end
 
-  def main(args)
-    o = parse_args(args)
-    p o unless o[:quiet]
-
+  def run(opts)
     tmpdir = Dir.mktmpdir
     begin
       cwd = Dir.pwd
-      if o[:bundle]
+      if opts[:bundle]
+
+        b_opts = {}
+        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 o[:bundle], "Gemfile"
-        bundle_install(o[:jruby], o[:quiet])
+        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
+          bundle_install(opts[:jruby], opts[:quiet], b_opts)
+        end
         FileUtils.cd cwd
         abort("FAIL: bundler returned: #{$?}") if $? != 0
       end
 
-      o[:gems].each do |gem|
-        gem_install(o[:jruby], File.join(tmpdir, bundler_vendor_dir), gem, o[:quiet])
+      opts[:gems].each do |gem|
+        gem_install(opts[:jruby], File.join(tmpdir, bundler_vendor_dir), gem, opts[:quiet])
         abort("FAIL: gem install returned: #{$?}") if $? != 0
       end
 
-      jarname = File.basename(tmpdir) + ".jar"
-      make_jar(jarname, File.join(tmpdir, bundler_vendor_dir), o[:quiet])
+      # 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)
+      end
+
+      jarname = opts[:output] ? opts[:output] : File.basename(tmpdir) + ".jar"
+      make_jar(jarname, File.join(tmpdir, bundler_vendor_dir), opts[:quiet])
       abort("FAIL: jar packaging returned: #{$?}") if $? != 0
 
-      if o[:quiet]
+      if opts[:quiet]
         puts jarname
       else
         puts "Created #{jarname}"
@@ -126,4 +152,11 @@ module Gemjam
       FileUtils.remove_entry_secure(tmpdir, true)
     end
   end
+
+  def main(args)
+    o = parse_args(args)
+    p o unless o[:quiet]
+
+    run(o)
+  end
 end

data/lib/gemjam/version.rb

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

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gemjam
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Vincent Batts
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-25 00:00:00 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies: []
-
 description: Create java jar, for jRuby, from gems or a bundler Gemfile
-email: 
+email:
 - vbatts@redhat.com
-executables: 
+executables:
 - gemjam
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -35,41 +26,32 @@ files:
 - Rakefile
 - bin/gemjam
 - gemjam.gemspec
-- jrubygem-gemjam.spec
+- jrubygem-gemjam.spec.erb
 - lib/gemjam.rb
 - lib/gemjam/version.rb
-homepage: ""
+homepage: https://github.com/vbatts/gemjam
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Create java jar, for jRuby, from gems or a bundler Gemfile
 test_files: []
-
+has_rdoc: