ruby-maven 3.0.3.0.28.4.1 → 3.0.3.0.28.5

data/lib/ruby/maven/cucumber_steps.rb

@@ -0,0 +1,161 @@
+require 'fileutils'
+require 'ruby-maven'
+module Maven
+  class CucumberSteps
+
+    def initialize(options = {})
+      @options = {:ruby_version => RUBY_VERSION }
+      @options[:jruby_version] = JRUBY_VERSION if defined? JRUBY_VERSION
+        
+      @options.merge!(options || {})
+    end
+
+    def rmvn
+      @rmvn ||= Maven::RubyMaven.new
+    end
+
+    def copy_tests(tests)
+      FileUtils.mkdir_p(@app_directory)
+      FileUtils.cp_r(File.join('templates', "tests-#{tests}", "."), 
+                     File.join(@app_directory, 'test'),
+                     :remove_destination => true)
+    end
+
+    def copy_specs(specs)
+      FileUtils.mkdir_p(@app_directory)
+      FileUtils.cp_r(File.join('templates', "specs-#{specs}", "."), 
+                     File.join(@app_directory, 'spec'),
+                     :remove_destination => true)
+    end
+
+    def copy_files(files)
+      FileUtils.mkdir_p(@app_directory)
+      FileUtils.cp_r(File.join('templates', "files-#{files}", "."), 
+                     @app_directory,
+                     :remove_destination => true)
+    end
+
+    def create_rails_application(template)
+      name = template.sub(/.template$/, '')
+      @app_directory = File.join('target', name)
+      
+      # rails version from gemspec
+      gemspec = File.read(Dir.glob("*.gemspec")[0])
+      rails_version = gemspec.split("\n").detect { |l| l =~ /development_dep.*rails/ }.sub(/'$/, '').sub(/.*'/, '')
+      
+      rmvn.options['-Dplugin.version'] = @options[:plugin_version] if @options[:plugin_version]
+      rmvn.options['-Djruby.version'] = @options[:jruby_version] if @options[:jruby_version]
+       if @options[:ruby_version]
+         rversion = @options[:ruby_version] =~ /^1.8./ ? '--1.8': '--1.9'
+         rmvn.options['-Djruby.switches'] = rversion
+       end
+      
+      rmvn.options['-Drails.version'] = rails_version
+      rmvn.options['-Dgem.home'] = ENV['GEM_HOME']
+      rmvn.options['-Dgem.path'] = ENV['GEM_PATH']
+      rmvn.options['-o'] = nil
+      
+      FileUtils.rm_rf(@app_directory)
+      
+      template_file = File.expand_path("templates/#{template}")
+      rmvn.exec("rails", "new", @app_directory, "-f", '--', '-e', "-Dtemplate=#{template_file}")
+    end
+
+    def given_template(template)
+      create_rails_application(template)
+    end
+
+    def given_template_and_tests(template, tests)
+      create_rails_application(template)
+      copy_tests(tests)
+    end
+
+    def given_template_and_specs(template, specs)
+      create_rails_application(template)
+      copy_specs(specs)
+    end
+
+    def given_template_and_files(template, files)
+      create_rails_application(template)
+      copy_files(files)
+    end
+
+    def given_application(name)
+      @app_directory = File.join('target', name)
+    end
+
+    def given_application_and_tests(name, tests)
+      @app_directory = File.join('target', name)
+      copy_tests(tests)
+    end
+
+    def given_application_and_specs(name, specs)
+      @app_directory = File.join('target', name)
+      copy_specs(specs)
+    end
+
+    def given_application_and_files(name, files)
+      @app_directory = File.join('target', name)
+      copy_files(files)
+    end
+
+    def execute(args)
+      rmvn.options['-l'] = "output.log"
+      rmvn.exec_in(@app_directory, args.split(' '))
+    end
+      
+    def expected_output(expected)
+      result = File.read(File.join(@app_directory, "output.log"))
+      expected.split(/\"?\s+and\s+\"?/).each do |exp|
+        puts exp
+        yield(result =~ /.*#{exp}.*/)
+      end 
+    end
+  end
+end
+
+
+steps = Maven::CucumberSteps.new(:plugin_version => '0.28.5-SNAPSHOT')
+
+Given /^I create new rails application with template "(.*)"$/ do |template|
+  steps.given_template(template)
+end
+
+Given /^I create new rails application with template "(.*)" and "(.*)" tests$/ do |template, tests|
+  steps.given_template_and_tests(template, tests)
+end
+
+Given /^I create new rails application with template "(.*)" and "(.*)" specs$/ do |template, specs|
+  steps.given_template_and_specs(template, specs)
+end
+
+Given /^I create new rails application with template "(.*)" and "(.*)" files$/ do |template, files|
+  steps.given_template_and_files(template, files)
+end
+
+Given /^me an existing rails application "(.*)"$/ do |name|
+  steps.given_application(name)
+end
+
+Given /^me an existing rails application "(.*)" and "(.*)" tests$/ do |name, tests|
+  steps.given_application_and_tests(name, tests)
+end
+
+Given /^me an existing rails application "(.*)" and "(.*)" specs$/ do |name, specs|
+  steps.given_application_and_specs(name, specs)
+end
+
+Given /^me an existing rails application "(.*)" and "(.*)" files$/ do |name, files|
+  steps.given_application_and_files(name, files)
+end
+
+And /^I execute \"(.*)\"$/ do |args|
+  steps.execute(args)
+end
+
+Then /^the output should contain \"(.*)\"$/ do |expected|
+  steps.expected_output(expected) do |exp|
+    exp.should_not be_nil
+  end
+end
+

data/lib/ruby/maven/tools/gem_project.rb

@@ -46,9 +46,9 @@ module Maven
         else
           spec = ::Gem::Specification.load(specfile)
           loaded_files << File.expand_path(specfile)
+          @gemspec = specfile
         end
         raise "file not found '#{specfile}'" unless spec
-        @is_gemspec = loaded_files.size == 0
         artifact_id spec.name
         version spec.version
         name spec.summary || "#{self.artifact_id} - gem"
@@ -65,6 +65,7 @@ module Maven
         end
 
         config = {}
+        add_param(config, "gemspec", @gemspec) if loaded_files.size == 1
         add_param(config, "autorequire", spec.autorequire)
         add_param(config, "defaultExecutable", spec.default_executable)
         add_param(config, "testFiles", spec.test_files)
@@ -113,7 +114,8 @@ module Maven
             end
 
           versions = dep.requirement.requirements.collect do |req|
-            req.to_s
+            # use this construct to get the same result in 1.8.x and 1.9.x
+            req.collect{ |i| i.to_s }.join
           end
           gem(dep.name, versions).scope = scope
         end
@@ -173,22 +175,6 @@ module Maven
 
         repository("rubygems-prereleases").url = "http://rubygems-proxy.torquebox.org/prereleases" if has_prerelease && !repository("rubygems-prereleases").url
 
-        if !jar?("org.jruby:jruby-complete") && !jar?("org.jruby:jruby-core") && versions[:jruby_version]
-          minor = versions[:jruby_version].sub(/[0-9]*\./, '').sub(/\..*/, '')
-
-          #TODO once jruby-core pom is working !!!
-          if minor.to_i > 55 #TODO fix minor minimum version
-            jar("org.jruby:jruby-core", versions[:jruby_version])
-            jar("org.jruby:jruby-stdlib", versions[:jruby_version])
-            # override deps which works
-            jar("jline:jline", '0.9.94') if versions[:jruby_version] =~ /1.6.[1-2]/
-            jar("org.jruby.extras:jffi", '1.0.8', 'native') if versions[:jruby_version] =~ /1.6.[0-2]/
-            jar("org.jruby.extras:jaffl", '0.5.10') if versions[:jruby_version] =~ /1.6.[0-2]/
-          else
-            jar("org.jruby:jruby-complete", versions[:jruby_version]) 
-          end
-        end
-
         # TODO go through all plugins to find out any SNAPSHOT version !!
         if versions[:jruby_plugins] =~ /-SNAPSHOT$/ || properties['jruby.plugins.version'] =~ /-SNAPSHOT$/
           plugin_repository("sonatype-snapshots") do |nexus|
@@ -339,7 +325,7 @@ module Maven
             end
           end
         end
-        if dep && !@is_gemspec
+        if dep && !@gemspec
           project = self
           
           # first collect the missing deps it any

data/lib/ruby/maven/tools/pom_generator.rb

@@ -11,7 +11,8 @@ module Maven
         proj.to_xml
       end
 
-      def read_gemfile(filename, plugin_version = nil, jruby_version = nil)
+      # the dummy allows to have all three methods the same argument list
+      def read_gemfile(filename, plugin_version = nil, dummy = nil)
         dir = File.dirname(filename)
         proj = 
           if File.exists? File.join( dir, 'config', 'application.rb' )
@@ -21,16 +22,17 @@ module Maven
           end
         proj.load(filename.to_s)
         proj.load(File.join(File.dirname(filename.to_s), 'Mavenfile'))
-        proj.add_defaults(versions(plugin_version, jruby_version))
+        proj.add_defaults(versions(plugin_version, nil))
         proj.dump_loaded_file_list
         proj.to_xml
       end
 
-      def read_gemspec(filename, plugin_version = nil, jruby_version = nil)
+      # the dummy allows to have all three methods the same argument list
+      def read_gemspec(filename, plugin_version = nil, dummy = nil)
         proj = Maven::Tools::GemProject.new
         proj.load_gemspec(filename.to_s)
         proj.load(File.join(File.dirname(filename.to_s), 'Mavenfile'))
-        proj.add_defaults(versions(plugin_version, jruby_version))
+        proj.add_defaults(versions(plugin_version, nil))
         proj.dump_loaded_file_list
         proj.to_xml
       end

data/lib/ruby/maven/tools/rails_project.rb

@@ -28,6 +28,22 @@ module Maven
           versions[:jruby_rack] = '1.1.0.dev'
         end
 
+        if !jar?("org.jruby:jruby-complete") && !jar?("org.jruby:jruby-core") && versions[:jruby_version]
+          minor = versions[:jruby_version].sub(/[0-9]*\./, '').sub(/\..*/, '')
+
+          #TODO once jruby-core pom is working !!!
+          if minor.to_i > 55 #TODO fix minor minimum version
+            jar("org.jruby:jruby-core", versions[:jruby_version])
+            jar("org.jruby:jruby-stdlib", versions[:jruby_version])
+            # override deps which works
+            jar("jline:jline", '0.9.94') if versions[:jruby_version] =~ /1.6.[1-2]/
+            jar("org.jruby.extras:jffi", '1.0.8', 'native') if versions[:jruby_version] =~ /1.6.[0-2]/
+            jar("org.jruby.extras:jaffl", '0.5.10') if versions[:jruby_version] =~ /1.6.[0-2]/
+          else
+            jar("org.jruby:jruby-complete", versions[:jruby_version]) 
+          end
+        end
+
         jar("org.jruby.rack:jruby-rack", versions[:jruby_rack]) unless jar?("org.jruby.rack:jruby-rack")
 
         self.properties = {

data/lib/ruby/maven/tools/versions.rb

@@ -4,7 +4,7 @@
       :jetty_plugin => "7.5.1.v20110908",
       :jruby_rack => "1.0.10",
       :war_plugin => "2.1.1",
-      :jruby_plugins => "0.28.4",
+      :jruby_plugins => "0.28.5",
       :jruby_version => "1.6.4",
     }.freeze
   end

data/lib/ruby/ruby-maven.rb

@@ -0,0 +1 @@
+require 'ruby_maven'

data/lib/ruby/ruby_maven.rb

@@ -16,7 +16,7 @@ module Maven
       :cucumber => [:test],
       :rspec => [:test],
       :runit => [:test],
-      :bundler => [:install]
+      :bundler => [:install, :update]
     }
     ALIASES = {
       :ruby => :jruby, 
@@ -71,10 +71,11 @@ module Maven
           version = args.detect do |a|
             a =~ /^-Dplugin.version=/
           end
+          version ||= options['-Dplugin.version']
 
           if version
             args.delete(version)
-            version = version.sub(/^-Dplugin.version=/, ':')
+            version = ":" + version.sub(/^-Dplugin.version=/, '')
           end
           aa = if index = args.index("--")
                  args[(index + 1)..-1]
@@ -193,7 +194,8 @@ module Maven
       a = generate_pom(*a)
       puts a.join ' '
       if defined? JRUBY_VERSION
-        launch_jruby(a)
+        # TODO use a setup like maven_gemify from jruby to launch maven
+        launch_java(a)
       else
         launch_java(a)
       end

metadata

@@ -2,7 +2,7 @@
 name: ruby-maven
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.3.0.28.4.1
+  version: 3.0.3.0.28.5
 platform: ruby
 authors: 
   - mkristian
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 +05:30
+date: 2011-10-13 00:00:00 +05:30
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
   - lib/maven-aether-provider-3.0.3.jar
   - lib/plexus-component-annotations-1.5.5.jar
   - lib/wagon-http-shared-1.0-beta-7.jar
+  - lib/ruby-maven-3.0.3.0.28.5.jar
   - lib/maven-model-builder-3.0.3.jar
   - lib/maven-repository-metadata-3.0.3.jar
   - lib/maven-model-3.0.3.jar
@@ -86,6 +87,8 @@ files:
   - lib/plexus-sec-dispatcher-1.3.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