ruby-maven 3.0.3.0.29.0.pre → 3.0.4.0.29.0

data/lib/ext/README.txt

@@ -1,2 +1,2 @@
-Use this directory to contribute 3rd-party extensions to the Maven core. These extensions can either extend or override
-Maven's default implementation.
+Use this directory to contribute 3rd-party extensions to the Maven core. These extensions can either extend or override
+Maven's default implementation.

data/lib/ruby/ruby_maven.rb

@@ -10,12 +10,11 @@ module Maven
       :rake => [:rake],
       :jruby => [:jruby, :compile],
       :gem => [:package, :install, :push, :exec, :pom, :initialize, :irb],
-      :gemify => [:gemify, :versions],
-      :rails2 => [:new, :generate, :rake, :server, :console],
       :rails3 => [:new, :generate, :rake, :server, :console, :dbconsole, :pom, :initialize],
       :cucumber => [:test],
       :rspec => [:test],
       :runit => [:test],
+      :mini => [:test,:spec],
       :bundler => [:install, :update]
     }
     ALIASES = {
@@ -136,9 +135,9 @@ module Maven
     def options_array
       options.collect do |k,v|
         if k =~ /^-D/
-          v = "=#{v}" if v
+          v = "=#{v}" unless v.nil?
         else
-          v = " #{v}" if v
+          v = " #{v}" unless v.nil?
         end
         "#{k}#{v}"
       end
@@ -150,6 +149,10 @@ module Maven
       args
     end
 
+    def new_rails_project
+      Maven::Tools::RailsProject.new
+    end
+
     def generate_pom(*args)
       unless args.member?("-f") || args.member?("--file")
         gemfiles = Dir["*Gemfile"]
@@ -157,12 +160,12 @@ module Maven
         if gemfiles.size > 0
           proj =
             if File.exists? File.join( 'config', 'application.rb' )
-              Maven::Tools::RailsProject.new
+              new_rails_project
             else
               Maven::Tools::GemProject.new
             end
           filename = gemfiles[0]
-          proj.load(filename)
+          proj.load_gemfile(filename)
         else
           gemspecs = Dir["*.gemspec"]
           gemspecs.delete_if {|g| g =~ /.pom/}
@@ -173,9 +176,12 @@ module Maven
           end
         end
         if filename
-          proj.load(File.join(File.dirname(filename), 'Mavenfile'))
+          proj.load_jarfile(File.join(File.dirname(filename), 'Jarfile'))
+          proj.load_gemfile(File.join(File.dirname(filename), 'Mavenfile'))
           proj.add_defaults
-          pom = filename + ".pom"
+          #target = File.join(File.dirname(filename), 'target')
+          #FileUtils.mkdir_p target
+          pom = ".pom.xml"
           File.open(pom, 'w') do |f|
             f.puts proj.to_xml
           end
@@ -194,7 +200,7 @@ module Maven
       a << options_array
       a.flatten!
       a = generate_pom(*a) unless no_pom
-      puts a.join ' ' if verbose
+      puts "mvn #{a.join(' ')}" if verbose
       if defined? JRUBY_VERSION
         # TODO use a setup like maven_gemify from jruby to launch maven
         launch_java(a)
@@ -204,8 +210,17 @@ module Maven
     end
 
     def exec_in(launchdirectory, *args)
+      succeeded = nil
       FileUtils.cd(launchdirectory) do
-        exec(args)
+        succeeded = exec(args)
+      end
+      succeeded
+    end
+
+    def dump_pom(force = false, file = 'pom.xml')
+      if force || !File.exists?(file)
+        generate_pom
+        FileUtils.cp(".pom.xml", file)
       end
     end
   end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-maven
 version: !ruby/object:Gem::Version 
-  prerelease: 13
-  version: 3.0.3.0.29.0.pre
+  prerelease: 
+  version: 3.0.4.0.29.0
 platform: ruby
 authors: 
   - mkristian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-17 00:00:00 Z
+date: 2012-06-13 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: thor
@@ -23,13 +23,22 @@ dependencies:
             version: 0.14.6
     type: :runtime
     version_requirements: *id001
-description: maven support for rubygems based on maven 3.0. it allows to use xyz.gemspec file as pom file or the usual pom.xml files. with a rails3 application with a Gemfile (suitable for jruby) you can run jetty as development server. this gem is a stripped polyglot-maven which includes only the jruby part. the executable runs only with jruby.
+  - !ruby/object:Gem::Dependency 
+    name: maven-tools
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.29.1
+    type: :runtime
+    version_requirements: *id002
+description: maven support for rubygems based on maven 3.0. it allows to use xyz.gemspec file as pom file or the usual pom.xml files. with a rails3 application with a Gemfile (suitable for jruby). you need java installed or jruby but it will run with MRI (without installed jruby) since the maven will take care of the jruby to use.
 email: 
   - m.kristian@web.de
 executables: 
   - rmvn
-  - gwt
-  - jetty-run
 extensions: []
 
 extra_rdoc_files: 
@@ -40,9 +49,6 @@ files:
   - LICENSE.txt
   - NOTICE.txt
   - README.txt
-  - bin/gwt
-  - bin/tomcat-run
-  - bin/jetty-run
   - bin/mvnDebug.bat
   - bin/mvn
   - bin/mvn.bat
@@ -52,51 +58,39 @@ files:
   - bin/m2.conf
   - boot/plexus-classworlds-2.4.jar
   - conf/settings.xml
-  - lib/plexus-cipher-1.4.jar
-  - lib/maven-core-3.0.3.jar
-  - lib/aether-util-1.11.jar
-  - lib/maven-settings-builder-3.0.3.jar
-  - lib/wagon-provider-api-1.0-beta-7.jar
-  - lib/ruby-maven-3.0.3.0.29.0.pre.jar
-  - lib/maven-settings-3.0.3.jar
-  - lib/maven-embedder-3.0.3.jar
-  - lib/maven-aether-provider-3.0.3.jar
+  - lib/maven-settings-3.0.4.jar
+  - lib/sisu-guava-0.9.9.jar
+  - lib/wagon-http-2.2-shaded.jar
+  - lib/aether-api-1.13.1.jar
   - lib/plexus-component-annotations-1.5.5.jar
-  - lib/wagon-http-shared-1.0-beta-7.jar
-  - lib/maven-model-builder-3.0.3.jar
-  - lib/maven-repository-metadata-3.0.3.jar
-  - lib/maven-model-3.0.3.jar
-  - lib/aether-spi-1.11.jar
-  - lib/wagon-file-1.0-beta-7.jar
+  - lib/aether-spi-1.13.1.jar
+  - lib/maven-repository-metadata-3.0.4.jar
+  - lib/maven-compat-3.0.4.jar
+  - lib/maven-core-3.0.4.jar
+  - lib/aether-impl-1.13.1.jar
+  - lib/plexus-cipher-1.7.jar
   - lib/plexus-utils-2.0.6.jar
-  - lib/aether-connector-wagon-1.11.jar
-  - lib/aether-impl-1.11.jar
-  - lib/nekohtml-1.9.6.2.jar
-  - lib/sisu-inject-plexus-2.1.1.jar
+  - lib/maven-artifact-3.0.4.jar
+  - lib/maven-model-builder-3.0.4.jar
+  - lib/sisu-inject-bean-2.3.0.jar
+  - lib/maven-aether-provider-3.0.4.jar
+  - lib/wagon-provider-api-2.2.jar
+  - lib/maven-settings-builder-3.0.4.jar
+  - lib/maven-model-3.0.4.jar
+  - lib/maven-plugin-api-3.0.4.jar
   - lib/plexus-interpolation-1.14.jar
-  - lib/maven-plugin-api-3.0.3.jar
-  - lib/wagon-http-lightweight-1.0-beta-7.jar
-  - lib/aether-api-1.11.jar
-  - lib/sisu-guice-2.9.4-no_aop.jar
-  - lib/maven-artifact-3.0.3.jar
-  - lib/maven-compat-3.0.3.jar
+  - lib/aether-connector-wagon-1.13.1.jar
+  - lib/wagon-file-2.2.jar
+  - lib/aether-util-1.13.1.jar
+  - lib/maven-embedder-3.0.4.jar
   - lib/commons-cli-1.2.jar
-  - lib/xercesMinimal-1.9.6.2.jar
-  - lib/sisu-inject-bean-2.1.1.jar
+  - lib/sisu-guice-3.1.0-no_aop.jar
   - lib/plexus-sec-dispatcher-1.3.jar
+  - lib/sisu-inject-plexus-2.3.0.jar
   - lib/ext/README.txt
   - lib/ruby/ruby_maven.rb
   - lib/ruby/ruby-maven.rb
   - lib/ruby/maven/cucumber_steps.rb
-  - lib/ruby/maven/tools/execute_in_phase.rb
-  - lib/ruby/maven/tools/rails_project.rb
-  - lib/ruby/maven/tools/gem_project.rb
-  - lib/ruby/maven/tools/pom_generator.rb
-  - lib/ruby/maven/tools/gemfile_lock.rb
-  - lib/ruby/maven/tools/versions.rb
-  - lib/ruby/maven/model/model_utils.rb
-  - lib/ruby/maven/model/model.rb
-  - lib/ruby/maven/model/dependencies.rb
 homepage: http://github.com/mkristian/ruby-maven
 licenses: []
 
@@ -121,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: maven support for ruby projects with gemspec, Gemfile

data/bin/gwt

@@ -1,59 +0,0 @@
-#!/usr/bin/env ruby
-require 'ruby_maven'
-require 'thor'
-
-class GWTCommand < Thor
-  no_tasks do
-    def mvn
-      @mvn ||= Maven::RubyMaven.new
-    end
-    
-    def exec(*args)
-      ARGV.clear # clean up in case another script gets executed
-      print "maven commandline: "
-      mvn.exec(args)
-    end
-  end
-
-  desc "new APP_PATH GWT_PACKAGE_NAME [rails-options] [-- maven-options]", "create a new rails application with GWT UI given the path of the application and its package for the new GWT module"
-  method_option :session, :type => :boolean, :default => false, :desc => 'adds session support'
-  method_option :menu, :type => :boolean, :default => false, :desc => 'adds menu support'
-  def new(app_path, gwt_package, *args)
-    args = ARGV.dup
-    args.delete('new')
-    args.delete(app_path)
-    args.delete(gwt_package)
-    args.delete_if {|a| a =~ /^--session|^--menu/ }
-    if i = args.index("--")
-      maven_args = args[i..-1]
-      args = i == 0 ? [] : args[0..(i-1)]
-    end
-    margs = ["rails3:new", "-Dargs=\"#{[app_path, args].flatten!.join ' '}\"", "-Dgwt.package=#{gwt_package}", "-Dgwt.session=#{options['session'] || false}", "-Dgwt.menu=#{options['menu'] || false}", maven_args || []].flatten!
-    exec(margs)
-  end
-
-  def help(*args)
-    super
-    exec ["rails3:new", "-Dargs=--help"] if File.exists?('Gemfile')
-  end
-
-  desc "run [maven_options]", "starts the GWT development shell"
-  def server(*args)
-    args = ARGV.dup
-    args.delete('server')
-
-    exec ["gwt:run", args].flatten!
-  end
-
-  desc "compile [maven_options]", "compiles the gwt java code to javascript"
-  def compile(*args)
-    args = ARGV.dup
-    args.delete('compile')
-
-    exec ["compile", "gwt:compile", args].flatten!
-  end
-end
-if ARGV[0] == 'run'
-  ARGV[0] = 'server'
-end
-GWTCommand.start

data/bin/jetty-run

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-if ARGV.size > 4 || ARGV[0] == "--help" || ARGV[0] == "-h" || ARGV[0] == "-?"
-  puts "usage: #{File.basename($0)} [-e <environment>] [--war [<path/to/warfile>]]"
-  puts "\tdefault environment: development"
-  exit 1
-end
-
-args = [__FILE__.gsub(/-/, ':').gsub(/.*[\/\\]/, '')]
-if ARGV.size == 2 && ARGV[0] == "-e"
-  args << "-Drails.env=#{ARGV[1]}"
-  args << "-Prun"
-elsif ARGV.size == 1 && ARGV[0] == "--war"
-  args = ["jetty:run-war", "-Pwar"]
-elsif ARGV.size == 2 && ARGV[0] == "--war"
-  args = ["jetty:deploy-war", "-DwebApp=#{ARGV[1]}", "-Pwar"]
-elsif ARGV.size == 3 && ARGV[0] == "-e" && ARGV[2] == "--war"
-   args = ["jetty:run-war", "-Pwar", "-Drails.env=#{ARGV[1]}"]
-elsif ARGV.size == 3 && ARGV[1] == "-e" && ARGV[0] == "--war"
-   args = ["jetty:run-war", "-Pwar", "-Drails.env=#{ARGV[2]}"]
-elsif ARGV.size == 4 && ARGV[0] == "-e" && ARGV[2] == "--war"
-   args = ["jetty:deploy-war", "-Pwar",  "-DwebApp=#{ARGV[3]}", "-Drails.env=#{ARGV[1]}"]
-elsif ARGV.size == 4 && ARGV[2] == "-e" && ARGV[0] == "--war"
-   args = ["jetty:deploy-war", "-Pwar",  "-DwebApp=#{ARGV[1]}", "-Drails.env=#{ARGV[3]}"]
-end
-ARGV.replace(args)
-load File.join(File.dirname(__FILE__), "rmvn")

data/bin/tomcat-run

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-if ARGV.size > 4 || ARGV[0] == "--help" || ARGV[0] == "-h" || ARGV[0] == "-?"
-  puts "usage: #{File.basename($0)} [-e <environment>] [--war [<path/to/warfile>]]"
-  puts "\tdefault environment: development"
-  exit 1
-end
-
-args = [__FILE__.gsub(/-/, ':').gsub(/.*[\/\\]/, '')]
-if ARGV.size == 2 && ARGV[0] == "-e"
-  args << "-Drails.env=#{ARGV[1]}"
-  args << "-Prun"
-elsif ARGV.size == 1 && ARGV[0] == "--war"
-  args = ["jetty:run-war", "-Pwar"]
-elsif ARGV.size == 2 && ARGV[0] == "--war"
-  args = ["jetty:deploy-war", "-DwebApp=#{ARGV[1]}", "-Pwar"]
-elsif ARGV.size == 3 && ARGV[0] == "-e" && ARGV[2] == "--war"
-   args = ["jetty:run-war", "-Pwar", "-Drails.env=#{ARGV[1]}"]
-elsif ARGV.size == 3 && ARGV[1] == "-e" && ARGV[0] == "--war"
-   args = ["jetty:run-war", "-Pwar", "-Drails.env=#{ARGV[2]}"]
-elsif ARGV.size == 4 && ARGV[0] == "-e" && ARGV[2] == "--war"
-   args = ["jetty:deploy-war", "-Pwar",  "-DwebApp=#{ARGV[3]}", "-Drails.env=#{ARGV[1]}"]
-elsif ARGV.size == 4 && ARGV[2] == "-e" && ARGV[0] == "--war"
-   args = ["jetty:deploy-war", "-Pwar",  "-DwebApp=#{ARGV[1]}", "-Drails.env=#{ARGV[3]}"]
-end
-ARGV.replace(args)
-load File.join(File.dirname(__FILE__), "rmvn")

data/lib/ruby/maven/model/dependencies.rb

@@ -1,281 +0,0 @@
-require File.join(File.dirname(__FILE__), 'model_utils.rb')
-
-module Maven
-  module Model
-
-    class DependencyArray < Array
-      def <<(dep)
-        raise "not of type Dependency" unless dep.is_a?(Dependency)
-        d = detect { |item| item == dep }
-        if d
-          d.version = dep.version
-          self
-        else
-          super
-        end
-      end
-      alias :push :<<
-    end
-
-    class ExclusionArray < Array
-      def <<(*dep)
-        excl = dep[0].is_a?(Exclusion) ? dep[0]: Exclusion.new(*dep.flatten)
-        delete_if { |item| item == excl }
-        super excl
-      end
-      alias :push :<<
-    end
-
-    class Coordinate < Tag
-      tags :group_id, :artifact_id, :version
-      def initialize(*args)
-        @group_id, @artifact_id, @version = *coordinate(*args.flatten)
-      end
-
-      def hash
-        "#{group_id}:#{artifact_id}".hash
-      end
-
-      def ==(other)
-        group_id == other.group_id && artifact_id == other.artifact_id
-      end
-      alias :eql? :==
-
-      private
-
-      def coordinate(*args)
-        if args[0] =~ /:/
-          [args[0].sub(/:[^:]+$/, ''), args[0].sub(/.*:/, ''), convert_version(*args[1, 2])]
-        else
-          [args[0], args[1], convert_version(*args[2,3])]
-        end
-      end
-
-      def convert_version(*args)
-        if args.size == 0
-          nil
-        else
-          low, high = convert(args[0])
-          low, high = convert(args[1], low, high) if args[1] =~ /[=~><]/
-          if low == high
-            low
-          else
-            "#{low || '[0.0.0'},#{high || ')'}"
-          end
-        end
-      end
-
-      def convert(arg, low = nil, high = nil)
-        if arg =~ /~>/
-          val = arg.sub(/~>\s*/, '')
-          last = val.sub(/\.[^.]+$/, '.99999')
-          ["[#{val}", "#{last}]"]
-        elsif arg =~ />=/
-          val = arg.sub(/>=\s*/, '')
-          ["[#{val}", (nil || high)]
-        elsif arg =~ /<=/
-          val = arg.sub(/<=\s*/, '')
-          [(nil || low), "#{val}]"]
-        # treat '!' the same way as '>' since maven can not describe such range
-        elsif arg =~ /[!>]/  
-          val = arg.sub(/>\s*/, '')
-          ["(#{val}", (nil || high)]
-        elsif arg =~ /</
-          val = arg.sub(/<\s*/, '')
-          [(nil || low), "#{val})"]
-        elsif arg =~ /\=/
-          val = arg.sub(/=\s*/, '')
-          [val, val]
-        else
-          [arg, arg]
-        end
-      end
-    end
-
-    class Parent < Coordinate
-      tags :relative_path
-
-    end
-
-    class Exclusion < Tag
-      tags :group_id, :artifact_id
-      def initialize(*args)
-        @group_id, @artifact_id = *coordinate(*args)
-      end
-
-      def hash
-        "#{group_id}:#{artifact_id}".hash
-      end
-
-      def ==(other)
-        group_id == other.group_id && artifact_id == other.artifact_id
-      end
-      alias :eql? :==
-
-      private
-      
-      def coordinate(*args)
-        case args.size
-        when 1
-          name = args[0].sub(/^mvn:/, '')
-          if name =~ /:/
-            [name.sub(/:[^:]+$/, ''), name.sub(/.*:/, '')]
-          else
-            ["rubygems", name]
-          end
-        else
-          [args[0], args[1]]
-        end
-      end
-    end
-
-    class Dependency < Coordinate
-      tags :type, :scope, :classifier, :exclusions
-      def initialize(type, *args)
-        super(*args)
-        @type = type
-        args.flatten!
-        if args[0] =~ /:/ && args.size == 3
-          @classifier = args[2] unless args[2] =~ /[=~><]/
-        elsif args.size == 4
-          @classifier = args[3] unless args[3] =~ /[=~><]/
-        end
-      end
-
-      def hash
-        "#{group_id}:#{artifact_id}:#{@type}:#{@classifier}".hash
-      end
-
-      def ==(other)
-        super && @type == other.instance_variable_get(:@type) && @classifier == other.instance_variable_get(:@classifier)
-      end
-      alias :eql? :==
-
-      def self.new_gem(gemname, *args)
-        if gemname =~ /^mvn:/
-          new(:maven_gem, gemname.sub(/^mvn:/, ''), *args)
-        else
-          new(:gem, "rubygems", gemname, *args)
-        end
-      end
-
-      def self.new_maven_gem(gemname, *args)
-        new(:maven_gem, gemname.sub(/^mvn:/, ''), *args)
-      end
-
-      def self.new_jar(*args)
-        new(:jar, *args)
-      end
-
-      def self.new_test_jar(*args)
-        result = new(:jar, *args)
-        result.scope :test
-        result
-      end
-
-      def exclusions(&block)
-        @exclusions ||= ExclusionArray.new
-        if block
-          block.call(@exclusions)
-        end
-        @exclusions
-      end
-
-      def exclude(*args)
-        exclusions << args
-      end
-    end
-
-    module Dependencies
-    
-      def self.included(parent)
-        parent.tags :dependencies
-      end
-
-      def jar?(*args)
-        dependencies.member?(Dependency.new(:jar, *args))
-      end
-
-      def test_jar?(*args)
-        dependencies.member?(Dependency.new_test_jar(*args))
-      end
-
-      def gem?(*args)
-        dependencies.member?(Dependency.new(:gem, ['rubygems', *args].flatten))
-      end
-
-      def detect_gem(name)
-        dependencies.detect { |d| d.type.to_sym == :gem && d.artifact_id == name }
-      end
-
-      def maven_gem?(*args)
-        dependencies.member?(Dependency.new_maven_gem(*args))
-      end
-
-      def dependencies(&block)
-        @dependencies ||= DependencyArray.new
-        if block
-          block.call(self)
-        end
-        @dependencies
-      end
-
-      def add_dependency(dep, has_version = true, &block)
-        d = dependencies.detect { |d| d == dep }
-        if d
-          if has_version
-            d.version = dep.version
-          end
-          dep = d
-        else
-          dependencies << dep
-        end
-        block.call(dep) if block
-        dep
-      end
-      private :add_dependency
-
-      def add_gem(*args, &block)
-        args = args.flatten
-        if args.size == 1
-          dep = Dependency.new_gem(*args)
-          dep = dependencies.detect { |d| d == dep }
-          if dep
-            return dep
-          end
-          args[1] = ">= 0.0.0"
-        end
-        add_dependency(Dependency.new_gem(*args), &block)
-      end
-      private :add_gem
-
-      def jar(*args, &block)
-        if args.last.is_a?(Hash)
-          raise "hash not allowed for jar"
-        end
-        add_dependency(Dependency.new_jar(args), args.size > 1, &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)
-      end
-      
-      def gem(*args, &block)
-        if args.last.is_a?(Hash)
-          raise "hash not allowed in that context"
-        end
-        add_gem(args, &block)
-      end
-
-      def maven_gem(*args, &block)
-        if args.last.is_a?(Hash)
-          raise "hash not allowed in that context"
-        end
-        add_dependency(Dependency.new_maven_gem(args), args.size > 1, &block)
-      end
-    end
-  end
-end