jbundler 0.5.5 → 0.6.0

data/lib/jbundler/config.rb

@@ -19,34 +19,74 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 require 'yaml'
+require 'jar_dependencies'
 
 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, :vendor_dir
+    RC_FILE = '.jbundlerrc'
+
+    attr_accessor :verbose, :local_repository, :jarfile, :gemfile, :skip, :settings, :offline, :work_dir, :vendor_dir, :basedir
 
     def initialize
-      file = '.jbundlerrc'
-      homefile = File.join(ENV['HOME'], file)
-      home_config = YAML.load_file(homefile) if File.exists?(homefile)
+      if ENV.has_key? 'HOME'
+        homefile = File.join(ENV['HOME'], RC_FILE)
+        home_config = YAML.load_file(homefile) if File.exists?(homefile)
+      else
+        home_config = nil
+      end
+      @config = (home_config || {})
+      @basedir = find_basedir( File.expand_path( '.' ) )
+      @basedir ||= File.expand_path( '.' )
+      file = join_basedir( RC_FILE )
       pwd_config = YAML.load_file(file) if File.exists?(file)
-      File.expand_path( file )
-      @config = (home_config || {}).merge(pwd_config || {})
+      @config.merge!(pwd_config || {})
+    end
+    
+    def join_basedir( path )
+      if @basedir
+        File.join( @basedir, path )
+      else
+        path
+      end
+    end
+
+    def find_basedir( dir )
+      f = File.join( dir, RC_FILE )
+      return dir if File.exists?( f )
+      f = File.join( dir, _jarfile )
+      return dir if File.exists?( f )
+      f = File.join( dir, _gemfile )
+      return dir if File.exists?( f )
+      parent = File.dirname( dir )
+      if dir != ENV['HOME'] && dir != parent
+        find_basedir( parent )
+      end
+    end
+
+    def absolute( file )
+      if file.nil? || file == File.expand_path( file )
+        file
+      else
+        File.join( @basedir, file )
+      end
+    end
+
+    def _jbundler_env( key )
+      ENV[ key.upcase.gsub( /[.]/, '_' ) ] ||
+        @config[ key.downcase.sub(/^j?bundle_/, '' ).sub( /[.]/, '_' ) ]
     end
+    private :_jbundler_env
 
     if defined? JRUBY_VERSION
-      def jbundler_env(key)
-        java.lang.System.getProperty(key.downcase.gsub(/_/, '.')) ||
-          ENV[key.upcase.gsub(/[.]/, '_')] ||
-          @config[key.downcase.sub(/^j?bundle_/, '').sub(/[.]/, '_')]
+      def jbundler_env( key )
+        java.lang.System.getProperty( key.downcase.gsub( /_/, '.' ) ) ||
+          _jbundler_env( key )
       end
     else
-      def jbundler_env(key)
-        ENV[key.upcase.gsub(/[.]/, '_')] ||
-          @config[key.downcase.sub(/^j?bundler/, '').sub(/[.]/, '_')]
-      end
+      alias :jbundler_env :_jbundler_env
     end
     private :jbundler_env
 
@@ -63,36 +103,54 @@ module JBundler
     end
 
     def jarfile
-      if File.exists?('Mvnfile')
-        warn "'Mvnfile' name is deprecated, please use 'Jarfile' instead"
-        @jarfile = 'Mvnfile'
-      end
-      @jarfile ||= jbundler_env('JBUNDLE_JARFILE') || 'Jarfile'
+      @jarfile ||= absolute( _jarfile )
     end
 
+    def _jarfile
+      jbundler_env('JBUNDLE_JARFILE') || 'Jarfile'
+    end
+    private :_jarfile
+
     def jarfile_lock
       "#{jarfile}.lock"
     end
 
     def gemfile
-      @gemfile ||= jbundler_env('BUNDLE_GEMFILE') || 'Gemfile'
+      @gemfile ||= absolute( _gemfile )
+    end
+
+    def _gemfile
+      jbundler_env('BUNDLE_GEMFILE') || 'Gemfile'
     end
