maven-tools 0.32.5 → 0.33.2

data/lib/maven/tools/gemspec_dependencies.rb

@@ -0,0 +1,52 @@
+require 'maven/tools/coordinate'
+
+module Maven
+  module Tools
+    class GemspecDependencies
+
+      def initialize( gemspec )
+        if gemspec.is_a? Gem::Specification
+          @spec = gemspec
+        else
+          @spec = Gem::Specification.load( gemspec )
+        end
+        _setup
+      end
+
+      def java_runtime
+        _deps( :java_runtime )
+      end
+
+      def runtime
+        _deps( :runtime )
+      end
+
+      def development
+        _deps( :development )
+      end
+
+      private
+
+      include Coordinate
+
+      def _deps( type )
+        @deps ||= {}
+        @deps[ type ] ||= []
+      end
+
+      def _setup
+        @spec.dependencies.each do |dep|
+          versions = dep.requirement.requirements.collect do |req|
+            # use this construct to get the same result in 1.8.x and 1.9.x
+            req.collect{ |i| i.to_s }.join
+          end
+          _deps( dep.type ) << "rubygems:#{dep.name}:#{to_version( *versions )}"
+        end
+        @spec.requirements.each do |req|
+          coord = to_split_coordinate( req )
+          _deps( :java_runtime ) << coord if coord
+        end
+      end
+    end
+  end
+end

data/lib/maven/tools/jarfile.rb

@@ -19,6 +19,8 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 require File.join(File.dirname(__FILE__), 'coordinate.rb')
+require File.join(File.dirname(__FILE__), 'artifact.rb')
+require 'fileutils'
 module Maven
   module Tools
 
