ruby-maven 0.8.pre-java → 0.8.3.0.2-java

data/bin/jetty-run

@@ -1,5 +1,5 @@
 #!/usr/bin/env jruby
-if ARGV.size > 2 || ARGV[0] == "--help" || ARGV[0] == "-h"
+if ARGV.size > 4 || ARGV[0] == "--help" || ARGV[0] == "-h"
   puts "usage: #{File.basename($0)} [-e <environment>] [--war [warfile]]"
   puts "\tdefault environment: development"
   exit 1

data/bin/rmvn

@@ -20,7 +20,16 @@ classpath.split(":").each do |path|
 end
 
 # make the command line for the goals of the jruby-maven-plugins nicer
-plugins = {:rake => [:rake], :ruby => [:jruby, :compile], :gem => [:package, :install, :exec, :pom, :initialize], :gemify => [:gemify, :versions], :rails2 => [:new, :generate, :rake, :server, :console], :rails3 => [:new, :generate, :rake, :server, :console, :dbconsole, :pom], :cucumber => [:test], :rspec => [:test]}
+plugins = {
+  :rake => [:rake],
+  :ruby => [:jruby, :compile],
+  :gem => [:package, :install, :exec, :pom, :initialize, :irb],
+  :gemify => [:gemify, :versions],
+  :rails2 => [:new, :generate, :rake, :server, :console],
+  :rails3 => [:new, :generate, :rake, :server, :console, :dbconsole, :pom],
+  :cucumber => [:test],
+  :rspec => [:test]
+}
 aliases = {:jruby => :ruby, :spec => :rspec, :rails => :rails3}
 
 if ARGV.size > 0 
@@ -38,28 +47,45 @@ if ARGV.size > 0
     else
       goal = plugins[name][0]
     end
-    line = (ARGV[start, 1000] || []).join(' ')
-    args = ["de.saumya.mojo:#{ARGV[0]}-maven-plugin:#{goal}"]
-    args << "-Dargs=\"#{line}\"" if line.size > 0
-    ARGV.replace(args)
-  elsif name == :"--help"
-    ARGV.replace([name.to_s])
-    plugins.each do |name, goals|
-      print "plugin #{name}"
-      print " - alias: #{aliases[name]}" if aliases[name]
-      puts
-      if goals.size > 1
-        print "\tgoals       : #{goals.join(',')}"
-        puts
+    args = if index = ARGV.index("--")
+             ARGV[index + 1, 1000]
+           else
+             []
+           end
+    ruby_args = (ARGV[start, (index || 1000) - start] || []).join(' ')
+    version = ARGV.detect do |a|
+      if a =~ /^-Dplugin.version=/
+        a.sub(/^-Dplugin.version=/, '')
       end
-      print "\tdefault goal: #{goals[0]}"
-      puts
+    end
+    args << "de.saumya.mojo:#{name}-maven-plugin:#{version ? (version + ':'): ''}#{goal}"
+    args << "-Dargs=#{ruby_args}" if ruby_args.size > 0
+    ARGV.replace(args)
+  else
+    ARGV.delete("--")
+  end
+end
+if ARGV.size == 0 || ARGV[0] == "--help"
+  puts "usage: rmvn [<plugin name>|<plugin alias> [<args>] [-- <maven options>] | [<maven goal>|<maven phase> <maven options>] | --help"
+  ARGV.replace(["--help"])
+  plugins.each do |name, goals|
+    puts
+    print "plugin #{name}"
+    print " - alias: #{aliases[name]}" if aliases[name]
+    puts
+    if goals.size > 1
+      print "\tgoals       : #{goals.join(',')}"
       puts
     end
+    print "\tdefault goal: #{goals[0]}"
+    puts
   end
+  puts
 end
 
 print "maven commandline: "
-puts ARGV.join ' '
+args = ARGV.dup
+ARGV.clear # clean up in case another script gets executed with clean ARGV
+puts args.join ' '
 
-org.codehaus.plexus.classworlds.launcher.Launcher.main(ARGV)
+org.codehaus.plexus.classworlds.launcher.Launcher.main(args)

data/conf/settings.xml

@@ -43,7 +43,7 @@ under the License.
  | values (values used when the setting is not specified) are provided.
  |
  |-->
-<settings xmlns="http://maven.apache.org/settings/1.0.0" 
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" 
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
   <!-- localRepository

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-maven
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
     - 0
     - 8
