nicksieger-warbler 0.9.12 → 0.9.13

data/History.txt

@@ -1,3 +1,11 @@
+== 0.9.13
+
+* RailsConf 2009 edition.
+* Only bundled JRuby and JRuby-Rack upgrades. Bug fixes will have to come in 0.9.14.
+* This should also be the last release with bundled JRuby and JRuby-Rack.
+* Upgrade to JRuby 1.3.0RC1 and JRuby-Rack 0.9.4. The latter allows 
+  Rails 2.3 to work with Warbler.
+
 == 0.9.12
 
 * Allow framework auto-detection to be disabled. Set

data/Manifest.txt

@@ -0,0 +1,35 @@
+History.txt
+Manifest.txt
+README.txt
+LICENSES.txt
+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/warbler/config.rb
+lib/warbler/gems.rb
+lib/warbler/task.rb
+lib/warbler/version.rb
+lib/warbler.rb
+spec/sample/app/controllers/application.rb
+spec/sample/app/helpers/application_helper.rb
+spec/sample/config/boot.rb
+spec/sample/config/environment.rb
+spec/sample/config/environments/development.rb
+spec/sample/config/environments/production.rb
+spec/sample/config/environments/test.rb
+spec/sample/config/initializers/inflections.rb
+spec/sample/config/initializers/mime_types.rb
+spec/sample/config/initializers/new_rails_defaults.rb
+spec/sample/config/routes.rb
+spec/spec_helper.rb
+spec/warbler/config_spec.rb
+spec/warbler/gems_spec.rb
+spec/warbler/task_spec.rb
+tasks/warbler.rake

data/README.txt

@@ -26,19 +26,19 @@ Warbler's +warble+ command is just a small wrapper around Rake with internally
 defined tasks. (Notice "rake" still prints out in the message, but you should
 substitute "warble" for "rake" on the command line when running this way.)
 
-    $ warble -T
-    rake config         # Generate a configuration file to customize your war assembly
-    rake pluginize      # Unpack warbler as a plugin in your Rails application
-    rake war            # Create trunk.war
-    rake war:app        # Copy all application files into the .war
-    rake war:clean      # Clean up the .war file and the staging area
-    rake war:gems       # Unpack all gems into WEB-INF/gems
-    rake war:jar        # Run the jar command to create the .war
-    rake war:java_libs  # Copy all java libraries into the .war
-    rake war:public     # Copy all public HTML files to the root of the .war
-    rake war:webxml     # Generate a web.xml file for the webapp
-
-Warble makes heavy use of Rake's file and directory tasks, so only recently
+   $ warble -T
+   rake config         # Generate a configuration file to customize your war assembly
+   rake pluginize      # Unpack warbler as a plugin in your Rails application
+   rake war            # Create trunk.war
+   rake war:app        # Copy all application files into the .war
+   rake war:clean      # Clean up the .war file and the staging area
+   rake war:gems       # Unpack all gems into WEB-INF/gems
+   rake war:jar        # Run the jar command to create the .war
+   rake war:java_libs  # Copy all java libraries into the .war
+   rake war:public     # Copy all public HTML files to the root of the .war
+   rake war:webxml     # Generate a web.xml file for the webapp
+
+Warbler makes heavy use of Rake's file and directory tasks, so only recently
 updated files will be copied, making repeated assemblies much faster.
 
 == Configuration
@@ -49,10 +49,10 @@ Rails applications are detected automatically and configured appropriately.
 The following items are set up for you:
 
 * The Rails gem is packaged if you haven't vendored Rails.
-* Other gems configured in Rails.configuration.gems are packaged (Rails 2.1 or
-  later)
-* Multi-thread-safe execution (as introduced in Rails 2.2) is detected and
-  runtime pooling is disabled.
+* Other gems configured in Rails.configuration.gems are packaged
+  (Rails 2.1 or later)
+* Multi-thread-safe execution (as introduced in Rails 2.2) is detected
+  and runtime pooling is disabled.
 
 === Merb applications
 
@@ -66,20 +66,22 @@ contents will be used as the rackup script for your Rack-based application.
 You will probably need to specify framework and application gems in
 config/warble.rb.
 
-See http://github.com/nicksieger/jruby-rack/tree/master/examples for examples
+See <a href="http://jruby-rack.kenai.com/sources/main/show/examples">the examples in the jruby-rack project</a>
 of how to configure Warbler to package Camping and Sinatra apps.
 
 === Configuration auto-detect notes
 
