maven-tools 0.34.5 → 1.0.0.rc2

data/lib/maven/tools/gemfile_lock.rb

@@ -82,9 +82,3 @@ module Maven
     end
   end
 end
-
-if $0 == __FILE__
-  lockfile = Maven::Tools::GemfileLock.new(File.new(ARGV[0] || 'Gemfile.lock'))
-  p lockfile
-  p lockfile.dependency_hull("rails")
-end

data/lib/maven/tools/model.rb

@@ -1,5 +1,10 @@
 require 'virtus'
 
+module Maven
+  module Tools
+    class Base
+    end
+
 module GAV
   def self.included( base )
     base.attribute :group_id, String
@@ -33,27 +38,27 @@ module INU
   end
 end
 
-class Parent
-  include Virtus
+class Parent < Base
+  include Virtus.model
 
   include GAV
 
   attribute :relative_path, String
 end
-class Organization
-  include Virtus
+class Organization < Base
+  include Virtus.model
 
   include NU
 end
-class License
-  include Virtus
+class License < Base
+  include Virtus.model
 
   include NU
   attribute :distribution, String
   attribute :comments, String
 end
-class Developer
-  include Virtus
+class Developer < Base
+  include Virtus.model
 
   include INU
   attribute :email, String
@@ -63,8 +68,8 @@ class Developer
   attribute :timezone, String
   attribute :properties, Hash
 end
-class Contributor
-  include Virtus
+class Contributor < Base
+  include Virtus.model
 
   include NU
   attribute :email, String
@@ -74,8 +79,8 @@ class Contributor
   attribute :timezone, String
   attribute :properties, Hash
 end
-class MailingList
-  include Virtus
+class MailingList < Base
+  include Virtus.model
 
   attribute :name, String
   attribute :subscribe, String
@@ -84,26 +89,26 @@ class MailingList
   attribute :archive, String
   attribute :other_archives, Array[ String ]
 end
-class Prerequisites
-  include Virtus
+class Prerequisites < Base
+  include Virtus.model
 
   attribute :maven, String
 end
-class Scm
-  include Virtus
+class Scm < Base
+  include Virtus.model
 
   attribute :connection, String
   attribute :developer_connection, String
   attribute :tag, String
   attribute :url, String
 end
-class IssueManagement
-  include Virtus
+class IssueManagement < Base
+  include Virtus.model
 
   include SU
 end
-class Notifier
-  include Virtus
+class Notifier < Base
+  include Virtus.model
   
   attribute :type, String
   attribute :send_on_error, Boolean
@@ -113,33 +118,33 @@ class Notifier
   attribute :address, String
   attribute :configuration, Hash
 end
-class CiManagement
-  include Virtus
+class CiManagement < Base
+  include Virtus.model
 
   include SU
   
   attribute :notifiers, Array[ Notifier ]
 end
-class Site
-  include Virtus
+class Site < Base
+  include Virtus.model
 
   include INU
 end
-class Relocation
-  include Virtus
+class Relocation < Base
+  include Virtus.model
 
   include GAV
   attribute :message, String
 end
-class RepositoryPolicy
-  include Virtus
+class RepositoryPolicy < Base
+  include Virtus.model
 
   attribute :enabled, Boolean
   attribute :update_policy, String
   attribute :checksum_policy, String
 end
-class Repository
-  include Virtus
+class Repository < Base
+  include Virtus.model
 
   attribute :unique_version, String
   attribute :releases, RepositoryPolicy
@@ -150,22 +155,24 @@ class Repository
   attribute :layout, String
 end
 class PluginRepository < Repository; end
-class DistributionManagement
-  include Virtus
+class DeploymentRepository < Repository; end
+class DistributionManagement < Base
+  include Virtus.model
 
   attribute :repository, Repository
   attribute :snapshot_repository, Repository
   attribute :site, Site
   attribute :download_url, String
