jbundler 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84995673fbb7c47e7f3ad1b2b8c6973dc97feb43
-  data.tar.gz: 002ded9ef8e351737ac6e0202beec5fab700f643
+  metadata.gz: f22bab089dc37576e6c78f1f5eef96ac2f1182e3
+  data.tar.gz: 8a3075075fd3eeae9c043c690d756db1200ce068
 SHA512:
-  metadata.gz: 63904f8bb1cc95824bbe7d57deeedc7edb510ec17dd0a2aea2cdf7877945565a41733d446f5557ecdff71e518b9894bac1d19f650cdd070c2d4e23079c7b33ee
-  data.tar.gz: e3e4d92cd282bace89e3ea1f29a6d9d63809b087cd1b91532c855c57d990ad2ba93328423e02c00915370750c21856557882c4cb2377eda7b1bff9464e369da9
+  metadata.gz: 4c48cd7ff3eef42dfeab093e8c026848a7e344537d845c2bce981749c05253e14bbc81e9572ae003b3da8fd57f8d9d5a2d46492c251911f6208b48c09a3d6d8e
+  data.tar.gz: 9417e8203b945b66f06d0a451f1496059acb5b6ae8b7aaa5721bea9c0ac60bf86ba8ffa1efc28ddb2534ca9acdb9ee27d721fc636827095e87db0e4c747b22b0

data/Gemfile.lock

@@ -1,36 +1,47 @@
 PATH
   remote: .
   specs:
-    jbundler (0.5.5)
+    jbundler (0.6.0)
       bundler (~> 1.5)
-      ruby-maven (>= 3.1.1.0.1, < 3.1.2)
+      jar-dependencies (~> 0.0.4)
+      ruby-maven (>= 3.1.1.0.3, < 3.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.4.0)
-    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)
-    ruby-maven (3.1.1.0.2)
-      maven-tools (~> 0.33)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    equalizer (0.0.9)
+    ice_nine (0.11.0)
+    jar-dependencies (0.0.4)
+    maven-tools (1.0.0.rc6)
+      virtus (~> 1.0)
+    minitest (5.3.3)
+    rake (10.3.1)
+    ruby-maven (3.1.1.0.5)
+      maven-tools (~> 1.0.0.rc4)
       ruby-maven-libs (= 3.1.1)
     ruby-maven-libs (3.1.1)
     thor (0.18.1)
-    virtus (0.5.5)
-      backports (~> 3.3)
-      descendants_tracker (~> 0.0.1)
+    thread_safe (0.3.4-java)
+    virtus (1.0.2)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0.3)
+      equalizer (~> 0.0.9)
 
 PLATFORMS
   java
-  ruby
 
 DEPENDENCIES
   copyright-header (= 1.0.8)
   jbundler!
-  minitest (~> 4.0)
+  minitest (~> 5.3)
   rake (~> 10.0)
   thor (~> 0.18.0)

data/Gemfile.lock~

@@ -1,33 +1,47 @@
 PATH
   remote: .
   specs:
-    jbundler (0.5.0)
-      bundler (~> 1.2)
-      ruby-maven (~> 3.1.0.0)
+    jbundler (0.6.0)
+      bundler (~> 1.5)
+      jar-dependencies (~> 0.0.3)
+      ruby-maven (>= 3.1.1.0.3, < 3.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.3.3)
-    descendants_tracker (0.0.1)
-    maven-tools (0.33.1)
-      virtus (~> 0.5)
-    minitest (4.7.5)
-    rake (10.1.0)
-    ruby-maven (3.1.0.0.1)
-      maven-tools (~> 0.33)
-      ruby-maven-libs (= 3.1.0)
-    ruby-maven-libs (3.1.0)
-    thor (0.15.4)
-    virtus (0.5.5)
-      backports (~> 3.3)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    equalizer (0.0.9)
+    ice_nine (0.11.0)
+    jar-dependencies (0.0.3)
+    maven-tools (1.0.0.rc4)
+      virtus (~> 1.0)
+    minitest (5.3.3)
+    rake (10.3.1)
+    ruby-maven (3.1.1.0.3)
+      maven-tools (~> 1.0.0.rc4)
+      ruby-maven-libs (= 3.1.1)
+    ruby-maven-libs (3.1.1)
+    thor (0.18.1)
+    thread_safe (0.3.3-java)
+    virtus (1.0.2)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0.3)
+      equalizer (~> 0.0.9)
 
 PLATFORMS
   java
 
 DEPENDENCIES