-* If you don't have database access in the environment where you package your
-  application, you may wish to set `Warbler.framework_detection` to false at
-  the top of config.rb. In this case you may need to specify additional
-  details such as booter, gems and other settings.
-* A more accurate way of detecting a Merb application's gems is needed. Until
-  then, you will have to specify them in config/warble.rb. See below.
-* Is it possible to more generally detect what gems an application uses?
-  Gem.loaded_specs is available, but the application needs to be loaded first
-  before its contents are reliable.
+* If you don't have database access in the environment where you
+  package your application, you may wish to set
+  `Warbler.framework_detection` to false at the top of config.rb. In
+  this case you may need to specify additional details such as booter,
+  gems and other settings.
+* A more accurate way of detecting a Merb application's gems is
+  needed. Until then, you will have to specify them in
+  config/warble.rb. See below.
+* Is it possible to more generally detect what gems an application
+  uses? Gem.loaded_specs is available, but the application needs to be
+  loaded first before its contents are reliable.
 
 === Custom configuration
 
@@ -98,7 +100,7 @@ doing this. With the gem, simply run
 
 If you have Warbler installed as a plugin, use the generator:
 
-    script/generate warble
+ script/generate warble
 
 Finally, edit the config/warble.rb to your taste. If you install the gem but
 later decide you'd like to have it as a plugin, use the +pluginize+ command:
@@ -122,16 +124,17 @@ Java web applications are configured mainly through this file, and Warbler
 creates a suitable default file for you for use. However, if you need to
 customize it in any way, you have two options.
 
-1. If you just want a static web.xml file whose contents you manually control,
-   you may copy the one generated for you in <tt>tmp/war/WEB-INF/web.xml</tt>
-   to <tt>config/web.xml</tt> and modify as needed. It will be copied into the
-   webapp for you.
-2. If you want to inject some dynamic information into the file, copy the
-   <tt>WARBLER_HOME/web.xml.erb</tt> to <tt>config/web.xml.erb</tt>. Its
-   contents will be evaluated for you and put in the webapp. Note that you can
-   also pass arbitrary properties to the ERb template by setting
-   <tt>config.webxml.customkey</tt> values in your <tt>config/warble.rb</tt>
-   file.
+1. If you just want a static web.xml file whose contents you manually
+   control, you may copy the one generated for you in
+   <tt>tmp/war/WEB-INF/web.xml</tt> to <tt>config/web.xml</tt> and
+   modify as needed. It will be copied into the webapp for you.
+2. If you want to inject some dynamic information into the file, copy
+   the <tt>WARBLER_HOME/web.xml.erb</tt> to
+   <tt>config/web.xml.erb</tt>. Its contents will be evaluated for you
+   and put in the webapp. Note that you can also pass arbitrary
+   properties to the ERb template by setting
+   <tt>config.webxml.customkey</tt> values in your
+   <tt>config/warble.rb</tt> file.
 
 For more information on configuration, see Warbler::Config.
 
@@ -141,17 +144,17 @@ If Warbler isn't packaging the files you were expecting, there are several
 debug tasks available to give you more insight into what's going on.
 
 * <tt>war:debug</tt> prints a YAML dump of the current configuration
-* <tt>war:debug:X</tt> prints a list of files that Warbler will include during
-  that stage of assembly. Valid values of <tt>X</tt> are <tt>app, java_libs,
-  gems, public, includes, excludes</tt>.
+* <tt>war:debug:X</tt> prints a list of files that Warbler will
+  include during that stage of assembly. Valid values of <tt>X</tt>
+  are <tt>app, java_libs, gems, public, includes, excludes</tt>.
 
 == Source
 
 You can get the Warbler source using Git, in any of the following ways:
 
-    git clone git://git.caldersphere.net/warbler.git
-    git clone http://git.caldersphere.net/warbler.git
-    git clone git://github.com/nicksieger/warbler.git
+   git clone git://kenai.com/warbler~main
+   git clone git://git.caldersphere.net/warbler.git
+   git clone git://github.com/nicksieger/warbler.git
 
 You can also download a tarball of Warbler source at
 http://github.com/nicksieger/warbler/tree/master.
@@ -160,8 +163,8 @@ http://github.com/nicksieger/warbler/tree/master.
 
 Warbler is provided under the terms of the MIT license.
 
-    Warbler (c) 2007-08 Sun Microsystems, Inc.
+Warbler (c) 2007-2009 Sun Microsystems, Inc.
 
-Warbler also bundles several other pieces of software for convenience. Please
-read the file LICENSES.txt to ensure that you agree with the terms of all the
-components.
+Warbler also bundles several other pieces of software for convenience.
+Please read the file LICENSES.txt to ensure that you agree with the
+terms of all the components.

data/Rakefile

