jbundler 0.5.2 → 0.5.3

data/lib/jbundler/cli.rb

@@ -51,11 +51,13 @@ module JBundler
       JBundler::Tree.new( config ).show_it
     end
 
-    desc 'executable', 'create an executable jar with a given bootstrap.rb file'
-    method_option :bootstrap, :type => :string, :aliases => '-b', :required => true, :desc => 'file which will be executed when the jar gets executed'
+    desc 'executable', 'create an executable jar with a given bootstrap.rb file\nLIMITATION: only for jruby 1.6.x and newer'
+    method_option :bootstrap, :type => :string, :aliases => '-b'#, :required => true, :desc => 'file which will be executed when the jar gets executed'
+    method_option :compile, :type => :boolean, :aliases => '-c', :default => false, :desc => 'compile the ruby files from the lib directory'
+    method_option :verbose, :type => :boolean, :aliases => '-v', :default => false, :desc => 'more output'
     method_option :groups, :type => :array, :aliases => '-g', :desc => 'bundler groups to use for determine the gems to include in the jar file'
     def executable
-      ex = JBundler::Executable.new( options[ :bootstrap ], config )
+      ex = JBundler::Executable.new( options[ 'bootstrap' ], config, options[ 'compile' ], options[ :verbose ], *( options[ 'groups' ] || [:default] ) )
       ex.packit
     end
 
@@ -75,7 +77,6 @@ module JBundler
     def update
       if ARGV.size == 1
         require 'java'
-        require 'jbundler/config'
         config = JBundler::Config.new
         FileUtils.rm_f(config.jarfile_lock)
         

data/lib/jbundler/executable.rb

@@ -2,115 +2,41 @@ require 'maven/tools/jarfile'
 require 'maven/tools/dsl'
 require 'maven/ruby/maven'
 require 'fileutils'
+require 'jbundler/executable_pom'
 module JBundler
   class Executable
 
+    class Filter
+      
+      def initialize(a)
+        @a = a
+      end
+      def method_missing(m, *args, &b)
+        args[ 0 ].sub!(/^.* - /, '' )
+        args[ 0 ] = 'asd'
+        @a.send(m,*args, &b)
+      end
+    end
+
     BOOTSTRAP = 'jar-bootstrap.rb'
 
     include Maven::Tools::DSL
 
-    def initialize( bootstrap, config )
+    def initialize( bootstrap, config, compile, verbose, *groups )
       raise "file not found: #{bootstrap}" unless File.exists?( bootstrap )
-      @bootstrap = bootstrap
-      @config = config
-    end
-
-    attr_accessor :clean, :groups
-
-    def groups
-      @groups || []
-    end
-
-    def setup_jruby( jruby )
-      if ( jruby < '1.7' )
-        warn 'jruby version below 1.7 uses jruby-complete'
-        jar 'org.jruby:jruby-core', jruby
-      elsif ( jruby < '1.7.5' )
-        jar 'org.jruby:jruby-core', jruby
-      else
-        jar 'org.jruby:jruby', jruby
-      end
-    end
-    private :setup_jruby
-
-    def jruby_home( path )
-      File.join( 'META-INF/jruby.home/lib/ruby/gems/shared', path )
+      @pom = ExecutablePom.new( bootstrap, config, compile, verbose, *groups )
     end
 
     def packit
