maven-tools 0.31.0 → 0.32.0

data/lib/maven/model/model.rb

@@ -5,8 +5,54 @@ require File.join(File.dirname(__FILE__), 'dependencies.rb')
 module Maven
   module Model
 
+    class Resource  < Tag
+      
+      tags :directory, :includes, :excludes, :target_path, :filtering
+
+      def includes(&block)
+        @includes ||= NamedArray.new( 'includes' )
+        if block
+          block.call( @includes )
+        end
+        @includes
+      end
+
+      def excludes(&block)
+        @excludes ||= NamedArray.new( 'excludes' )
+        if block
+          block.call(@excludes)
+        end
+        @excludes
+      end
+
+    end
+
+    class TestResource < Resource
+      tags :dummy
+
+      def _name
+        'testResource'
+      end
+    end
+
     class Build < Tag
-      tags :source_directory, :script_source_directory, :test_source_directory, :output_directory, :test_output_directory, :default_goal, :directory, :final_name, :plugins, :plugin_management
+      tags :source_directory, :script_source_directory, :test_source_directory, :output_directory, :test_output_directory, :default_goal, :directory, :final_name, :plugins, :plugin_management, :resources, :test_resources
+
+      def resources(&block)
+        @resources ||= ResourceArray.new
+        if block
+          block.call(@resources)
+        end        
+        @resources
+      end
+
+      def test_resources(&block)
+        @test_resources ||= ResourceArray.new( 'testResources', TestResource )
+        if block
+          block.call(@test_resources)
+        end        
+        @test_resources
+      end
 
       def plugins(&block)
         @plugins ||= PluginHash.new
@@ -29,7 +75,7 @@ module Maven
       end
 
       def to_xml(buf = "", indent = "")
-        if @final_name.nil? && (@plugins.nil? || @plugins.size == 0) && @plugin_management.nil? #TODO check the rest
+        if @final_name.nil? && (@resources.nil? || @resources.size == 0) && (@test_resources.nil? || @test_resources.size == 0) && (@plugins.nil? || @plugins.size == 0) && @plugin_management.nil? #TODO check the rest
           ""
         else
           super
@@ -276,12 +322,20 @@ module Maven
         self
       end
     end
+    
+    class SourceControl < Tag
 
+      tags :connection, :developer_connection, :url
+
+      def _name
+        'scm'
+      end
+    end
 
     class Project < Coordinate
       prepend_tags :model_version, :parent
 
-      tags :name, :packaging, :description, :url, :developers, :licenses, :repositories, :plugin_repositories
+      tags :name, :packaging, :description, :url, :developers, :licenses, :repositories, :plugin_repositories, :scm
 
       include Dependencies
 
@@ -325,9 +379,16 @@ module Maven
       
       def parent(*args, &block)
         @parent ||= Parent.new(*args)
-        @parent.call(block) if block
+        block.call( @parent ) if block
         @parent
       end
+      
+      def source_control(&block)
+        @scm ||= SourceControl.new
+        block.call( @scm ) if block
+        @scm
+      end
+      alias :scm :source_control
 
       def execute_in_phase(phase, name = nil, &block)
         gem_plugin = plugin("gem")

data/lib/maven/model/utils.rb

@@ -114,6 +114,29 @@ EOF
       end
     end
 
+    class ResourceArray < Array
+
+      def initialize( name = 'resources', child = Resource, &block )
+        @_child = child
+        #super( name, &block )
+        if block
+          block.call self
+        end
+        self
+      end
+
+      alias :do_add :<<
+
+      def add( &block )
+        r = @_child.new
+        block.call( r )
+        do_add r
+        r
+      end
+      alias :<< :add
+      
+    end
+
     class ModelHash < Hash
 
       def initialize(clazz)
@@ -326,7 +349,14 @@ EOF
             buf << "#{indent}  <#{k}>\n"
             singular = k.to_s.sub(/s$/, '')
             v.each do |i|