+    private :_gemfile
 
     def gemfile_lock
       "#{gemfile}.lock"
     end
 
     def classpath_file
-      jbundler_env('JBUNDLE_CLASSPATH_FILE') || '.jbundler/classpath.rb'
+      absolute( jbundler_env('JBUNDLE_CLASSPATH_FILE') ||
+                '.jbundler/classpath.rb' )
     end
 
     def local_repository
       # use maven default local repo as default
-      @local_maven_repository ||= jbundler_env('JBUNDLE_LOCAL_REPOSITORY')
+      local_maven_repository = absolute( jbundler_env('JBUNDLE_LOCAL_REPOSITORY') )
+      if local_maven_repository
+        warn "JBUNDLE_LOCAL_REPOSITORY environment or jbundle.local.repository' system property is deprecated use JARS_HOME or jars.home instead"
+        ENV[ Jars::HOME ] ||= local_maven_repository
+      else
+        Jars.home
+      end
     end
 
     def settings
-      @settings ||= jbundler_env('JBUNDLE_SETTINGS')
+      settings = absolute( jbundler_env('JBUNDLE_SETTINGS') )
+      if settings
+        warn "JBUNDLE_SETTINGS environment or jbundle.settings' system property is deprecated use JARS_MAVEN_SETTINGS or jars.maven.settings instead"
+        ENV[ Jars::MAVEN_SETTINGS ] ||= settings
+      end
+      Jars.maven_settings
     end
 
     def offline
@@ -118,20 +176,13 @@ module JBundler
       @mirror
     end
 
-    def rubygems_mirror
-      @rubygems_mirror ||= jbundler_env('BUNDLE_RUBYGEMS_MIRROR')
-      # here a leading slash is needed !!
-      @rubygems_mirror =  @rubygems_mirror.sub( /([^\/])$/ , "\\1/" ) if @rubygems_mirror
-      warn 'reubygems mirror config is deprecated, use bundler >=1.5 and its mirror config'
-      @rubygems_mirror
-    end
-
     def work_dir
-      @work_dir ||= jbundler_env('JBUNDLE_WORK_DIR') || 'pkg'
+      @work_dir ||= absolute( jbundler_env('JBUNDLE_WORK_DIR') || 'pkg' )
     end
 
     def vendor_dir
-      @vendor_dir ||= jbundler_env('JBUNDLE_VENDOR_DIR') || File.join( 'vendor', 'jars' )
+      @vendor_dir ||= absolute( jbundler_env('JBUNDLE_VENDOR_DIR') ||
+                                File.join( 'vendor', 'jars' ) )
     end
 
   end

data/lib/jbundler/configurator.rb

@@ -9,6 +9,7 @@ module JBundler
     end
     
     def configure( maven )
+      maven.property( 'jbundler.basedir', @config.basedir )
       maven.property( 'jbundler.jarfile', @config.jarfile )
       maven.property( 'jbundler.gemfile', @config.gemfile )
       maven.property( 'jbundler.workdir', work_dir )

data/lib/jbundler/context.rb

@@ -0,0 +1,34 @@
+require 'maven/tools/jarfile'
+require 'jbundler/classpath_file'
+require 'jbundler/vendor'
+require 'jbundler/gemfile_lock'
+require 'jbundler/aether'
+
+module JBundler
+
+  class Context
+    
+    attr_reader :config
+
+    def initialize
+      @config = JBundler::Config.new
+    end
+    
+    def jarfile
+      @jarfile ||= Maven::Tools::Jarfile.new( @config.jarfile )
+    end
+
+    def vendor
+      @vendor ||= JBundler::Vendor.new( @config.vendor_dir )
+    end
+
+    def classpath
+      @classpath ||= JBundler::ClasspathFile.new( @config.classpath_file )
+    end
+    
+    def gemfile_lock
+      @gemfile_lock ||= JBundler::GemfileLock.new( jarfile, 
+                                                   @config.gemfile_lock )
+    end
+  end
+end

