maven-tools 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb25e10235359acd7536276bae2fb121b54a7236
-  data.tar.gz: 4c37c3d8d1292711cb69d91271a31f7904fb5f56
+  metadata.gz: 26c28a69e50f9e111649ce61924f54cabf6f63b7
+  data.tar.gz: 10cac74469e0e75b47982e9edc5c596ab40f6a5e
 SHA512:
-  metadata.gz: e27447be1c62cce5080e2987d7b2d8468cbb8adf19c85fc07bc0c02703dfda8121c78737d911db5f7d85abfc465b1582c1606fb25c8585d6f6ffcfaf27b0f02f
-  data.tar.gz: ccd6c4f02a520e416a71458b3e9efef2cee45fa88181eb7248fc0f577c721afd747ca9a7c06488c12d607ad0664751126b850fdbdaff440c73b8ad9ceffcb1bb
+  metadata.gz: fbed6ef1c9355e616b061e3666641fbe47084a4bc2f10b47506de85ab25003dc6b5e1f76bfa7ef46cb81b8340570783e94aa6a34410e55220bf194ff8d10dfb8
+  data.tar.gz: 2fbe060c86ba0bc5866f6e1d583614ae17f43f61dd818b51925a9546cfed7becb95c9585bccf6b85594073b33f629e632f2d30d3c43deb1233f19c43999fb245

data/Mavenfile

@@ -6,13 +6,14 @@ jruby_plugin( :minitest, :minispecDirectory =>"spec/*spec.rb" ) do
   execute_goals(:spec)
 end
 
-snapshot_repository :jruby, 'http://ci.jruby.org/snapshots/maven'
+#snapshot_repository :jruby, 'http://ci.jruby.org/snapshots/maven'
 
 # (jruby-1.6.7 produces a lot of yaml errors parsing gemspecs)