+  copyright-header (= 1.0.8)
   jbundler!
-  minitest (~> 4.0)
+  minitest (~> 5.3)
   rake (~> 10.0)
-  thor (> 0.14.0, < 0.16.0)
+  thor (~> 0.18.0)

data/bin/jbundle

@@ -11,10 +11,13 @@ if ARGV[0] == 'help'
 
 else
 
-  ARGV << 'install' if ARGV.size == 0
+  if ARGV == [] || ARGV.all?{ |a| a.match( /^-/ ) }
+    ARGV.unshift 'install'
+  end
 
   if ARGV[0] == 'console'
     require 'irb'
+    require 'jbundler'
     require 'jbundler/lazy'
     include JBundler::Lazy
   end
@@ -22,37 +25,24 @@ else
   require 'jbundler/config'
   config = JBundler::Config.new
 
-  if ['install', 'update', 'show', 'console'].member?( ARGV[0] )
+  if ['lock_down', 'install', 'update', 'show', 'console'].member?( ARGV[0] )
     begin
-      file = File.join( ENV['HOME'], '.bundle', 'config' )
-      if File.exists?( file )
-        require 'yaml'
-        bundle_config = YAML.load_file( file )
-        mirrors = bundle_config.select { |k,v| nil != (k =~ /BUNDLE_MIRROR__/) }
-        if config.rubygems_mirror || mirrors.size > 0
-          mirrors.each do |k,v| 
-            ENV[ k ] = v
-          end
-          if config.rubygems_mirror
-            ENV['BUNDLE_MIRROR__HTTP://RUBYGEMS.ORG'] = config.rubygems_mirror
-            ENV['BUNDLE_MIRROR__HTTPS://RUBYGEMS.ORG'] = config.rubygems_mirror
-          end
-          
-          begin
-            load Gem.bin_path('nexus', 'nbundle') 
-          rescue Gem::GemNotFoundException
-            warn ''
-            warn 'to use a rubygems mirror you need to install the nexus gem'
-            warn '    $ gem install nexus'
-            warn ''
-            warn 'rubygems mirror ignored !'
-          end
-        else
-          load Gem.bin_path('bundler', 'bundle') 
-        end
-      else
-        load Gem.bin_path('bundler', 'bundle')         
-      end
+      is_lock_down = ARGV.delete( 'lock_down' )
+      ARGV.delete( 0 ) if is_lock_down
+      is_vendor = ARGV.delete( '--vendor' ) 
+      is_debug = ARGV.delete( '--debug' )  
+      is_verbose = ARGV.delete( '--verbose' ) 
+      ARGV.delete( '--skip-vendor' )
+      ARGV.delete( '--skip-debug' )
+      ARGV.delete( '--skip-verbose' )
+
+      load Gem.bin_path('bundler', 'bundle') 
+
+      ARGV.insert( 0, 'lock_down' ) if is_lock_down
+      ARGV.insert( 1, '--debug' ) if is_debug
+      ARGV.insert( 1, '--vendor' ) if is_vendor
+      ARGV.insert( 1, '--verbose' ) if is_verbose
+
       require 'jbundler/cli'
       JBundler::Cli.start
     rescue Exception => e

data/lib/jbundler.rb

@@ -18,62 +18,70 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-require 'maven/tools/jarfile'
-require 'jbundler/classpath_file'
-require 'jbundler/vendor'
-require 'jbundler/gemfile_lock'
-require 'jbundler/aether'
+
+require 'jbundler/context'
 
 module JBundler
 
-  def setup_test
-    config = JBundler::Config.new
-    JBundler::ClasspathFile.new(config.classpath_file).require_test_classpath
-    config
+  def self.context
+    @context ||= JBundler::Context.new
   end
 
