aslakhellesoy-warbler 0.9.12 → 0.9.13

data/History.txt

@@ -1,3 +1,7 @@
+== 0.9.13 (In Git)
+
+* Ability to set jruby_complete.jar in config/warbler.rb (Aslak Hellesøy)
+
 == 0.9.12
 
 * Allow framework auto-detection to be disabled. Set

data/generators/warble/templates/warble.rb

@@ -9,6 +9,10 @@ Warbler::Config.new do |config|
   # Application directories to be included in the webapp.
   config.dirs = %w(app config lib log vendor tmp)
 
+  # Sets the jruby_complete.jar to package with the war. Defaults
+  # to jruby_complete.jar inside your JRuby installation.
+  # config.jruby_complete_jar = path/to/jruby_complete.jar
+
   # Additional files/directories to include, above those in config.dirs
   # config.includes = FileList["db"]
 

data/lib/warbler/config.rb

@@ -17,6 +17,10 @@ module Warbler
     # Directory where files will be staged, defaults to tmp/war
     attr_accessor :staging_dir
 
+    # The jruby-complete.jar to package with the war. Defaults to
+    # jruby-complete.jar inside current JRuby if it exists.
+    attr_accessor :jruby_complete_jar
+
     # Directory where the war file will be written. Can be used to direct
     # Warbler to place your war file directly in your application server's
     # autodeploy directory. Defaults to the root of the Rails directory.
@@ -96,7 +100,8 @@ module Warbler
       @dirs        = TOP_DIRS.select {|d| File.directory?(d)}
       @includes    = FileList[]
       @excludes    = FileList[]
-      @java_libs   = FileList[jruby_jar,"#{warbler_home}/lib/*.jar"]
+      @java_libs   = FileList[]
+      @jruby_complete_jar = default_jruby_complete_jar
       @java_classes = FileList[]
       @gems        = Warbler::Gems.new
       @gem_dependencies = true
@@ -108,6 +113,19 @@ module Warbler
       @war_name    = File.basename(@rails_root)
       auto_detect_frameworks
       yield self if block_given?
+
+      unless File.file?(@jruby_complete_jar)
+      
+      raise %{
+Couldn't find #{@jruby_complete_jar} 
+Please do one of the following:
+
+* Set config.jruby_complete_jar in your config/warble.rb
+* Download a jruby-complete.jar and put it in your JRuby's lib dir (without version number)
+* If you are running warble with a non-JRuby interpreter - set JRUBY_HOME
+      }
+      end
+      @java_libs += FileList[@jruby_complete_jar,"#{warbler_home}/lib/*.jar"]
       @excludes += warbler_vendor_excludes(warbler_home)
       @excludes += FileList["**/*.log"] if @exclude_logs
       @excludes << @staging_dir
@@ -119,12 +137,10 @@ module Warbler
 
     private
     
-    def jruby_jar
+    def default_jruby_complete_jar
       jruby_home   = ENV["JRUBY_HOME"]
       libdir       = jruby_home ? File.join(jruby_home, 'lib') : ::Config::CONFIG['libdir']
-      jruby_jar    = File.join(libdir, 'jruby.jar')
-      raise "#{jruby_jar} does not exist. Define JRUBY_HOME or run with JRuby." unless File.file?(jruby_jar)
-      jruby_jar
+      jruby_jar    = File.join(libdir, "jruby-complete.jar")
     end
     
     def warbler_vendor_excludes(warbler_home)

data/lib/warbler/version.rb

@@ -5,5 +5,5 @@
 #++
 
 module Warbler
-  VERSION = "0.9.12"
+  VERSION = "0.9.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-warbler
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors: 
 - Nick Sieger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-13 00:00:00 -08:00
+date: 2009-01-23 00:00:00 -08:00
 default_executable: warble
 dependencies: 
 - !ruby/object:Gem::Dependency