jbundler 0.7.4 → 0.8.0.pre

data/lib/jbundler.rb

@@ -18,56 +18,14 @@
 # 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 'jbundler/context'
-require 'jbundler/lock_down'
-
+require 'jbundler/executor'
 module JBundler
 
-  def self.context
-    @context ||= JBundler::Context.new
-  end
-
-  def self.setup_test
-    context.classpath.require_test_classpath
-    context.config
+  def self.install( debug = false, verbose = false, options = {} )
+    JBundler::Executor.new( debug, verbose ).lock_down( options )
   end
 
-  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
-    elsif context.classpath.exists? && context.jarfile.exists_lock?
-      require 'java'
-      context.classpath.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.install( debug = false, verbose = false )
-    jbundler = JBundler::LockDown.new( context.config )
-    msg = jbundler.lock_down( false, debug, verbose )
-    puts msg if msg
-  end
-
-  def self.setup
-    if context.config.skip
-      warn "skip jbundler setup" if context.config.verbose
-    else
-      require_jars
-    end
+  def self.jarfile
+    ENV[ 'JBUNDLER_JARFILE' ] || ENV_JAVA[ 'jbundler.jarfile' ] || 'Jarfile'
   end
 end
-
-JBundler.setup

metadata

@@ -1,39 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: jbundler
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0.pre
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: maven-tools
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.6
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.0.8
+  name: maven-tools
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ruby-maven
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.1.0.6
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 1.0.8
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -42,64 +33,59 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.1.2
+  name: ruby-maven
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.1.0.6
+    - - <
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 3.1.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 0.1.11
+  name: jar-dependencies
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jar-dependencies
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.11
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: '1.7'
+  name: bundler
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.7'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.3'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.3'
-  prerelease: false
-  type: :development
+        version: '10.0'
 description: |
   managing jar dependencies with or without bundler. adding bundler like handling of version ranges for jar dependencies.
 email:
@@ -111,37 +97,11 @@ extra_rdoc_files: []
 files:
 - bin/jbundle
 - lib/jbundler.rb
-- lib/jbundler/pom_runner.rb
-- lib/jbundler/dependency_pom.rb
-- lib/jbundler/aether.rb
-- lib/jbundler/executable_pom.rb
-- lib/jbundler/classpath_file.rb
-- lib/jbundler/jarfile_lock.rb
-- lib/jbundler/jruby_complete_pom.rb
-- lib/jbundler/tree.rb
-- lib/jbundler/lock_down.rb
-- lib/jbundler/executable.rb
+- lib/jbundler/executor.rb
 - lib/jbundler/pom.rb
-- lib/jbundler/jruby_complete.rb
-- lib/jbundler/configurator.rb
-- lib/jbundler/cli.rb
-- lib/jbundler/lazy.rb
-- lib/jbundler/config.rb
-- lib/jbundler/context.rb
-- lib/jbundler/gemfile_lock.rb
-- lib/jbundler/vendor.rb
-- lib/jbundler/show.rb
-- lib/jbundler.jar
-- spec/classpath_file_spec.rb
-- spec/vendor_spec.rb
-- spec/config_spec.rb
-- spec/setup.rb
-- spec/pom_spec.rb
-- spec/aether_spec.rb
-- spec/project/Settings.xml
-- spec/project/settings.xml
 - MIT-LICENSE
 - Readme.md
+- Gemfile.lock~
 - Gemfile.lock
 - Gemfile
 homepage: https://github.com/mkristian/jbundler
@@ -159,18 +119,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: managing jar dependencies
-test_files:
-- spec/classpath_file_spec.rb
-- spec/vendor_spec.rb
-- spec/config_spec.rb
-- spec/pom_spec.rb
-- spec/aether_spec.rb
+test_files: []

data/lib/jbundler/aether.rb

