lock_jar 0.10.0 → 0.10.2

data/lib/lock_jar/domain/jarfile_dsl.rb

@@ -1,47 +1,47 @@
-# 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'
-
-module LockJar
-  module Domain
-    class JarfileDsl < Dsl
-  
-      attr_accessor :file_path, :bundler_enabled
-      
-      class << self
-        alias :overriden_create :create
-        def create(jarfile)
-          builder = new
-          builder.file_path = jarfile
-          
-          evaluate(builder, jarfile)
-        end
-      end
-
-      def bundler(*groups)
-        if groups.nil?
-          groups = [:default]
-        else
-          groups = groups.map(&:to_sym)
-        end
-
-        @bundler_enabled = groups
-      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'
+
+module LockJar
+  module Domain
+    class JarfileDsl < Dsl
+  
+      attr_accessor :file_path, :bundler_enabled
+      
+      class << self
+        alias :overriden_create :create
+        def create(jarfile)
+          builder = new
+          builder.file_path = jarfile
+          
+          evaluate(builder, jarfile)
+        end
+      end
+
+      def bundler(*groups)
+        if groups.nil?
+          groups = [:default]
+        else
+          groups = groups.map(&:to_sym)
+        end
+
+        @bundler_enabled = groups
+      end
+  
+    end
+  end
 end

data/lib/lock_jar/domain/lockfile.rb

@@ -1,114 +1,114 @@
-# 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 "yaml"
-require 'lock_jar/version'
-
-module LockJar
-  module Domain
-    class Lockfile
-      
-      attr_accessor :local_repository, :maps, :excludes, :remote_repositories, 
-                    :version, :groups, :gems, :merged
-      attr_reader :force_utf8
-      
-      
-      def self.read( path )
-        lockfile = Lockfile.new
-        
-        lock_data = YAML.load_file( path )
-        
-        lockfile.version = lock_data['version'] || LockJar::VERSION
-        lockfile.merged = lock_data['merged']
-        lockfile.local_repository = lock_data['local_repository']
-        lockfile.merged = lock_data['merged'] || []
-        lockfile.maps = lock_data['maps'] || []
-        lockfile.excludes = lock_data['excludes'] || []
-        lockfile.groups = lock_data['groups'] || lock_data['scopes'] || {}
-        lockfile.remote_repositories = lock_data['remote_repositories'] || lock_data['repositories'] || []
-        lockfile.gems = lock_data['gems'] || []
-        lockfile
-      end
-      
-      def initialize
-        @force_utf8 ||= RUBY_VERSION =~ /^1.9/
-        @groups = { 'default' => {} }
-        @maps = []
-        @excludes = []
-        @remote_repositories = []
-        @gems = []
-        @merged = []
-        
-        @version = LockJar::VERSION # default version
-      end
-      
-      def to_hash
-        lock_data = { 'version' => @version }
-  
-        unless local_repository.nil?
-          lock_data['local_repository'] = local_repository
-          
-          if @force_utf8
-            lock_data['local_repository'] = lock_data['local_repository'].force_encoding("UTF-8")
-          end
-        end
-            
-        unless merged.empty?
-          lock_data['merged'] = merged
-        end
-        
-        if maps.size > 0
-          lock_data['maps'] = maps
-        end
-        
-        if excludes.size > 0 
-          lock_data['excludes'] = excludes
-            
-          if @force_utf8
-            lock_data['excludes'].map! { |exclude| exclude.force_encoding("UTF-8") }
-          end
-        end
-        
-        unless gems.empty?
-          lock_data['gems'] = gems
-        end
-        
-        lock_data['groups'] = groups
-        
-        #if @force_utf8
-        #  lock_data['groups'].each do |group, group_notations|
-        #    group_notations.map! { |notation| notation.force_encoding("UTF-8") }
-        #  end
-        #end
-        
-        if remote_repositories.size > 0
-          lock_data['remote_repositories'] = remote_repositories
-        end
-        
-        lock_data
-      end
-      
-      def to_yaml
-        to_hash.to_yaml
-      end
-      
-      def write( path )
-        File.open( path, "w") do |f|
-          f.write( to_yaml )
-        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 "yaml"
+require 'lock_jar/version'
+
+module LockJar
+  module Domain
+    class Lockfile
+      
+      attr_accessor :local_repository, :maps, :excludes, :remote_repositories, 
+                    :version, :groups, :gems, :merged
+      attr_reader :force_utf8
+      
+      
+      def self.read( path )
+        lockfile = Lockfile.new
+        
+        lock_data = YAML.load_file( path )
+        
+        lockfile.version = lock_data['version'] || LockJar::VERSION
+        lockfile.merged = lock_data['merged']
+        lockfile.local_repository = lock_data['local_repository']
+        lockfile.merged = lock_data['merged'] || []
+        lockfile.maps = lock_data['maps'] || []
+        lockfile.excludes = lock_data['excludes'] || []
+        lockfile.groups = lock_data['groups'] || lock_data['scopes'] || {}
+        lockfile.remote_repositories = lock_data['remote_repositories'] || lock_data['repositories'] || []
+        lockfile.gems = lock_data['gems'] || []
+        lockfile
+      end
+      
+      def initialize
+        @force_utf8 ||= RUBY_VERSION =~ /^1.9/
+        @groups = { 'default' => {} }
+        @maps = []
+        @excludes = []
+        @remote_repositories = []
+        @gems = []
+        @merged = []
+        
+        @version = LockJar::VERSION # default version
+      end
+      
+      def to_hash
+        lock_data = { 'version' => @version }
+  
+        unless local_repository.nil?
+          lock_data['local_repository'] = local_repository
+          
+          if @force_utf8
+            lock_data['local_repository'] = lock_data['local_repository'].force_encoding("UTF-8")
+          end
+        end
+            
+        unless merged.empty?
+          lock_data['merged'] = merged
+        end
+        
+        if maps.size > 0
+          lock_data['maps'] = maps
+        end
+        
+        if excludes.size > 0 
+          lock_data['excludes'] = excludes
+            
+          if @force_utf8
+            lock_data['excludes'].map! { |exclude| exclude.force_encoding("UTF-8") }
+          end
+        end
+        
+        unless gems.empty?
+          lock_data['gems'] = gems
+        end
+        
+        lock_data['groups'] = groups
+        
+        #if @force_utf8
+        #  lock_data['groups'].each do |group, group_notations|
+        #    group_notations.map! { |notation| notation.force_encoding("UTF-8") }
+        #  end
+        #end
+        
+        if remote_repositories.size > 0
+          lock_data['remote_repositories'] = remote_repositories
+        end
+        
+        lock_data
+      end
+      
+      def to_yaml
+        to_hash.to_yaml
+      end
+      
+      def write( path )
+        File.open( path, "w") do |f|
+          f.write( to_yaml )
+        end
+      end
+    end
+  end
 end

