lock_jar 0.6.2 → 0.7.0

data/spec/Jarfile

@@ -1,13 +1,13 @@
-local '~/.m2/repository'
+local_repo '~/.m2/repository'
 repository 'http://mirrors.ibiblio.org/pub/mirrors/maven2'
 
 jar "org.apache.mina:mina-core:2.0.4"
 pom 'spec/pom.xml'
     
-scope 'runtime' do
+group 'development' do
     jar 'com.typesafe:config:jar:0.5.0'
 end
 
-scope 'test' do
+group 'test' do
     jar 'junit:junit:jar:4.10'
 end

data/spec/lock_jar/class_loader_spec.rb

@@ -4,50 +4,54 @@ require 'lib/lock_jar/class_loader'
 
 describe LockJar::ClassLoader, "#isolate" do
  
-  it "should create a SimpleEmail" do
-    # Generate the IsolateJarfile.lock 
-    LockJar.lock( :lockfile => 'tmp/IsolateJarfile.lock' ) do
-     jar 'org.apache.commons:commons-email:1.2'
+  if Naether.platform != 'java'
+    pending "need tests for RJB backed classloader"
+  else
+    it "should create a SimpleEmail" do
+      # Generate the IsolateJarfile.lock 
+      LockJar.lock( :lockfile => 'tmp/IsolateJarfile.lock' ) do
+       jar 'org.apache.commons:commons-email:1.2'
+      end
+      
+      email = LockJar::ClassLoader.new( 'tmp/IsolateJarfile.lock' ).isolate do
+          email = new_instance( 'org.apache.commons.mail.SimpleEmail' )
+          email.setSubject( 'test subject' )     
+          
+          email
+      end
+      
+      email.getSubject().should eql 'test subject'
+      
+      unless $CLASSPATH.nil?
+        $CLASSPATH.to_a.join(' ').should_not =~ /commons-email-1\.2\.jar/
+      end
+      
+      expect { org.apache.commons.mail.SimpleEmail.new }.to raise_error
     end
-    
-    email = LockJar::ClassLoader.new( 'tmp/IsolateJarfile.lock' ).isolate do
-        email = new_instance( 'org.apache.commons.mail.SimpleEmail' )
-        email.setSubject( 'test subject' )     
-        
-        email
+  
+    it "should create a JsonFactory and ObjectMapper" do
+      # Generate the IsolateJarfile.lock 
+      LockJar.lock( :lockfile => 'tmp/IsolateJarfile.lock' ) do
+       jar 'com.fasterxml.jackson.core:jackson-core:2.0.6'
+       jar 'com.fasterxml.jackson.core:jackson-databind:2.0.6'
+      end
+      
+      json = '{ "test1": "1test1", "test2": "2test2"}'
+      
+      map = LockJar::ClassLoader.new( 'tmp/IsolateJarfile.lock' ).isolate do
+          factory = new_instance( 'com.fasterxml.jackson.core.JsonFactory' )
+          mapper = new_instance( 'com.fasterxml.jackson.databind.ObjectMapper', factory) 
+          mapper.readValue(json, java.util.Map.java_class)
+      end
+      
+      map.get('test1').should eql "1test1"
+      map.get('test2').should eql "2test2"
+      
+      unless $CLASSPATH.nil?
+        $CLASSPATH.to_a.join(' ').should_not =~ /jackson-databind-2\.0\.6\.jar/
+      end
+      
+      expect { com.fasterxml.jackson.core.JsonFactory.new }.to raise_error
     end
-    
-    email.getSubject().should eql 'test subject'
-    
-    unless $CLASSPATH.nil?
-      $CLASSPATH.to_a.join(' ').should_not =~ /commons-email-1\.2\.jar/
-    end
-    
-    expect { org.apache.commons.mail.SimpleEmail.new }.to raise_error
-  end
-
-  it "should create a JsonFactory and ObjectMapper" do
-    # Generate the IsolateJarfile.lock 
-    LockJar.lock( :lockfile => 'tmp/IsolateJarfile.lock' ) do
-     jar 'com.fasterxml.jackson.core:jackson-core:2.0.6'
-     jar 'com.fasterxml.jackson.core:jackson-databind:2.0.6'
-    end
-    
-    json = '{ "test1": "1test1", "test2": "2test2"}'
-    
-    map = LockJar::ClassLoader.new( 'tmp/IsolateJarfile.lock' ).isolate do
-        factory = new_instance( 'com.fasterxml.jackson.core.JsonFactory' )
-        mapper = new_instance( 'com.fasterxml.jackson.databind.ObjectMapper', factory) 
-        mapper.readValue(json, java.util.Map.java_class)
-    end
-    
-    map.get('test1').should eql "1test1"
-    map.get('test2').should eql "2test2"
-    
-    unless $CLASSPATH.nil?
-      $CLASSPATH.to_a.join(' ').should_not =~ /jackson-databind-2\.0\.6\.jar/
-    end
-    
-    expect { com.fasterxml.jackson.core.JsonFactory.new }.to raise_error
   end
 end

