maven-tools 0.30.0 → 0.31.0

data/README.md

@@ -1 +1,21 @@
-# maven tools [![Build Status](https://secure.travis-ci.org/torquebox/maven-tools.png)](http://travis-ci.org/torquebox/maven-tools) #
+maven tools 
+===========
+
+* [![Build Status](https://secure.travis-ci.org/torquebox/maven-tools.png)](http://travis-ci.org/torquebox/maven-tools)
+* [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/torquebox/maven-tools)
+
+
+Contributing
+------------
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+meta-fu
+-------
+
+enjoy :) 
+

data/lib/maven/model/dependencies.rb

@@ -198,18 +198,20 @@ module Maven
       end
       private :add_gem
 
-      def jar(*args, &block)
+      def add_something(method, args, block = nil)
         if args.last.is_a?(Hash)
-          raise "hash not allowed for jar"
+          raise "hash not allowed for #{method.to_s.sub /new_/, ''}"
         end
-        add_dependency(Dependency.new_jar(args), args.size > 1, &block)
+        add_dependency(Dependency.send( method, *args), *args.size > 1, &block)
+      end
+      private :add_something
+
+      def jar(*args, &block)
+        add_something( :new_jar, args, block )
       end
 
       def test_jar(*args, &block)
-        if args.last.is_a?(Hash)
-          raise "hash not allowed for test_jar"
-        end
-        add_dependency(Dependency.new_test_jar(args), args.size > 1, &block)
+        add_something( :new_test_jar, args, block )
       end
       
       def gem(*args, &block)
@@ -220,10 +222,7 @@ module Maven
       end
 
       def pom(*args, &block)
-        if args.last.is_a?(Hash)
-          raise "hash not allowed in that context"
-        end
-        add_dependency(Dependency.new_pom(args), args.size > 1, &block)
+        add_something( :new_pom, args, block )
       end
     end
   end

data/lib/maven/model/model.rb

@@ -250,7 +250,7 @@ module Maven
           @email = args[2]
         end
         @email = @email[0] if @email.is_a? Array # this produces a partial list
-        @id = @email.sub(/@/, '_at_').gsub(/\./, '_dot_') unless @id
+        @id = (@email || @name).sub(/@/, '_at_').gsub(/\./, '_dot_').gsub(/ /, '_') unless @id
         self
       end
     end

data/lib/maven/model/utils.rb

@@ -81,7 +81,7 @@ EOF
           when Hash
             if val.size > 0
               buf << "#{indent}  <#{var}>\n"
-              val.keys.each do |k|
+              val.keys.sort{ |n,m| n.to_s <=> m.to_s }.each do |k|
                 v = val[k]
                 if v.is_a? Tag
                   v.to_xml(buf, indent + "    ")
@@ -152,48 +152,47 @@ EOF
         default_model.send(method, *args, &block)
       end
     end
-    
-    class DeveloperHash < Hash
+
+    class NamedHash < Hash
 
       def keys
         @keys ||= []
       end
 
-      def get(*args, &block)
-        developer = if args.size == 1 && args[0].is_a?(Developer)
-                      args[0] 
-                    else 
-                      Developer.new(*args)
-                    end
-        keys << developer.id unless keys.member? developer.id
-        self[developer.id] = developer
+      def new_instance( clazz, args )
+        if args.size == 1 && args[0].is_a?(clazz)
+          args[0] 
+        else 
+          clazz.new(*args)
+        end
+      end
+
+      def do_get( clazz, args, method, block = nil)
+        value = new_instance( clazz, args )
+        key = value.send method
+        keys << key unless keys.member? key
+        self[ key ] = value
         if block
-          block.call(developer)
+          block.call( value )
         end
-        developer
+        value
       end
-      alias :new :get
-      alias :add :get
+      def get; end
     end
 
-    class LicenseHash < Hash
+    class DeveloperHash < NamedHash
 
-      def keys
-        @keys ||= []
+      def get( *args, &block )
+        do_get( Developer, args, :id, block )
       end
+      alias :new :get
+      alias :add :get
+    end
 
-      def get(*args, &block)
-        license = if args.size == 1 && args[0].is_a?(License)
-                      args[0] 
-                    else 
-                      License.new(*args)
-                    end
-        keys << license.name unless keys.member? license.name
-        self[license.name] = license
-        if block
-          block.call(license)
-        end
-        license
+    class LicenseHash < NamedHash
+
+      def get( *args, &block )
+        do_get( License, args, :name, block )
       end
       alias :new :get
       alias :add :get

data/lib/maven/tools/coordinate.rb

@@ -4,11 +4,19 @@ module Maven
 
       def to_coordinate(line)
         if line =~ /^\s*(jar|pom)\s/
-          
-          group_id, artifact_id, version, second_version = line.sub(/\s*[a-z]+\s+/, '').sub(/#.*/,'').gsub(/\s+/,'').gsub(/['"],/, ':').gsub(/['"]/, '').split(/:/)
+          packaging = line.strip.sub(/\s+.*/, '')
+
+          # Remove packaging, comments and whitespaces
+          sanitized_line = line.sub(/\s*[a-z]+\s+/, '').sub(/#.*/,'').gsub(/\s+/,'')
+
+          # Remove version(s) and quotes to find the group id, artifact id and classifier
+          group_id, artifact_id, classifier = sanitized_line.split(',')[0].gsub(/['"]/, '').split(/:/)
+
+          # Remove the group id, artifact id and classifier to find the version(s)
+          version, second_version = sanitized_line.split(',')[1..-1].join(',').gsub(/['"],/, ':').gsub(/['"]/, '').split(/:/)
           mversion = second_version ? to_version(version, second_version) : to_version(version)
-          extension = line.strip.sub(/\s+.*/, '')
-          "#{group_id}:#{artifact_id}:#{extension}:#{mversion}"
+
+          classifier ? "#{group_id}:#{artifact_id}:#{packaging}:#{classifier}:#{mversion}" : "#{group_id}:#{artifact_id}:#{packaging}:#{mversion}"
         end
       end
 

data/lib/maven/tools/gem_project.rb

@@ -54,9 +54,14 @@ module Maven
         name spec.summary || "#{self.artifact_id} - gem"
         description spec.description if spec.description
         url spec.homepage if spec.homepage
+        done_authors = []
         (spec.email || []).zip(spec.authors || []).map do |email, author|
+          done_authors << author
           self.developers.new(author, email)
         end
+        (spec.authors - done_authors).each do |author|
+          self.developers.new(author, nil)
+        end
 
         #  TODO work with collection of licenses - there can be more than one !!!
         (spec.licenses + spec.files.select {|file| file.to_s =~ /license|gpl/i }).each do |license|
@@ -338,8 +343,8 @@ module Maven
             options = { 
               :lifecycleMappingMetadata => { 
                 :pluginExecutions => Maven::Model::NamedArray.new(:pluginExecution) do |e|
-                  # sort them for testing
-                  configs.sort {|m,n| -1 *(n.first[1][:artifactId].to_s <=> m.first[1][:artifactId].to_s) }.each { |c| e << c }
+                  # sort them - handy for testing
+                  configs.sort {|m,n| m[:pluginExecutionFilter][:artifactId].to_s <=> n[:pluginExecutionFilter][:artifactId].to_s }.each { |c| e << c }
                 end
               }
             }

data/lib/maven/tools/version.rb

@@ -1,5 +1,5 @@
 module Maven
   module Tools
-    VERSION = '0.30.0'.freeze
+    VERSION = '0.31.0'.freeze
   end
 end

data/lib/maven/tools/versions.rb

@@ -8,7 +8,7 @@ module Maven
         :jar_plugin => "2.4",
         :jruby_plugins => "0.29.0",
         :bundler_version => "1.1.4",
-        :jruby_version => defined?(JRUBY_VERSION) ? JRUBY_VERSION : "1.6.7.2"
+        :jruby_version => defined?(JRUBY_VERSION) ? JRUBY_VERSION : "1.6.8"
       }.freeze
     end
   end

data/spec/coordinate_spec.rb

@@ -44,4 +44,15 @@ describe Maven::Tools::Coordinate do
     subject.to_coordinate('pom "e:f", "[1.8,1.9.9)"').must_equal "e:f:pom:[1.8,1.9.9)"
     subject.to_coordinate('pom "f:g", ">1.2", "<=2.0"').must_equal "f:g:pom:(1.2,2.0]"
   end
+
+  it 'should support classifiers' do
+    subject.to_coordinate('something "a:b:jdk15"').must_be_nil
+    subject.to_coordinate('#jar "a:b:jdk15"').must_be_nil
+    subject.to_coordinate('jar "a:b:jdk15" # bla').must_equal "a:b:jar:jdk15:[0,)"
+    subject.to_coordinate("pom 'b:c:jdk15', '!2.3.4'").must_equal "b:c:pom:jdk15:(2.3.4,)"
+    subject.to_coordinate('jar "c:d:jdk15", "2.3.4"').must_equal "c:d:jar:jdk15:2.3.4"
+    subject.to_coordinate("jar 'd:e:jdk15', '~>1.8.2'").must_equal "d:e:jar:jdk15:[1.8.2,1.8.99999]"
+    subject.to_coordinate('pom "e:f:jdk15", "[1.8,1.9.9)"').must_equal "e:f:pom:jdk15:[1.8,1.9.9)"
+    subject.to_coordinate('pom "f:g:jdk15", ">1.2", "<=2.0"').must_equal "f:g:pom:jdk15:(1.2,2.0]"
+  end
 end

metadata

@@ -1,53 +1,71 @@
 --- !ruby/object:Gem::Specification 
 name: maven-tools
 version: !ruby/object:Gem::Version 
+  hash: 99
   prerelease: 
-  version: 0.30.0
+  segments: 
+  - 0
+  - 31
+  - 0
+  version: 0.31.0
 platform: ruby
 authors: 
-  - Kristian Meier
+- Kristian Meier
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-11-06 00:00:00 Z
+date: 2013-01-20 00:00:00 Z
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 0.9.2.2
-    type: :development
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: minitest
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.10.0
-    type: :development
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.7.0
-    type: :development
-    version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 73
+        segments: 
+        - 10
+        - 0
+        - 3
+        version: 10.0.3
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 4
+        - 4
+        version: "4.4"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 7
+        version: "2.7"
+  type: :development
+  version_requirements: *id003
 description: adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc
 email: 
-  - m.kristian@web.de
+- m.kristian@web.de
 executables: []
 
 extensions: []
@@ -55,38 +73,38 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-  - lib/maven_tools.rb
-  - lib/maven-tools.rb
-  - lib/maven-tools.rb~
-  - lib/maven_tools.rb~
-  - lib/maven/jarfile.rb~
-  - lib/maven/maven_util.rb~
-  - lib/maven/tools/coordinate.rb
-  - lib/maven/tools/execute_in_phase.rb
-  - lib/maven/tools/version.rb
-  - lib/maven/tools/jarfile.rb~
-  - lib/maven/tools/jarfile.rb
-  - lib/maven/tools/rails_project.rb
-  - lib/maven/tools/versions.rb~
-  - lib/maven/tools/gem_project.rb
-  - lib/maven/tools/gem_project.rb~
-  - lib/maven/tools/pom_generator.rb
-  - lib/maven/tools/gemfile_lock.rb~
-  - lib/maven/tools/gemfile_lock.rb
-  - lib/maven/tools/minimal_project.rb
-  - lib/maven/tools/coordinate.rb~
-  - lib/maven/tools/versions.rb
-  - lib/maven/model/utils.rb
-  - lib/maven/model/dependencies.rb~
-  - lib/maven/model/model.rb
-  - lib/maven/model/dependencies.rb
-  - lib/maven/model/model_utils.rb~
-  - lib/maven/model/utils.rb~
-  - lib/maven/model/model.rb~
-  - spec/coordinate_spec.rb
-  - spec/jarfile_spec.rb
-  - MIT-LICENSE
-  - README.md
+- lib/maven_tools.rb
+- lib/maven-tools.rb
+- lib/maven-tools.rb~
+- lib/maven_tools.rb~
+- lib/maven/jarfile.rb~
+- lib/maven/tools/coordinate.rb
+- lib/maven/tools/execute_in_phase.rb
+- lib/maven/tools/version.rb
+- lib/maven/tools/jarfile.rb~
+- lib/maven/tools/jarfile.rb
+- lib/maven/tools/rails_project.rb
+- lib/maven/tools/versions.rb~
+- lib/maven/tools/gem_project.rb
+- lib/maven/tools/gem_project.rb~
+- lib/maven/tools/pom_generator.rb
+- lib/maven/tools/gemfile_lock.rb~
+- lib/maven/tools/gemfile_lock.rb
+- lib/maven/tools/minimal_project.rb
+- lib/maven/tools/coordinate.rb~
+- lib/maven/tools/versions.rb
+- lib/maven/model/utils.rb
+- lib/maven/model/dependencies.rb~
+- lib/maven/model/model.rb
+- lib/maven/model/dependencies.rb
+- lib/maven/model/model_utils.rb~
+- lib/maven/model/utils.rb~
+- lib/maven/model/model.rb~
+- lib/maven/maven_util.rb~
+- spec/coordinate_spec.rb
+- spec/jarfile_spec.rb
+- MIT-LICENSE
+- README.md
 homepage: http://github.com/torquebox/maven-tools
 licenses: []
 
@@ -94,26 +112,32 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: helpers for maven related tasks
 test_files: 
-  - spec/coordinate_spec.rb
-  - spec/jarfile_spec.rb
+- spec/coordinate_spec.rb
+- spec/jarfile_spec.rb