-end
-
-config = JBundler::Config.new
-
-jarfile = Maven::Tools::Jarfile.new(config.jarfile)
-if config.skip
-  warn "skip jbundler setup"
-else
-  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 self.setup_test
+    context.classpath.require_test_classpath
+    context.config
+  end
 
-  if classpath_file.needs_update?(jarfile, gemfile_lock) && ! vendor.vendored?
-    aether = JBundler::AetherRuby.new(config)
-    
-    jarfile.populate_unlocked(aether)
-    gemfile_lock.populate_dependencies(aether)
-    jarfile.populate_locked(aether)
-    
-    aether.resolve
-    
-    classpath_file.generate(aether.classpath_array)
-    jarfile.generate_lockfile(aether.resolved_coordinates)
+  def self.update
+    if( context.classpath.needs_update?( context.jarfile, 
+                                         context.gemfile_lock ) and
+        not context.vendor.vendored? )
+      
+      warn 'deprecated - use jbundle install to update bundle'
+      aether = JBundler::AetherRuby.new( context.config )
+      
+      context.jarfile.populate_unlocked( aether )
+      context.gemfile_lock.populate_dependencies( aether )
+      context.jarfile.populate_locked( aether )
+      
+      aether.resolve
+      
+      context.classpath.generate( aether.classpath_array, [], [], 
+                                  context.config.local_repository )
+      context.jarfile.generate_lockfile( aether.resolved_coordinates )
+    end
   end
 
-  if vendor.vendored?
-    jars = vendor.require_jars
-    if config.verbose
-      warn "jbundler classpath:"
-      jars.each do |path|
-        warn "\t#{path}"
+  def self.require_jars
+    if context.vendor.vendored?
+      jars = context.vendor.require_jars
+      if context.config.verbose
+        warn "jbundler classpath:"
+        jars.each do |path|
+          warn "\t#{path}"
+        end
       end
-    end
-  elsif classpath_file.exists? && jarfile.exists_lock?
-    require 'java'
-    classpath_file.require_classpath
-    if config.verbose
-      warn "jbundler classpath:"
-      JBUNDLER_CLASSPATH.each do |path|
-        warn "\t#{path}"
+    elsif context.classpath.exists? && context.jarfile.exists_lock?
+      require 'java'
+      context.classpath_file.require_classpath
+      if context.config.verbose
+        warn "jbundler classpath:"
+        JBUNDLER_CLASSPATH.each do |path|
+            warn "\t#{path}"
+        end
       end
+      Jars.freeze_loading
+    end
+  end
+    
+  def self.setup
+    if context.config.skip
+      warn "skip jbundler setup" if context.config.verbose
+    else
+      update
+      require_jars
     end
   end
-
 end
+
+JBundler.setup

data/lib/jbundler/aether.rb

@@ -20,7 +20,7 @@
 #
 require 'yaml'
 require 'jbundler/config'
-require 'maven'
+require 'maven/ruby'
 
 module JBundler
 

data/lib/jbundler/classpath_file.rb

@@ -26,13 +26,17 @@ module JBundler
       @classpathfile = classpathfile
     end
 
-    def require_classpath
+    def load_classpath
       load File.expand_path @classpathfile
+    end
+
+    def require_classpath
+      load_classpath
       JBUNDLER_CLASSPATH.each { |c| require c }
     end
 
     def require_test_classpath
-      load File.expand_path @classpathfile unless defined? JBUNLDER_TEST_CLASSPATH
+      load_classpath
       JBUNDLER_TEST_CLASSPATH.each { |c| require c }
     end
 
@@ -44,26 +48,51 @@ module JBundler
       File.exists?(@classpathfile)
     end
 
+    def missing?( jarfile )
+      !exists? || !jarfile.exists_lock?
+    end
+
+    def jarfile_newer?( jarfile )
+      jarfile.exists? && (jarfile.mtime > mtime)
+    end
+
+    def jarlock_newer?( jarfile )
+      jarfile.exists_lock? && (jarfile.mtime_lock > mtime)
+    end
+       
     def needs_update?(jarfile, gemfile_lock)