+  attribute :status, String
   attribute :relocation, Relocation
 end
-class Exclusion
-  include Virtus
+class Exclusion < Base
+  include Virtus.model
 
   include GA
 end
-class Dependency
-  include Virtus
+class Dependency < Base
+  include Virtus.model
 
   include GAV
 
@@ -185,18 +192,18 @@ class Dependency
     end
   end
 end
-class DependencyManagement
-  include Virtus
+class DependencyManagement < Base
+  include Virtus.model
 
   attribute :dependencies, Array[ Dependency ]
 end
-class Extension
-  include Virtus
+class Extension < Base
+  include Virtus.model
 
   include GAV
 end
-class Resource
-  include Virtus
+class Resource < Base
+  include Virtus.model
 
   attribute :target_path, String
   attribute :filtering, String
@@ -204,8 +211,8 @@ class Resource
   attribute :includes, Array[ String ]
   attribute :excludes, Array[ String ]
 end
-class Execution
-  include Virtus
+class Execution < Base
+  include Virtus.model
 
   attribute :id, String
   attribute :phase, String
@@ -213,8 +220,8 @@ class Execution
   attribute :inherited, Boolean
   attribute :configuration, Hash
 end
-class Plugin
-  include Virtus
+class Plugin < Base
+  include Virtus.model
 
   include GAV
   attribute :extensions, Boolean
@@ -233,36 +240,36 @@ class Plugin
     end
   end
 end
-class PluginManagement
-  include Virtus
+class PluginManagement < Base
+  include Virtus.model
 
   attribute :plugins, Array[ Plugin ]
 end
 class TestResource < Resource; end
-class ReportSet
-  include Virtus
+class ReportSet < Base
+  include Virtus.model
 
   attribute :id, String
   attribute :reports, Array[ String ]
   attribute :inherited, Boolean
   attribute :configuration, Hash
 end
-class ReportPlugin
-  include Virtus
+class ReportPlugin < Base
+  include Virtus.model
 
   include GAV
 
   attribute :report_sets, Array[ ReportSet ]
 end
-class Reporting
-  include Virtus
+class Reporting < Base
+  include Virtus.model
 
   attribute :exclude_defaults, Boolean
   attribute :output_directory, String
   attribute :plugins, Array[ ReportPlugin ]
 end
-class Build
-  include Virtus
+class Build < Base
+  include Virtus.model
 
   attribute :source_directory, String
   attribute :script_source_directory, String
@@ -279,37 +286,37 @@ class Build
   attribute :plugin_management, PluginManagement
   attribute :plugins, Array[ Plugin ]
 end
-class Os
-  include Virtus
+class Os < Base
+  include Virtus.model
 
   attribute :name, String
   attribute :family, String
   attribute :arch, String
   attribute :version, String
 end
-class Property
-  include Virtus
+class Property < Base
+  include Virtus.model
 
   attribute :name, String
   attribute :value, String
 end
-class File
-  include Virtus
+class ActivationFile < Base
+  include Virtus.model
 
   attribute :missing, String
   attribute :exists, String
 end
-class Activation
-  include Virtus
+class Activation < Base
+  include Virtus.model
 
   attribute :active_by_default, Boolean
   attribute :jdk, String
   attribute :os, Os
   attribute :property, Property
-  attribute :file, File
+  attribute :file, ActivationFile
 end
-class Profile
-  include Virtus
+class Profile < Base
+  include Virtus.model
 
   attribute :id, String
   attribute :activation, Activation
@@ -323,8 +330,8 @@ class Profile
   attribute :plugin_repositories, Array[ PluginRepository ]
   attribute :reporting, Reporting
 end
-class Model
-  include Virtus
+class Model < Base
+  include Virtus.model
 
   attribute :model_version, String
   attribute :parent, Parent
@@ -357,3 +364,5 @@ class Model
   attribute :reporting, Reporting
   attribute :profiles, Array[ Profile ]
 end
