warbler 0.9.13 → 0.9.14

data/History.txt

@@ -1,3 +1,14 @@
+== 0.9.14
+
+* So, jruby-rack is bundled for one more release. 1.0 will not contain
+  any jar files, I promise!
+* Upgraded jruby-rack to 0.9.5.
+* Unbundled jruby-complete jar in favor of new jruby-jars gem, which
+  can be upgraded separately.
+* Skip gems which have no loaded_from attribute set
+  (this happened with the Authlogic gem on Edge Rails)
+  (thanks Laszlo Bacsi)
+
 == 0.9.13
 
 * RailsConf 2009 edition.

data/Manifest.txt

@@ -9,8 +9,7 @@ generators/warble
 generators/warble/templates
 generators/warble/templates/warble.rb
 generators/warble/warble_generator.rb
-lib/jruby-complete-1.3.0RC1.jar
-lib/jruby-rack-0.9.4.jar
+lib/jruby-rack-0.9.5.jar
 lib/warbler
 lib/warbler/config.rb
 lib/warbler/gems.rb

data/Rakefile

@@ -8,7 +8,8 @@ begin
   File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
   require 'hoe'
   require File.dirname(__FILE__) + '/lib/warbler/version'
-  hoe = Hoe.new("warbler", Warbler::VERSION) do |p|
+  hoe = Hoe.spec("warbler") do |p|
+    p.version = Warbler::VERSION
     p.rubyforge_name = "caldersphere"
     p.url = "http://caldersphere.rubyforge.org/warbler"
     p.author = "Nick Sieger"
@@ -16,7 +17,7 @@ begin
     p.summary = "Warbler chirpily constructs .war files of your Rails applications."
     p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
     p.description = p.paragraphs_of('README.txt', 1...2).join("\n\n")
-    p.extra_deps << ['rake', '>= 0.7.3']
+    p.extra_deps += [['rake', '>= 0.7.3'], ['jruby-jars', '>= 1.3.1']]
     p.test_globs = ["spec/**/*_spec.rb"]
   end
   hoe.spec.files = MANIFEST
@@ -33,11 +34,12 @@ end
 # Hoe insists on setting task :default => :test
 # !@#$ no easy way to empty the default list of prerequisites
 Rake::Task['default'].send :instance_variable_set, "@prerequisites", FileList[]
+Rake::Task['default'].send :instance_variable_set, "@actions", []
 
 if defined?(JRUBY_VERSION)
   task :default => :spec
 else
-  task :default => :rcov
+  task :default => :rcov_verify
 end
 
 Spec::Rake::SpecTask.new do |t|
@@ -47,15 +49,11 @@ end
 
 Spec::Rake::SpecTask.new("spec:rcov") do |t|
   t.rcov = true
-  t.rcov_opts << '--exclude gems/*'
 end
 
 # so we don't confuse autotest
-RCov::VerifyTask.new(:rcov) do |t|
+RCov::VerifyTask.new(:rcov_verify) do |t|
   t.threshold = 100
 end
 
-task "spec:rcov" do
-  rm_f "Manifest.txt"
-end
-task :rcov => "spec:rcov"
+task :rcov_verify => "spec:rcov"

data/lib/warbler/config.rb

@@ -1,5 +1,5 @@
 #--
-# (c) Copyright 2007-2008 Sun Microsystems, Inc.
+# (c) Copyright 2007-2009 Sun Microsystems, Inc.
 # See the file LICENSES.txt included with the distribution for
 # software license details.
 #++
@@ -91,11 +91,12 @@ module Warbler
     attr_accessor :webxml
 
     def initialize(warbler_home = WARBLER_HOME)
+      @warbler_home = warbler_home
       @staging_dir = File.join("tmp", "war")
       @dirs        = TOP_DIRS.select {|d| File.directory?(d)}
       @includes    = FileList[]
       @excludes    = FileList[]
-      @java_libs   = FileList["#{warbler_home}/lib/*.jar"]
+      @java_libs   = default_jar_files
       @java_classes = FileList[]
       @gems        = Warbler::Gems.new
       @gem_dependencies = true
@@ -146,6 +147,11 @@ module Warbler
       c
     end
 
+    def default_jar_files
+      require 'jruby-jars'
+      FileList["#{@warbler_home}/lib/*.jar", JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path]
+    end
+
     def auto_detect_frameworks
       !Warbler.framework_detection || auto_detect_rails || auto_detect_merb || auto_detect_rackup
     end

data/lib/warbler/task.rb

@@ -296,6 +296,9 @@ module Warbler
       fail "gem '#{gem}' not installed" if matched.empty?
       spec = matched.last
 
+      # skip gems with no load path
+      return if spec.loaded_from == ""
+
       gem_name = "#{spec.name}-#{spec.version}"
       unless spec.platform.nil? || spec.platform == Gem::Platform::RUBY
         [spec.platform, spec.original_platform].each do |p|

data/lib/warbler/version.rb

@@ -1,9 +1,9 @@
 #--
-# (c) Copyright 2007-2008 Sun Microsystems, Inc.
+# (c) Copyright 2007-2009 Sun Microsystems, Inc.
 # See the file LICENSES.txt included with the distribution for
 # software license details.
 #++
 
 module Warbler
-  VERSION = "0.9.13"
+  VERSION = "0.9.14"
 end

data/spec/warbler/task_spec.rb

@@ -165,7 +165,7 @@ describe Warbler::Task do
   it "should define a java_libs task for copying java libraries" do
     define_tasks "java_libs"
     Rake::Task["warble:java_libs"].invoke
-    file_list(%r{WEB-INF/lib/jruby-complete.*\.jar$}).should_not be_empty
+    file_list(%r{WEB-INF/lib/jruby-.*\.jar$}).should_not be_empty
   end
 
   it "should define an app task for copying application files" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warbler
 version: !ruby/object:Gem::Version 
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors: 
 - Nick Sieger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 -07:00
+date: 2009-08-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,21 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.3
     version: 
-description: Warbler is a gem to make a .war file out of a Rails, Merb, or Rack-based application. The intent is to provide a minimal, flexible, ruby-like way to bundle up all of your application files for deployment to a Java application server.
+- !ruby/object:Gem::Dependency 
+  name: jruby-jars
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+    version: 
+description: |-
+  Warbler is a gem to make a .war file out of a Rails, Merb, or Rack-based
+  application. The intent is to provide a minimal, flexible, ruby-like way to
+  bundle up all of your application files for deployment to a Java application
+  server.
 email: nick@nicksieger.com
 executables: 
 - warble
@@ -41,13 +55,9 @@ files:
 - Rakefile
 - web.xml.erb
 - bin/warble
-- generators/warble
-- generators/warble/templates
 - generators/warble/templates/warble.rb
 - generators/warble/warble_generator.rb
-- lib/jruby-complete-1.3.0RC1.jar
-- lib/jruby-rack-0.9.4.jar
-- lib/warbler
+- lib/jruby-rack-0.9.5.jar
 - lib/warbler/config.rb
 - lib/warbler/gems.rb
 - lib/warbler/task.rb
@@ -71,6 +81,8 @@ files:
 - tasks/warbler.rake
 has_rdoc: true
 homepage: http://caldersphere.rubyforge.org/warbler
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -92,9 +104,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Warbler chirpily constructs .war files of your Rails applications.
 test_files: 
 - spec/warbler/config_spec.rb