-      (jarfile.exists? || gemfile_lock.exists? || jarfile.exists_lock?) && (!exists? || !jarfile.exists_lock? || (jarfile.exists? && (jarfile.mtime > mtime)) || (jarfile.exists_lock? && (jarfile.mtime_lock > mtime)) || (gemfile_lock.exists? && (gemfile_lock.mtime > mtime)))
+      if jarfile.exists? || gemfile_lock.exists? || jarfile.exists_lock?
+        missing?( jarfile ) || jarfile_newer?( jarfile ) || jarlock_newer?( jarfile ) || gemfile_lock.newer?( mtime )
+      else
+        false
+      end
     end
 
-    def generate( classpath_array, test_array = [], jruby_array = [] )
+    def generate( classpath_array, test_array = [], jruby_array = [], local_repo = nil )
       FileUtils.mkdir_p(File.dirname(@classpathfile))
       File.open(@classpathfile, 'w') do |f|
-        dump_array( f, jruby_array || [], 'JRUBY_' )
-        dump_array( f, test_array || [], 'TEST_' )
-        dump_array( f, classpath_array || [], '' )
-        f.puts "JBUNDLER_CLASSPATH.each { |c| require c }"
+        if local_repo
+          local_repo = File.expand_path( local_repo )
+          f.puts "require 'jar_dependencies'"
+          f.puts "JBUNDLER_LOCAL_REPO = Jars.home"
+        end
+        dump_array( f, jruby_array || [], 'JRUBY_', local_repo )
+        dump_array( f, test_array || [], 'TEST_', local_repo )
+        dump_array( f, classpath_array || [], '', local_repo )
         f.close
       end
     end
     
     private
-    def dump_array( file, array, prefix )
+    def dump_array( file, array, prefix, local_repo )
       file.puts "JBUNDLER_#{prefix}CLASSPATH = []"
       array.each do |path|
-        file.puts "JBUNDLER_#{prefix}CLASSPATH << '#{path}'" unless path =~ /pom$/
+        if local_repo
+          path.sub!( /#{local_repo}/, '' )
+          file.puts "JBUNDLER_#{prefix}CLASSPATH << (JBUNDLER_LOCAL_REPO + '#{path}')" unless path =~ /pom$/
+        else
+          file.puts "JBUNDLER_#{prefix}CLASSPATH << '#{path}'" unless path =~ /pom$/
+        end
       end
       file.puts "JBUNDLER_#{prefix}CLASSPATH.freeze"
     end

data/lib/jbundler/cli.rb

@@ -23,6 +23,7 @@ require 'jbundler/config'
 require 'jbundler/executable'
 require 'jbundler/tree'
 require 'jbundler/lock_down'
+require 'jbundler/jruby_complete'
 module JBundler
   class Cli < Thor
     no_tasks do
@@ -30,27 +31,38 @@ module JBundler
         @config ||= JBundler::Config.new
       end
 
-      def do_show
-        require 'java' 
-        require 'jbundler/classpath_file'
-        require 'jbundler/vendor'
-        classpath_file = JBundler::ClasspathFile.new( config.classpath_file )
+      def unvendor
+        vendor = JBundler::Vendor.new( config.vendor_dir )
+        vendor.clear
+      end
+
+      def vendor
         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|
-            puts "  * #{path}"
-          end
+          raise "already vendored. please 'jbundle install --no-deployment before."
         else
-          puts "JBundler classpath is not installed."
+          vendor.setup( JBundler::ClasspathFile.new( config.classpath_file ) )
         end
       end
+
+      def say_bundle_complete
+        puts ''
+        puts 'Your jbundle is complete! Use `jbundle show` to see where the bundled jars are installed.'
+      end
+    end
+
+    desc 'jruby_complete', 'pack a jruby-complete jar with custom dependencies and maybe adjust jruby dependencies like newer versions of joda-time or snakeyaml', :hide => true
+    method_option :clean, :type => :boolean, :default => false
+    method_option :verbose, :type => :boolean, :default => false
+    method_option :debug, :type => :boolean, :default => false
+    method_option :show, :type => :boolean, :default => false, :desc => 'show versions of all libraries from jruby'
+    def jruby_complete
+      jc = JBundler::JRubyComplete.new( config, options )
+      if options[ :show ]
+        jc.show_versions
+      else
+        jc.packit
+      end
     end
 
     desc 'tree', 'display a graphical representation of the dependency tree'
@@ -59,12 +71,30 @@ module JBundler
       JBundler::Tree.new( config ).show_it
     end
 
-    desc 'lock_down', 'using a different library to create the Jarfile.lock - experimental'
-    method_option :vendor, :type => :boolean, :default => false, :desc => 'vendor jars in given vendor directory.'
-    method_option :debug, :type => :boolean, :default => false, :desc => 'enable maven output'
-    def lock_down
+    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 most options. the install command is also the default when no command is given."
+    method_option :vendor, :type => :boolean, :default => false, :desc => 'vendor jars into vendor directory (jbundler only).'
+    method_option :debug, :type => :boolean, :default => false, :desc => 'enable maven debug output (jbundler only).'
+    method_option :verbose, :type => :boolean, :default => false, :desc => 'enable maven output (jbundler only).'
+    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'
+    method_option :path, :type => :string
+    method_option :without, :type => :array
+    method_option :system, :type => :boolean
+    method_option :local, :type => :boolean
+    method_option :binstubs, :type => :string
+    method_option :trust_policy, :type => :string
+    method_option :gemfile, :type => :string
+    method_option :jobs, :type => :string
+    method_option :retry, :type => :string
+    method_option :no_cache, :type => :boolean
+    method_option :quiet, :type => :boolean
+    def install
       JBundler::LockDown.new( config ).lock_down( options[ :vendor ],
-                                                  options[ :debug ] )
+                                                  options[ :debug ] ,
+                                                  options[ :verbose ] )
+      config.verbose = ! options[ :quiet ]
+      Show.new( config ).show_classpath
+      puts 'jbundle complete' unless options[ :quiet ]
     end
 
     desc 'executable', 'create an executable jar with a given bootstrap.rb file\nLIMITATION: only for jruby 1.6.x and newer'
