lock_jar 0.10.0 → 0.10.2

data/lib/lock_jar/domain/dsl.rb

@@ -1,188 +1,188 @@
-# 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.
-
-require 'lock_jar/maven'
-require 'lock_jar/domain/dsl_helper'
-require 'lock_jar/domain/artifact'
-
-module LockJar
-  module Domain
-    class Dsl
-  
-      DEFAULT_GROUP = ['default']
-      
-      attr_accessor :artifacts, :remote_repositories, :local_repository, :groups,
-                    :maps, :excludes, :merged
-                    
-      attr_reader :file_path
-      
-      class << self
-      
-        def create(jarfile = nil, &blk)
-          builder = new
-          evaluate(builder, jarfile, &blk)
-        end
-        
-        def evaluate(builder, jarfile = nil, &blk)
-          if jarfile.nil? && blk.nil?
-            raise "jarfile or block must be set"
-          end
-          
-          if jarfile
-            builder.instance_eval(DslHelper.read_file(jarfile.to_s), jarfile.to_s, 1)
-          end      
-              
-          if blk
-            builder.instance_eval(&blk)
-          end      
-          
-          builder
-        end
-        
-      end
-      
-      def initialize
-  
-        @remote_repositories = []
-        @artifacts = { 'default' => [] }
-         
-        @group_changed = false
-          
-        @present_group = 'default'
-        
-        @local_repository = nil
-        @maps = {}
-        
-        @excludes = []
-        
-        @merged = []
-      end
-      
-      def exclude(*notations)
-        @excludes += notations
-      end
-      
-      def jar(notation, *args)
-        opts = {}
-        if args.last.is_a? Hash
-          opts.merge!( args.last )
-        end
-        
-        artifact = Jar.new( notation )
-        
-        assign_groups( artifact, opts[:group] )
-      end
-      
-      def local( *args )
-        unless args.empty?
-          if File.directory?( File.expand_path( args.first ) )
-            warn "[DEPRECATION] `local` to set local_repository is deprecated.  Please use `local_repo` instead."
-            local_repo(args.first)
-          else
-            path = args.shift
-
-            opts = {}
-            if args.last.is_a? Hash
-              opts.merge!( args.last )
-            end
-            
-            artifact = Local.new( path )
-            
-            assign_groups( artifact, opts[:group] )
-          end
-        end
-      end
-  
-      def local_repo( path )
-        @local_repository = path
-      end
-      
-      alias_method :name, :local_repository
-      
-      # Map a dependency to another dependency or local directory.
-      def map( notation, *args )
-        @maps[notation] = args
-      end
-      
-      # 
-      def pom(path, *args)
-        unless path =~ /\.xml$/i
-          raise "#{path} is an invalid pom path"  
-        end
-        
-        opts = { :scopes => ['runtime', 'compile'] }
-          
-        if args.last.is_a? Hash
-          opts.merge! args.last
-        end
-        
-        artifact = Pom.new( path, opts[:scopes] )
-        
-        assign_groups( artifact, opts[:groups] )
-      end
-  
-      def remote_repo( url, opts = {} )
-        @remote_repositories << url
-      end
-      alias_method :remote_repository, :remote_repo
-      alias_method :repository, :remote_repo
-      
-      def group(*groups, &blk)
-         @group_changed = true
-         groups.each do |group|
-           @present_group = group.to_s
-           yield
-         end
-         @group_changed = false
-         @present_group = 'default'
-      end   
-      
-      # @deprecated Please use {#group} instead
-      def scope(*scopes, &blk)
-        warn "[DEPRECATION] `scope` is deprecated.  Please use `group` instead."
-        group(*scopes,&blk)
-      end
-      
-      private 
-      def assign_groups(artifact, groups=nil)
-        
-        if groups
-          
-          unless groups.is_a? Array
-            groups = [groups]
-          end
-          
-          # include present group if within a group block
-          if @group_changed
-            groups << @present_group
-          end
-          
-        else
-          groups = [@present_group]
-        end
-        
-        if artifact
-          groups.uniq.each do |group|
-            group_key = group.to_s
-            @artifacts[group_key] = [] unless @artifacts[group_key]
-            @artifacts[group_key] << artifact
-          end
-        end
-        
-      end
-      
-    end
-  end
+# 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.
+
+require 'lock_jar/maven'
+require 'lock_jar/domain/dsl_helper'
+require 'lock_jar/domain/artifact'
+
+module LockJar
+  module Domain
+    class Dsl
+  
+      DEFAULT_GROUP = ['default']
+      
+      attr_accessor :artifacts, :remote_repositories, :local_repository, :groups,
+                    :maps, :excludes, :merged
+                    
+      attr_reader :file_path
+      
+      class << self
+      
+        def create(jarfile = nil, &blk)
+          builder = new
+          evaluate(builder, jarfile, &blk)
+        end
+        
+        def evaluate(builder, jarfile = nil, &blk)
+          if jarfile.nil? && blk.nil?
+            raise "jarfile or block must be set"
+          end
+          
+          if jarfile
+            builder.instance_eval(DslHelper.read_file(jarfile.to_s), jarfile.to_s, 1)
+          end      
+              
+          if blk
+            builder.instance_eval(&blk)
+          end      
+          
+          builder
+        end
+        
+      end
+      
+      def initialize
+  
+        @remote_repositories = []
+        @artifacts = { 'default' => [] }
+         
+        @group_changed = false
+          
+        @present_group = 'default'
+        
+        @local_repository = nil
+        @maps = {}
+        
+        @excludes = []
+        
+        @merged = []
+      end
+      
+      def exclude(*notations)
+        @excludes += notations
+      end
+      
+      def jar(notation, *args)
+        opts = {}
+        if args.last.is_a? Hash
+          opts.merge!( args.last )
+        end
+        
+        artifact = Jar.new( notation )
+        
+        assign_groups( artifact, opts[:group] )
+      end
+      
+      def local( *args )
+        unless args.empty?
+          if File.directory?( File.expand_path( args.first ) )
+            warn "[DEPRECATION] `local` to set local_repository is deprecated.  Please use `local_repo` instead."
+            local_repo(args.first)
+          else
+            path = args.shift
+
+            opts = {}
+            if args.last.is_a? Hash
+              opts.merge!( args.last )
+            end
+            
+            artifact = Local.new( path )
+            
+            assign_groups( artifact, opts[:group] )
+          end
+        end
+      end
+  
+      def local_repo( path )
+        @local_repository = path
+      end
+      
+      alias_method :name, :local_repository
+      
+      # Map a dependency to another dependency or local directory.
+      def map( notation, *args )
+        @maps[notation] = args
+      end
+      
+      # 
+      def pom(path, *args)
+        unless path =~ /\.xml$/i
+          raise "#{path} is an invalid pom path"  
+        end
+        
+        opts = { :scopes => ['runtime', 'compile'] }
+          
+        if args.last.is_a? Hash
+          opts.merge! args.last
+        end
+        
+        artifact = Pom.new( path, opts[:scopes] )
+        
+        assign_groups( artifact, opts[:groups] )
+      end
+  
+      def remote_repo( url, opts = {} )
+        @remote_repositories << url
+      end
+      alias_method :remote_repository, :remote_repo
+      alias_method :repository, :remote_repo
+      
+      def group(*groups, &blk)
+         @group_changed = true
+         groups.each do |group|
+           @present_group = group.to_s
+           yield
+         end
+         @group_changed = false
+         @present_group = 'default'
+      end   
+      
+      # @deprecated Please use {#group} instead
+      def scope(*scopes, &blk)
+        warn "[DEPRECATION] `scope` is deprecated.  Please use `group` instead."
+        group(*scopes,&blk)
+      end
+      
+      private 
+      def assign_groups(artifact, groups=nil)
+        
+        if groups
+          
+          unless groups.is_a? Array
+            groups = [groups]
+          end
+          
+          # include present group if within a group block
+          if @group_changed
+            groups << @present_group
+          end
+          
+        else
+          groups = [@present_group]
+        end
+        
+        if artifact
+          groups.uniq.each do |group|
+            group_key = group.to_s
+            @artifacts[group_key] = [] unless @artifacts[group_key]
+            @artifacts[group_key] << artifact
+          end
+        end
+        
+      end
+      
+    end
+  end
 end

