lock_jar 0.0.2 → 0.0.3

data/README.rdoc

@@ -102,6 +102,8 @@ or directly load all Jars into the classpath
   require 'lock_jars'
   
   jars = LockJar.load  
+
+Do not forget, if you change your Jarfile, you have to re-generate the Jarfile.lock.
   
   
 === Buildr Integration
@@ -119,7 +121,8 @@ 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. 
+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.
 
 
 ==== Example

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/lock_jar/runtime.rb

@@ -79,18 +79,53 @@ module LockJar
         dependencies
       end
       
-      def load( jarfile_lock = "Jarfile.lock", scopes = ['compile', 'runtime'] )
+      def load( jarfile_lock = "Jarfile.lock", scopes = ['compile', 'runtime'], &blk )
+        dependencies = []
+        
+        if jarfile_lock
+          if File.exists?(jarfile_lock)
+            dependencies += read_jarfile( jarfile_lock, scopes )
+          else
+            warn( "LockJar jarfile_lock not found: #{jarfile_lock}" )
+          end
+        end
+                
+        if blk
+          dsl = LockJar::Dsl.evaluate(&blk)
+          dependencies += read_dsl( dsl, scopes )
+        end
+        
+        dependencies.uniq!
+        
+        @resolver.load_jars_to_classpath( dependencies )
+      end
+      
+      private
+      def read_jarfile( jarfile_lock, scopes )
         lock_data = YAML.load_file( jarfile_lock )
         
         dependencies = []
-           
+         
         scopes.each do |scope|
           if lock_data['scopes'][scope]
             dependencies += lock_data['scopes'][scope]['resolved_dependencies']
           end
         end
         
-        @resolver.load_jars_to_classpath( dependencies )
+        dependencies
+      end
+      
+      def read_dsl( dsl, scopes )
+        
+        dependencies = []
+         
+        dsl.notations.each do |scope,notations|
+          if notations && notations.size > 0
+            dependencies += notations
+          end
+        end
+        
+        @resolver.resolve( dependencies )
       end
   end
 end

data/lib/lock_jar.rb

@@ -31,15 +31,15 @@ module LockJar
   # List jars for an array of scope in a lockfile
   #
   # Accepts path to the lockfile, array of scopes, and hash of options to configure LockJar
-  def self.list( lockfile = 'Jarfile.lock', scopes = ['compile', 'runtime'], opts = {} )
+  def self.list( lockfile = 'Jarfile.lock', scopes = ['compile', 'runtime'], opts = {}, &blk )
       Runtime.new( opts ).list( lockfile, scopes )
   end
     
   # Load jars for an array of scopes in a lockfile
   #
   # Accepts a path to the lockfile, array scopes, and hash of optiosn to configure LockJar
-  def self.load( lockfile = 'Jarfile.lock', scopes = ['compile', 'runtime'], opts = {} )
-      Runtime.new( opts ).load( lockfile, scopes )
+  def self.load( lockfile = 'Jarfile.lock', scopes = ['compile', 'runtime'], opts = {}, &blk )
+      Runtime.new( opts ).load( lockfile, scopes, &blk )
   end
-
+ 
 end

data/lock_jar.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lock_jar
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael Guymon