lock_jar 0.1.0 → 0.2.0

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "naether", "~> 0.6.0"
+gem "naether", "~> 0.7.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.rdoc

@@ -16,14 +16,15 @@ gem install lock_jar
 === Using a Jarfile
 
 ==== Jarfile
-A Jarfile is a simple file using a Ruby DSL for defining a project's Jar dependencies using the following 
+
+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 Maven repository to use.
-* jar: Add Jar dependency in artifact notation
-* pom: Add local path to a Maven pom
-* scope: set the scope for a jar or pom declaration. Default scope is compile
+* 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.
 
 Example Jarfile
 
@@ -43,7 +44,7 @@ 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.
+When the Jarfile is locked, the transitive dependencies for the Jars and POM are resolved and saved to the Jarfile.lock file.
 
 Example of locking a Jarfile to a Jarfile.lock
 
@@ -101,34 +102,45 @@ or directly load all Jars into the classpath
 
 Do not forget, if you change your Jarfile, you have to re-generate the Jarfile.lock.
   
-=== Skipping the Jarfile
+==== Skipping the Jarfile
 
-You can skip the Jarfile and directly load dependencies by passing a block to LockJar.load
+You can skip the Jarfile and Jarfile.lock to directly load dependencies by passing a block to LockJar.load
     
     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.