data/lib/lock_jar/domain/dsl_helper.rb

@@ -1,84 +1,84 @@
-# 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.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
+# 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.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/lib/lock_jar/domain/gem_dsl.rb

@@ -1,45 +1,45 @@
-# 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.
-
-require 'lock_jar/maven'
-require 'lock_jar/domain/jarfile_dsl'
-require 'lock_jar/domain/dsl_helper'
-
-module LockJar
-  module Domain
-    class GemDsl < JarfileDsl
-  
-      attr_accessor :gem_dir
-      
-      class << self
-        alias :overriden_create :create
-        def create(spec, jarfile)
-          builder = new
-          builder.gem_dir = spec.gem_dir
-          
-          jarfile = File.join( spec.gem_dir, jarfile )
-          builder.file_path = "gem:#{spec.name}:#{jarfile.gsub( "#{spec.base_dir}/", "" )}.lock"
-          
-          evaluate(builder, jarfile)
-        end
-      end
-      
-      alias :overriden_pom :pom
-      def pom(path, *args)
-        overriden_pom( File.join( gem_dir, path), *args)
-      end
-    end
-  end
+# 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.
+
+require 'lock_jar/maven'
+require 'lock_jar/domain/jarfile_dsl'
+require 'lock_jar/domain/dsl_helper'
+
+module LockJar
+  module Domain
+    class GemDsl < JarfileDsl
+  
+      attr_accessor :gem_dir
+      
+      class << self
+        alias :overriden_create :create
+        def create(spec, jarfile)
+          builder = new
+          builder.gem_dir = spec.gem_dir
+          
+          jarfile = File.join( spec.gem_dir, jarfile )
+          builder.file_path = "gem:#{spec.name}:#{jarfile.gsub( "#{spec.base_dir}/", "" )}.lock"
+          
+          evaluate(builder, jarfile)
+        end
+      end
+      
+      alias :overriden_pom :pom
+      def pom(path, *args)
+        overriden_pom( File.join( gem_dir, path), *args)
+      end
+    end
+  end
 end