@@ -8,17 +8,17 @@ 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"
     p.email = "nick@nicksieger.com"
     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', 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.test_globs = ["spec/**/*_spec.rb"]
-    p.rdoc_pattern = /\.(rb|txt)/
   end
   hoe.spec.files = MANIFEST
   hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
@@ -34,8 +34,13 @@ 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", []
 
-task :default => :rcov
+if defined?(JRUBY_VERSION)
+  task :default => :spec
+else
+  task :default => :rcov_verify
+end
 
 Spec::Rake::SpecTask.new do |t|
   t.spec_opts ||= []
@@ -44,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/task.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.
 #++
@@ -227,7 +227,11 @@ module Warbler
     end
 
     def define_webinf_file_tasks
-      target_files = @config.dirs.map do |d|
+      target_files = @config.dirs.select do |d|
+        exists = File.directory?(d)
+        warn "warning: application directory `#{d}' does not exist or is not a directory; skipping" unless exists
+        exists
+      end.map do |d|
         define_file_task(d, "#{@config.staging_dir}/#{apply_pathmaps(d, :application)}")
       end
       files = FileList[*(@config.dirs.map{|d| "#{d}/**/*"})]
@@ -292,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|
@@ -318,7 +325,7 @@ module Warbler
 
       task gem_unpack_task_name => [dest.pathmap("%d")] do |t|
         require 'rubygems/installer'
-        Gem::Installer.new(src).unpack(dest)
+        Gem::Installer.new(src, :unpack => true).unpack(dest)
       end
 
       if @config.gem_dependencies

data/lib/warbler/version.rb

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

data/spec/warbler/task_spec.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.
 #++
@@ -36,7 +36,9 @@ describe Warbler::Task do
     @defined_tasks ||= []
     tasks.each do |task|
       unless @defined_tasks.include?(task)
-        Warbler::Task.new "warble", @config, "define_#{task}_task".to_sym do |t|
+        meth = "define_#{task}_task"
+        meth = "define_#{task}_tasks" unless Warbler::Task.private_instance_methods.include?(meth)
+        Warbler::Task.new "warble", @config, meth.to_sym do |t|
           options.each {|k,v| t.send "#{k}=", v }
         end
         @defined_tasks << task
@@ -438,6 +440,14 @@ describe Warbler::Task do
     @config.webxml.booter.should == :rails
     @config.webxml.jruby.max.runtimes.should == 1
   end
+
+  it "should skip directories that don't exist in config.dirs and print a warning" do
+    @config = Warbler::Config.new
+    @config.dirs = %w(lib notexist)
+    define_tasks "webinf_file"
+    Rake.application.lookup("#{@config.staging_dir}/WEB-INF/lib").should_not be_nil
+    Rake.application.lookup("#{@config.staging_dir}/WEB-INF/notexist").should be_nil
+  end
 end
 
 describe "The warbler.rake file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nicksieger-warbler
 version: !ruby/object:Gem::Version 
-  version: 0.9.12
+  version: 0.9.13
 platform: ruby
 authors: 
 - Nick Sieger
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 -08:00
+date: 2009-06-01 00:00:00 -07:00
 default_executable: warble
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -21,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.3
     version: 
-description: = Warbler
+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
@@ -40,36 +41,34 @@ 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.1.6.jar
-- lib/jruby-rack-0.9.3.jar
-- lib/warbler
+- generators/warble/templates/warble.rb
+- lib/jruby-complete-1.3.0RC1.jar
+- lib/jruby-rack-0.9.4.jar
+- lib/warbler.rb
 - lib/warbler/config.rb
 - lib/warbler/gems.rb
 - lib/warbler/task.rb
 - lib/warbler/version.rb
-- lib/warbler.rb
+- spec/spec_helper.rb
 - spec/sample/app/controllers/application.rb
 - spec/sample/app/helpers/application_helper.rb
 - spec/sample/config/boot.rb
 - spec/sample/config/environment.rb
+- spec/sample/config/routes.rb
 - spec/sample/config/environments/development.rb
 - spec/sample/config/environments/production.rb
 - spec/sample/config/environments/test.rb
 - spec/sample/config/initializers/inflections.rb
 - spec/sample/config/initializers/mime_types.rb
 - spec/sample/config/initializers/new_rails_defaults.rb
-- spec/sample/config/routes.rb
-- spec/spec_helper.rb
 - spec/warbler/config_spec.rb
 - spec/warbler/gems_spec.rb
 - spec/warbler/task_spec.rb
 - tasks/warbler.rake
-has_rdoc: true
+has_rdoc: false
 homepage: http://caldersphere.rubyforge.org/warbler
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -91,9 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.2.0
+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