jbundler 0.5.3 → 0.5.4

data/Gemfile

@@ -1,5 +1,7 @@
+#-*- mode: ruby -*-
 source 'https://rubygems.org'
+
 gemspec
 
-# needed for some specs
-gem 'rspec', '<3.0', :group => :test
+gem "copyright-header", "1.0.8", :platform => :mri, :group => :copyright
+

data/Gemfile.lock

@@ -1,32 +1,24 @@
 PATH
   remote: .
   specs:
-    jbundler (0.5.2)
+    jbundler (0.5.4)
       bundler (~> 1.2)
-      ruby-maven (>= 3.1.0.0.1, < 3.1.1)
+      ruby-maven (>= 3.1.1.0.1, < 3.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.3.4)
-    descendants_tracker (0.0.1)
-    diff-lcs (1.2.4)
-    maven-tools (0.33.3)
+    backports (3.3.5)
+    copyright-header (1.0.8)
+    descendants_tracker (0.0.3)
+    maven-tools (0.34.2)
       virtus (~> 0.5)
     minitest (4.7.5)
     rake (10.1.0)
-    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)
-    ruby-maven (3.1.0.0.1)
+    ruby-maven (3.1.1.0.1)
       maven-tools (~> 0.33)
-      ruby-maven-libs (= 3.1.0)
-    ruby-maven-libs (3.1.0)
+      ruby-maven-libs (= 3.1.1)
+    ruby-maven-libs (3.1.1)
     thor (0.15.4)
     virtus (0.5.5)
       backports (~> 3.3)
@@ -37,8 +29,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  copyright-header (= 1.0.8)
   jbundler!
   minitest (~> 4.0)
   rake (~> 10.0)
-  rspec (< 3.0)
   thor (> 0.14.0, < 0.16.0)

data/lib/jbundler/aether.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Kristian Meier
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -53,9 +53,13 @@ module JBundler
       @aether = Aether.new( config.verbose )
       @aether.add_proxy( config.proxy ) if config.proxy
       @aether.add_mirror( config.mirror ) if config.mirror
-      @aether.offline = config.offline
-      @aether.user_settings = config.settings if config.settings
-      @aether.local_repository = java.io.File.new(config.local_repository) if config.local_repository
+      @aether.offline = config.offline 
+      if config.settings
+        @aether.user_settings = java.io.File.new( config.settings )
+      end
+      if config.local_repository
+        @aether.local_repository = java.io.File.new(config.local_repository)
+      end
     rescue NativeException => e
       e.cause.print_stack_trace
       raise e

data/lib/jbundler/classpath_file.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Kristian Meier
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

data/lib/jbundler/cli.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Kristian Meier
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -32,8 +32,15 @@ module JBundler
       def do_show
         require 'java' 
         require 'jbundler/classpath_file'
-        classpath_file = JBundler::ClasspathFile.new(config.classpath_file)
-        if classpath_file.exists?
+        require 'jbundler/vendor'
+        classpath_file = JBundler::ClasspathFile.new( config.classpath_file )
+        vendor = JBundler::Vendor.new( config.vendor_dir )
+        if vendor.vendored?
+          puts "JBundler classpath:"
+          vendor.require_jars.each do |path|
+            puts "  * #{path}"
+          end
+        elsif classpath_file.exists?
           classpath_file.require_classpath unless defined? JBUNDLER_CLASSPATH
           puts "JBundler classpath:"
           JBUNDLER_CLASSPATH.each do |path|
@@ -52,7 +59,7 @@ module JBundler
     end
 
     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 :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'
@@ -67,8 +74,22 @@ module JBundler
     end
     
     desc 'install', "first `bundle install` is called and then the jar dependencies will be installed. for more details see `bundle help install`, jbundler will ignore all options. the install command is also the default when no command is given."
+    method_option :deployment, :type => :boolean, :default => false, :desc => "copy the jars into the vendor/jars directory (or as configured). these vendored jars have preference before the classpath jars !"
+    method_option :no_deployment, :type => :boolean, :default => false, :desc => 'clears the vendored jars'
     def install
       require 'jbundler'