-      require 'bundler'
-      Bundler.setup( *groups )
-
-      require 'jbundler'
-      jarfile = ::Maven::Tools::Jarfile.new( @config.jarfile )
-
-      work_dir = File.join( @config.work_dir, 'executable' )
-      FileUtils.rm_rf( work_dir )
-      FileUtils.mkdir_p( work_dir )
-      FileUtils.cp( @bootstrap, File.join( work_dir,
-                                           BOOTSTRAP ) )
-      project = maven do
-        jarfile.locked.each do |dep|
-          artifact( dep )
-        end
-        build.final_name = model.artifact_id
-        build.directory = work_dir
-        resource do 
-          directory work_dir
-          includes [ BOOTSTRAP ]
-        end
-        Gem.loaded_specs.values.each do |s|
-          resource do 
-            directory s.full_gem_path
-            target_path File.join( jruby_home( 'gems' ),
-                                   File.basename( s.full_gem_path ) )
-            if s.full_gem_path == File.expand_path( '.' )
-              excludes [ "**/#{File.basename( @config.work_dir )}/**" ]
-            end
-          end
-          resource do 
-            directory File.dirname( s.loaded_from )
-            includes [ File.basename( s.loaded_from ) ]
-            target_path jruby_home( 'specifications' )
-          end            
-        end
-        
-        properties( 'maven.test.skip' => true,
-                    'project.build.sourceEncoding' => 'utf-8' )
-
-        jarfile.populate_unlocked do |dsl|
-          setup_jruby( dsl.jruby || '1.7.4' )
-          local = dsl.artifacts.select do |a|
-            a[ :system_path ]
-          end
-          if local
-            localrepo = File.join( work_dir, 'localrepo' )
-            repository( "file:#{localrepo}", :id => 'localrepo' )
-            local.each do |a|
-              file = "#{localrepo}/#{a[ :group_id ].gsub( /\./, File::SEPARATOR)}/#{a[ :artifact_id ]}/#{a[ :version ]}/#{a[ :artifact_id ]}-#{a[ :version ]}.#{a[ :type ]}"
-              FileUtils.mkdir_p( File.dirname( file ) )
-              FileUtils.cp( a.delete( :system_path ), file )
-              a.delete( :scope )
-              jar a
-            end
-          end
-        end
-
-        plugin( :shade, '2.1',
-                :transformers => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
-                                     :mainClass => 'org.jruby.JarBootstrapMain' } ] ) do
-          execute_goals( 'shade', :phase => 'package' )
-        end
-      end
-
-      m = Maven::Ruby::Maven.new( project, '.executable.pom.xml' )
+      m = Maven::Ruby::Maven.new( @pom.project, '.executable.pom.xml' )
+      m.verbose = @verbose
       m.package
-      
+
       FileUtils.rm_f( 'dependency-reduced-pom.xml' )
       puts
       puts 'now you can execute your jar like this'
       puts
-      puts "\tjava -jar #{work_dir}/#{project.artifact_id}.jar"
+      puts "\tjava -jar #{@pom.work_dir}/#{@pom.project.artifact_id}.jar"
       puts
     end
   end

data/lib/jbundler/executable_pom.rb

@@ -0,0 +1,149 @@
+require 'maven/tools/jarfile'
+require 'maven/tools/dsl'
+require 'maven/tools/versions'
+require 'maven/tools/model'
+require 'maven/ruby/maven'
+require 'fileutils'
+module JBundler
+  class ExecutablePom
+
+    BOOTSTRAP = 'jar-bootstrap.rb'
+
+    include Maven::Tools::DSL
+
+    def initialize( bootstrap, config, compile, verbose, *groups )
+      @bootstrap = bootstrap
+      @config = config
+      @groups = groups
+      @compile = compile
+      @verbose = verbose
+    end
+
+    private
+
+    def setup_jruby( jruby )
+      if ( jruby < '1.6' )
+        raise 'jruby before 1.6 are not supported'
+      elsif ( jruby < '1.7' )
+        warn 'jruby version below 1.7 uses jruby-complete'
+        jar 'org.jruby:jruby-complete', jruby
+      elsif ( jruby < '1.7.5' )
+        jar 'org.jruby:jruby-core', jruby
+      else
+        jar 'org.jruby:jruby', jruby
+      end
+    end
+
+    def jruby_home( path )
+      File.join( 'META-INF/jruby.home/lib/ruby/gems/shared', path )
+    end
+
+    def bundler_setup
+      require 'bundler'
+      Bundler.setup( *@groups )
+    rescue LoadError
+      # ignore- bundler is optional
+    end
+      
+    def jarfile
+      unless @jarfile
+        bundler_setup
+        
+        require 'jbundler'
+        @jarfile = ::Maven::Tools::Jarfile.new( @config.jarfile )
+      end
+      @jarfile
+    end
+
+    def create_project
+      maven do
+        jarfile.locked.each do |dep|
+          artifact( dep )
+        end
+        build.final_name = model.artifact_id
+        build.directory = work_dir
+        resource do 
+          directory work_dir
+          includes [ BOOTSTRAP ]
+        end
+        Gem.loaded_specs.values.each do |s|
+          resource do 
+            directory s.full_gem_path
+            target_path File.join( jruby_home( 'gems' ),
+                                   File.basename( s.full_gem_path ) )
+            if s.full_gem_path == File.expand_path( '.' )
+              excludes [ "**/#{File.basename( @config.work_dir )}/**" ]
+            end
+          end
+          resource do 
+            directory File.dirname( s.loaded_from )
+            includes [ File.basename( s.loaded_from ) ]
+            target_path jruby_home( 'specifications' )
+          end            
+        end
+        
+        properties( 'maven.test.skip' => true,
+                    'project.build.sourceEncoding' => 'utf-8' )
+
+        jarfile.populate_unlocked do |dsl|
+          setup_jruby( dsl.jruby || JRUBY_VERSION )
+          local = dsl.artifacts.select do |a|
+            a[ :system_path ]
+          end
+          if local
+            localrepo = File.join( work_dir, 'localrepo' )
+            repository( "file:#{localrepo}", :id => 'localrepo' )
+            local.each do |a|
+              file = "#{localrepo}/#{a[ :group_id ].gsub( /\./, File::SEPARATOR)}/#{a[ :artifact_id ]}/#{a[ :version ]}/#{a[ :artifact_id ]}-#{a[ :version ]}.#{a[ :type ]}"
+              FileUtils.mkdir_p( File.dirname( file ) )
+              FileUtils.cp( a.delete( :system_path ), file )
+              a.delete( :scope )
+              jar a
+            end
+          end
+        end
+        
+        if @compile
+          
+          properties 'jruby.plugins.version' => Maven::Tools::VERSIONS[ :jruby_plugins ]
+          plugin( 'de.saumya.mojo:jruby-maven-plugin', '${jruby.plugins.version}' ) do
+            execute_goal( :compile,
+                          :rubySourceDirectory => 'lib',
+                          :jrubycVerbose => @verbose)
+          end
+          
+        else
+
+          resource do 
+            directory '${basedir}/lib'
+            includes [ '**/*.rb' ]
+          end
+
+        end
+                        
+        plugin( :shade, '2.1',
+                :transformers => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
+                                     :mainClass => 'org.jruby.JarBootstrapMain' } ] ) do
+          execute_goals( 'shade', :phase => 'package' )
+        end
+      end
+    end
+
+    public
+
+    def work_dir
+      unless @work_dir
+        @work_dir = File.join( @config.work_dir, 'executable' )
+        FileUtils.rm_rf( @work_dir )
+        FileUtils.mkdir_p( @work_dir )
+        FileUtils.cp( @bootstrap, File.join( @work_dir,
+                                             BOOTSTRAP ) )
+      end
+      @work_dir
+    end
+
+    def project
+      @project ||= create_project
+    end
+  end
+end