data/lib/jbundler/{lock_down_pom.rb → dependency_pom.rb}

@@ -1,23 +1,27 @@
+bdir = java.lang.System.getProperty( "jbundler.basedir" )
 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 ) )
+basedir( bdir )
+if basedir != bdir
+  # older maven-tools needs this
+  self.instance_variable_set( :@basedir, bdir )
+end
 
 gemfile( gfile ) if File.exists? gfile
 
-jarfile( jfile )
+jarfile( jfile, :skip_locked => true )
 
 build do
   directory = jworkdir
-  default_goal 'dependency:list'
 end
         
+properties( 'project.build.sourceEncoding' => 'utf-8',
+            'tesla.dump.readOnly' => true,
+            'tesla.dump.pom' => 'tree.pom.xml' )
+
 plugin( :dependency, '2.8',
         :includeTypes => 'jar',
         :outputAbsoluteArtifactFilename => true,
-        :outputFile => "#{jworkdir}/dependencies.txt" )
-
-properties( 'project.build.sourceEncoding' => 'utf-8',
-            'tesla.dump.readOnly' => true,
-            'tesla.dump.pom' => 'lockdown.pom.xml'  )
+        :outputFile => java.lang.System.getProperty( "jbundler.outputFile" ) )

data/lib/jbundler/executable_pom.rb

@@ -21,7 +21,6 @@ FileUtils.cp( java.lang.System.getProperty( 'jbundler.bootstrap'),
 def jruby_home( path )
   File.join( 'META-INF/jruby.home/lib/ruby/gems/shared', path )
 end
-
  
 jfile.locked.each do |dep|
   artifact( dep )
@@ -54,19 +53,13 @@ properties( 'maven.test.skip' => true,
 
 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
+  setup_jruby( dsl.jruby || JRUBY_VERSION, :compile )
+  dsl.artifacts.select do |a|
+    a[ :scope ] == :provided
+  end.each do |a|
+    a[ :scope ] = :compile
+    artifact( a )
   end
-
   local = dsl.artifacts.select do |a|
     a[ :system_path ]
   end

data/lib/jbundler/gemfile_lock.rb

@@ -35,6 +35,10 @@ module JBundler
       !@lockfile.nil?
     end
 
+    def newer?( mtime )
+      exists? && ( self.mtime > mtime )
+    end
+
     def mtime
       File.mtime(@lockfile) if @lockfile
     end

data/lib/jbundler/jruby_complete.rb

@@ -0,0 +1,44 @@
+require 'jbundler/pom_runner'
+require 'fileutils'
+module JBundler
+  class JRubyComplete < PomRunner
+
+    def initialize( config, options )
+      super options
+      work_dir = File.expand_path( config.work_dir )
+      maven.property( 'jbundler.workdir', work_dir )
+      maven.property( 'jbundler.basedir', config.basedir )
+      maven.property( 'jbundler.jarfile', config.jarfile )
+      maven.property( 'jbundler.gemfile', config.gemfile )
+      @tree = File.join( work_dir, 'tree.txt' )
+      maven.property( 'jbundler.outputFile', @tree )
+    end
+
+    def pom_file
+      File.join( File.dirname( __FILE__ ), 'jruby_complete_pom.rb' )
+    end
+
+    def show_versions
+      puts '...'
+
+      FileUtils.rm_f( @tree )
+
+      exec( 'dependency:tree' )
+
+      if File.exists?( @tree )
+        puts File.read( @tree )
+      end
+    end
+
+    def packit
+      puts '...'
+      exec( :package )
+
+      puts
+      puts 'now you can use jruby like this'
+      puts
+      puts "\tjava -jar jruby_complete_custom.jar"
+      puts
+    end
+  end
+end

data/lib/jbundler/jruby_complete_pom.rb

@@ -0,0 +1,31 @@
+jfile = ::Maven::Tools::Jarfile.new( java.lang.System.getProperty( "jbundler.jarfile" ) )
+workdir = java.lang.System.getProperty( "jbundler.workdir" )
+jworkdir = File.join( workdir, 'jruby_complete' )
+FileUtils.mkdir_p( jworkdir )
+
+build.directory = jworkdir
+
+properties( 'maven.test.skip' => true,
+            'project.build.sourceEncoding' => 'utf-8' )
+
+jfile.populate_unlocked do |dsl|
+  setup_jruby( dsl.jruby || JRUBY_VERSION, :compile )
+  dsl.artifacts.select do |a|
+    a[ :scope ] == :provided
+  end.each do |a|
+    a[ :scope ] = :compile
+    artifact( a )
+  end
+end
+
+plugin( :shade, '2.1',
+        :outputFile => "${user.dir}/jruby-complete-custom.jar",
+        :transformers => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
+                             :mainClass => 'org.jruby.Main' } ] ) do
+  execute_goals( 'shade', :phase => 'package' )
+end
+
+plugin( :dependency, '2.8',
+        :includeTypes => 'jar',
+        :outputAbsoluteArtifactFilename => true,
+        :outputFile => java.lang.System.getProperty( "jbundler.outputFile" ) )