+      if options[ :no_deployment ]
+        vendor = JBundler::Vendor.new( config.vendor_dir )
+        vendor.clear
+      end
+      if options[ :deployment ]
+        vendor = JBundler::Vendor.new( config.vendor_dir )
+        if vendor.vendored?
+          raise "already vendored. please 'jbundle install --no-deployment before."
+        else
+          vendor.setup( JBundler::ClasspathFile.new( config.classpath_file ) )
+        end
+      end
       do_show
       puts 'Your jbundle is complete! Use `jbundle show` to see where the bundled jars are installed.'
     end

data/lib/jbundler/config.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Kristian Meier
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -25,23 +25,27 @@ module JBundler
   # allow yaml config in $HOME/.jbundlerrc and $PWD/.jbundlerrc
   class Config
 
-    attr_accessor :verbose, :local_repository, :jarfile, :gemfile, :skip, :settings, :offline, :work_dir
+    attr_accessor :verbose, :local_repository, :jarfile, :gemfile, :skip, :settings, :offline, :work_dir, :vendor_dir
 
     def initialize
       file = '.jbundlerrc'
       homefile = File.join(ENV['HOME'], file)
       home_config = YAML.load_file(homefile) if File.exists?(homefile)
       pwd_config = YAML.load_file(file) if File.exists?(file)
+      File.expand_path( file )
       @config = (home_config || {}).merge(pwd_config || {})
     end
 
     if defined? JRUBY_VERSION
       def jbundler_env(key)
-        @config[key.downcase.sub(/^j?bundle_/, '').sub(/[.]/, '_')] || java.lang.System.getProperty(key.downcase.gsub(/_/, '.')) || ENV[key.upcase.gsub(/[.]/, '_')]
+        java.lang.System.getProperty(key.downcase.gsub(/_/, '.')) ||
+          ENV[key.upcase.gsub(/[.]/, '_')] ||
+          @config[key.downcase.sub(/^j?bundle_/, '').sub(/[.]/, '_')]
       end
     else
       def jbundler_env(key)
-        @config[key.downcase.sub(/^j?bundler/, '').sub(/[.]/, '_')] || ENV[key.upcase.gsub(/[.]/, '_')]
+        ENV[key.upcase.gsub(/[.]/, '_')] ||
+          @config[key.downcase.sub(/^j?bundler/, '').sub(/[.]/, '_')]
       end
     end
     private :jbundler_env
@@ -79,7 +83,7 @@ module JBundler
     end
 
     def classpath_file
-      '.jbundler/classpath.rb'
+      jbundler_env('JBUNDLE_CLASSPATH_FILE') || '.jbundler/classpath.rb'
     end
 
     def local_repository
@@ -118,5 +122,9 @@ module JBundler
       @work_dir ||= jbundler_env('JBUNDLE_WORK_DIR') || 'target'
     end
 
+    def vendor_dir
+      @vendor_dir ||= jbundler_env('JBUNDLE_VENDOR_DIR') || File.join( 'vendor', 'jars' )
+    end
+
   end
 end

data/lib/jbundler/configurator.rb

@@ -0,0 +1,23 @@
+require 'jbundler/configurator'
+module JBundler
+  class Configurator
+
+    attr_accessor :groups, :bootstrap, :verbose, :compile, :work_dir
+
+    def initialize( config )
+      @config = config
+    end
+    
+    def configure( maven )
+      maven.property( 'jbundler.jarfile', @config.jarfile )
+      maven.property( 'jbundler.gemfile', @config.gemfile )
+      maven.property( 'jbundler.workdir', work_dir )
+      maven.property( 'jbundler.groups', @groups )
+      maven.property( 'jbundler.bootstrap', @bootstrap )
+    end
+
+    def work_dir
+      @work_dir ||= File.expand_path( @config.work_dir )
+    end
+  end
+end

data/lib/jbundler/executable.rb

@@ -1,8 +1,5 @@
-require 'maven/tools/jarfile'
-require 'maven/tools/dsl'
 require 'maven/ruby/maven'
 require 'fileutils'