data/spec/lock_jar/domain/dsl_helper_spec.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'../../spec_helper'))
+
+require 'lock_jar/domain/dsl_helper'
+
+describe LockJar::Domain::DslHelper do
+    
+    it "should merge dsl" do
+      block1 = LockJar::Domain::Dsl.create  do
+        repository 'http://repository.jboss.org/nexus/content/groups/public-jboss'
+        
+        jar "org.apache.mina:mina-core:2.0.4"
+        pom 'spec/pom.xml'
+            
+        group 'runtime' do
+            jar 'org.apache.tomcat:servlet-api:jar:6.0.35'
+        end
+        
+        group 'test' do
+            jar 'junit:junit:jar:4.10'
+        end
+      end
+      
+      block2 = LockJar::Domain::Dsl.create  do
+        repository 'http://repository.jboss.org/nexus/content/groups/public-jboss'
+        repository 'http://new-repo'
+        
+        jar "org.apache.mina:mina-core:2.0.4"
+        jar "compile-jar"
+            
+        group 'runtime' do
+            jar 'runtime-jar'
+            pom 'runtime-pom.xml'
+        end
+        
+        group 'test' do
+            jar 'test-jar'
+            pom 'test-pom.xml'
+        end
+      end
+      
+      dsl = LockJar::Domain::DslHelper.merge( block1, block2 )
+      
+      dsl.artifacts['default'].should =~ [LockJar::Domain::Jar.new("org.apache.mina:mina-core:2.0.4"), LockJar::Domain::Pom.new("spec/pom.xml",["runtime", "compile"]), LockJar::Domain::Jar.new("compile-jar")]
+      
+      #  "runtime" => [LockJar::Domain::Jar.new("org.apache.tomcat:servlet-api:jar:6.0.35"), LockJar::Domain::Jar.new("runtime-jar"), LockJar::Domain::Pom.new("runtime-pom.xml")], 
+      #  "test" => [LockJar::Domain::Jar.new("junit:junit:jar:4.10"), LockJar::Domain::Jar.new("test-jar"), LockJar::Domain::Pom.new("test-pom.xml")]
+      
+      
+      dsl.remote_repositories.should eql( ["http://repository.jboss.org/nexus/content/groups/public-jboss", 'http://new-repo'] )
+            
+    end
+end

data/spec/lock_jar/domain/dsl_spec.rb

@@ -0,0 +1,54 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'../../spec_helper'))
+require 'lock_jar/domain/artifact'
+describe LockJar::Domain::Dsl do
+  context "Instance" do
+    it "should load a Jarfile" do
+      jarfile = LockJar::Domain::Dsl.create( "spec/Jarfile" )
+      
+      jarfile.local_repository.should eql '~/.m2/repository'
+      jarfile.artifacts["default"][0].should == LockJar::Domain::Jar.new("org.apache.mina:mina-core:2.0.4")
+      jarfile.artifacts["default"][1].path.should eql "spec/pom.xml"
+      jarfile.artifacts["default"][2].should be_nil
+      
+      jarfile.artifacts["development"][0].should == LockJar::Domain::Jar.new("com.typesafe:config:jar:0.5.0") 
+      jarfile.artifacts["development"][1].should be_nil
+      
+      jarfile.artifacts["test"][0].should == LockJar::Domain::Jar.new("junit:junit:jar:4.10")
+      jarfile.artifacts["test"][1].should be_nil
+      
+      jarfile.remote_repositories.should eql( ['http://mirrors.ibiblio.org/pub/mirrors/maven2'] )
+    end
+    
+    it "should load a block" do
+      block = LockJar::Domain::Dsl.create  do
+        local_repo '~/.m2'
+        repository 'http://repository.jboss.org/nexus/content/groups/public-jboss'
+        
+        jar "org.apache.mina:mina-core:2.0.4"
+        pom 'spec/pom.xml'
+            
+        group 'pirate' do
+            jar 'org.apache.tomcat:servlet-api:jar:6.0.35'
+        end
+        
+        group 'test' do
+            jar 'junit:junit:jar:4.10'
+        end
+      end
+      
+      block.local_repository.should eql '~/.m2'
+      block.artifacts.should == {
+        "default" => [LockJar::Domain::Jar.new("org.apache.mina:mina-core:2.0.4"), LockJar::Domain::Pom.new("spec/pom.xml")], 
+        "pirate" => [LockJar::Domain::Jar.new("org.apache.tomcat:servlet-api:jar:6.0.35")], 
+        "test" => [LockJar::Domain::Jar.new("junit:junit:jar:4.10")]
+      }
+      block.remote_repositories.should eql( ["http://repository.jboss.org/nexus/content/groups/public-jboss"] )
+          
+    end
+    
+    it "should raise an error without arguments" do
+      lambda { LockJar::Domain::Dsl.create }.should raise_error
+    end
+    
+  end
+end