data/spec/executable_compile/Jarfile

@@ -0,0 +1 @@
+jar 'junit:junit', '4.11'

data/spec/executable_compile/start.rb

@@ -0,0 +1 @@
+require 'app'

data/spec/executable_no_compile/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'rspec', '<3.0'

data/spec/executable_no_compile/Gemfile.lock

@@ -0,0 +1,18 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  rspec (< 3.0)

data/spec/executable_no_compile/Jarfile

@@ -0,0 +1 @@
+jar 'junit:junit', '4.11'

data/spec/executable_no_compile/Jarfile.lock

@@ -0,0 +1,2 @@
+junit:junit:jar:4.11
+org.hamcrest:hamcrest-core:jar:1.3

data/spec/executable_no_compile/start.rb

@@ -0,0 +1 @@
+require 'app'

data/spec/executable_only_java_sources/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'rspec', '<3.0'

data/spec/executable_only_java_sources/Gemfile.lock

@@ -0,0 +1,18 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  rspec (< 3.0)

data/spec/executable_only_java_sources/Jarfile.lock

@@ -0,0 +1,2 @@
+junit:junit:jar:4.11
+org.hamcrest:hamcrest-core:jar:1.3

data/spec/{executable → executable_only_java_sources}/start.rb

@@ -1,3 +1,4 @@
+require 'java' #for jruby before 1.7.x
 import 'org.junit.runner.JUnitCore'
 import 'test.AppTest'
 

data/spec/executable_spec.rb

@@ -5,23 +5,39 @@ require 'fileutils'
 
 describe JBundler::Executable do
 
-  before do
-    dir = File.join( File.dirname( __FILE__ ), 'executable' )
-    java.lang.System.set_property( 'user.dir', dir )
-    FileUtils.rm_rf( File.join( dir, 'target' ) )
-    Dir.chdir( dir )
-  end
-
-  it 'should create executable jar' do
-    skip 'rvm is not working properly' if ENV[ 'rvm_version' ]
-    exec = JBundler::Executable.new( 'start.rb', 
-                                     JBundler::Config.new )
-    exec.groups = [:default]
-    exec.packit
+  [ 
+   'executable_only_java_sources',
+   'executable_compile',
+   'executable_no_compile'
+  ].each do |exec_dir|
     