+end
+end

data/lib/maven/tools/pom.rb

@@ -38,7 +38,7 @@ module Maven
       end
 
       def eval_file( file )
-        if file && File.directory?( file )
+        if file && ::File.directory?( file )
           dir = file
           file = nil
         else
@@ -55,7 +55,7 @@ module Maven
 
         if file
           FileUtils.cd( dir ) do
-            @model = to_model( File.basename( file ) )
+            @model = to_model( ::File.basename( file ) )
           end
         end
       end
@@ -69,7 +69,7 @@ module Maven
       end
 
       def pom_file( pom, dir = '.' )
-        files = Dir[ File.join( dir, pom ) ]
+        files = Dir[ ::File.join( dir, pom ) ]
         case files.size
         when 0
         when 1
@@ -90,21 +90,21 @@ module Maven
 
       def to_file( file )
         if @model
-          v = ::Maven::Tools::Visitor.new( File.open( file, 'w' ) )
+          v = ::Maven::Tools::Visitor.new( ::File.open( file, 'w' ) )
           v.accept_project( @model )
           true
         end
       end
 
       def to_model( file )
-        if File.exists?( file )
+        if ::File.exists?( file )
           case file
           when /pom.rb/
-            eval_pom( "tesla do\n#{ File.read( file ) }\nend", file )
+            eval_pom( "tesla do\n#{ ::File.read( file ) }\nend", file )
           when /(Maven|Gem|Jar)file/
-            eval_pom( "tesla do\n#{ File.read( file ) }\nend", file )
+            eval_pom( "tesla do\n#{ ::File.read( file ) }\nend", file )
           when /.+\.gemspec/
-            eval_pom( "tesla do\ngemspec( '#{ File.basename( file ) }' )\nend", file )
+            eval_pom( "tesla do\ngemspec( '#{ ::File.basename( file ) }' )\nend", file )
           end
         else
           eval_pom( "tesla do\n#{file}\nend", nil )

data/lib/maven/tools/version.rb

@@ -20,6 +20,6 @@
 #
 module Maven
   module Tools
-    VERSION = '0.34.5'.freeze
+    VERSION = '1.0.0.rc2'.freeze
   end
 end

data/lib/maven/tools/versions.rb

@@ -27,10 +27,10 @@ module Maven
         :war_plugin => "2.2",
         :jar_plugin => "2.4",
         :clean_plugin => "2.4",
-        :jruby_plugins => "1.0.0",
-        :bundler_version => "1.6.2",
-        :jruby_version => "1.7.12",
-        :tesla_version => "0.0.9"
+        :jruby_plugins => "1.0.0-rc4",
+        :bundler_version => "1.3.5",
+        :jruby_version => "1.7.6",
+        :tesla_version => "0.0.8"
       }.freeze
     end
   end

data/lib/maven/tools/visitor.rb

@@ -80,7 +80,7 @@ module Maven
           start_tag( name )
           n = name.to_s.sub( /ies$/, 'y' ).sub( /s$/, '' )
           case array.first
-          when Virtus
+          when Maven::Tools::Base
             array.each do |i|
               start_tag( n )
               visit( i )
@@ -143,7 +143,7 @@ module Maven
             accept_raw_hash( k, v )
           else
             case v
-            when Virtus
+            when Base
               accept( k, v )
             when Array
               accept_array( k, v )

data/spec/gemfile_with_lock/bouncy-castle-version.rb

@@ -0,0 +1,4 @@
+class BouncyCastle
+  MAVEN_VERSION = '1.49' unless defined? MAVEN_VERSION
+  VERSION_ = MAVEN_VERSION.sub( /[.]/, '' ) unless defined? BouncyCastle::VERSION_
+end

data/spec/pom_maven_alternative_style/pom.rb

@@ -50,179 +50,126 @@ project 'my name', 'example.com' do
   end
 
   modules 'part1', 'part2'
