lock_jar 0.3.0 → 0.3.1

data/README.rdoc

@@ -46,7 +46,11 @@ Example Jarfile
 	
 ==== Resolving dependencies
 
-* LockJar.lock( jarfile = 'Jarfile', opts = {} ): Using a Jarfile, creates a lock file. Default jarfile lock is *Jarfile.lock*, can be changed by setting opts = { :lockfile => 'NewLockFile' }. The local repo defined in the Jarfile can be override by setting opts = { :local_repo => 'path/to/local/repo' }
+* LockJar.lock( *args ): Using a Jarfile, creates a lock file. Default jarfile is *Jarfile* and default lockfile is *Jarfile.lock*.
+  * An arg of a String will set the Jarfile, e.g. 'Jarfile.different'
+  * An arg of a Hash will set the options, e.g. { :local_repo => 'path' }
+    * :local_repo sets the local repo path
+    * :lockfile sets the Jarfile.lock path
 
 When the Jarfile is locked, the transitive dependencies are resolved and saved to the Jarfile.lock file.
 
@@ -97,16 +101,17 @@ The Jarfile.lock
 ==== Accessing Jars
 
 * LockJar.list(*args): Lists all dependencies as notations for scopes from the Jarfile.lock. Defaults scopes are *compile* and *runtime*. Default lock file is *Jarfile.lock*.
-  * args of a String will set the Jarfile, e.g. 'Jarfile.different'
-  * args of an Array will set the scopes, e.g. ['compile','test']
-  * args of a Hash will set the options, e.g. { :local_repo => 'path' }
+  * An arg of a String will set the Jarfile.lock, e.g. 'Better.lock'
+  * An arg of an Array will set the scopes, e.g. ['compile','test']
+  * An arg of a Hash will set the options, e.g. { :local_repo => 'path' }
     * :local_repo sets the local repo path
     * :local_paths converts the notations to paths to jars in the local repo path
+    * :resolve to true will make transitive dependences resolve before loading to classpath 
   
 * LockJar.load(*args): Loads all dependencies to the classpath for scopes from the Jarfile.lock. Defaults scopes are *compile* and *runtime*. Default lock file is *Jarfile.lock*.
-  * args of a String will set the Jarfile, e.g. 'Jarfile.different'
-  * args of an Array will set the scopes, e.g. ['compile','test']
-  * args of a Hash will set the options, e.g. { :local_repo => 'path' }
+  * An arg of a String will set the Jarfile.lock, e.g. 'Better.lock'
+  * An arg of an Array will set the scopes, e.g. ['compile','test']
+  * An arg of a Hash will set the options, e.g. { :local_repo => 'path' }
     * :local_repo sets the local repo path
     * :resolve to true will make transitive dependences resolve before loading to classpath 
 
@@ -122,14 +127,28 @@ Do not forget, if you change your Jarfile, you have to re-generate the Jarfile.l
   
 ==== Skipping the Jarfile
 
-You can skip the Jarfile and Jarfile.lock to directly load dependencies by passing a block to LockJar.load
+You can skip the Jarfile and Jarfile.lock to directly play with dependencies by passing a block to LockJar.lock, LockJar.list, LockJar.load
+
+===== Lock with a Jarfile
+
+    LockJar.lock do
+      jar 'org.eclipse.jetty:example-jetty-embedded:jar:8.1.2.v20120308'
+    end
+
+===== List with a Jarfile
+    
+    LockJar.list do
+      jar 'org.eclipse.jetty:example-jetty-embedded:jar:8.1.2.v20120308'
+    end
+
+===== Load with a Jarfile
     
     LockJar.load do
       jar 'org.eclipse.jetty:example-jetty-embedded:jar:8.1.2.v20120308'
     end
 
 Since you skipped the locking part, mostly likely you will need to resolve the dependences in the block, just pass the 
-:resolve => true option to enable dependency resolution.
+:resolve => true option to enable dependency resolution (also works for LockJar.list).
 
     LockJar.load( :resolve => true ) do
       jar 'org.eclipse.jetty:example-jetty-embedded:jar:8.1.2.v20120308'

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/lock_jar/resolver.rb

@@ -59,7 +59,7 @@ module LockJar
         @naether = Naether.create_from_jars( jars )
       end
       
-      @naether.local_repo_path = opts[:local_repo] if opts[:local_repo]
+      @naether.local_repo_path = opts[:local_repo].to_s if opts[:local_repo]
       
       
       @naether.clear_remote_repositories if opts[:offline]