data/lib/jbundler/lock_down.rb

@@ -6,6 +6,7 @@ require 'jbundler/show'
 require 'maven/tools/jarfile'
 require 'maven/ruby/maven'
 require 'fileutils'
+require 'jar_installer'
 module JBundler
   class LockDown
 
@@ -13,93 +14,125 @@ module JBundler
       @config = config
       @configurator = Configurator.new( config )
     end
+    
+    def vendor
+      @vendor ||= JBundler::Vendor.new( @config.vendor_dir )
+    end
 
-    def lock_down( needs_vendor = false, debug = false )
-      jarfile = Maven::Tools::Jarfile.new( @config.jarfile )
-      vendor = JBundler::Vendor.new( @config.vendor_dir )
-      classpath_file = JBundler::ClasspathFile.new( @config.classpath_file )
-      gemfile_lock = JBundler::GemfileLock.new( jarfile, 
-                                                @config.gemfile_lock )
+    def update( debug = false, verbose = false )
+      if vendor.vendored?
+        raise 'can not update vendored jars'
+      end
 
-      needs_update = classpath_file.needs_update?( jarfile, gemfile_lock )
-      if( ( ! needs_update ||
-            vendor.vendored? ) && ! vendor )
+      FileUtils.rm_f( @config.jarfile_lock )
+      
+      lock_down( false, debug, verbose )
+    end
+    
+    def lock_down( needs_vendor = false, debug = false, verbose = false )
+      classpath = JBundler::ClasspathFile.new( @config.classpath_file )
+      needs_update = needs_update?( classpath )
+      if ( ! needs_update && ! needs_vendor ) || vendor.vendored?
 
-        puts 'up to date'
+        puts 'Jar dependencies are up to date !'
 
       else
 
         puts '...'
+       
+        locked = StringIO.new
 
-        exec_maven( debug )
+        deps = install_dependencies( debug, verbose )
 