-end
-#   <scm>
-#     <connection/>
-#     <developerConnection/>
-#     <tag/>
-#     <url/>
-#   </scm>
-#   <issueManagement>
-#     <system/>
-#     <url/>
-#   </issueManagement>
-#   <ciManagement>
-#     <system/>
-#     <url/>
-#     <notifiers>
-#       <notifier>
-#         <type/>
-#         <sendOnError/>
-#         <sendOnFailure/>
-#         <sendOnSuccess/>
-#         <sendOnWarning/>
-#         <address/>
-#         <configuration>
-#           <key>value</key>
-#         </configuration>
-#       </notifier>
-#     </notifiers>
-#   </ciManagement>
 
-#   <distributionManagement>
-#     <repository>
-#       <uniqueVersion/>
-#       <releases>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </releases>
-#       <snapshots>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </snapshots>
-#       <id/>
-#       <name/>
-#       <url/>
-#       <layout/>
-#     </repository>
-#     <snapshotRepository>
-#       <uniqueVersion/>
-#       <releases>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </releases>
-#       <snapshots>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </snapshots>
-#       <id/>
-#       <name/>
-#       <url/>
-#       <layout/>
-#     </snapshotRepository>
-#     <site>
-#       <id/>
-#       <name/>
-#       <url/>
-#     </site>
-#     <downloadUrl/>
-#     <relocation>
-#       <groupId/>
-#       <artifactId/>
-#       <version/>
-#       <message/>
-#     </relocation>
-#     <status/>
-#   </distributionManagement>
-
-#   <properties>
-#     <key>value</key>
-#   </properties>
-
-#   <dependencyManagement>
-#     <dependencies>
-#       <dependency>
-#         <groupId/>
-#         <artifactId/>
-#         <version/>
-#         <type/>
-#         <classifier/>
-#         <scope/>
-#         <systemPath/>
-#         <exclusions>
-#           <exclusion>
-#             <artifactId/>
-#             <groupId/>
-#           </exclusion>
-#         </exclusions>
-#         <optional/>
-#       </dependency>
-#     </dependencies>
-#   </dependencyManagement>
-#   <dependencies>
-#     <dependency>
-#       <groupId/>
-#       <artifactId/>
-#       <version/>
-#       <type/>
-#       <classifier/>
-#       <scope/>
-#       <systemPath/>
-#       <exclusions>
-#         <exclusion>
-#           <artifactId/>
-#           <groupId/>
-#         </exclusion>
-#       </exclusions>
-#       <optional/>
-#     </dependency>
-#   </dependencies>
+  scm( 'scm:git:git://github.com/torquebox/maven-tools.git',
+       'scm:git:ssh://git@github.com/torquebox/maven-tools.git',
+       'http://github.com/torquebox/maven-tools',
+       :tag => 'first' )
+  issue_management( 'https://issues.sonatype.org/', 
+                    :system => 'jira' )
+  ci_management( 'travis-ci.org/jruby/jruby',
+                 :system => 'travis' ) do
+    notifier( 'email', 'mail2@example.com' )
+    notifier( 'email', 'mail@example.com',
+              :send_on_error => true,
+              :send_on_failure => false,
+              :send_on_success =>true,
+              :send_on_warning => false,
+              :configuration => { :key1 => 'value1',
+                :key2 => 'value2' } )
+  end 
+  distribution( 'active',
+                'http://dev.example.com/downloads' ) do
+    repository( :first, 
+                'http://repo.example.com',
+                'First',
+                :unique_version => 123,
+                :layout => 'legacy' ) do
+      releases( :enabled => true,
+                :update_policy => 'daily',
+                :checksum_policy => :strict )
+      snapshots( :enabled =>false,
+                 :update_policy => :never,
+                 :checksum_policy => 'none' )
+    end
+    snapshot_repository( 'snapshots', 
+                         'http://snaphots.example.com',
+                         'First Snapshots',
+                         :unique_version => 1234,
+                         :layout => 'legacy' ) do
+      releases( :enabled => false,
+                :update_policy => 'daily',
+                :checksum_policy => :strict )
+      snapshots( :enabled =>true,
+                 :update_policy => :never,
+                 :checksum_policy => 'none' )
+    end
+    site( 'first','http://dev.example.com', 'dev site'  )
+    relocation( 'org.group', 'artifact', '1.2.3',
+                :message => 'follow the maven convention' )
+  end
+  properties :key1 => 'value1', 'key2' => :value2
+  scope :provided do
+    dependency_management do
+      jar( 'com.example', 'tools', '1.2.3',
+           :classifier => 'super',
+           :system_path => '/home/development/tools.jar',
+           :exclusions => [ 'org.example:some', 'org.example:something' ],
+           :optional => true )
+    end
+    war( 'com.example', 'tools', '2.3',
+         :classifier => 'super',
+         :system_path => '/home/development/wartools.jar',
+         :exclusions => [ 'org.example:some', 'org.example:something' ],
+         :optional => false )
+  end
+  repository( 'first', 'http://repo.example.com', 'First' ) do
+    unique_version 123
+    layout 'legacy'
+    releases( :enabled => true,
+              :update_policy => 'daily',
+              :checksum_policy => :strict )
+    snapshots( :enabled => false,
+               :update_policy => :never,
+               :checksum_policy => 'none' )
+  end
+  snapshot_repository( 'snapshots', 
+                       'http://snaphots.example.com',
+                       'First Snapshots',
+                       :unique_version => 12345,
+                       :layout => 'legacy' ) do
+    releases( :update_policy => 'daily',
+              :checksum_policy => :strict )
+    snapshots( :update_policy => :never,
+               :checksum_policy => 'none' )
+  end
+  plugin_repository( :first, 'http://pluginrepo.example.com', 'First' ) do
+    unique_version 12
+    layout 'legacy'
+    releases( :enabled => true,
+              :update_policy => 'daily',
+              :checksum_policy => :strict )
+    snapshots( :enabled => false,
+               :update_policy => :never,
+               :checksum_policy => 'none' )
+  end
 