@@ -82,7 +112,7 @@ module JBundler
       # dummy - never executed !!!
     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."
+    desc 'lock_down', "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. that is kept as fall back in cases where the new install does not work as before."
     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'
     method_option :path, :type => :string
@@ -96,43 +126,39 @@ module JBundler
     method_option :retry, :type => :string
     method_option :no_cache, :type => :boolean
     method_option :quiet, :type => :boolean
-    def install
+    def lock_down
       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.'
+
+      unvendor if options[ :no_deployment ]
+
+      vendor if options[ :deployment ]
+
+      config.verbose = ! options[ :quiet ]
+
+      Show.new( config ).show_classpath
+
+      say_bundle_complete unless options[ :quiet ]
     end
 
     desc 'update', "first `bundle update` is called and if there are no options then the jar dependencies will be updated. for more details see `bundle help update`."
+    method_option :debug, :type => :boolean, :default => false, :desc => 'enable maven debug output (jbundler only).'
+    method_option :verbose, :type => :boolean, :default => false, :desc => 'enable maven output (jbundler only).'
     def update
-      if ARGV.size == 1
-        require 'java'
-        config = JBundler::Config.new
-        FileUtils.rm_f(config.jarfile_lock)
+      return unless ARGV.size == 1
         
-        require 'jbundler'
-        do_show
-        puts ''
-        puts 'Your jbundle is updated! Use `jbundle show` to see where the bundled jars are installed.'
-      end
+      JBundler::LockDown.new( config ).update( options[ :debug ] ,
+                                               options[ :verbose ] )
+
+      config.verbose = ! options[ :quiet ]
+      Show.new( config ).show_classpath
+      puts ''
+      puts 'Your jbundle is updated! Use `jbundle show` to see where the bundled jars are installed.'
     end
 
     desc 'show', "first `bundle show` is called and if there are no options then the jar dependencies will be displayed. for more details see `bundle help show`."
     def show
-      if ARGV.size == 1
-        do_show
-     end
+      config.verbose = true
+      Show.new( config ).show_classpath
     end
   end
 end