-        deps_file = File.join( File.expand_path( @config.work_dir ), 
-                               'dependencies.txt' )
-        deps = StringIO.new
-        jars = {}
-        vendor_map = {}
-        File.read( deps_file ).each_line do |line| 
-          if line.match /:jar:/
-            jar = line.sub( /.+:/, '' ).sub( /\s$/, '' )
-            unless line.match /:provided/
-              vendor_map[ line.sub( /:[^:]+:[^:]+$/, '' )
-                            .sub( /^\s+/, '' ) ] = jar
-            end
-            case line
-            when /:provided:/
-              ( jars[ :jruby ] ||= [] ) << jar
-            when /:test:/
-              ( jars[ :test ] ||= [] ) << jar
-            else
-              ( jars[ :runtime ] ||= [] ) << jar
-            end
-          end
-          # TODO make lock depend on jruby version as well on
-          # include test as well, i.e. keep the scope in place
-          if( line.match( /:compile:|:runtime:/ ) &&
-              ! line.match( /^ruby.bundler:/ ) )
-            deps.puts line.sub( /:[^:]+:[^:]+$/, '' ).sub( /^\s+/, '' )
-          end
-        end
-        if needs_update
-          if deps.string.empty?
-            FileUtils.rm_f @config.jarfile_lock
-          else
-            File.open( @config.jarfile_lock, 'w' ) do |f|
-              f.print deps.string
-            end
-          end
-          classpath_file.generate( jars[ :runtime ],
-                                   jars[ :test ],
-                                   jars[ :jruby ] )
-        end
-        if needs_vendor
-          puts "vendor directory: #{@config.vendor_dir}"
-          vendor_map.each do |key, file|
-            vendor.copy_jar( key, file )
+        jars = collect_jars( deps, locked, debug, verbose )
+
+        update_files( classpath, locked, jars ) if needs_update
+
+        vendor_it( vendor, deps ) if needs_vendor
+
+      end
+    end
+
+    private
+
+    def needs_update?( classpath )
+      jarfile = Maven::Tools::Jarfile.new( @config.jarfile )
+      gemfile_lock = JBundler::GemfileLock.new( jarfile, 
+                                                @config.gemfile_lock )
+
+      classpath.needs_update?( jarfile, gemfile_lock )
+    end
+
+    def vendor_it( vendor, deps )
+      puts "vendor directory: #{@config.vendor_dir}"
+      vendor.vendor_dependencies( deps )
+      puts
+    end
+
+    def collect_jars( deps, locked, debug, verbose )
+      jars = {}
+      deps.each do |d|
+        case d.scope
+        when :provided
+          ( jars[ :jruby ] ||= [] ) << d.file
+        when :test
+          ( jars[ :test ] ||= [] ) << d.file
+        else
+          ( jars[ :runtime ] ||= [] ) << d.file
+          if( ! d.gav.match( /^ruby.bundler:/ ) )
+            # TODO make Jarfile.lock depend on jruby version as well on
+            # include test as well, i.e. keep the scope in place
+            locked.puts d.coord
           end
-          puts
         end
-        if @config.verbose
-          Show.new( @config ).show_classpath
-          puts
+      end
+      jars
+    end
+
+    def update_files( classpath_file, locked, jars )
+      if locked.string.empty?
+        FileUtils.rm_f @config.jarfile_lock
+      else
+        File.open( @config.jarfile_lock, 'w' ) do |f|
+          f.print locked.string
         end
-        puts 'jbundle complete'
       end
+      classpath_file.generate( jars[ :runtime ],
+                               jars[ :test ],
+                               jars[ :jruby ],
+                               @config.local_repository )
     end
 
-    private
-    
-    def exec_maven( debug )
+    def install_dependencies( debug, verbose )
+      deps_file = File.join( File.expand_path( @config.work_dir ), 
+                               'dependencies.txt' )
+ 
+      exec_maven( debug, verbose, deps_file )
+
+      result = []
+      File.read( deps_file ).each_line do |line|
+        dep = Jars::JarInstaller::Dependency.new( line )
+        result << dep if dep
+      end
+      result
+    ensure
+      FileUtils.rm_f( deps_file ) if deps_file
+    end
+
+    def exec_maven( debug, verbose, output )
       m = Maven::Ruby::Maven.new
       m.options[ '-f' ] = File.join( File.dirname( __FILE__ ), 
-                                     'lock_down_pom.rb' )
-      m.options[ '-q' ] = nil unless debug
+                                     'dependency_pom.rb' )
+          m.property( 'verbose', debug || verbose )
+          m.options[ '-q' ] = nil if !debug and !verbose
+          m.options[ '-e' ] = nil if !debug and verbose
+          m.options[ '-X' ] = nil if debug
       m.verbose = debug
-      
+      m.property( 'jbundler.outputFile', output )
+
       @configurator.configure( m )
-      
-      m.exec
+
+      m.exec( 'dependency:list' )
     end
   end
 end