@@ -52,6 +54,14 @@ module Maven
           File.read(@lockfile).each_line do |line|
             line.strip!
             if line.size > 0 && !(line =~ /^\s*#/)
+              # fix the classifier and version position
+              if line.count( ':' ) == 4
+                parts = line.split( ':' )
+                p = parts.last
+                parts[ 4 ] = parts[ 3 ]
+                parts[ 3 ] = p
+                line = parts.join( ':' )
+              end
               _locked << line
             end
           end
@@ -68,27 +78,91 @@ module Maven
         locked.detect { |l| l.sub(/^([^:]+:[^:]+):.+/) { $1 } == coord } != nil
       end
 
-      def populate_unlocked(container)
+      class DSL
+        include Coordinate
+
+        def self.eval_file( file )
+          jarfile = self.new
+          jarfile.eval_file( file )
+        end
+
+        def eval_file( file )
+          if File.exists?( file )
+            eval( File.read( file ) )
+            self
+          end
+        end
+
+        def artifacts
+          @artifacts ||= []
+        end
+
+        def repositories
+          @repositories ||= []
+        end
+
+        def snapshot_repositories
+          @snapshot_repositories ||= []
+        end
+
+        def local( path )
+          artifacts << Artifact.new_local( File.expand_path( path ), :jar )
+        end
+
+        def jar( *args )
+          args << '[0,)' if args.size == 1
+          artifacts << Artifact.from( :jar, *args )
+        end
+
+        def pom( *args )
+          args << '[0,)' if args.size == 1
+          artifacts << Artifact.from( :pom, *args )
+        end
+
+        def snapshot_repository( name, url = nil )
+          if url.nil?
+            url = name
+          end
+          snapshot_repositories << { :name => name.to_s, :url => url }
+        end
+
+        def repository( name, url = nil )
+          if url.nil?
+            url = name
+          end
+          repositories << { :name => name.to_s, :url => url }
+        end
+        alias :source :repository
+
+        def jruby( version = nil )
+          @jruby = version if version
+        end
+          
+      end
+
+      def populate_unlocked( container = nil, &block )
         if File.exists?(@file)
-          File.read(@file).each_line do |line| 
-            if coord = to_coordinate(line)
-              unless locked?(coord)
-                container.add_artifact(coord)
+          dsl = DSL.new
+          dsl.eval_file( @file )
+
+          if block
+            block.call( dsl )
+          end
+          if container
+            dsl.artifacts.each do |a|
+              if path = a[ :system_path ]
+                container.add_local_jar( path )
+              elsif not locked?( a.to_s )
+                container.add_artifact( a.to_s )
               end
-            elsif line =~ /^\s*(repository|source)\s/
-              # allow `source :name, "http://url"`
-              # allow `source "name", "http://url"`
-              # allow `source "http://url"`
-              # also allow `repository` instead of `source`
-              name, url = line.sub(/.*(repository|source)\s+/, '').split(/,/)
-              url = name unless url
-              # remove whitespace and trailing/leading ' or "
-              name.strip!
-              name.gsub!(/^:/, '')
-              name.gsub!(/^['"]|['"]$/,'')
-              url.strip!
-              url.gsub!(/^['"]|['"]$/,'')
-              container.add_repository(name, url)
+            end
+            dsl.repositories.each do |repo|
+              container.add_repository( repo[ :name ] || repo[ 'name' ],
+                                        repo[ :url ] || repo[ 'url' ] )
+            end
+            dsl.snapshot_repositories.each do |repo|
+              container.add_snapshot_repository( repo[ :name ] || repo[ 'name' ],
+                                                 repo[ :url ] || repo[ 'url' ] )
             end
           end
         end
@@ -112,4 +186,4 @@ module Maven
     end
 
   end
-end
+end

data/lib/maven/tools/model.rb

@@ -0,0 +1,359 @@
+require 'virtus'
+
+module GAV
+  def self.included( base )
+    base.attribute :group_id, String
+    base.attribute :artifact_id, String
+    base.attribute :version, String
+  end
+end
+module GA
+  def self.included( base )
+    base.attribute :group_id, String
+    base.attribute :artifact_id, String
+  end
+end
+module SU
+  def self.included( base )
+    base.attribute :system, String
+    base.attribute :url, String
+  end
+end
+module NU
+  def self.included( base )
+    base.attribute :name, String
+    base.attribute :url, String
+  end
+end
+module INU
+  def self.included( base )
+    base.attribute :id, String
+    base.attribute :name, String
+    base.attribute :url, String
+  end
+end
+
+class Parent
+  include Virtus
+
+  include GAV
+
+  attribute :relative_path, String
+end
+class Organization
+  include Virtus
+
+  include NU
+end
+class License
+  include Virtus
+
+  include NU
+  attribute :distribution, String
+  attribute :comments, String
+end
+class Developer
+  include Virtus
+
+  include INU
+  attribute :email, String
+  attribute :organization, String
+  attribute :organization_url, String
+  attribute :roles, String
+  attribute :timezone, String
+  attribute :properties, Hash
+end
+class Contributor
+  include Virtus
+
+  include NU
+  attribute :email, String
+  attribute :organization, String
+  attribute :organization_url, String
+  attribute :roles, String
+  attribute :timezone, String
+  attribute :properties, Hash
+end
+class MailingList
+  include Virtus
+
+  attribute :name, String
+  attribute :subscribe, String
+  attribute :unsubscribe, String
+  attribute :post, String
+  attribute :archive, String
+  attribute :other_archives, Array[ String ]
+end
+class Prerequisites
+  include Virtus
+
+  attribute :maven, String
+end
+class Scm
+  include Virtus
+
+  attribute :connection, String
+  attribute :developer_connection, String
+  attribute :tag, String
+  attribute :url, String
+end
+class IssueManagement
+  include Virtus
+
+  include SU
+end
+class Notifier
+  include Virtus
+  
+  attribute :type, String
+  attribute :send_on_error, Boolean
+  attribute :send_on_failure, Boolean
+  attribute :send_on_success, Boolean
+  attribute :send_on_warning, Boolean
+  attribute :address, String
+  attribute :configuration, Hash
+end
+class CiManagement
+  include Virtus
+
+  include SU
+  
+  attribute :notifiers, Array[ Notifier ]
+end
+class Site
+  include Virtus
+
+  include INU
+end
+class Relocation
+  include Virtus
+
+  include GAV
+  attribute :message, String
+end
+class RepositoryPolicy
+  include Virtus
+
+  attribute :enabled, Boolean
+  attribute :update_policy, String
+  attribute :checksum_policy, String
+end
+class Repository
+  include Virtus
+
+  attribute :unique_version, String
+  attribute :releases, RepositoryPolicy
+  attribute :snapshot, RepositoryPolicy
+
+  include INU
+
+  attribute :layout, String
+end
+class PluginRepository < Repository; end
+class DistributionManagement
+  include Virtus
+
+  attribute :repository, Repository
+  attribute :snapshot_repository, Repository
+  attribute :site, Site
+  attribute :download_url, String
+  attribute :relocation, Relocation
+end
+class Exclusion
+  include Virtus
+
+  include GA
+end
+class Dependency
+  include Virtus
+
+  include GAV
+
+  attribute :type, String
+  attribute :classifier, String
+  attribute :scope, String
+  attribute :system_path, String
+  attribute :exclusions, Array[ Exclusion ]
+  attribute :optional, Boolean
+
+  # silent default
+  def type=( t )
+    if t.to_sym == :jar
+      @type = nil
+    else
+      @type = t
+    end
+  end
+end
+class DependencyManagement
+  include Virtus
+
+  attribute :dependencies, Array[ Dependency ]
+end
+class Extension
+  include Virtus
+
+  include GAV
+end
+class Resource
+  include Virtus
+
+  attribute :target_path, String
+  attribute :filtering, String
+  attribute :directory, String
+  attribute :includes, Array[ String ]
+  attribute :excludes, Array[ String ]
+end
+class Execution
+  include Virtus
+
+  attribute :id, String
+  attribute :phase, String
+  attribute :goals, Array[ String ]
+  attribute :inherited, Boolean
+  attribute :configuration, Hash
+end
+class Plugin
+  include Virtus
+
+  include GAV
+  attribute :extensions, Boolean
+  attribute :executions, Array[ Execution ]
+  attribute :dependencies, Array[ Dependency ]
+  attribute :goals, Array[ String ]
+  attribute :inherited, Boolean
+  attribute :configuration, Hash
+
+  # silent default
+  def group_id=( v )
+    if v.to_s == 'org.apache.maven.plugins'
+      @group_id = nil
+    else
+      @group_id = v
+    end
+  end
+end
+class PluginManagement
+  include Virtus
+
+  attribute :plugins, Array[ Plugin ]
+end
+class TestResource < Resource; end
+class ReportSet
+  include Virtus
+
+  attribute :id, String
+  attribute :reports, Array[ String ]
+  attribute :inherited, Boolean
+  attribute :configuration, Hash
+end
+class ReportPlugin
+  include Virtus
+
+  include GAV
+
+  attribute :report_sets, Array[ ReportSet ]
+end
+class Reporting
+  include Virtus
+
+  attribute :exclude_defaults, Boolean
+  attribute :output_directory, String
+  attribute :plugins, Array[ ReportPlugin ]
+end
+class Build
+  include Virtus
+
+  attribute :source_directory, String
+  attribute :script_source_directory, String
+  attribute :test_source_directory, String
+  attribute :output_directory, String
+  attribute :test_output_directory, String
+  attribute :extensions, Array[ Extension ]
+  attribute :default_goal, String
+  attribute :resources, Array[ Resource ]
+  attribute :test_resources, Array[ TestResource ]
+  attribute :directory, String
+  attribute :final_name, String
+  attribute :filters, Array[ String ]
+  attribute :plugin_management, PluginManagement
+  attribute :plugins, Array[ Plugin ]
+end
+class Os
+  include Virtus
+
+  attribute :name, String
+  attribute :family, String
+  attribute :arch, String
+  attribute :version, String
+end
+class Property
+  include Virtus
+
+  attribute :name, String
+  attribute :value, String
+end
+class File
+  include Virtus
+
+  attribute :missing, String
+  attribute :exists, String
+end
+class Activation
+  include Virtus
+
+  attribute :active_by_default, Boolean
+  attribute :jdk, String
+  attribute :os, Os
+  attribute :property, Property
+  attribute :file, File
+end
+class Profile
+  include Virtus
+
+  attribute :id, String
+  attribute :activation, Activation
+  attribute :build, Build
+  attribute :modules, Array[ String ]
+  attribute :distribution_management, DistributionManagement
+  attribute :properties, Hash
+  attribute :dependency_management, DependencyManagement
+  attribute :dependencies, Array[ Dependency ]
+  attribute :repositories, Array[ Repository ]
+  attribute :plugin_repositories, Array[ PluginRepository ]
+  attribute :reporting, Reporting
+end
+class Model
+  include Virtus
+
+  attribute :model_version, String
+  attribute :parent, Parent
+
+  include GAV
+
+  attribute :packaging, String
+
+  include NU
+
+  attribute :description, String
+  attribute :inception_year, String
+  attribute :organization, Organization
+  attribute :licenses, Array[ License ]
+  attribute :developers, Array[ Developer ]
+  attribute :contributors, Array[ Contributor ]
+  attribute :mailing_lists, Array[ MailingList ]
+  attribute :prerequisites, Prerequisites
+  attribute :modules, Array[ String ]
+  attribute :scm, Scm
+  attribute :issue_management, IssueManagement
+  attribute :ci_management, CiManagement
+  attribute :distribution_management, DistributionManagement
+  attribute :properties, Hash
+  attribute :dependency_management, DependencyManagement
+  attribute :dependencies, Array[ Dependency ]
+  attribute :repositories, Array[ Repository ]
+  attribute :plugin_repositories, Array[ PluginRepository ]
+  attribute :build, Build
+  attribute :reporting, Reporting
+  attribute :profiles, Array[ Profile ]
+end