+
+    LockJar.load( :resolve => true ) do
+      jar 'org.eclipse.jetty:example-jetty-embedded:jar:8.1.2.v20120308'
+    end
+
 === Bundler Integration
 
 LockJar integrates with {Bundler}[https://github.com/carlhuda/bundler/] by {modifying}[https://github.com/mguymon/lock_jar/blob/master/lib/lock_jar/bundler.rb] the Bundler
-DSL to include LockJar's DSL, generating a Jarfile.lock when Bundler locks, and populating the classpath
-when Bundler requires.
+DSL to include LockJar's DSL, generating a Jarfile.lock when Bundler locks, and populating the classpath when Bundler requires.
 
 ==== Example
 
 The following Gemfile with LockJar
 
-  require 'lock_jar/bundler'
+  # This is what modifies Bundler to trigger LockJar
+  require 'lock_jar/bundler' 
   
   gem "naether"
+
+  group :development do
+    gem "rspec", "~> 2.9.0"
+  end
         
   # lockjar dsl that is used to generate Jarfile.lock
   lock_jar do
     scope :test do
-	  jar 'junit:junit:jar:4.10'
-	end
-	  
+      jar 'junit:junit:jar:4.10'
+    end
+    
     pom 'spec/pom.xml', :scope => :compile
   end
 
@@ -136,12 +148,20 @@ Will produce a Gemfile.lock and Jarfile.lock for
 
   bundle install
   
-When Bundle.setup or Bundle.require is called, the jars from the Jarfile.lock are loaded into the classpath.
+When Bundler.setup or Bundler.require is called, the jars from the Jarfile.lock are loaded into the classpath.
+
+  require 'rubygems'
+  require 'bundler'
+
+  # This is what modifies Bundler to trigger LockJar
+  require 'lock_jar/bundler' 
+
+  Bundler.require
   
 === Buildr Integration
 
 LockJar integrates with {Buildr}[http://buildr.apache.org/] using an {Addon}[https://github.com/mguymon/lock_jar/blob/master/lib/lock_jar/buildr.rb].
-This allows the Jarfile to be defined directly into a buildfile. A global app LockJar definition can be set and
+This allows the Jarfile to be defined directly into a buildfile. A global LockJar definition can be set and
 is inherited to all projects. Each project may have its own LockJar definition. A lock file is generated per project based
 on the project name.
 
@@ -153,8 +173,9 @@ and a task per project to generate the lockfile for a single project
 
   buildr <app>:<project>:lock_jar:lock
 
-The resolved dependencies are automatically added to the classpath for compiling and testing. Do not forget, if you change the lock_jar
-definitions, you have to rerun the lock_jar:lock task.
+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.
 
 
 ==== Example

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/lock_jar/buildr.rb

@@ -18,16 +18,18 @@ require 'lock_jar/dsl'
 
 module Buildr
   
-  attr_reader :global_lockjar_dsl
-  
   class << self
     def project_to_lockfile( project )
       "#{project.name.gsub(/:/,'-')}.lock"
     end
+    
+    def global_lockjar_dsl
+      @@global_lockjar_dsl
+    end
   end
   
   def lock_jar( &blk )
-    @global_lockjar_dsl = ::LockJar::Dsl.evaluate(&blk)            
+    @@global_lockjar_dsl = ::LockJar::Dsl.evaluate(&blk) 
   end
   
   namespace "lock_jar" do
@@ -47,8 +49,9 @@ module Buildr
     
       def lock_jar( &blk )
           @lockjar_dsl = ::LockJar::Dsl.evaluate(&blk)    
-          if global_lockjar_dsl
-            @lockjar_dsl.merge( global_lockjar_dsl )
+                   
+          unless Buildr.global_lockjar_dsl.nil?
+            @lockjar_dsl.merge( Buildr.global_lockjar_dsl )
           end        
       end
       
@@ -57,7 +60,7 @@ module Buildr
       end
       
       def lockjar_dsl
-        @lockjar_dsl || global_lockjar_dsl
+        @lockjar_dsl || Buildr.global_lockjar_dsl
       end
       
       after_define do |project|      

data/lib/lock_jar/bundler.rb

@@ -47,6 +47,8 @@ module Bundler
     attr_accessor :lock_jar
     
     def lock( file )
+      
+      # XXX: this is call from Bundler.setup. Only should happen on install or update
       LockJar.lock( lock_jar )
       
       lockjar_replaced_lock( file )

data/lib/lock_jar/dsl.rb

@@ -20,6 +20,7 @@ module LockJar
     attr_reader :repositories
     attr_reader :local_repository
     attr_reader :scopes
+    attr_reader :maps
     
     class << self
     
@@ -61,10 +62,7 @@ module LockJar
       @present_scope = 'compile'
       
       @local_repository = nil
-    end
-    
-    def local( path )
-      @local_repository = path
+      @maps = {}
     end
     
     def jar(notation, *args)
@@ -75,6 +73,34 @@ module LockJar
       
       artifact( notation, opts )
     end
+
+    def local( path )
+      @local_repository = path
+    end
+    
+    def merge( dsl )
+      @repositories = (@repositories + dsl.repositories).uniq
+      
+      dsl.notations.each do |scope, notations|
+        @notations[scope] = (@notations[scope] + notations).uniq         
+      end
+      
+      dsl.maps.each do |notation,paths|
+        existing_map = @maps[notation]
+        if existing_map
+          @maps[notation] = (existing_map + paths).uniq
+        else
+          @maps[notation] = paths
+        end
+      end
+      
+      self
+    end
+  
+    # Map a dependency to another dependency or local directory.
+    def map( notation, *args )
+      @maps[notation] = args
+    end
     
     # Pom default to all scopes, unless nested in a scope
     def pom(path, *args)
@@ -91,11 +117,15 @@ module LockJar
       
       artifact( path, opts )
     end
+
+    def read_file(file)
+      File.open(file, "rb") { |f| f.read }
+    end
     
     def repository( url, opts = {} )
       @repositories << url
     end
-    
+
     def scope(*scopes, &blk)
        @scope_changed = true
        scopes.each do |scope|
@@ -104,22 +134,8 @@ module LockJar
        end
        @scope_changed = false
        @present_scope = 'compile'
-    end
+    end   
     
-    def read_file(file)
-      File.open(file, "rb") { |f| f.read }
-    end
-    
-    def merge( dsl )
-      @repositories = (@repositories + dsl.repositories).uniq
-      
-      dsl.notations.each do |scope, notations|
-        @notations[scope] = (@notations[scope] + notations).uniq         
-      end
-      
-      self
-    end
-   
     private 
     def artifact(artifact, opts)
       

data/lib/lock_jar/resolver.rb

@@ -63,11 +63,37 @@ module LockJar
       @naether.dependenciesNotation
     end
     
-    def load_jars_to_classpath( notations )
-      jars = @naether.to_local_paths( notations )
+    def to_local_paths( notations )
+      paths = []   
+      notations.each do |notation|
+        if File.directory?(notation)
+          paths << notation
+        else
+          paths = paths + @naether.to_local_paths( [notation] )
+        end
+      end
+      
+      paths
+    end
+    
+    def load_to_classpath( notations )
+      dirs = []
+      jars = [] 
+        
+      notations.each do |notation|
+        if File.directory?(notation)
+          dirs << notation
+        else
+          jars << notation
+        end
+      end
+      
+      Naether::Java.load_paths( dirs )
+      
+      jars = @naether.to_local_paths( jars )
       Naether::Java.load_jars( jars )
       
-      jars
+      dirs + jars
     end
   end
 end

data/lib/lock_jar/runtime.rb

@@ -27,6 +27,7 @@ module LockJar
     attr_reader :current_resolver
     
     def resolver( opts = {} )
+      # XXX: opts for a method will cause resolver to reload
       if @current_resolver.nil? || opts != @current_resolver.opts
         @current_resolver = LockJar::Resolver.new( opts )
       end
@@ -35,6 +36,7 @@ module LockJar
     end
     
     def lock( jarfile, opts = {} )
+      
         lock_jar_file = nil
         
         if jarfile.is_a? LockJar::Dsl
@@ -61,7 +63,11 @@ module LockJar
         if lock_jar_file.repositories.size > 0
           lock_data['repositories'] = lock_jar_file.repositories
         end
-          
+        
+        if lock_jar_file.maps.size > 0
+          lock_data['maps'] = lock_jar_file.maps
+        end
+        
         lock_data['scopes'] = {} 
           
         lock_jar_file.notations.each do |scope, notations|
@@ -73,6 +79,7 @@ module LockJar
           
           if dependencies.size > 0
             resolved_notations = resolver(opts).resolve( dependencies )
+            
             lock_data['scopes'][scope] = { 
               'dependencies' => notations,
               'resolved_dependencies' => resolved_notations } 
@@ -86,17 +93,45 @@ module LockJar
     
       def list( jarfile_lock, scopes = ['compile', 'runtime'], opts = {}, &blk )
         dependencies = []
-                
+        maps = []
+            
         if jarfile_lock
-          dependencies += lockfile_dependencies( read_lockfile( jarfile_lock), scopes )
+          lockfile = read_lockfile( jarfile_lock)
+          dependencies += lockfile_dependencies( lockfile, scopes )
+          maps = lockfile['maps']
         end
         
         unless blk.nil?
           dsl = LockJar::Dsl.evaluate(&blk)
           dependencies += dsl_dependencies( dsl, scopes )
+          maps = dsl.maps
         end
         
-        dependencies.uniq
+        if maps && maps.size > 0 
+          mapped_dependencies = []
+          
+          maps.each do |notation, replacements|
+            dependencies.each do |dep|
+              if dep =~ /#{notation}/
+                replacements.each do |replacement|
+                  mapped_dependencies << replacement
+                end
+              else
+                mapped_dependencies << dep
+              end
+            end
+          end
+                          
+          dependencies = mapped_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 )
+          
+        else
+          dependencies.uniq
+        end
       end
       
       def load( jarfile_lock, scopes = ['compile', 'runtime'], opts = {}, &blk )
@@ -122,14 +157,15 @@ module LockJar
           dependencies = resolver(opts).resolve( dependencies )
         end
         
-        resolver(opts).load_jars_to_classpath( dependencies )
+        resolver(opts).load_to_classpath( dependencies )
       end
       
-      private
       def read_lockfile( jarfile_lock )
         YAML.load_file( jarfile_lock )
       end
       
+      private
+      
       def lockfile_dependencies( lockfile, scopes)
         dependencies = []
          

data/lib/lock_jar.rb

@@ -21,6 +21,10 @@ require 'lock_jar/runtime'
 
 module LockJar
   
+  def self.config( opts )
+    Runtime.instance.resolver( opts )
+  end
+  
   # Lock a Jarfile and generate a Jarfile.lock
   #
   # Accepts path to the jarfile and hash of options to configure LockJar
@@ -80,5 +84,9 @@ module LockJar
       
       Runtime.instance.load( lockfile, scopes, opts, &blk )
   end
+  
+  def self.read( lockfile )
+    Runtime.instance.read_lockfile( lockfile )
+  end
  
 end

data/lock_jar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lock_jar"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Guymon"]
-  s.date = "2012-04-19"
+  s.date = "2012-05-09"
   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,25 +45,25 @@ 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.12"