-#   <repositories>
-#     <repository>
-#       <releases>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </releases>
-#       <snapshots>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </snapshots>
-#       <id/>
-#       <name/>
-#       <url/>
-#       <layout/>
-#     </repository>
-#   </repositories>
-#   <pluginRepositories>
-#     <pluginRepository>
-#       <releases>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </releases>
-#       <snapshots>
-#         <enabled/>
-#         <updatePolicy/>
-#         <checksumPolicy/>
-#       </snapshots>
-#       <id/>
-#       <name/>
-#       <url/>
-#       <layout/>
-#     </pluginRepository>
-#   </pluginRepositories>
+  build do
+    source_directory 'src'
+    script_source_directory 'script'
+    test_source_directory 'test'
+    output_directory 'pkg'
+    test_output_directory 'pkg/test'
+    default_goal :install
+    extension 'org.group', 'gem-extension', '1.2'
+    resource do
+      target_path 'target'
+      filtering true
+      directory 'resources'
+      includes [ '**/*' ]
+      excludes [ '*~' ]
+    end
+    test_resource do
+      target_path 'target/test'
+      filtering false
+      directory 'testresources'
+      includes [ '**/*' ]
+      excludes [ '*~' ]
+    end
+  end
+end
 
 #   <build>
-#     <sourceDirectory/>
-#     <scriptSourceDirectory/>
-#     <testSourceDirectory/>
-#     <outputDirectory/>
-#     <testOutputDirectory/>
-#     <extensions>
-#       <extension>
-#         <groupId/>
-#         <artifactId/>
-#         <version/>
-#       </extension>
-#     </extensions>
-#     <defaultGoal/>
 #     <resources>
 #       <resource>
 #         <targetPath/>