data/spec/lock_jar_spec.rb

@@ -1,6 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'spec_helper'))
 require 'rubygems'
 require 'lib/lock_jar'
+require 'lib/lock_jar/domain/dsl'
 require 'naether'
 
 describe LockJar, "#lock" do    
@@ -15,47 +16,86 @@ describe LockJar, "#lock" do
     File.exists?( 'tmp/Jarfile.lock' ).should be_true
     
     lockfile = LockJar.read('tmp/Jarfile.lock')
-    lockfile.should eql( {
+    lockfile.to_hash.should eql({
+      "version"=> LockJar::VERSION, 
       "local_repository"=>"~/.m2/repository", 
-      "scopes"=>{
-        "compile"=>{
-          "dependencies"=>["org.apache.mina:mina-core:2.0.4", "spec/pom.xml"], 
-          "resolved_dependencies"=>["com.metapossum:metapossum-scanner:jar:1.0", 
-            "org.apache.mina:mina-core:jar:2.0.4", "commons-beanutils:commons-beanutils:jar:1.8.3", 
-            "ch.qos.logback:logback-classic:jar:0.9.24", 
-            "commons-logging:commons-logging:jar:1.1.1", "junit:junit:jar:4.7", 
-            "ch.qos.logback:logback-core:jar:0.9.24", "commons-lang:commons-lang:jar:2.6", 
-            "com.slackworks:modelcitizen:jar:0.2.2", "org.slf4j:slf4j-api:jar:1.6.1", 
-            "commons-io:commons-io:jar:1.4"]}, 
-        "runtime"=>{
-          "dependencies"=>["spec/pom.xml", "com.typesafe:config:jar:0.5.0"], 
-          "resolved_dependencies"=>["com.typesafe:config:jar:0.5.0"]}, 
+      "groups"=>{
+        "default"=>{
+          "dependencies"=>["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",
+            "com.slackworks:modelcitizen:jar:0.2.2", 
+            "commons-beanutils:commons-beanutils:jar:1.8.3", "commons-io:commons-io:jar:1.4", 
+            "commons-lang:commons-lang:jar:2.6", "commons-logging:commons-logging:jar:1.1.1", 
+             "org.apache.mina:mina-core:jar:2.0.4", 
+            "org.slf4j:slf4j-api:jar:1.6.1"], 
+          "artifacts"=>[{
+            "jar:org.apache.mina:mina-core:jar:2.0.4"=>{
+              "transitive"=>{"org.slf4j:slf4j-api:jar:1.6.1"=>{}}
+            }
+          }, {
+            "pom:spec/pom.xml"=>{
+              "scopes"=>["runtime", "compile"], 
+              "transitive"=>{
+                "com.slackworks:modelcitizen:jar:0.2.2" => {
+                  "com.metapossum:metapossum-scanner:jar:1.0"=>{
+                    "commons-io:commons-io:jar:1.4"=>{}
+                  }, 
+                  "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"=>{}
+                  }, 
+                  "commons-lang:commons-lang:jar:2.6"=>{}
+                }
+              }
+            }
+          }]
+        }, 
+        "development"=>{
+          "dependencies"=>["com.typesafe:config:jar:0.5.0"], 
+          "artifacts"=>[{
+            "jar:com.typesafe:config:jar:0.5.0"=>{"transitive"=>{}}
+          }]
+        }, 
         "test"=>{
-          "dependencies"=>["spec/pom.xml", "junit:junit:jar:4.10"], 
-          "resolved_dependencies"=>["junit:junit:jar:4.10", "org.jboss.unit:jboss-unit:jar:1.2.4",
-            "org.hamcrest:hamcrest-core:jar:1.1"]}}, 
-      "repositories"=>["http://repo1.maven.org/maven2/", "http://mirrors.ibiblio.org/pub/mirrors/maven2", "http://repository.jboss.org/nexus/content/groups/public-jboss"]
+          "dependencies"=>["junit:junit:jar:4.10", "org.hamcrest:hamcrest-core:jar:1.1"], 
+          "artifacts"=>[{
+            "jar:junit:junit:jar:4.10"=>{
+              "transitive"=>{"org.hamcrest:hamcrest-core:jar:1.1"=>{}}}
+          }]
+        }
+      },
+      "remote_repositories" => ["http://mirrors.ibiblio.org/pub/mirrors/maven2", "http://repository.jboss.org/nexus/content/groups/public-jboss"]
     })
   end
   