data/lib/lock_jar/runtime.rb

@@ -27,6 +27,10 @@ module LockJar
     attr_reader :current_resolver
     
     def resolver( opts = {} )
+      if opts[:local_repo]
+        opts[:local_repo] = File.expand_path(opts[:local_repo])
+      end
+      
       # XXX: opts for a method will cause resolver to reload
       if @current_resolver.nil? || opts != @current_resolver.opts
         @current_resolver = LockJar::Resolver.new( opts )
@@ -169,6 +173,10 @@ module LockJar
           dependencies = mapped_dependencies
         end
         
+        if opts[:resolve]
+          dependencies = resolver(opts).resolve( dependencies )
+        end
+        
         if opts[:local_paths]
           opts.delete( :local_paths ) # remove list opts so resolver is not reset
           resolver(opts).to_local_paths( dependencies.uniq )
@@ -196,11 +204,7 @@ module LockJar
         end
         
         dependencies = list( jarfile_lock, scopes, opts, &blk )
-        
-        if opts[:resolve]
-          dependencies = resolver(opts).resolve( dependencies )
-        end
-        
+                
         resolver(opts).load_to_classpath( dependencies )
       end
       

data/lock_jar.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "lock_jar"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]

data/spec/lock_jar/bundler_spec.rb

@@ -30,7 +30,8 @@ describe Bundler do
       in_app_root
     end
     
-    after(:each) do
+    after(:all) do
+      puts "Changing pwd back to #{root}"
       Dir.chdir(root)
     end
   

data/spec/lock_jar/runtime_spec.rb

@@ -14,13 +14,13 @@ describe LockJar::Runtime do
         local 'dsl_config'
       end
       
-      LockJar::Runtime.instance.current_resolver.naether.local_repo_path.should eql 'tmp/param_config'
+      LockJar::Runtime.instance.current_resolver.naether.local_repo_path.should eql File.expand_path('tmp/param_config')
     
       LockJar::Runtime.instance.load( nil ) do 
         local 'tmp/dsl_config'
       end
       
-      LockJar::Runtime.instance.current_resolver.naether.local_repo_path.should eql 'tmp/dsl_config'
+      LockJar::Runtime.instance.current_resolver.naether.local_repo_path.should eql File.expand_path('tmp/dsl_config')
     
     end
   end

data/spec/lock_jar_spec.rb

@@ -104,7 +104,6 @@ describe LockJar, "#load" do
     LockJar.lock( "spec/Jarfile", :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
           
     jars = LockJar.load( 'tmp/Jarfile.lock', ['compile', 'runtime'], :local_repo => 'tmp/test-repo' )
-    
     jars.should eql( [File.expand_path("tmp/test-repo/org/apache/mina/mina-core/2.0.4/mina-core-2.0.4.jar"), File.expand_path("tmp/test-repo/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"), File.expand_path("tmp/test-repo/com/slackworks/modelcitizen/0.2.2/modelcitizen-0.2.2.jar"), File.expand_path("tmp/test-repo/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"), File.expand_path("tmp/test-repo/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"), File.expand_path("tmp/test-repo/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"), File.expand_path("tmp/test-repo/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24.jar"), File.expand_path("tmp/test-repo/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24.jar"), File.expand_path("tmp/test-repo/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar"), File.expand_path("tmp/test-repo/commons-io/commons-io/1.4/commons-io-1.4.jar"), File.expand_path("tmp/test-repo/junit/junit/4.7/junit-4.7.jar"), File.expand_path("tmp/test-repo/org/apache/tomcat/servlet-api/6.0.35/servlet-api-6.0.35.jar")] )
       
     if Naether.platform == 'java'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_jar
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: naether
-  requirement: &6015220 !ruby/object:Gem::Requirement
+  requirement: &15583440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *6015220
+  version_requirements: *15583440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &6011880 !ruby/object:Gem::Requirement
+  requirement: &15580160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *6011880
+  version_requirements: *15580160
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &6132000 !ruby/object:Gem::Requirement
+  requirement: &15700940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *6132000
+  version_requirements: *15700940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &6129360 !ruby/object:Gem::Requirement
+  requirement: &15697920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *6129360
+  version_requirements: *15697920
 description: ! "Manage Jar files for Ruby. In the spirit of Bundler, a Jarfile\n  is
   used to generate a Jarfile.lock that contains all the resolved jar dependencies
   for scopes runtime, compile, and test.\n  The Jarfile.lock can be used to populate
@@ -105,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 122660553079972418
+      hash: -3207536742551290776
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: