get rid of the org.jruby rake plugin - avoid target/classpath.rb generation

Author: kares

Rakefile

@@ -32,21 +32,19 @@ end
 
 directory 'target/classes'
 
-file 'target/classpath.rb' do
-  sh 'mvn org.jruby.plugins:jruby-rake-plugin:classpath -Djruby.classpath.scope=test'
-end
-GENERATED << 'target/classpath.rb'
-
 desc "Compile classes"
-task :compile => [:'target/classes'] do |t|
-  sh 'mvn compile'
-end
+task(:compile => 'target/classes') { sh 'mvn compile' }
 
 directory 'target/test-classes'
 
 desc "Compile test classes"
-task :test_compile => ['target/test-classes'] do |t|
-  sh 'mvn test-compile'
+task(:test_compile => 'target/test-classes') { sh 'mvn test-compile' }
+
+desc "Copy .jar dependencies for (local) testing"
+task(:test_jars) { sh 'mvn test-compile -P jars' }
+
+task(:test_prepare => ['target/classes', 'target/test-classes']) do
+  sh 'mvn compile test-compile -P jars'
 end
 
 desc "Unpack the rack gem"
@@ -104,7 +102,7 @@ namespace :resources do
   task :test => :test_resources
 end
 
-task :speconly => ['target/classpath.rb', :resources, :test_resources] do
+task :speconly => [ :resources, :test_resources ] do
   if ENV['SKIP_SPECS'].to_s == 'true'
     puts "Skipping specs due to SKIP_SPECS=#{ENV['SKIP_SPECS']}"
   else
@@ -117,7 +115,7 @@ task :speconly => ['target/classpath.rb', :resources, :test_resources] do
 end
 
 desc "Run specs"
-task :spec => [:compile, :test_compile, :speconly]
+task :spec => [:test_prepare, :speconly]
 task :test => :spec
 
 POM_FILE = 'pom.xml'
@@ -132,14 +130,6 @@ GEM_VERSION =
 
 JAR_VERSION = GEM_VERSION.sub(/\.(\D+\w*)/, '-\1') # 1.1.1.SNAPSHOT -> 1.1.1-SNAPSHOT
 
-desc "Print the (Maven) class-path"
-task :classpath => 'target/classpath.rb' do
-  require './target/classpath'
-  classpath = Maven.classpath
-  classpath = classpath.reject { |p| p =~ /target\/(test-)?classes$/ }
-  puts *classpath
-end
-
 file (target_jruby_rack = 'target/gem/lib/jruby-rack.rb') do |t|
   mkdir_p File.dirname(t.name)
   File.open(t.name, "wb") do |f|

pom.xml

@@ -132,36 +132,36 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.17</version>
-        <scope>provided</scope>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.17</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>3.1.4.RELEASE</version>
-        <scope>test</scope>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-core</artifactId>
+      <version>3.1.4.RELEASE</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 
   <build>
     <defaultGoal>install</defaultGoal>
     <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
     <resources>
-        <resource>
-            <directory>${basedir}/src/main/ruby</directory>
-        </resource>
-        <resource>
-            <directory>${basedir}/src/main/tld</directory>
-            <targetPath>META-INF</targetPath>
-        </resource>
+      <resource>
+        <directory>${basedir}/src/main/ruby</directory>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/main/tld</directory>
+        <targetPath>META-INF</targetPath>
+      </resource>
     </resources>
     <testSourceDirectory>${basedir}/src/spec/java</testSourceDirectory>
     <testResources>
-        <testResource>
-            <directory>${basedir}/src/spec/ruby</directory>
-        </testResource>
+      <testResource>
+        <directory>${basedir}/src/spec/ruby</directory>
+      </testResource>
     </testResources>
     <plugins>
       <plugin>
@@ -258,12 +258,6 @@
           </execution>
         </executions>
       </plugin>
-      <!--
-      <plugin>
-        <groupId>org.jruby</groupId>
-        <artifactId>jruby-rake-plugin</artifactId>
-        <version>${jruby.version}</version>
-      </plugin>-->
     </plugins>
     <extensions>
       <extension>
@@ -273,5 +267,33 @@
       </extension>
     </extensions>
   </build>
+
+  <profiles>
+    <profile>
+      <id>jars</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>2.8</version>
+            <executions>
+              <execution>
+                <phase>process-sources</phase>
+                <goals>
+                  <goal>copy-dependencies</goal>
+                </goals>
+                <configuration>
+                  <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                  <excludeGroupIds>org.jruby</excludeGroupIds>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
 

src/spec/ruby/spec_helper.rb

@@ -8,13 +8,12 @@
 require 'rspec'
 
 require 'java'
-begin
-  require File.expand_path('target/classpath.rb', File.dirname(__FILE__) + '/../../..')
-rescue LoadError => e
-  puts "classpath.rb script missing try running `rake clean compile` first"
-  raise e
-end unless defined?(Maven.set_classpath)
-Maven.set_classpath
+target = File.expand_path('target', "#{File.dirname(__FILE__)}/../../..")
+jars = File.exist?(lib = "#{target}/lib") && ( Dir.entries(lib) - [ '.', '..' ] )
+raise "missing .jar dependencies please run `rake test_jars'" if ! jars || jars.empty?
+$CLASSPATH << File.expand_path('classes', target)
+$CLASSPATH << File.expand_path('test-classes', target)
+jars.each { |jar| $CLASSPATH << File.expand_path(jar, lib) }
 
 # Java imports :
 java_import 'javax.servlet.ServletContext'