-  it "should not replace dependencies with maps" do
-    dsl = LockJar::Dsl.evaluate do
+  it "should replace dependencies with map" do
+    dsl = LockJar::Domain::Dsl.create 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( {
-      "repositories" => ["http://repo1.maven.org/maven2/", 'http://mirrors.ibiblio.org/pub/mirrors/maven2', "http://repository.jboss.org/nexus/content/groups/public-jboss"],
+    lockfile.to_hash.should eql({
+      "version"=> LockJar::VERSION, 
       "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"]}}} )      
+      "groups"=>{
+        "default"=>{
+          "dependencies"=>["junit:junit:jar:4.10", "org.hamcrest:hamcrest-core:jar:1.1"], 
+          "artifacts"=>[{
+            "jar:junit:junit:jar:4.10"=>{
+              "transitive"=>{"org.hamcrest:hamcrest-core:jar:1.1"=>{}}}
+          }]
+        }
+      },
+      "remote_repositories" => ["http://mirrors.ibiblio.org/pub/mirrors/maven2", "http://repository.jboss.org/nexus/content/groups/public-jboss"]
+    })      
   end
   
   it "should exclude excludes from dependencies" do
-    dsl = LockJar::Dsl.evaluate do
+    dsl = LockJar::Domain::Dsl.create do
       exclude 'commons-logging', 'logkit'
       jar 'opensymphony:oscache:jar:2.4.1'
     end
