lock_jar 0.7.0 → 0.7.1

data/README.md

@@ -325,6 +325,33 @@ Bundler  calls `setup` and `require`. To enable this support, add this require t
 You can optionally create a _Jarfile_ that will automatically be included when you `bundle install` or `bundle update`. Otherwise
 Gems with a Jarfile will be merge to generate a _Jarfile.lock_. The Jarfile.lock will be loaded when Bundler calls `setup` or `require`.
 
+### Bundler to LockJar groups
+
+LockJar will merge the dependencies from the `default` and `runtime` group of a Gem's _Jarfile_. These will be placed in the 
+lockfile under Gem's corresponding Bundler group. For example, the following Gemfile:
+
+    group :development do
+      gem 'solr_sail', '~>0.1.0'
+    end
+
+Would produce the follow _Jarfile.lock_ excerpt:
+
+    ---
+    version: 0.7.0
+    merged:
+    - gem:solr_sail:gems/solr_sail-0.1.0-java/Jarfile
+    groups:
+      default:
+        dependencies: []
+        artifacts: []
+      development:
+        dependencies:
+         - ch.qos.logback:logback-classic:jar:1.0.6
+         - ch.qos.logback:logback-core:jar:1.0.6
+         - com.google.guava:guava:jar:r05
+
+Since `solr_sail` is defined in the _Gemfile's_ `development` group, the corresponding _Jarfile.lock_ dependencies are also under the `development` group.
+      
 ## License
 
 Licensed to the Apache Software Foundation (ASF) under one or more

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/lock_jar/bundler.rb

@@ -27,7 +27,7 @@ module LockJar
           LockJar.load( lockfile, groups )
           
           if ENV["DEBUG"]
-            puts "[LockJar] Loaded Jars  for #{groups.inspect}: #{LockJar::Registry.instance.loaded_jars.inspect}"
+            puts "[LockJar] Loaded Jars for #{groups.inspect}: #{LockJar::Registry.instance.loaded_jars.inspect}"
           end
         end
       end
@@ -135,7 +135,7 @@ module Bundler
                 
                 spec_dsl = LockJar::Domain::GemDsl.create( spec, "Jarfile" )
                 
-                dsl = LockJar::Domain::DslHelper.merge( dsl, spec_dsl )
+                dsl = LockJar::Domain::DslHelper.merge( dsl, spec_dsl, group.to_s )
               end 
             end
             

data/lib/lock_jar/domain/dsl_helper.rb

@@ -21,18 +21,36 @@ module LockJar
       
         #
         # Merge LockJar::Domain::Dsl
-        #
-        def merge( into_dsl, from_dsl )
+        # @param [LockJar::Domain::Dsl] into_dsl dsl that is merged into
+        # @param [LockJar::Domain::Dsl] from_dsl dsl that is merged from
+        # @param [String] into_group force only runtime and default groups to be loaded into this group
+        # @return [LockJar::Domain::Dsl] 
+        def merge( into_dsl, from_dsl, into_group = nil )
           into_dsl.remote_repositories = (into_dsl.remote_repositories + from_dsl.remote_repositories).uniq
           
-          from_dsl.artifacts.each do |group, artifacts|
-            group_artifacts = into_dsl.artifacts[group] || []
-            artifacts.each do |art|
+          # merge default and runtime group into specific group
+          if into_group
+            group_artifacts = into_dsl.artifacts[into_group] || []
+            defaults = from_dsl.artifacts['default'] || []
+            runtime = from_dsl.artifacts['runtime'] || []
+            ( defaults + runtime ).each do |art|
               unless group_artifacts.include? art
                 group_artifacts << art
               end
             end
-            into_dsl.artifacts[group] = group_artifacts
+            into_dsl.artifacts[into_group] = group_artifacts
+            
+          # one to one merging of groups
+          else
+            from_dsl.artifacts.each do |group, artifacts|
+              group_artifacts = into_dsl.artifacts[group] || []
+              artifacts.each do |art|
+                unless group_artifacts.include? art
+                  group_artifacts << art
+                end
+              end
+              into_dsl.artifacts[group] = group_artifacts
+            end
           end
           
           from_dsl.maps.each do |artifact,paths|

data/lock_jar.gemspec

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

data/spec/lock_jar_spec.rb

@@ -104,7 +104,7 @@ describe LockJar, "#lock" do
     File.exists?( 'tmp/Jarfile.lock' ).should be_true
     lockfile = LockJar.read('tmp/Jarfile.lock')
     lockfile.to_hash.should eql({
-      "version"=>"0.7.0", 
+      "version"=> LockJar::VERSION, 
       "excludes"=>["commons-logging", "logkit"], 
       "groups"=>{
         "default"=>{
@@ -142,7 +142,7 @@ describe LockJar, "#lock" do
     
     lockfile = LockJar.read('tmp/NoRepoJarfile.lock')
     lockfile.to_hash.should eql({
-      "version"=>"0.7.0", 
+      "version"=> LockJar::VERSION, 
       "groups"=>{
         "default"=>{
           "dependencies"=>["org.eclipse.jetty.orbit:javax.servlet:jar:3.0.0.v201112011016", 

metadata

@@ -2,7 +2,7 @@
 name: lock_jar
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Michael Guymon