lock_jar 0.13.0 → 0.14.0

data/lib/lock_jar/domain/dsl_helper.rb

@@ -1,84 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with this
-# work for additional information regarding copyright ownership. The ASF
-# licenses this file to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-module LockJar
-  module Domain
-    class DslHelper
-
-      class << self
-
-        #
-        # Merge LockJar::Domain::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
-
-          # 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[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|
-            existing_map = into_dsl.maps[artifact]
-            if existing_map
-              into_dsl.maps[artifact] = (existing_map + paths).uniq
-            else
-              into_dsl.maps[artifact] = paths
-            end
-          end
-
-          from_dsl.excludes.each do |exclude|
-            unless into_dsl.excludes.include? exclude
-              into_dsl.excludes << exclude
-            end
-          end
-
-          if from_dsl.file_path
-            into_dsl.merged << from_dsl.file_path
-          end
-
-          into_dsl
-        end
-
-        def read_file(file)
-          File.open(file, "rb") { |f| f.read }
-        end
-      end
-    end
-  end
-end

data/spec/lock_jar/domain/dsl_helper_spec.rb

@@ -1,52 +0,0 @@
-require '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