@@ -63,19 +103,33 @@ describe LockJar, "#lock" do
     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( {
+    lockfile.to_hash.should eql({
+      "version"=>"0.7.0", 
       "excludes"=>["commons-logging", "logkit"], 
-      "scopes"=>{
-          "compile"=>{
-            "dependencies"=>["opensymphony:oscache:jar:2.4.1"], 
-            "resolved_dependencies"=>["log4j:log4j:jar:1.2.12", "javax.jms:jms:jar:1.1", 
-              "opensymphony:oscache:jar:2.4.1", "javax.servlet:servlet-api:jar:2.3", 
-              "avalon-framework:avalon-framework:jar:4.1.3"]}}, 
-      "repositories"=>["http://repo1.maven.org/maven2/", 
-        "http://mirrors.ibiblio.org/pub/mirrors/maven2", 
-        "http://repository.jboss.org/nexus/content/groups/public-jboss"]
+      "groups"=>{
+        "default"=>{
+          "dependencies"=>[
+            "avalon-framework:avalon-framework:jar:4.1.3", "javax.jms:jms:jar:1.1", 
+            "javax.servlet:servlet-api:jar:2.3", "log4j:log4j:jar:1.2.12", 
+            "opensymphony:oscache:jar:2.4.1"], 
+          "artifacts"=>[{
+            "jar:opensymphony:oscache:jar:2.4.1"=>{
+              "transitive"=>{
+                "commons-logging:commons-logging:jar:1.1"=>{
+                  "logkit:logkit:jar:1.0.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"=>{}
+              }
+            }
+          }]
+        }
+      },
+      "remote_repositories" => ["http://mirrors.ibiblio.org/pub/mirrors/maven2", "http://repository.jboss.org/nexus/content/groups/public-jboss"]
     })
-  
+    
   end
   
   
@@ -87,19 +141,38 @@ describe LockJar, "#lock" do
     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-util:jar:8.1.3.v20120416", 
+    lockfile.to_hash.should eql({
+      "version"=>"0.7.0", 
+      "groups"=>{
+        "default"=>{
+          "dependencies"=>["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.orbit:javax.servlet:jar:3.0.0.v201112011016", 
             "org.eclipse.jetty:jetty-security:jar:8.1.3.v20120416", 
-            "org.eclipse.jetty:jetty-continuation:jar:8.1.3.v20120416", 
-            "org.eclipse.jetty:jetty-servlet:jar:8.1.3.v20120416", 
             "org.eclipse.jetty:jetty-server:jar:8.1.3.v20120416", 
-            "org.eclipse.jetty:jetty-http:jar:8.1.3.v20120416"]}}, 
-      "repositories"=>["http://repo1.maven.org/maven2/"]})
+            "org.eclipse.jetty:jetty-servlet:jar:8.1.3.v20120416", 
+            "org.eclipse.jetty:jetty-util:jar:8.1.3.v20120416"], 
+          "artifacts"=>[{
+            "jar:org.eclipse.jetty:jetty-servlet:jar:8.1.3.v20120416"=>{
+              "transitive"=>{
+                "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
 
@@ -108,19 +181,20 @@ describe LockJar, "#install" do
     
     LockJar.lock( "spec/Jarfile", :download_artifacts => false, :local_repo => 'tmp/test-repo-install', :lockfile => 'tmp/Jarfile.lock' )
           
-    jars = LockJar.install( 'tmp/Jarfile.lock', ['compile'], :local_repo => 'tmp/test-repo-install' )
-    jars.should eql( 
-      [ File.expand_path( "tmp/test-repo-install/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar"), 
-        File.expand_path( "tmp/test-repo-install/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"), 
-        File.expand_path( "tmp/test-repo-install/org/apache/mina/mina-core/2.0.4/mina-core-2.0.4.jar"), 
-        File.expand_path( "tmp/test-repo-install/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24.jar" ), 
-        File.expand_path( "tmp/test-repo-install/junit/junit/4.7/junit-4.7.jar"), 
-        File.expand_path( "tmp/test-repo-install/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"), 
-        File.expand_path( "tmp/test-repo-install/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24.jar"), 
-        File.expand_path( "tmp/test-repo-install/com/slackworks/modelcitizen/0.2.2/modelcitizen-0.2.2.jar"), 
-        File.expand_path( "tmp/test-repo-install/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"), 
-        File.expand_path( "tmp/test-repo-install/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"), 
-        File.expand_path( "tmp/test-repo-install/commons-io/commons-io/1.4/commons-io-1.4.jar")] )
+    jars = LockJar.install( 'tmp/Jarfile.lock', ['default'], :local_repo => 'tmp/test-repo-install' )
+    jars.should eql([
+      File.expand_path("tmp/test-repo-install/ch/qos/logback/logback-classic/0.9.24/logback-classic-0.9.24.jar"), 
+      File.expand_path("tmp/test-repo-install/ch/qos/logback/logback-core/0.9.24/logback-core-0.9.24.jar"), 
+      File.expand_path("tmp/test-repo-install/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar"), 
+      File.expand_path("tmp/test-repo-install/com/slackworks/modelcitizen/0.2.2/modelcitizen-0.2.2.jar"), 
+      File.expand_path("tmp/test-repo-install/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"), 
+      File.expand_path("tmp/test-repo-install/commons-io/commons-io/1.4/commons-io-1.4.jar"), 
+      File.expand_path("tmp/test-repo-install/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"), 
+      File.expand_path("tmp/test-repo-install/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"), 
+      File.expand_path("tmp/test-repo-install/org/apache/mina/mina-core/2.0.4/mina-core-2.0.4.jar"), 
+      File.expand_path("tmp/test-repo-install/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar") 
+
+    ])
   end
   
 end
@@ -130,18 +204,18 @@ describe LockJar, "#list" 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 = LockJar.list( 'tmp/Jarfile.lock', ['default', 'development', 'bad scope'], :local_repo => 'tmp/test-repo' )
     jars.should eql([
-      "com.metapossum:metapossum-scanner:jar:1.0", "org.apache.mina:mina-core:jar:2.0.4", 
-      "commons-beanutils:commons-beanutils:jar:1.8.3", "ch.qos.logback:logback-classic:jar:0.9.24", 
-      "commons-logging:commons-logging:jar:1.1.1", "junit:junit:jar:4.7", 
-      "ch.qos.logback:logback-core:jar:0.9.24", "commons-lang:commons-lang:jar:2.6", 
-      "com.slackworks:modelcitizen:jar:0.2.2", "org.slf4j:slf4j-api:jar:1.6.1", 
-      "commons-io:commons-io:jar:1.4", "com.typesafe:config:jar:0.5.0" ])
+      "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", "com.slackworks:modelcitizen:jar:0.2.2", 
+       "commons-beanutils:commons-beanutils:jar:1.8.3", "commons-io:commons-io:jar:1.4", 
+       "commons-lang:commons-lang:jar:2.6", "commons-logging:commons-logging:jar:1.1.1", 
+       "org.apache.mina:mina-core:jar:2.0.4", 
+       "org.slf4j:slf4j-api:jar:1.6.1", "com.typesafe:config:jar:0.5.0" ])
   end
   
   it "should replace dependencies with maps" do
-    dsl = LockJar::Dsl.evaluate do
+    dsl = LockJar::Domain::Dsl.create do
       map 'junit:junit', 'tmp'
       jar 'junit:junit:4.10'
     end
@@ -152,7 +226,7 @@ describe LockJar, "#list" do
   end
   
   it "should replace dependencies with maps and get local paths" do
-    dsl = LockJar::Dsl.evaluate do
+    dsl = LockJar::Domain::Dsl.create do
       map 'junit:junit', 'tmp'
       jar 'junit:junit:4.10'
     end
@@ -173,22 +247,22 @@ 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/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar"), 
-      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/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"), 
+    
+    jars = LockJar.load( 'tmp/Jarfile.lock', ['default'], :local_repo => 'tmp/test-repo' )
+    LockJar::Registry.instance.lockfile_registered?( "tmp/Jarfile.lock" ).should be_false
+    
+    jars.should eql([
       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/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"), 
-      File.expand_path("tmp/test-repo/junit/junit/4.7/junit-4.7.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/commons-lang/commons-lang/2.6/commons-lang-2.6.jar"), 
+      File.expand_path("tmp/test-repo/com/metapossum/metapossum-scanner/1.0/metapossum-scanner-1.0.jar"), 
       File.expand_path("tmp/test-repo/com/slackworks/modelcitizen/0.2.2/modelcitizen-0.2.2.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/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar"), 
       File.expand_path("tmp/test-repo/commons-io/commons-io/1.4/commons-io-1.4.jar"), 
-      File.expand_path("tmp/test-repo/com/typesafe/config/0.5.0/config-0.5.0.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-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"), 
+      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"),
+    ])
     if Naether.platform == 'java'
       lambda { include_class 'org.apache.mina.core.IoUtil' }.should_not raise_error
     else

metadata

@@ -2,14 +2,14 @@
 name: lock_jar
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Guymon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: naether
@@ -17,13 +17,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
     none: false
   prerelease: false
   type: :runtime
@@ -97,13 +97,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.0
     none: false
   prerelease: false
   type: :development
@@ -144,22 +144,27 @@ files:
 - bin/lockjar
 - lib/lock_jar.rb
 - lib/lock_jar/buildr.rb
+- lib/lock_jar/bundler.rb
 - lib/lock_jar/class_loader.rb
 - lib/lock_jar/cli.rb
-- lib/lock_jar/dsl.rb
+- lib/lock_jar/domain/artifact.rb
+- lib/lock_jar/domain/dsl.rb
+- lib/lock_jar/domain/dsl_helper.rb
+- lib/lock_jar/domain/gem_dsl.rb
+- lib/lock_jar/domain/jarfile_dsl.rb
+- lib/lock_jar/domain/lockfile.rb
 - lib/lock_jar/maven.rb
 - lib/lock_jar/registry.rb
 - lib/lock_jar/resolver.rb
-- lib/lock_jar/rubygems.rb
 - lib/lock_jar/runtime.rb
 - lib/lock_jar/version.rb
 - lock_jar.gemspec
 - spec/Jarfile
 - spec/lock_jar/class_loader_spec.rb
-- spec/lock_jar/dsl_spec.rb
+- spec/lock_jar/domain/dsl_helper_spec.rb
+- spec/lock_jar/domain/dsl_spec.rb
 - spec/lock_jar/maven_spec.rb
 - spec/lock_jar/resolver_spec.rb
-- spec/lock_jar/rubygems_spec.rb
 - spec/lock_jar/runtime_spec.rb
 - spec/lock_jar_spec.rb
 - spec/pom.xml