lock_jar 0.2.2 → 0.3.0

data/Gemfile

@@ -1,11 +1,11 @@
 source "http://rubygems.org"
 
-gem "naether", "~> 0.7.0"
+gem "naether", "~> 0.8.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.9.0"
-  gem "bundler", "> 1.0.0"
+  gem "bundler", "~> 1.1.0"
   gem "jeweler", "~> 1.6.4"
 end

data/README.rdoc

@@ -20,11 +20,13 @@ gem install lock_jar
 A Jarfile is a simple file using a Ruby DSL for defining a project's dependencies using the following 
 methods:
 
-* local: Set the local Maven repository
-* repository: Add url of additional remote Maven repository.
-* jar: Add Jar dependency in artifact notation, default scope is *compile*
-* pom: Add local path to a Maven pom, default is to load dependencies for all scopes.
-* scope: Set the scope for nested jar or pom.
+* local( path ): Set the local Maven repository
+* repository( url ): Add url of additional remote Maven repository.
+* map( notation, paths ): Map local paths to a notation.
+* exclude( excludes ): Add a artifact:group that will be excluded from resolved dependencies. A single or Array of excludes can be set.
+* jar( notations, opts = {} ): Add Jar dependency in artifact notation, artifact:group:version as the bare minimum. A single or Array of notations can be passed. Default scope is *compile*, can be specified by setting opts = { :scope => <new_scope> }
+* pom( pom_path, opts = {} ): Add local path to a Maven pom, default is to load dependencies for all scopes. To select the scopes to be loaded from the pom, set the opts = { :scopes => <new_scopes> }
+* scope( scopes ): Set the scope for nested jar or pom. A single or Array of scopes can be set.
 
 Example Jarfile
 
@@ -44,7 +46,9 @@ Example Jarfile
 	
 ==== Resolving dependencies
 
-When the Jarfile is locked, the transitive dependencies for the Jars and POM are resolved and saved to the Jarfile.lock file.
+* 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' }
+
+When the Jarfile is locked, the transitive dependencies are resolved and saved to the Jarfile.lock file.
 
 Example of locking a Jarfile to a Jarfile.lock
 
@@ -92,6 +96,20 @@ 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' }
+    * :local_repo sets the local repo path
+    * :local_paths converts the notations to paths to jars in the local repo path
+  
+* 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' }
+    * :local_repo sets the local repo path
+    * :resolve to true will make transitive dependences resolve before loading to classpath 
+
 Once a Jarfile.lock is generated, you can list all resolved jars by
   
   jars = LockJar.list
@@ -173,6 +191,12 @@ and a task per project to generate the lockfile for a single project
 
   buildr <app>:<project>:lock_jar:lock
 