data/lib/lock_jar/maven.rb

@@ -1,112 +1,112 @@
-# 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 'naether/maven'
-
-module LockJar
-  
-  # Helper for providing Maven specific operations
-  #
-  # @author Michael Guymon
-  # 
-  class Maven
-    
-    class << self
-      
-      #
-      # Get the version of a POM
-      #
-      # @param [String] pom_path path to the pom
-      #
-      # @return [String] version of POM
-      #
-      def pom_version( pom_path )
-        maven = Naether::Maven.create_from_pom( pom_path )
-        maven.version()
-      end
-      
-      #
-      # Get dependencies of a Pom
-      #
-      # @param [String] pom_path path to the pom
-      # @param [Array] scopes
-      #
-      # @return [String] version of POM
-      #
-      def dependencies( pom_path, scopes = ['compile', 'runtime'] )
-        maven = Naether::Maven.create_from_pom( pom_path )
-        maven.dependencies(scopes)
-      end
-      
-      #
-      # Write a POM from list of notations
-      #
-      # @param [String] pom notation
-      # @param [String] file_path path of new pom
-      # @param [Hash] opts
-      # @option opts [Boolean] :include_resolved to add dependencies of resolve dependencies from Jarfile.lock. Default is true.
-      # @option opts [Array] :dependencies Array of of mixed dependencies:
-      #  * [String] Artifact notation, such as groupId:artifactId:version, e.g. 'junit:junit:4.7' 
-      #  * [Hash] of a single artifaction notation => scope - { 'junit:junit:4.7' => 'test' }
-      #
-      def write_pom( notation, file_path, opts = {} )
-        opts = {:include_resolved => true}.merge( opts )
-        
-        maven = Naether::Maven.create_from_notataion( notation )
-        
-        if opts[:include_resolved]
-          # Passes in nil to the resolver to get the cache
-          maven.load_naether( Runtime.instance.resolver.naether )
-        end
-        
-        if opts[:dependencies]
-          opts[:dependencies].each do |dep|
-            if dep.is_a? Array
-              maven.add_dependency(dep[0], dep[1])
-            else
-              maven.add_dependency(dep)
-            end
-          end
-        end
-        maven.write_pom( file_path )
-      end
-      
-      #
-      # Deploy an artifact to a Maven repository
-      #
-      # @param [String] notation of artifact
-      # @param [String] file_path path to the Jar
-      # @param [String] url Maven repository deploying to
-      # @param [Hash] deploy_opts options for deploying 
-      # @param [Hash] lockjar_opts options for initializing LockJar
-      #
-      def deploy_artifact( notation, file_path, url, deploy_opts = {}, lockjar_opts = {} )
-        Runtime.instance.resolver(lockjar_opts).naether.deploy_artifact( notation, file_path, url, deploy_opts )
-      end
-      
-      #
-      # Install an artifact to a local repository
-      #
-      # @param [String] notation of artifact
-      # @param [String] pom_path path to the pom
-      # @param [String] jar_path path to the jar
-      # @param [Hash] opts options
-      #
-      def install( notation, pom_path, jar_path, opts = {} )
-        Runtime.instance.resolver(opts).naether.install( notation, pom_path, jar_path )
-      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 'naether/maven'
+
+module LockJar
+  
+  # Helper for providing Maven specific operations
+  #
+  # @author Michael Guymon
+  # 
+  class Maven
+    
+    class << self
+      
+      #
+      # Get the version of a POM
+      #
+      # @param [String] pom_path path to the pom
+      #
+      # @return [String] version of POM
+      #
+      def pom_version( pom_path )
+        maven = Naether::Maven.create_from_pom( pom_path )
+        maven.version()
+      end
+      
+      #
+      # Get dependencies of a Pom
+      #
+      # @param [String] pom_path path to the pom
+      # @param [Array] scopes
+      #
+      # @return [String] version of POM
+      #
+      def dependencies( pom_path, scopes = ['compile', 'runtime'] )
+        maven = Naether::Maven.create_from_pom( pom_path )
+        maven.dependencies(scopes)
+      end
+      
+      #
+      # Write a POM from list of notations
+      #
+      # @param [String] pom notation
+      # @param [String] file_path path of new pom
+      # @param [Hash] opts
+      # @option opts [Boolean] :include_resolved to add dependencies of resolve dependencies from Jarfile.lock. Default is true.
+      # @option opts [Array] :dependencies Array of of mixed dependencies:
+      #  * [String] Artifact notation, such as groupId:artifactId:version, e.g. 'junit:junit:4.7' 
+      #  * [Hash] of a single artifaction notation => scope - { 'junit:junit:4.7' => 'test' }
+      #
+      def write_pom( notation, file_path, opts = {} )
+        opts = {:include_resolved => true}.merge( opts )
+        
+        maven = Naether::Maven.create_from_notataion( notation )
+        
+        if opts[:include_resolved]
+          # Passes in nil to the resolver to get the cache
+          maven.load_naether( Runtime.instance.resolver.naether )
+        end
+        
+        if opts[:dependencies]
+          opts[:dependencies].each do |dep|
+            if dep.is_a? Array
+              maven.add_dependency(dep[0], dep[1])
+            else
+              maven.add_dependency(dep)
+            end
+          end
+        end
+        maven.write_pom( file_path )
+      end
+      
+      #
+      # Deploy an artifact to a Maven repository
+      #
+      # @param [String] notation of artifact
+      # @param [String] file_path path to the Jar
+      # @param [String] url Maven repository deploying to
+      # @param [Hash] deploy_opts options for deploying 
+      # @param [Hash] lockjar_opts options for initializing LockJar
+      #
+      def deploy_artifact( notation, file_path, url, deploy_opts = {}, lockjar_opts = {} )
+        Runtime.instance.resolver(lockjar_opts).naether.deploy_artifact( notation, file_path, url, deploy_opts )
+      end
+      
+      #
+      # Install an artifact to a local repository
+      #
+      # @param [String] notation of artifact
+      # @param [String] pom_path path to the pom
+      # @param [String] jar_path path to the jar
+      # @param [Hash] opts options
+      #
+      def install( notation, pom_path, jar_path, opts = {} )
+        Runtime.instance.resolver(opts).naether.install( notation, pom_path, jar_path )
+      end
+    end
+  end
 end