lib/jar_installer.rb in jar-dependencies-0.1.7 vs lib/jar_installer.rb in jar-dependencies-0.1.8
- old
+ new
@@ -168,12 +168,21 @@
@options.delete( :ignore_dependencies )
end
def vendor_jars( write_require_file = true )
return unless has_jars?
- # do not vendor only if set explicitly via ENV/system-properties
- do_install( Jars.to_prop( Jars::VENDOR ) != 'false', write_require_file )
+ case Jars.to_prop( Jars::VENDOR )
+ when 'true'
+ do_vendor = true
+ when 'false'
+ do_vendor = false
+ else
+ # if the spec_file does not exists this means it is a local gem
+ # coming via bundle :path or :git
+ do_vendor = File.exists?( @spec.spec_file )
+ end
+ do_install( do_vendor, write_require_file )
end
def install_jars( write_require_file = true )
return unless has_jars?
do_install( false, write_require_file )
@@ -204,11 +213,17 @@
self.class.install_deps( install_dependencies, vendor_dir,
jars_file, vendor )
end
def setup_arguments( deps )
- args = [ 'dependency:list', "-DoutputFile=#{deps}", '-DoutputAbsoluteArtifactFilename=true', '-DincludeTypes=jar', '-DoutputScope=true', '-f', @specfile ]
+ args = [ 'dependency:list',
+ "-DoutputFile=#{deps}",
+ '-DoutputAbsoluteArtifactFilename=true',
+ '-DincludeTypes=jar',
+ '-DoutputScope=true',
+ '-f', File.dirname( __FILE__ ) + '/jars/jar_pom.rb',
+ "-Djars.specfile=#{@specfile}" ]
if Jars.debug?
args << '-X'
elsif not Jars.verbose?
args << '--quiet'
@@ -267,9 +282,10 @@
deps = File.join( @basedir, 'deps.lst' )
maven = Maven::Ruby::Maven.new
maven.verbose = Jars.verbose?
+ puts " jar dependencies for #{@spec.spec_name} . . ." unless Jars.quiet?
maven.exec( *setup_arguments( deps ) )
self.class.load_from_maven( deps )
ensure
FileUtils.rm_f( deps ) if deps