-              buf << "#{indent}    <#{singular}>#{i}</#{singular}>\n"
+              case i
+              when Hash
+                buf << "#{indent}    <#{singular}>\n"
+                map_to_xml(buf, indent + "    ", i)
+                buf << "#{indent}    </#{singular}>\n"
+              else
+                buf << "#{indent}    <#{singular}>#{i}</#{singular}>\n"
+              end
             end
             buf << "#{indent}  </#{k}>\n"
           when /\n$/

data/lib/maven/tools/execute_in_phase.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), 'gem_project.rb')
 
 proj = Maven::Tools::GemProject.new("in_phase_execution")
 
-proj.load(ARGV[0])
+proj.load_mavenfile(ARGV[0])
 
 block = proj.executions_in_phase[ARGV[1]]
 block.call if block

data/lib/maven/tools/gem_project.rb

@@ -233,7 +233,7 @@ module Maven
           if packaging =~ /gem/
             gem.extensions = true
             if @gemspec && !(self.gem?('jruby-openssl') || self.gem?('jruby-openssl-maven'))
-              gem.gem('jruby-openssl-maven')
+              gem.gem('jruby-openssl')
             end
           end
           if File.exists?('lib') && File.exists?(File.join('src', 'main', 'java'))

data/lib/maven/tools/version.rb

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

metadata

@@ -1,143 +1,116 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: maven-tools
-version: !ruby/object:Gem::Version 
-  hash: 99
-  prerelease: 
-  segments: 
-  - 0
-  - 31
-  - 0
-  version: 0.31.0
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 0.32.0
 platform: ruby
-authors: 
-- Kristian Meier
-autorequire: 
+authors:
+- Christian Meier
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2013-01-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 10.0.3
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 73
-        segments: 
-        - 10
-        - 0
-        - 3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 10.0.3
+    none: false
+  prerelease: false
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 4
-        - 4
-        version: "4.4"
+  prerelease: false
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.7'
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 7
-        version: "2.7"
+  prerelease: false
   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: 
+email:
 - m.kristian@web.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - 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: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.8.15
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: helpers for maven related tasks
-test_files: 
+test_files:
 - spec/coordinate_spec.rb
 - spec/jarfile_spec.rb

data/lib/maven-tools.rb~

@@ -1 +0,0 @@
-require 'maven_tools/jarfile'

data/lib/maven/jarfile.rb~

@@ -1,77 +0,0 @@
-require 'jbundler/maven_util'
-module JBundler
-
-  class Mavenfile
-    include MavenUtil
-
-    def initialize(file = 'Mvnfile')
-      @file = file
-      @lockfile = file + ".lock"
-    end
-
-    def mtime
-      File.mtime(@file)
-    end
-
-    def exists?
-      File.exists?(@file)
-    end
-
-    def mtime_lock
-      File.mtime(@lockfile)
-    end
-
-    def exists_lock?
-      File.exists?(@lockfile)
-    end
-
-    def load_lockfile
-      _locked = []
-      if exists_lock?
-        File.read(@lockfile).each_line do |line|
-          line.strip!
-          if line.size > 0 && !(line =~ /^\s*#/)
-            _locked << line
-          end
-        end
-      end
-      _locked
-    end
-
-    def locked
-      @locked ||= load_lockfile
-    end
-
-    def locked?(coordinate)
-      coord = coordinate.sub(/^([^:]+:[^:]+):.+/) { $1 }
-      locked.detect { |l| l.sub(/^([^:]+:[^:]+):.+/) { $1 } == coord } != nil
-    end
-
-    def populate_unlocked(aether)
-      File.read(@file).each_line do |line| 
-        if coord = to_coordinate(line)
-          unless locked?(coord)
-            aether.add_artifact(coord)
-          end
-        elsif line =~ /^\s*(repository|source)\s/
-          name, url = line.sub(/.*(repository|source)\s+/, '').gsub(/['":]/,'').split(/,/)
-          url = name unless url
-          aether.add_repository(name, url)
-        end
-      end
-    end
-
-    def populate_locked(aether)
-      locked.each { |l| aether.add_artifact(l) }
-    end
-
-    def generate_lockfile(dependency_coordinates)
-      File.open(@lockfile, 'w') do |f|
-        dependency_coordinates.each do |d|
-          f.puts d.to_s
-        end
-      end
-    end
-  end
-
-end