-properties( 'jruby.versions' => ['1.7.13','9000.dev-SNAPSHOT'].join(','),
+properties( #'jruby.versions' => ['1.7.16.1','9.0.0.0-SNAPSHOT'].join(','),
+            'jruby.versions' => ['1.7.16.1'].join(','),
             'jruby.modes' => ['1.9', '2.0','2.1'].join(','),
             # just lock the versions
-            'jruby.version' => '1.7.13',
+            'jruby.version' => '1.7.16.1',
             'tesla.dump.pom' => 'pom.xml',
             'tesla.dump.readonly' => true )
 

data/Rakefile

@@ -8,6 +8,38 @@ end
 
 task :default => [ :specs ]
 
+desc 'generate licenses data from internet'
+task :licenses do
+  require 'open-uri'
+  require 'ostruct'
+  
+  File.open( 'lib/maven/tools/licenses.rb', 'w' ) do |f|
+    url = 'http://opensource.org'
+    f.puts "require 'ostruct'"
+    f.puts 'module Maven'
+    f.puts '  module Tools'
+    f.puts '    LICENSES = {}'
+    
+    open( url + '/licenses/alphabetical' ).each_line do |line|
+      
+      if line =~ /.*"\/licenses\// and line =~ /<li>/
+        l = OpenStruct.new
+        line.sub!( /.*"(\/licenses\/([^"]*))">/ ) do
+          l.url = "http://opensource.org#{$1}"
+          l.short = $1.sub( /\/licenses\//, '' )
+          ''
+        end
+        line.sub!( /\ \(.*$/, '' )
+        f.puts "    LICENSES[ #{l.short.downcase.inspect} ] = OpenStruct.new :short => #{l.short.inspect}, :name => #{line.strip.inspect}, :url => #{l.url.inspect}"
+      end
+    end
+    f.puts '    LICENSES.freeze'
+    f.puts '  end'
+    f.puts 'end'
+  end
+  
+end
+
 desc 'run minispecs'
 task :specs do
   begin
@@ -19,7 +51,7 @@ task :specs do
   $LOAD_PATH << "spec"
   $LOAD_PATH << "lib"
 
-  Dir['spec/*_spec.rb'].each { |f| require File.basename(f.sub(/.rb$/, '')) }
+  Dir['spec/**/*_spec.rb'].each { |f| require f.sub(/spec\//, '') }
 end
 
 task :headers do

data/lib/maven/tools/dsl.rb

@@ -46,6 +46,15 @@ module Maven
         @model
       end
 
+      # TODO remove me
+      def needs_torquebox= t
+        @needs_torquebox = t
+      end
+      # TODO remove me
+      def current
+        @current
+      end
+
       def eval_pom( src, reference_file )
         @source = reference_file || '.'
         eval( src, nil, ::File.expand_path( @source ) )
@@ -315,29 +324,16 @@ module Maven
           options = file
           file = 'Jarfile'
         end
-        unless file.is_a?( Maven::Tools::Jarfile )
-          file = Maven::Tools::Jarfile.new( ::File.expand_path( file ) )
+        if file.is_a?( Maven::Tools::Jarfile )
+          warn "DEPRECATED use filename instead"
+          file = jfile.file
         end
+        dsl = Maven::Tools::DSL::Jarfile.new( @current, file, options[ :skip_lock ] )
 
-        if options[ :skip_locked ] or not file.exists_lock?
-          dsl = file.setup_unlocked( @current )
-          # TODO this setup should be partly part of Jarfile
-          jarfile_dsl( dsl )
-        else
-          file.locked.each do |dep|
-            artifact( dep )
-          end
-          file.populate_unlocked do |dsl|
-            dsl = file.setup_locked( @current )
-            # TODO this setup should be partly part of Jarfile
-            jarfile_dsl( dsl )
-            dsl.parent.dependencies.each do |d|
-              @current.dependencies << d if d.system_path
-            end
-          end
-        end
+        # TODO this setup should be part of DSL::Jarfile
+        jarfile_dsl( dsl )
       end
-      
+
       def jarfile_dsl( dsl )
         dsl.repositories.each do |r|
           repository r.merge( {:id => r[:name] } )
@@ -353,112 +349,26 @@ module Maven
           @gemspec_args = [ name, options ]
           return
         end
-        if name.is_a? Hash
-          options = name
-          name = nil
-        end
-        if name
-          name = ::File.join( basedir, name )
-        else name
-          gemspecs = Dir[ ::File.join( basedir, "*.gemspec" ) ]
-          raise "more then one gemspec file found" if gemspecs.size > 1
-          raise "no gemspec file found" if gemspecs.size == 0
-          name = gemspecs.first
-        end
-        spec = nil
-        f = ::File.expand_path( name )
-        spec_file = ::File.read( f )
-        begin
-          spec = Gem::Specification.from_yaml( spec_file )
-        rescue Exception
-          FileUtils.cd( basedir ) do
-            # TODO jruby java user.dir
-            spec = eval( spec_file, nil, f )
-          end
-        end
-        
-        self.spec( spec, name, options )
-      end
-
-      def spec( spec, name = nil, options = {} )
-        name ||= "#{spec.name}-#{spec.version}.gemspec"
-
-        @gemfile_options = nil
-
         if @context == :project
-          build.directory = '${basedir}/pkg'
-          version = spec.version.to_s
-          if options[ :snapshot ] && spec.version.prerelease?
-            version += '-SNAPSHOT'
-          end
-          id "rubygems:#{spec.name}:#{version}"
-          name( spec.summary || spec.name )
-          description spec.description
-          url spec.homepage
-          if spec.homepage && spec.homepage.match( /github.com/ )
-            con = spec.homepage.sub( /http:/, 'https:' ).sub( /\/?$/, ".git" )
-            scm :url => spec.homepage, :connection => con
-          end
-
-          spec.licenses.each do |l|
-            license( l )
-          end
-          authors = [ spec.authors || [] ].flatten
-          emails = [ spec.email || [] ].flatten
-          authors.zip( emails ).each do |d|
-            developer( :name => d[0], :email => d[1] )
-          end
-        end
-
-        has_jars = setup_gem_support( options, spec )
-
-        if @context == :project and not options[ :only_metadata ]
-          packaging 'gem'
-          if has_jars
-            extension 'de.saumya.mojo:gem-with-jar-extension:${jruby.plugins.version}'
-          else
-            extension 'de.saumya.mojo:gem-extension:${jruby.plugins.version}'
-          end
-        end
-
-        return if options[ :only_metadata ]
-
-        config = { :gemspec => name.sub( /^#{basedir}\/?/, '' ) }
-        if options[ :include_jars ] || options[ 'include_jars' ] 
-          config[ :includeDependencies ] = true
-          config[ :useRepositoryLayout ] = true
-        end
-        jruby_plugin!( :gem, config )
-
-        deps = nil
-        if @inside_gemfile.is_a? Symbol
-          profile! @inside_gemfile do
-            deps = all_deps( spec )
+          if @inside_gemfile.is_a? Symbol
+            options[ :profile ] = @inside_gemfile
           end
+          options[ :no_gems ] = gemspec_without_gem_dependencies?
+          require_relative 'dsl/project_gemspec'
+          DSL::ProjectGemspec.new( self, name, options )
         else
-          deps = all_deps( spec )
-        end
-        
-        deps.java_dependency_artifacts.each do |a|
-          _dependency a
+          require_relative 'dsl/profile_gemspec'
+          DSL::ProfileGemspec.new( self, name, options )
         end
       end
 
-      def all_deps( spec )
-        deps = Maven::Tools::GemspecDependencies.new( spec )
-        deps.runtime.each do |d|
-          gem d
-        end
-        unless deps.development.empty?
-          scope :test do
-            deps.development.each do |d|
-              gem d
-            end          
-          end
-        end
-        deps
+      # TODO remove this hack to get jar-dependencies to work
+      def gemspec_without_gem_dependencies?
+        gems = GemspecDependencies.new( Gem::Specification.new )
+        gems.runtime << 123
+        deps = gems.send( :_deps, :runtime )
+        deps.size == 0
       end
-      private :all_deps
 
       def licenses
         yield
@@ -1309,6 +1219,9 @@ module Maven
         if @context
           m = "#{method}=".to_sym
           if @current.respond_to? m
+            if method == :properties && defined? JRUBY_VERSION
+              return @current.properties = java.util.Properties.new
+            end
             #p @context
             #p m
             #p args

data/lib/maven/tools/dsl/dependency_dsl.rb

@@ -29,9 +29,15 @@ module Maven
 
         class << self
           def create( parent, type, scope, *args, &block )
-            a = DependencyDSL.from( type, *args, &block )
-            a.scope = scope if scope
-            
+            if type
+              a = DependencyDSL.from( type, *args, &block )
+              a.scope = scope if scope
+            else
+              scope = args.shift
+              args += [nil, nil, { :scope => scope } ][ (args.size - 4 )..2 ]
+              a = DependencyDSL.new( *args )
+            end
+
             options = process_exclusions( a.model, a.dup )
             a.instance_eval &block if block
             fill_options( a.model, options, :type )

data/lib/maven/tools/dsl/gem_support.rb

@@ -0,0 +1,97 @@
+#
+# Copyright (C) 2014 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+module Maven
+  module Tools
+    module DSL
+      module GemSupport 
+
+        def setup_jruby_plugins_version( project )
+          if not @parent.properties.key?( 'jruby.plugins.version' ) and
+              not project.properties.key?( 'jruby.plugins.version' )
+            @parent.properties( 'jruby.plugins.version' => VERSIONS[ :jruby_plugins ] )
+          end
+        end
+
+        def setup_gem_support( project, options, spec = nil )
+          unless project.properties.member?( 'project.build.sourceEncoding' )
+            @parent.properties( 'project.build.sourceEncoding' => 'utf-8' )
+          end
+          if spec.nil?
+            require_path = '.'
+            name = ::File.basename( ::File.expand_path( '.' ) )
+          else
+            require_path = spec.require_path
+            name = spec.name
+          end
+
+          if ( nil == project.current.repositories.detect { |r| r.id == 'rubygems-releases' } && options[ :no_rubygems_repo ] != true )
+              
+            @parent.repository( 'rubygems-releases',
+                                'http://rubygems-proxy.torquebox.org/releases' )
+          end
+          @parent.needs_torquebox = true
+            
+          setup_jruby_plugins_version( project )
+          
+          if options.key?( :jar ) || options.key?( 'jar' )
+            jarpath = options[ :jar ] || options[ 'jar' ]
+            if jarpath
+              jar = ::File.basename( jarpath ).sub( /.jar$/, '' )
+              output = ::File.dirname( "#{require_path}/#{jarpath}" )
+              output.sub!( /\/$/, '' )
+            end
+          else
+            jar = "#{name}"
+            output = "#{require_path}"
+          end
+          if options.key?( :source ) || options.key?( 'source' )
+            source = options[ :source ] || options[ 'source' ]
+            @parent.build do
+              @parent.source_directory source
+            end
+          end
+          # TODO rename "no_rubygems_repo" to "no_jar_support"
+          if(  options[ :no_rubygems_repo ] != true && 
+               jar &&
+               ( source || File.exists?( File.join( project.basedir, 
+                                                    'src/main/java' ) ) ) )
+            
+            unless spec.nil? || spec.platform.to_s.match( /java|jruby/ )
+              warn "gem is not a java platform gem but has a jar and source"
+            end
+            
+            @parent.plugin( :jar, VERSIONS[ :jar_plugin ],
+                            :outputDirectory => output,
+                            :finalName => jar ) do
+              @parent.execute_goals :jar, :phase => 'prepare-package'
+            end
+            @parent.plugin( :clean, VERSIONS[ :clean_plugin ],
+                            :filesets => [ { :directory => output,
+                                             :includes => [ "#{jar}.jar", '*/**/*.jar' ] } ] )
+            true
+          else
+            false
+          end
+        end
+      end
+    end
+  end
+end

data/lib/maven/tools/dsl/gemspec.rb

@@ -0,0 +1,158 @@
+#
+# Copyright (C) 2014 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'maven/tools/coordinate'
+require 'maven/tools/versions'
+require 'maven/tools/dsl/jruby_dsl'
+require 'maven/tools/dsl/dependency_dsl'
+module Maven
+  module Tools
+    module DSL
+      class Gemspec
+
+        def initialize( parent, name = nil, options = {} )
+          @parent = parent
+          case name
+          when Hash
+            options = name
+            name = options[ 'name' ] || options[ :name ]
+          when Gem::Specification
+            process_gem_spec( name, options )
+            return
+          end
+          name = find_gemspec_file( name )
+          spec = gem_specification( name )
+          name ||= "#{spec.name}-#{spec.version}.gemspec"
+          process( spec, name, options )
+        end
+
+        attr_reader :parent
+
+        def help
+          warn "\n# Jarfile DSL #\n"
+          warn self.class.help_block( :local => "path-to-local-jar", :jar => nil, :pom => nil, :repository => nil, :snapshot_repository => nil, :jruby => nil, :scope => nil)[0..-2]
+        end
+
+        def gem( scope, coord )
+          DependencyDSL.create( @parent.current, :gem, scope, coord )
+        end
+
+        def jar( line )
+          maven_dependency( "jar #{line}" )
+        end
+
+        def pom( line )
+          maven_dependency( "pom #{line}" )
+        end
+
+        def method_missing( m, *args )
+          if args.size == 1
+            warn "unknown declaration: #{m} " + args[0]
+          else
+            super
+          end
+        end
+
+        private
+
+        include Maven::Tools::Coordinate
+
+        def process_gem_spec( spec, options )
+          if spec.spec_file
+            name = File.basename( spec.spec_file )
+          else
+            name = nil
+          end
+          process( spec, name, options )
+        end
+
+        def find_gemspec_file( name )
+          if name
+            ::File.join( @parent.basedir, name )
+          else
+            gemspecs = Dir[ ::File.join( @parent.basedir, "*.gemspec" ) ]
+            raise "more then one gemspec file found" if gemspecs.size > 1
+            raise "no gemspec file found" if gemspecs.size == 0
+            gemspecs.first
+          end
+        end
+
+        def gem_specification( name )
+          path = File.expand_path( name ) 
+          spec_file = File.read( path )
+          begin
+            Gem::Specification.from_yaml( spec_file )
+          rescue Exception
+            FileUtils.cd( @parent.basedir ) do
+              return eval( spec_file, nil, path )
+            end
+          end
+        end
+
+        def process( spec, name, options )       
+          if name
+            config = { :gemspec => name.sub( /^#{@parent.basedir}\/?/, '' ) }
+          end
+          if options[ :include_jars ] || options[ 'include_jars' ] 
+            config[ :includeDependencies ] = true
+            config[ :useRepositoryLayout ] = true
+            @parent.plugin :dependency do
+              @parent.execute_goal( 'copy-dependencies',
+                                    :phase => 'generate-test-resources',
+                                    :outputDirectory => spec.require_path,
+                                    :useRepositoryLayout => true )
+            end
+          end
+          @parent.jruby_plugin!( :gem, config )
+
+          gem_deps( spec, options ) unless options[ :no_gems ]
+          other_deps( spec )
+        end
+
+        def gem_deps( spec, options )
+          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
+            scope = dep.type == :development ? :test : nil
+            gem( scope, "rubygems:#{dep.name}:#{to_version( *versions )}" )
+          end
+        end
+
+        def other_deps( spec )
+          spec.requirements.each do |req|
+            req.sub!( /#.*^/, '' )
+            method = req.sub(/\s.*$/, '' ).to_sym
+            line = req.sub(/^[^\s]*\s/, '' )
+            send method, line
+          end
+        end
+
+        def maven_dependency( line )
+          coord = to_split_coordinate_with_scope( line )
+          if coord && coord.size > 1
+            DependencyDSL.create( @parent.current, nil, nil, *coord )
+          end
+        end
+      end
+    end
+  end
+end