-    `java -jar target/executable/executable.jar`.must_equal 'hello world'
-  end
+    let( exec_dir.to_sym ) do
+      dir = File.join( File.dirname( File.expand_path( __FILE__ ) ),
+                       exec_dir )
+      java.lang.System.set_property( 'user.dir', dir )
+      FileUtils.rm_rf( File.join( dir, 'target' ) )
+      dir
+    end
 
+    it "should create #{exec_dir} jar" do
+      skip 'rvm is not working properly' if ENV[ 'rvm_version' ]
+      skip "jruby #{JRUBY_VERSION}" if JRUBY_VERSION < '1.6.'
+      dir = eval "#{exec_dir}"
+
+      FileUtils.chdir( dir ) do
+        exec = JBundler::Executable.new( 'start.rb', 
+                                         JBundler::Config.new,
+                                         File.basename( dir ) == 'executable_compile',
+                                         false,
+                                         :default )
+        exec.packit
+        
+        `java -jar target/executable/#{exec_dir}.jar`.must_equal 'hello world'
+        
+        FileUtils.rm_rf( 'target' ) if ENV[ 'KEEP' ].nil?
+      end
+    end
+  end
 end
 
-FileUtils.rm_rf( File.join( File.expand_path( __FILE__ ).sub( /_spec.rb/, '' ), 'target' ) )
+#FileUtils.rm_rf( File.join( File.expand_path( __FILE__ ).sub( /_spec.rb/, '' ), 'target' ) )

data/spec/setup.rb

@@ -2,6 +2,9 @@
 $LOAD_PATH.unshift File.join( File.dirname( File.expand_path( File.dirname( __FILE__ ) ) ),
                               'lib' )
 
+# TODO somehow needed here for executable_spec
+require 'maven/tools/coordinate'
+
 begin
   require 'minitest'
 rescue LoadError

data/spec/tree/ref.txt

@@ -1,6 +1,6 @@
 +- rubygems:rspec:gem:2.14.1:compile
 |  +- rubygems:rspec-core:gem:2.14.5:compile (version selected from constraint [2.14.0,2.14.99999])
-|  +- rubygems:rspec-expectations:gem:2.14.2:compile (version selected from constraint [2.14.0,2.14.99999])
+|  +- rubygems:rspec-expectations:gem:2.14.3:compile (version selected from constraint [2.14.0,2.14.99999])
 |  |  \- rubygems:diff-lcs:gem:1.2.4:compile (version selected from constraint [1.1.3,2.0))
 |  \- rubygems:rspec-mocks:gem:2.14.3:compile (version selected from constraint [2.14.0,2.14.99999])
 +- org.jruby:jruby-core:jar:1.7.4:provided

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbundler
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-maven
@@ -118,6 +118,7 @@ files:
 - lib/jbundler/classpath_file.rb
 - lib/jbundler/tree.rb
 - lib/jbundler/gemfile_lock.rb
+- lib/jbundler/executable_pom.rb
 - lib/jbundler/cli.rb
 - lib/jbundler/config.rb
 - lib/jbundler/pom.rb
@@ -136,11 +137,21 @@ files:
 - spec/tree/Jarfile.lock
 - spec/tree/Gemfile
 - spec/tree/ref.txt
-- spec/executable/Jarfile
-- spec/executable/Jarfile.lock
-- spec/executable/Gemfile.lock
-- spec/executable/Gemfile
-- spec/executable/start.rb
+- spec/executable_only_java_sources/Jarfile
+- spec/executable_only_java_sources/Jarfile.lock
+- spec/executable_only_java_sources/Gemfile.lock
+- spec/executable_only_java_sources/Gemfile
+- spec/executable_only_java_sources/start.rb
+- spec/executable_no_compile/Jarfile
+- spec/executable_no_compile/Jarfile.lock
+- spec/executable_no_compile/Gemfile.lock
+- spec/executable_no_compile/Gemfile
+- spec/executable_no_compile/start.rb
+- spec/executable_compile/Jarfile
+- spec/executable_compile/Jarfile.lock
+- spec/executable_compile/Gemfile.lock
+- spec/executable_compile/Gemfile
+- spec/executable_compile/start.rb
 - MIT-LICENSE
 - Readme.md
 - Gemfile.lock