-require 'jbundler/executable_pom'
 module JBundler
   class Executable
 
@@ -13,30 +10,32 @@ module JBundler
       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, compile, verbose, *groups )
       raise "file not found: #{bootstrap}" unless File.exists?( bootstrap )
-      @pom = ExecutablePom.new( bootstrap, config, compile, verbose, *groups )
+      @config = Configurator.new( config )
+      @config.bootstrap = bootstrap
+      @config.compile = compile
+      @config.verbose = verbose
+      @config.groups = groups.join( ',' )
     end
 
     def packit
-      m = Maven::Ruby::Maven.new( @pom.project, '.executable.pom.xml' )
-      m.verbose = @verbose
-      m.package
+      m = Maven::Ruby::Maven.new
+      m.options[ '-f' ] = File.join( File.dirname( __FILE__ ), 
+                                     'executable_pom.rb' )
+      @config.configure( m )
+      m.verbose = @config.verbose
+      m.package( '-P', @config.compile ? :compile : :no_compile )
 
-      FileUtils.rm_f( 'dependency-reduced-pom.xml' )
+      #FileUtils.rm_f( 'dependency-reduced-pom.xml' )
       puts
       puts 'now you can execute your jar like this'
       puts
-      puts "\tjava -jar #{@pom.work_dir}/#{@pom.project.artifact_id}.jar"
+      puts "\tjava -jar #{@config.work_dir}/executable/*.jar"
       puts
     end
   end

data/lib/jbundler/executable_pom.rb

@@ -1,149 +1,110 @@
-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'
+begin
+  groups = java.lang.System.getProperty( "jbundler.groups" ) || ''
+  require 'bundler'
+  Bundler.setup( *groups.split( /,/ ) )
+rescue LoadError
+  # ignore- bundler is optional
+end
 
-    include Maven::Tools::DSL
+jfile = ::Maven::Tools::Jarfile.new( java.lang.System.getProperty( "jbundler.jarfile" ) )
 
-    def initialize( bootstrap, config, compile, verbose, *groups )
-      @bootstrap = bootstrap
-      @config = config
-      @groups = groups
-      @compile = compile
-      @verbose = verbose
-    end
+workdir = java.lang.System.getProperty( "jbundler.workdir" )
+jworkdir = File.join( workdir, 'executable' )
+FileUtils.rm_rf( jworkdir )
+FileUtils.mkdir_p( jworkdir )
 
-    private
+BOOTSTRAP = 'jar-bootstrap.rb' unless defined? BOOTSTRAP
 
-    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
+FileUtils.cp( java.lang.System.getProperty( 'jbundler.bootstrap'), 
+              File.join( jworkdir, BOOTSTRAP ) )
 
-    def jruby_home( path )
-      File.join( 'META-INF/jruby.home/lib/ruby/gems/shared', path )
-    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
+ 
+jfile.locked.each do |dep|
+  artifact( dep )
+end
+build.final_name = model.artifact_id
+build.directory = jworkdir
+resource do 
+  directory jworkdir
+  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 [ "**/#{workdir}/**" ]
     end
+  end
+  resource do 
+    directory File.dirname( s.loaded_from )
+    includes [ File.basename( s.loaded_from ) ]
+    target_path jruby_home( 'specifications' )
+  end            
+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' )
+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
+jfile.populate_unlocked do |dsl|
+  
+  # setup jruby version
+  jruby_version = dsl.jruby || JRUBY_VERSION
+  if ( jruby_version < '1.6' )
+    raise 'jruby before 1.6 are not supported'
+  elsif ( jruby_version < '1.7' )
+    warn 'jruby version below 1.7 uses jruby-complete'
+    jar 'org.jruby:jruby-complete', jruby_version
+  elsif ( jruby_version < '1.7.5' )
+    jar 'org.jruby:jruby-core', jruby_version
+  else
+    jar 'org.jruby:jruby', jruby_version
+  end
 