-    - pre
-  version: 0.8.pre
+    - 3
+    - 0
+    - 2
+  version: 0.8.3.0.2
 platform: java
 authors: 
   - mkristian
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-14 00:00:00 +05:30
+date: 2011-03-14 00:00:00 +05:30
 default_executable: 
 dependencies: []
 
@@ -32,47 +34,47 @@ extra_rdoc_files:
   - README.txt
 files: 
   - README.txt
-  - LICENSE.txt
   - NOTICE.txt
+  - LICENSE.txt
   - bin/jetty-run
   - bin/rmvn
   - bin/m2.conf
-  - boot/plexus-classworlds-2.2.3.jar
+  - boot/plexus-classworlds-2.4.jar
   - conf/settings.xml
+  - lib/maven-repository-metadata-3.0.2.jar
+  - lib/maven-aether-provider-3.0.2.jar
+  - lib/pmaven-common-0.8-SNAPSHOT.jar
+  - lib/maven-compat-3.0.2.jar
+  - lib/plexus-sec-dispatcher-1.3.jar
+  - lib/aether-connector-wagon-1.9.jar
+  - lib/maven-settings-3.0.2.jar
   - lib/plexus-cipher-1.4.jar
-  - lib/maven-repository-metadata-3.0.jar
-  - lib/maven-embedder-3.0.jar
-  - lib/wagon-http-lightweight-1.0-beta-6.jar
-  - lib/maven-settings-3.0.jar
-  - lib/sisu-inject-plexus-1.4.2.jar
-  - lib/sisu-inject-bean-1.4.2.jar
-  - lib/aether-api-1.7.jar
-  - lib/pmaven-cli-0.8-SNAPSHOT.jar
-  - lib/maven-compat-3.0.jar
-  - lib/plexus-utils-2.0.4.jar
-  - lib/maven-plugin-api-3.0.jar
-  - lib/aether-util-1.7.jar
-  - lib/maven-aether-provider-3.0.jar
-  - lib/aether-connector-wagon-1.7.jar
+  - lib/wagon-file-1.0-beta-7.jar
+  - lib/aether-util-1.9.jar
+  - lib/aether-impl-1.9.jar
   - lib/nekohtml-1.9.6.2.jar
-  - lib/pmaven-common-0.8-SNAPSHOT.jar
-  - lib/wagon-provider-api-1.0-beta-6.jar
+  - lib/wagon-http-lightweight-1.0-beta-7.jar
+  - lib/maven-settings-builder-3.0.2.jar
+  - lib/maven-model-3.0.2.jar
+  - lib/pmaven-cli-0.8-SNAPSHOT.jar
+  - lib/maven-core-3.0.2.jar
+  - lib/maven-embedder-3.0.2.jar
+  - lib/aether-spi-1.9.jar
+  - lib/maven-model-builder-3.0.2.jar
+  - lib/sisu-guice-2.9.1-noaop.jar
+  - lib/maven-artifact-3.0.2.jar
+  - lib/commons-cli-1.2.jar
+  - lib/wagon-http-shared-1.0-beta-7.jar
   - lib/plexus-component-annotations-1.5.5.jar
-  - lib/plexus-interpolation-1.14.jar
+  - lib/sisu-inject-bean-1.4.3.1.jar
+  - lib/sisu-inject-plexus-1.4.3.1.jar
+  - lib/maven-plugin-api-3.0.2.jar
+  - lib/wagon-provider-api-1.0-beta-7.jar
   - lib/xercesMinimal-1.9.6.2.jar
-  - lib/maven-artifact-3.0.jar
-  - lib/wagon-file-1.0-beta-6.jar
-  - lib/maven-core-3.0.jar
-  - lib/wagon-http-shared-1.0-beta-6.jar
-  - lib/commons-cli-1.2.jar
-  - lib/aether-impl-1.7.jar
-  - lib/sisu-guice-2.1.7-noaop.jar
-  - lib/maven-model-builder-3.0.jar
-  - lib/maven-model-3.0.jar
-  - lib/plexus-sec-dispatcher-1.3.jar
-  - lib/maven-settings-builder-3.0.jar
-  - lib/aether-spi-1.7.jar
-  - ext/ruby-tools-0.3.jar
+  - lib/plexus-interpolation-1.14.jar
+  - lib/aether-api-1.9.jar
+  - lib/plexus-utils-2.0.4.jar
+  - ext/ruby-tools-0.25.0.jar
   - ext/pmaven-jruby-0.8-SNAPSHOT.jar
 has_rdoc: true
 homepage: http://github.com/sonatype/polyglot-maven