+In a project, you can access an Array of notations using the *lock_jars* method, accepts same parameters as {LockJar.list}[https://github.com/mguymon/lock_jar#accessing-jars]
+
+  lock_jars()
+
+
+
 The compile scoped dependencies are automatically added to the classpath for compiling. The test scoped dependencies are
 automatically added to the classpath for tests. Do not forget, if you change the lock_jar
 definitions, you have to rerun the *lock_jar:lock* task.
@@ -186,7 +210,6 @@ Sample buildfile with LockJar
   
   # app definition, inherited into all projects
   lock_jar do
-       repository 'http://repository.jboss.org/nexus/content/groups/public-jboss'
 
        scope 'test' do
          jar 'junit:junit:jar:4.10'

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.3.0

data/lib/lock_jar/buildr.rb

@@ -18,13 +18,15 @@ require 'lock_jar/dsl'
 
 module Buildr
   
+  @@global_lockjar_dsl = nil
+  
   class << self
     def project_to_lockfile( project )
       "#{project.name.gsub(/:/,'-')}.lock"
     end
     
     def global_lockjar_dsl
-      @@global_lockjar_dsl
+      @@global_lockjar_dsl 
     end
   end
   
@@ -37,6 +39,10 @@ module Buildr
     task("lock") do 
       projects.each do |project|   
         if project.lockjar_dsl
+          # add buildr repos
+          repositories.remote.each do |repo|
+            project.lockjar_dsl.repository repo
+          end
           ::LockJar.lock( project.lockjar_dsl, :lockfile => Buildr.project_to_lockfile(project) )       
         end
       end
@@ -81,11 +87,18 @@ module Buildr
         task :compile => 'lock_jar:compile'
         task 'test:compile' => 'lock_jar:test:compile'
         
+        task 'eclipse' => 'lock_jar:eclipse'
+        
         namespace "lock_jar" do
             desc "Lock dependencies to JarFile"
             task("lock") do 
               dsl = project.lockjar_dsl
               if dsl
+                # add buildr repos
+                repositories.remote do |repo|
+                  puts repo
+                  dsl.repository repo
+                end
                 ::LockJar.lock( dsl, :lockfile => "#{project.name}.lock" )
               else
                 # XXX: output that there were not dependencies to lock
@@ -110,6 +123,17 @@ module Buildr
               project.test.compile.with( jars )
               project.test.with( jars )
             end
+            
+            task("eclipse") do
+              if project.lockjar_dsl && !File.exists?( Buildr.project_to_lockfile(project) )
+                raise "#{Buildr.project_to_lockfile(project)} does not exist, run #{project.name}:lockjar:lock first"
+              end
+              jars = ::LockJar.list( Buildr.project_to_lockfile(project), ['compile', 'runtime'] )
+              project.compile.with( jars )
+              
+              jars = ::LockJar.list( Buildr.project_to_lockfile(project), ['compile', 'test', 'runtime'] )
+              project.test.compile.with( jars )
+            end
         end
       end
     end

data/lib/lock_jar/resolver.rb

@@ -15,7 +15,7 @@
 
 require 'rubygems'
 require 'naether'
-require 'tmpdir'
+require 'fileutils'
 
 module LockJar
   class Resolver
@@ -25,27 +25,39 @@ module LockJar
     
     def initialize( opts = {} )
       @opts = opts
-      local_repo = opts[:local_repo]
+      local_repo = opts[:local_repo] || Naether::Bootstrap.default_local_repo
         
       # Bootstrap Naether
       jars = []
+      temp_jar_dir = File.join(local_repo, '.lock_jar', 'naether' )
       deps = Naether::Bootstrap.check_local_repo_for_deps( local_repo )
       if deps[:missing].size > 0
-        Dir.mktmpdir do |dir|
-          deps = Naether::Bootstrap.download_dependencies( dir, deps.merge( :local_repo => local_repo ) )
-          if deps[:downloaded].size > 0
-            Naether::Bootstrap.install_dependencies_to_local_repo( dir, :local_repo => local_repo )
-            jars = deps[:downloaded].map{ |jar| jar.values[0] }
-          else
-            # XXX: download failed?
+        deps = Naether::Bootstrap.download_dependencies( temp_jar_dir, deps.merge( :local_repo => local_repo ) )
+        if deps[:downloaded].size > 0
+                    
+          unless Dir.exists?( temp_jar_dir )
+            FileUtils.mkdir_p jar_dir
           end
+          
+          @naether = Naether::Bootstrap.install_dependencies_to_local_repo( temp_jar_dir, :local_repo => local_repo )
+          jars = jars + deps[:downloaded].map{ |jar| jar.values[0] }
+        else
+          # XXX: download failed?            
         end
-      else
-        jars = deps[:exists].map{ |jar| jar.values[0] }
+        
+      # Remove bootstrap jars, they have been installed to the local repo
+      elsif File.exists?( temp_jar_dir )        
+        FileUtils.rm_rf temp_jar_dir
       end
       
-      jars << Naether::JAR_PATH
-      @naether = Naether.create_from_jars( jars )
+      jars = jars + deps[:exists].map{ |jar| jar.values[0] }
+        
+      # Bootstrapping naether will create an instance from downloaded jars. 
+      # If jars exist locally already, create manually
+      if @naether.nil?  
+        jars << Naether::JAR_PATH
+        @naether = Naether.create_from_jars( jars )
+      end
       
       @naether.local_repo_path = opts[:local_repo] if opts[:local_repo]
       

data/lib/lock_jar/runtime.rb

@@ -35,16 +35,28 @@ module LockJar
       @current_resolver
     end
     
-    def lock( jarfile, opts = {} )
+    def lock( jarfile, opts = {}, &blk )
       
         lock_jar_file = nil
         
-        if jarfile.is_a? LockJar::Dsl
-          lock_jar_file = jarfile
-        else
-          lock_jar_file = LockJar::Dsl.evaluate( jarfile )
+        if jarfile
+          if jarfile.is_a? LockJar::Dsl
+            lock_jar_file = jarfile
+          else
+            lock_jar_file = LockJar::Dsl.evaluate( jarfile )
+          end
         end
         
+        unless blk.nil?
+          dsl = LockJar::Dsl.evaluate(&blk)
+          if lock_jar_file.nil?
+            lock_jar_file = dsl
+          else
+            lock_jar_file.merge( dsl )
+          end
+        end
+
+        
         # If not set in opts, and is set in  dsl
         if opts[:local_repo].nil? && lock_jar_file.local_repository
           opts[:local_repo] = lock_jar_file.local_repository 
@@ -119,6 +131,8 @@ module LockJar
         File.open( opts[:lockfile] || "Jarfile.lock", "w") do |f|
           f.write( lock_data.to_yaml )
         end
+        
+        lock_data
       end
     
       def list( jarfile_lock, scopes = ['compile', 'runtime'], opts = {}, &blk )
@@ -181,7 +195,7 @@ module LockJar
           end
         end
         
-        dependencies = list( jarfile_lock, scopes, &blk )
+        dependencies = list( jarfile_lock, scopes, opts, &blk )
         
         if opts[:resolve]
           dependencies = resolver(opts).resolve( dependencies )

data/lib/lock_jar.rb

@@ -28,8 +28,24 @@ module LockJar
   # Lock a Jarfile and generate a Jarfile.lock
   #
   # Accepts path to the jarfile and hash of options to configure LockJar
-  def self.lock( jarfile = 'Jarfile', opts = {} )
-    Runtime.instance.lock( jarfile, opts )
+  def self.lock( *args, &blk )
+    jarfile = nil
+    opts = {}
+      
+    args.each do |arg|
+      if arg.is_a?(Hash)
+        opts.merge!( arg )
+      elsif arg.is_a?( String ) || arg.is_a?( LockJar::Dsl )
+        jarfile = arg
+      end
+    end
+    
+    # default to Jarfile
+    if blk.nil? && jarfile.nil?
+      jarfile = 'Jarfile'
+    end
+    
+    Runtime.instance.lock( jarfile, opts, &blk )
   end
   
   # List jars for an array of scope in a lockfile

data/lock_jar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lock_jar"
-  s.version = "0.2.2"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
-  s.date = "2012-05-10"
+  s.date = "2012-05-14"
   s.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 the classpath"
   s.email = "michael.guymon@gmail.com"
   s.extra_rdoc_files = [
@@ -45,27 +45,27 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/mguymon/lock_jar"
   s.licenses = ["Apache"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.15"
   s.summary = "Manage Jar files for Ruby"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<naether>, ["~> 0.7.0"])
+      s.add_runtime_dependency(%q<naether>, ["~> 0.8.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
-      s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
     else
-      s.add_dependency(%q<naether>, ["~> 0.7.0"])
+      s.add_dependency(%q<naether>, ["~> 0.8.0"])
       s.add_dependency(%q<rspec>, ["~> 2.9.0"])
-      s.add_dependency(%q<bundler>, ["> 1.0.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     end
   else
-    s.add_dependency(%q<naether>, ["~> 0.7.0"])
+    s.add_dependency(%q<naether>, ["~> 0.8.0"])
     s.add_dependency(%q<rspec>, ["~> 2.9.0"])
-    s.add_dependency(%q<bundler>, ["> 1.0.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
   end
 end

data/spec/lock_jar/bundler_spec.rb

@@ -71,6 +71,8 @@ describe Bundler do
   end
   
   it "should load Jarfile.lock with Bundle.setup" do
+    LockJar.list( :resolve => true, :local_repo => tmp('test-repo') ) # ensure jars are already downloaded
+    
     ruby <<-RUBY
       require 'rubygems'
       require 'bundler'
@@ -83,7 +85,7 @@ describe Bundler do
 
       puts Naether::Java.create('com.slackworks.modelcitizen.ModelFactory').getClass().toString()
     RUBY
-    # err.should eq("") # 1.9.3 has a IConv error that outputs to std err
+    #err.should eq("") # 1.9.3 has a IConv error that outputs to std err
     out.should match("class com.slackworks.modelcitizen.ModelFactory")
   end
   

data/spec/lock_jar/dsl_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__),'../spec_helper'))
 
 describe LockJar::Dsl do
   context "Instance" do

data/spec/lock_jar/maven_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__),'../spec_helper'))
 require 'lib/lock_jar'
 require 'lib/lock_jar/maven'
 require 'naether'

data/spec/lock_jar/resolver_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__),'../spec_helper'))
 require 'lib/lock_jar/resolver'
 require 'fileutils'
 require 'naether'