+  s.rubygems_version = "1.8.24"
   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.6.0"])
+      s.add_runtime_dependency(%q<naether>, ["~> 0.7.0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
     else
-      s.add_dependency(%q<naether>, ["~> 0.6.0"])
+      s.add_dependency(%q<naether>, ["~> 0.7.0"])
       s.add_dependency(%q<rspec>, ["~> 2.9.0"])
       s.add_dependency(%q<bundler>, ["> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     end
   else
-    s.add_dependency(%q<naether>, ["~> 0.6.0"])
+    s.add_dependency(%q<naether>, ["~> 0.7.0"])
     s.add_dependency(%q<rspec>, ["~> 2.9.0"])
     s.add_dependency(%q<bundler>, ["> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/spec/lock_jar/bundler_spec.rb

@@ -1,16 +1,22 @@
-require 'spec_helper'
+require File.expand_path(File.join(File.dirname(__FILE__),'../spec_helper'))
+  
 require 'rubygems'
 require 'bundler'
 require 'lib/lock_jar/bundler'
 require 'helper/bundler_helper'
+require 'fileutils'
 
 describe Bundler do
     include BundlerHelper
     
+    before(:all) do
+      FileUtils.rm_rf( bundled_app ) if File.exists? bundled_app
+      FileUtils.mkdir_p tmp('bundler')
+    end
+    
     before(:each) do
       gemfile <<-G
         require 'lock_jar/bundler'
-        source "file://#{tmp('bundler')}"
         gem "naether"
         
         lock_jar do
@@ -33,14 +39,13 @@ describe Bundler do
   end
     
   it "provides a list of the jar and pom dependencies" do
-    Bundler.load.lock_jar.notations.should eql( {"compile"=>["/home/zinger/devel/projects/swx/lock_jar/spec/pom.xml"], "runtime"=>[], "test"=>["junit:junit:jar:4.10"]} )
+    Bundler.load.lock_jar.notations.should eql( {"compile"=>[File.expand_path(File.join(File.dirname(__FILE__), "../../spec/pom.xml"))], "runtime"=>[], "test"=>["junit:junit:jar:4.10"]} )
   end
   
   it "should create Jarfile.lock with bundle install" do
     File.delete( bundled_app("Jarfile.lock") ) if File.exists? bundled_app("Jarfile.lock")
     install_gemfile <<-G
       require 'lock_jar/bundler'
-      source "file://#{tmp('bundler')}"
       gem "naether"
       
       lock_jar do
@@ -52,10 +57,9 @@ describe Bundler do
       end
       
     G
+    File.exists?( bundled_app("Jarfile.lock") ).should be_true
     
-    File.exists?(  bundled_app("Jarfile.lock") ).should be_true
-    
-    IO.read( File.join(root,'spec', 'BundlerJarfile.lock') ).should eql( IO.read( bundled_app("Jarfile.lock") ) )
+    LockJar.read( File.join(root,'spec', 'BundlerJarfile.lock') ).should eql( LockJar.read( bundled_app("Jarfile.lock") ) )
   end
   
   it "should create Jarfile.lock with bundle update" do
@@ -63,7 +67,7 @@ describe Bundler do
     bundle "update"
     File.exists?(  bundled_app("Jarfile.lock") ).should be_true
     
-    IO.read( File.join(root,'spec', 'BundlerJarfile.lock') ).should eql( IO.read( bundled_app("Jarfile.lock") ) )
+    LockJar.read( File.join(root,'spec', 'BundlerJarfile.lock') ).should eql( LockJar.read( bundled_app("Jarfile.lock") ) )
   end
   
   it "should load Jarfile.lock with Bundle.setup" do
@@ -71,12 +75,16 @@ describe Bundler do
       require 'rubygems'
       require 'bundler'
       require 'lock_jar/bundler'
+      require 'naether/java'
+      
+      LockJar.config( :local_repo => '#{tmp('test-repo')}' )
+      
       Bundler.setup
 
-      puts com.slackworks.modelcitizen.ModelFactory.to_s
+      puts Naether::Java.create('com.slackworks.modelcitizen.ModelFactory').getClass().toString()
     RUBY
-    err.should eq("")
-    out.should match("Java::ComSlackworksModelcitizen::ModelFactory")
+    # err.should eq("") # 1.9.3 has a IConv error that outputs to std err
+    out.should match("class com.slackworks.modelcitizen.ModelFactory")
   end
   
 end

data/spec/lock_jar/dsl_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'spec/spec_helper'
 
 describe LockJar::Dsl do
   context "Instance" do

data/spec/lock_jar/maven_spec.rb

@@ -1,4 +1,4 @@
-require 'rubygems'
+require 'spec/spec_helper'
 require 'lib/lock_jar'
 require 'lib/lock_jar/maven'
 require 'naether'

data/spec/lock_jar/resolver_spec.rb

@@ -1,19 +1,26 @@
-require 'rubygems'
+require 'spec/spec_helper'
 require 'lib/lock_jar/resolver'
 require 'fileutils'
 require 'naether'
 
 describe LockJar::Resolver do
   context "Instance" do
-    it "should bootstrap naether" do
+    before(:each) do
       FileUtils.mkdir_p( 'tmp/test-repo' )
-      resolver = LockJar::Resolver.new( :local_repo => 'tmp/test-repo' )
-      
+      @resolver = LockJar::Resolver.new( :local_repo => 'tmp/test-repo' )
+    end
+    
+    it "should bootstrap naether" do
       deps = Naether::Bootstrap.check_local_repo_for_deps( 'tmp/test-repo' )
       deps[:missing].should eql([])
       deps[:exists].each do |dep|
         dep.values[0].should match /.+#{File::SEPARATOR}tmp#{File::SEPARATOR}test-repo#{File::SEPARATOR}.+/
       end
     end
+    
+    it "should return local paths for notations" do
+      @resolver.to_local_paths( ["junit:junit:jar:4.10"] ).should 
+        eql( [File.expand_path("tmp/test-repo/junit/junit/4.10/junit-4.10.jar")] )
+    end
   end
 end

data/spec/lock_jar/runtime_spec.rb

@@ -1,11 +1,11 @@
-require 'rubygems'
+require 'spec/spec_helper'
 require 'lib/lock_jar/runtime'
 
 describe LockJar::Runtime do
   context "Singleton" do
     it "should set local repo" do
       LockJar::Runtime.instance.load( nil ) do 
-        jar 'org.modeshape:modeshape-common:2.3.0.Final'
+        jar 'junit:junit:4.10'
       end
       
       LockJar::Runtime.instance.current_resolver.naether.local_repo_path.should eql File.expand_path('~/.m2/repository')

data/spec/lock_jar_spec.rb

@@ -1,20 +1,64 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'spec_helper'))
 require 'rubygems'
 require 'lib/lock_jar'
 require 'naether'
 
 describe LockJar do
   context "Module" 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' )
+    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
       
-      LockJar.lock( "spec/Jarfile", :local_repo => 'tmp/test-repo', :lockfile => 'tmp/Jarfile.lock' )
-      File.exists?( 'tmp/Jarfile.lock' ).should be_true
+      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
     end
-    
-    it "should list jars" do
-      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"] )
+  
+    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
     end
     
     context "load" do
@@ -25,6 +69,8 @@ describe LockJar do
           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")] )

data/spec/spec_helper.rb

@@ -1,5 +1,10 @@
+$:.unshift File.expand_path('.')
 $:.unshift File.expand_path('..', __FILE__)
-$:.unshift File.expand_path('../../lib', __FILE__)
+$:.unshift File.expand_path('../lib', __FILE__)
+
+require 'rubygems'
+require 'rspec'
+require 'lib/lock_jar'
 
 RSpec.configure do |config|
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lock_jar
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Guymon
@@ -15,27 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-19 00:00:00 Z
+date: 2012-05-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 0
-        - 6
+        - 7
         - 0
-        version: 0.6.0
+        version: 0.7.0
   version_requirements: *id001
   name: naether
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,9 +47,9 @@ dependencies:
         version: 2.9.0
   version_requirements: *id002
   name: rspec
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,9 +63,9 @@ dependencies:
         version: 1.0.0
   version_requirements: *id003
   name: bundler
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -81,6 +79,8 @@ dependencies:
         version: 1.6.4
   version_requirements: *id004
   name: jeweler
+  prerelease: false
+  type: :development
 description: |-
   Manage Jar files for Ruby. In the spirit of Bundler, a Jarfile
     is used to generate a Jarfile.lock that contains all the resolved jar dependencies for scopes runtime, compile, and test.
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Manage Jar files for Ruby