-          resource do 
-            directory '${basedir}/lib'
-            includes [ '**/*.rb' ]
-          end
+  local = dsl.artifacts.select do |a|
+    a[ :system_path ]
+  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
+  # setup a localrepo for the local jars if needed
+  if local
+    localrepo = File.join( jworkdir, '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
 
-    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
+profile :compile do
+  
+  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
+end
 
-    def project
-      @project ||= create_project
-    end
+profile :no_compile do
+  build do
+  resource do 
+    directory '${basedir}/lib'
+    includes [ '**/*.rb' ]
+  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

data/lib/jbundler/gemfile_lock.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Kristian Meier
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

data/lib/jbundler/lazy.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Kristian Meier
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -99,4 +99,4 @@ module JBundler
         end
     end
   end
-end
+end

data/lib/jbundler/pom.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Kristian Meier
+# Copyright (C) 2013 Christian Meier
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

data/lib/jbundler/tree.rb

@@ -1,3 +1,4 @@
+require 'jbundler/configurator'
 require 'maven/tools/jarfile'
 require 'maven/tools/dsl'
 require 'maven/tools/model'
@@ -9,46 +10,27 @@ module JBundler
     include Maven::Tools::DSL
 
     def initialize( config )
-      @config = config
+      @config = Configurator.new( config )
     end
 
     def show_it( debug = false )
-      require 'jbundler'
-      jfile = ::Maven::Tools::Jarfile.new( @config.jarfile )
-      project = maven do
-        basedir( File.dirname( @config.jarfile ) )
+      m = Maven::Ruby::Maven.new
+      m.options[ '-f' ] = File.join( File.dirname( __FILE__ ), 'tree_pom.rb' )
+      @config.configure( m )
 
-        gemfile( @config.gemfile ) if File.exists? @config.gemfile
-
-        jarfile :skip_locked => true
-
-        build.directory = @config.work_dir if @config.work_dir != 'target'
-        
-        properties( 'project.build.sourceEncoding' => 'utf-8' )
+      unless debug
+        # silence the output
+        old = java.lang.System.err
+        java.lang.System.err = java.io.PrintStream.new( java.io.ByteArrayOutputStream.new )
       end
 
-      output = java.io.ByteArrayOutputStream.new
-      out = java.io.PrintStream.new( output )
-      old = java.lang.System.err
-      java.lang.System.err = out
-
-      m = Maven::Ruby::Maven.new( project, '.tree.pom.xml' )
       m.exec( 'org.apache.maven.plugins:maven-dependency-plugin:2.8:tree' )
-      result = output.to_string( 'utf-8' ).split( "\n" )
-      result = result.each do |line|
-        line.gsub!( /\[[^ ]+\] /, '' )
-      end
-      unless debug
-        result = result.select do |line|
-          line =~ /^[INFO].*/
-        end
-      end
-      result = result.each do |line|
-        line.gsub!( /^.* - /, '' )
-      end
-      $stdout.puts result.join( "\n" )#.gsub( /^.* - /, '' )#.gsub( /\n\n\n/, "\n" )
+
+      puts File.read( File.join( File.expand_path( @config.work_dir ), 
+                                 'tree.txt' ) )
+      
     ensure
-      java.lang.System.err = old
+      java.lang.System.err = old if old
     end
   end
 end

data/lib/jbundler/tree_pom.rb

@@ -0,0 +1,19 @@
+jfile = java.lang.System.getProperty( "jbundler.jarfile" )
+gfile = java.lang.System.getProperty( "jbundler.gemfile" )
+jworkdir = java.lang.System.getProperty( "jbundler.workdir" )
+
+basedir( File.dirname( jfile ) )
+
+gemfile( gfile ) if File.exists? gfile
+
+jarfile( jfile, :skip_locked => true )
+
+build do
+  directory = jworkdir
+  default_goal 'dependency:tree'
+end
+        
+properties( 'project.build.sourceEncoding' => 'utf-8',
+            'tesla.dump.readOnly' => true,
+            'tesla.dump.pom' => 'tree.pom.xml',
+            'outputFile' => '${project.build.directory}/tree.txt' )