data/spec/lock_jar/runtime_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__),'../spec_helper'))
 require 'lib/lock_jar/runtime'
 
 describe LockJar::Runtime do

data/spec/lock_jar_spec.rb

@@ -3,121 +3,134 @@ require 'rubygems'
 require 'lib/lock_jar'
 require 'naether'
 
-describe LockJar do
-  context "Module" do
-    context "lock" do
-      it "should create a lock file" do
-        File.delete( 'tmp/Jarfile.lock' ) if File.exists?( 'tmp/Jarfile.lock' )
-        Dir.mkdir( 'tmp' ) unless File.exists?( 'tmp' )
-        
-        LockJar.lock( "spec/Jarfile", :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
-        File.exists?( 'tmp/Jarfile.lock' ).should be_true
-      end
-      
-      it "should not replace dependencies with maps" do
-        dsl = LockJar::Dsl.evaluate do
-          map 'junit:junit:4.10', 'tmp'
-          jar 'junit:junit:4.10'
-        end
-        
-        LockJar.lock( dsl, :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
-        lockfile = LockJar.read('tmp/Jarfile.lock')
-        lockfile.should eql( {
-          "maps"=>{"junit:junit:4.10"=>["tmp"]}, 
-          "scopes"=>{
-            "compile"=>{
-              "dependencies"=>["junit:junit:4.10"], "resolved_dependencies"=>["junit:junit:jar:4.10", "org.hamcrest:hamcrest-core:jar:1.1"]}}} )      
-      end
-      
-      it "should exclude excludes from dependencies" do
-        dsl = LockJar::Dsl.evaluate do
-          exclude 'commons-logging', 'logkit'
-          jar 'opensymphony:oscache:jar:2.4.1'
-        end
-        
-        LockJar.lock( dsl, :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
-        lockfile = LockJar.read('tmp/Jarfile.lock')
-        lockfile.should eql( {
-          "excludes"=>["commons-logging", "logkit"], 
-          "scopes"=>{
-            "compile"=>{
-              "dependencies"=>["opensymphony:oscache:jar:2.4.1"], 
-              "resolved_dependencies"=>["opensymphony:oscache:jar:2.4.1", "log4j:log4j:jar:1.2.12", "avalon-framework:avalon-framework:jar:4.1.3", "javax.jms:jms:jar:1.1", "javax.servlet:servlet-api:jar:2.3"]}}} )      
-      
-      end
+describe LockJar, "#lock" do    
+  it "should create a lock file" do
+    File.delete( 'tmp/Jarfile.lock' ) if File.exists?( 'tmp/Jarfile.lock' )
+    Dir.mkdir( 'tmp' ) unless File.exists?( 'tmp' )
+    
+    LockJar.lock( "spec/Jarfile", :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
+    File.exists?( 'tmp/Jarfile.lock' ).should be_true
+  end
+  
+  it "should not replace dependencies with maps" do
+    dsl = LockJar::Dsl.evaluate do
+      map 'junit:junit:4.10', 'tmp'
+      jar 'junit:junit:4.10'
     end
+    
+    LockJar.lock( dsl, :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
+    lockfile = LockJar.read('tmp/Jarfile.lock')
+    lockfile.should eql( {
+      "maps"=>{"junit:junit:4.10"=>["tmp"]}, 
+      "scopes"=>{
+        "compile"=>{
+          "dependencies"=>["junit:junit:4.10"], "resolved_dependencies"=>["junit:junit:jar:4.10", "org.hamcrest:hamcrest-core:jar:1.1"]}}} )      
+  end
   
-    context "list" do
-      it "should list jars" do
-        LockJar.lock( "spec/Jarfile", :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
-              
-        jars = LockJar.list( 'tmp/Jarfile.lock', ['compile', 'runtime', 'bad scope'], :local_repo => 'tmp/test-repo' )
-        jars.should eql( ["org.apache.mina:mina-core:jar:2.0.4", "org.slf4j:slf4j-api:jar:1.6.1", "com.slackworks:modelcitizen:jar:0.2.2", "commons-lang:commons-lang:jar:2.6", "commons-beanutils:commons-beanutils:jar:1.8.3", "commons-logging:commons-logging:jar:1.1.1", "ch.qos.logback:logback-classic:jar:0.9.24", "ch.qos.logback:logback-core:jar:0.9.24", "com.metapossum:metapossum-scanner:jar:1.0", "commons-io:commons-io:jar:1.4", "junit:junit:jar:4.7", "org.apache.tomcat:servlet-api:jar:6.0.35"] )
-      end
-      
-      it "should replace dependencies with maps" do
-        dsl = LockJar::Dsl.evaluate do
-          map 'junit:junit', 'tmp'
-          jar 'junit:junit:4.10'
-        end
-        
-        LockJar.lock( dsl, :local_repo => 'tmp/test-repo', :lockfile => 'tmp/ListJarfile.lock' )
-        paths = LockJar.list( 'tmp/ListJarfile.lock', :local_repo => 'tmp/test-repo' )
-        paths.should eql( [ "tmp", "org.hamcrest:hamcrest-core:jar:1.1"] ) 
-      end
-      
-      it "should replace dependencies with maps and get local paths" do
-        dsl = LockJar::Dsl.evaluate do
-          map 'junit:junit', 'tmp'
-          jar 'junit:junit:4.10'
-        end
-        
-        LockJar.lock( dsl, :local_repo => 'tmp/test-repo', :lockfile => 'tmp/ListJarfile.lock' )
-        paths = LockJar.list( 'tmp/ListJarfile.lock', :local_repo => 'tmp/test-repo' )
-        paths.should eql( [ "tmp", "org.hamcrest:hamcrest-core:jar:1.1"] ) 
-      end
+  it "should exclude excludes from dependencies" do
+    dsl = LockJar::Dsl.evaluate do
+      exclude 'commons-logging', 'logkit'
+      jar 'opensymphony:oscache:jar:2.4.1'
     end
     
-    context "load" do
-      it "by Jarfile.lock" do
-        if Naether.platform == 'java'
-          lambda { include_class 'org.apache.mina.core.IoUtil' }.should raise_error
-        else
-          lambda { Rjb::import('org.apache.mina.core.IoUtil') }.should raise_error
-        end
-        
-        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")] )
+    LockJar.lock( dsl, :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
+    File.exists?( 'tmp/Jarfile.lock' ).should be_true
+    lockfile = LockJar.read('tmp/Jarfile.lock')
+    lockfile.should eql( {
+      "excludes"=>["commons-logging", "logkit"], 
+      "scopes"=>{
+        "compile"=>{
+          "dependencies"=>["opensymphony:oscache:jar:2.4.1"], 
+          "resolved_dependencies"=>["opensymphony:oscache:jar:2.4.1", "log4j:log4j:jar:1.2.12", "avalon-framework:avalon-framework:jar:4.1.3", "javax.jms:jms:jar:1.1", "javax.servlet:servlet-api:jar:2.3"]}}} )      
+  
+  end
+  
+  
+  it "should lock using a block" do
+    LockJar.lock( :local_repo => 'tmp/test-repo', :lockfile => 'tmp/NoRepoJarfile.lock' ) do
+      jar "org.eclipse.jetty:jetty-servlet:8.1.3.v20120416"
+    end
+    
+    File.exists?( 'tmp/NoRepoJarfile.lock' ).should be_true
+    
+    lockfile = LockJar.read('tmp/NoRepoJarfile.lock')
+    lockfile.should eql( {
+      "scopes"=>{
+        "compile"=>{
+            "dependencies"=>["org.eclipse.jetty:jetty-servlet:8.1.3.v20120416"], 
+            "resolved_dependencies"=>["org.eclipse.jetty:jetty-servlet:jar:8.1.3.v20120416", "org.eclipse.jetty:jetty-security:jar:8.1.3.v20120416", "org.eclipse.jetty:jetty-server:jar:8.1.3.v20120416", "org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016", "org.eclipse.jetty:jetty-continuation:jar:8.1.3.v20120416", "org.eclipse.jetty:jetty-http:jar:8.1.3.v20120416", "org.eclipse.jetty:jetty-io:jar:8.1.3.v20120416", "org.eclipse.jetty:jetty-util:jar:8.1.3.v20120416"]}}} )           
+  end
+end
+
+describe LockJar, "#list" do     
+  it "should list jars" do
+    LockJar.lock( "spec/Jarfile", :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
           
-        if Naether.platform == 'java'
-          lambda { include_class 'org.apache.mina.core.IoUtil' }.should_not raise_error
-        else
-          lambda { Rjb::import('org.apache.mina.core.IoUtil') }.should_not raise_error
-        end
-      end
-       
-      it "by block with resolve option" do
-        if Naether.platform == 'java'
-          lambda { include_class 'org.modeshape.common.math.Duration' }.should raise_error
-        else
-          lambda { Rjb::import('org.modeshape.common.math.Duration') }.should raise_error
-        end
-        
-        jars = LockJar.load( :resolve => true ) do 
-          jar 'org.modeshape:modeshape-common:2.3.0.Final'
-        end
-        
-        jars.should eql( ["/home/zinger/.m2/repository/org/modeshape/modeshape-common/2.3.0.Final/modeshape-common-2.3.0.Final.jar", "/home/zinger/.m2/repository/org/slf4j/slf4j-api/1.5.11/slf4j-api-1.5.11.jar", "/home/zinger/.m2/repository/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar"] )
+    jars = LockJar.list( 'tmp/Jarfile.lock', ['compile', 'runtime', 'bad scope'], :local_repo => 'tmp/test-repo' )
+    jars.should eql( ["org.apache.mina:mina-core:jar:2.0.4", "org.slf4j:slf4j-api:jar:1.6.1", "com.slackworks:modelcitizen:jar:0.2.2", "commons-lang:commons-lang:jar:2.6", "commons-beanutils:commons-beanutils:jar:1.8.3", "commons-logging:commons-logging:jar:1.1.1", "ch.qos.logback:logback-classic:jar:0.9.24", "ch.qos.logback:logback-core:jar:0.9.24", "com.metapossum:metapossum-scanner:jar:1.0", "commons-io:commons-io:jar:1.4", "junit:junit:jar:4.7", "org.apache.tomcat:servlet-api:jar:6.0.35"] )
+  end
+  
+  it "should replace dependencies with maps" do
+    dsl = LockJar::Dsl.evaluate do
+      map 'junit:junit', 'tmp'
+      jar 'junit:junit:4.10'
+    end
+    
+    LockJar.lock( dsl, :local_repo => 'tmp/test-repo', :lockfile => 'tmp/ListJarfile.lock' )
+    paths = LockJar.list( 'tmp/ListJarfile.lock', :local_repo => 'tmp/test-repo' )
+    paths.should eql( [ "tmp", "org.hamcrest:hamcrest-core:jar:1.1"] ) 
+  end
+  
+  it "should replace dependencies with maps and get local paths" do
+    dsl = LockJar::Dsl.evaluate do
+      map 'junit:junit', 'tmp'
+      jar 'junit:junit:4.10'
+    end
+    
+    LockJar.lock( dsl, :local_repo => 'tmp/test-repo', :lockfile => 'tmp/ListJarfile.lock' )
+    paths = LockJar.list( 'tmp/ListJarfile.lock', :local_repo => 'tmp/test-repo' )
+    paths.should eql( [ "tmp", "org.hamcrest:hamcrest-core:jar:1.1"] ) 
+  end
+end
+    
+describe LockJar, "#load" do     
+  it "by Jarfile.lock" do
+    if Naether.platform == 'java'
+      lambda { include_class 'org.apache.mina.core.IoUtil' }.should raise_error
+    else
+      lambda { Rjb::import('org.apache.mina.core.IoUtil') }.should raise_error
+    end
+    
+    LockJar.lock( "spec/Jarfile", :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
           
-        if Naether.platform == 'java'
-          lambda { include_class 'org.modeshape.common.math.Duration' }.should_not raise_error
-        else
-          lambda { Rjb::import('org.modeshape.common.math.Duration') }.should_not raise_error
-        end
-      end
+    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'
+      lambda { include_class 'org.apache.mina.core.IoUtil' }.should_not raise_error
+    else
+      lambda { Rjb::import('org.apache.mina.core.IoUtil') }.should_not raise_error
+    end
+  end
+   
+  it "by block with resolve option" do
+    if Naether.platform == 'java'
+      lambda { include_class 'org.modeshape.common.math.Duration' }.should raise_error
+    else
+      lambda { Rjb::import('org.modeshape.common.math.Duration') }.should raise_error
+    end
+    
+    jars = LockJar.load( :resolve => true ) do 
+      jar 'org.modeshape:modeshape-common:2.3.0.Final'
+    end
+    
+    jars.should eql( ["/home/zinger/.m2/repository/org/modeshape/modeshape-common/2.3.0.Final/modeshape-common-2.3.0.Final.jar", "/home/zinger/.m2/repository/org/slf4j/slf4j-api/1.5.11/slf4j-api-1.5.11.jar", "/home/zinger/.m2/repository/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar"] )
+      
+    if Naether.platform == 'java'
+      lambda { include_class 'org.modeshape.common.math.Duration' }.should_not raise_error
+    else
+      lambda { Rjb::import('org.modeshape.common.math.Duration') }.should_not raise_error
     end
   end
-end
+end  

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 $:.unshift File.expand_path('.')
-$:.unshift File.expand_path('..', __FILE__)
-$:.unshift File.expand_path('../lib', __FILE__)
+$:.unshift File.expand_path(File.join('..', File.dirname(__FILE__)))
+$:.unshift File.expand_path(File.join('../lib', File.dirname(__FILE__)))
 
 require 'rubygems'
 require 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lock_jar
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: naether
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &6015220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+  version_requirements: *6015220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &6011880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -37,31 +32,21 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.9.0
+  version_requirements: *6011880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &6132000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  version_requirements: *6132000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &6129360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,12 +54,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.6.4
+  version_requirements: *6129360
 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
@@ -125,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1069555085123622793
+      hash: 122660553079972418
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -134,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Manage Jar files for Ruby