@@ -1,139 +0,0 @@
-#
-# 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
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# 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 'yaml'
-require 'jbundler/config'
-require 'maven/ruby'
-
-module JBundler
-
-  class AetherRuby
-
-    def self.setup_classloader
-      require 'java'
-
-      Dir.glob( File.join( Maven.lib, '*.jar' ) ).each do |path|
-        require path
-      end
-      begin
-        require 'jbundler.jar'
-      rescue LoadError
-        # allow the classes already be added to the classloader
-        begin
-          java_import 'jbundler.Aether'
-        rescue NameError
-          # assume this happens only when working on the git clone
-          raise "jbundler.jar is missing - maybe you need to build it first ? use\n$ rmvn prepare-package -Dmaven.test.skip\n"
-        end
-      end
-      java_import 'jbundler.Aether'
-    end
-
-    def initialize( config = Config.new )
-      unless defined? Aether
-        self.class.setup_classloader
-      end
-      @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 
-      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
-    end
-
-    def local_jars
-      @local_jars ||= []
-    end
-
-    def add_local_jar( path )
-       local_jars << File.expand_path( path )
-    end
-
-    def add_artifact(coordinate, extension = nil)
-      if extension
-        coord = coordinate.split(/:/)
-        coord.insert(2, extension)
-        @aether.add_artifact(coord.join(":"))
-      else
-        @aether.add_artifact(coordinate)
-      end
-    end
-
-    def add_repository(name, url)
-      @aether.add_repository(name, url)
-    end
-
-    def add_snapshot_repository(name, url)
-      @aether.add_snapshot_repository(name, url)
-    end
-
-    def resolve
-      @aether.resolve unless artifacts.empty?
-    rescue NativeException => e
-      e.cause.print_stack_trace
-      raise e
-    end
-
-    def classpath
-      if artifacts.empty? and local_jars.empty?
-        ''
-      else
-        path = [ @aether.classpath ] 
-        path = path + @local_jars if @local_jars
-        path.join( File::PATH_SEPARATOR )
-      end
-    end
-
-    def classpath_array
-      classpath.split(/#{File::PATH_SEPARATOR}/)
-    end
-
-    def repositories
-      @aether.repositories
-    end
-
-    def artifacts
-      @aether.artifacts
-    end
-
-    def resolved_coordinates
-      if @aether.artifacts.empty?
-        []
-      else
-        @aether.resolved_coordinates
-      end
-    end
-
-    def install(coordinate, file)
-      @aether.install(coordinate, file)
-    rescue NativeException => e
-      e.cause.print_stack_trace
-      raise e
-    end
-
-  end
-end

data/lib/jbundler/classpath_file.rb

@@ -1,115 +0,0 @@
-#
-# 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
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# 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.
-#
-module JBundler
-
-  class ClasspathFile
-
-    def initialize(classpathfile = '.jbundler/classpath.rb')
-      @classpathfile = classpathfile
-    end
-    
-    def file
-      @classpathfile
-    end
-
-    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_classpath
-      JBUNDLER_TEST_CLASSPATH.each { |c| require c }
-    end
-
-    def mtime
-      File.mtime(@classpathfile)
-    end
-
-    def exists?
-      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)
-      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 = [], local_repo = nil )
-      FileUtils.mkdir_p(File.dirname(@classpathfile))
-      File.open(@classpathfile, 'w') do |f|
-        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, local_repo )
-      file.puts "JBUNDLER_#{prefix}CLASSPATH = []"
-      array.each do |path|
-        dump_jar( file, path, prefix, local_repo )
-      end
-      file.puts "JBUNDLER_#{prefix}CLASSPATH.freeze"
-    end
-
-    def dump_jar( file, path, prefix, local_repo )
-      return if path =~ /pom$/
-      if local_repo
-        path.sub!( /#{local_repo}/, '' )
-        unless File.exists?( path )
-          file.puts "JBUNDLER_#{prefix}CLASSPATH << (JBUNDLER_LOCAL_REPO + '#{path}')"
-          path = nil
-        end
-      end
-      if path
-        # either we do not have a local_repo or the path is a absolute
-        # path from system artifact
-        file.puts "JBUNDLER_#{prefix}CLASSPATH << '#{path}'"        
-      end
-    end
-  end
-end

data/lib/jbundler/cli.rb

@@ -1,171 +0,0 @@
-#
-# 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
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# 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 'bundler/vendored_thor'
-require 'jbundler/config'
-require 'jbundler/executable'
-require 'jbundler/tree'
-require 'jbundler/lock_down'
-require 'jbundler/jruby_complete'
-module JBundler
-  # As of v1.9.0, bundler's vendored version of thor is namespaced
-  Thor = Bundler::Thor if Gem.loaded_specs['bundler'].version >= Gem::Version.new('1.9.0')
-
-  class Cli < Thor
-    no_tasks do
-      def config
-        @config ||= JBundler::Config.new
-      end
-
-      def unvendor
-        vendor = JBundler::Vendor.new( config.vendor_dir )
-        vendor.clear
-      end
-
-      def vendor
-        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
-
-      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'
-    #method_option :details, :type => :boolean, :default => false
-    def tree
-      JBundler::Tree.new( config ).show_it
-    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 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
-      msg = JBundler::LockDown.new( config ).lock_down( options[ :vendor ],
-                                                        options[ :debug ] ,
-                                                        options[ :verbose ] )
-      config.verbose = ! options[ :quiet ]
-      Show.new( config ).show_classpath
-      unless options[ :quiet ]
-        puts 'jbundle complete !'
-        puts
-      end
-      puts msg if msg
-    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 :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, options[ 'compile' ], options[ :verbose ], *( options[ 'groups' ] || [:default] ) )
-      ex.packit
-    end
-
-    desc 'console', 'irb session with gems and/or jars and with lazy jar loading.'
-    def console
-      # dummy - never executed !!!
-    end
-    
-    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
-    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 lock_down
-      require 'jbundler'
-
-      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
-      return unless ARGV.size == 1
-        
-      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
-      config.verbose = true
-      Show.new( config ).show_classpath
-    end
-  end
-end