warbler 0.9.9 → 0.9.10

data/History.txt

@@ -1,3 +1,14 @@
+== 0.9.10
+
+* Upgraded to JRuby-Rack 0.9.1. Fixes JRUBY-2620, JRUBY-2594, JRUBY-2507.
+* Now verified to work with Camping and Sinatra. See
+  http://github.com/nicksieger/jruby-rack/tree/master/examples for examples
+  of how to configure Warbler to package your Camping and Sinatra apps.
+* Upgraded to JRuby 1.1.3.
+* Log files are no longer packaged in the .war file.
+* Fix #<Warbler::WebxmlOpenStruct ...> appearing in web.xml and document workarounds.
+* Add config.autodeploy_dir that, when specified, will create the war there.
+
 == 0.9.9
 
 * Now shipping with JRuby-Rack 0.9!

data/Manifest.txt

@@ -9,8 +9,8 @@ generators/warble
 generators/warble/templates
 generators/warble/templates/warble.rb
 generators/warble/warble_generator.rb
-lib/jruby-complete-1.1.1.jar
-lib/jruby-rack-0.9.jar
+lib/jruby-complete-1.1.3.jar
+lib/jruby-rack-0.9.1.jar
 lib/warbler
 lib/warbler/config.rb
 lib/warbler/gems.rb

data/Rakefile

@@ -22,6 +22,11 @@ begin
   end
   hoe.spec.files = MANIFEST
   hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
+
+  task :gemspec do
+    File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
+  end
+  task :package => :gemspec
 rescue LoadError
   puts "You really need Hoe installed to be able to package this gem"
 end

data/generators/warble/templates/warble.rb

@@ -25,14 +25,20 @@ Warbler::Config.new do |config|
   # WEB-INF/classes. The example pathmap below accompanies the java_classes
   # configuration above. See http://rake.rubyforge.org/classes/String.html#M000017
   # for details of how to specify a pathmap.
-  # config.pathmaps.java_classes << "%{target/classes/,}"
+  # config.pathmaps.java_classes << "%{target/classes/,}p"
 
-  # Gems to be packaged in the webapp.  Note that Rails gems are added to this
-  # list if vendor/rails is not present, so be sure to include rails if you
-  # overwrite the value
-  # config.gems = ["activerecord-jdbc-adapter", "jruby-openssl"]
+  # Gems to be included. You need to tell Warbler which gems your application needs
+  # so that they can be packaged in the war file.
+  # The Rails gems are included by default unless the vendor/rails directory is present.
+  # config.gems += ["activerecord-jdbcmysql-adapter", "jruby-openssl"]
   # config.gems << "tzinfo"
-  # config.gems["rails"] = "1.2.3"
+
+  # Uncomment this if you don't want to package rails gem.
+  # config.gems -= ["rails"]
+
+  # The most recent versions of gems are used.
+  # You can specify versions of gems by using a hash assignment:
+  # config.gems["rails"] = "2.0.2"
 
   # Include gem dependencies not mentioned specifically
   config.gem_dependencies = true
@@ -54,6 +60,12 @@ Warbler::Config.new do |config|
   # Application booter to use, one of :rack, :rails, or :merb. (Default :rails)
   # config.webxml.booter = :rails
 
+  # When using the :rack booter, "Rackup" script to use.
+  # The script is evaluated in a Rack::Builder to load the application.
+  # Examples:
+  # config.webxml.rackup = %{require './lib/demo'; run Rack::Adapter::Camping.new(Demo)}
+  # config.webxml.rackup = require 'cgi' && CGI::escapeHTML(File.read("config.ru"))
+
   # Control the pool of Rails runtimes. Leaving unspecified means
   # the pool will grow as needed to service requests. It is recommended
   # that you fix these values when running a production server!

data/lib/warbler/config.rb

@@ -16,6 +16,11 @@ module Warbler
     # Directory where files will be staged, defaults to tmp/war
     attr_accessor :staging_dir
 
+    # 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.
+    attr_accessor :autodeploy_dir
+
     # Top-level directories to be copied into WEB-INF.  Defaults to 
     # names in TOP_DIRS
     attr_accessor :dirs
@@ -39,6 +44,9 @@ module Warbler
     # Whether to include dependent gems (default true)
     attr_accessor :gem_dependencies
 
+    # Whether to exclude **/*.log files (default is true)
+    attr_accessor :exclude_logs
+
     # Public HTML directory file list, to be copied into the root of the war
     attr_accessor :public_html
 
@@ -70,6 +78,12 @@ module Warbler
     #   keep around during idle time
     # * <tt>webxml.jruby.max.runtimes</tt> -- maximum number of pooled Rails
     #   application runtimes
+    #
+    # Note that if you attempt to access webxml configuration keys in a conditional,
+    # you might not obtain the result you want. For example:
+    #     <%= webxml.maybe.present.key || 'default' %>
+    # doesn't yield the right result. Instead, you need to generate the context parameters:
+    #     <%= webxml.context_params['maybe.present.key'] || 'default' %>
     attr_accessor :webxml
 
     def initialize(warbler_home = WARBLER_HOME)
@@ -81,6 +95,7 @@ module Warbler
       @java_classes = FileList[]
       @gems        = default_gems
       @gem_dependencies = true
+      @exclude_logs = true
       @public_html = FileList["public/**/*"]
       @pathmaps    = default_pathmaps
       @webxml      = default_webxml_config
@@ -88,6 +103,7 @@ module Warbler
       @war_name    = File.basename(@rails_root)
       yield self if block_given?
       @excludes += warbler_vendor_excludes(warbler_home)
+      @excludes += FileList["**/*.log"] if @exclude_logs
       @excludes << @staging_dir
     end
 
@@ -138,8 +154,9 @@ module Warbler
   end
 
   class WebxmlOpenStruct < OpenStruct
-    def initialize
-      @table = Hash.new {|h,k| h[k] = WebxmlOpenStruct.new }
+    def initialize(key = 'webxml')
+      @key = key
+      @table = Hash.new {|h,k| h[k] = WebxmlOpenStruct.new(k) }
     end
 
     def servlet_context_listener
@@ -169,5 +186,9 @@ module Warbler
       params.delete_if {|k,v| ['ignored', *ignored].include?(k.to_s) }
       params
     end
+
+    def to_s
+      "No value for '#@key' found"
+    end
   end
 end

data/lib/warbler/task.rb

@@ -162,7 +162,9 @@ module Warbler
       with_namespace_and_config do |name, config|
         desc "Run the jar command to create the .war"
         task "jar" do
-          sh "jar cf #{config.war_name}.war -C #{config.staging_dir} ."
+          war_path = "#{config.war_name}.war"
+          war_path = File.join(config.autodeploy_dir, war_path) if config.autodeploy_dir
+          sh "jar cf #{war_path} -C #{config.staging_dir} ."
         end
       end
     end
@@ -187,10 +189,13 @@ module Warbler
     end
 
     def define_webinf_file_tasks
+      target_files = @config.dirs.map do |d|
+        define_file_task(d, "#{@config.staging_dir}/#{apply_pathmaps(d, :application)}")
+      end
       files = FileList[*(@config.dirs.map{|d| "#{d}/**/*"})]
       files.include *(@config.includes.to_a)
       files.exclude *(@config.excludes.to_a)
-      target_files = files.map do |f|
+      target_files += files.map do |f|
         define_file_task(f,
           "#{@config.staging_dir}/#{apply_pathmaps(f, :application)}")
       end

data/lib/warbler/version.rb

@@ -5,5 +5,5 @@
 #++
 
 module Warbler
-  VERSION = "0.9.9"
+  VERSION = "0.9.10"
 end

data/spec/warbler/config_spec.rb

@@ -41,6 +41,22 @@ describe Warbler::Config do
     config.gems.should be_empty
   end
 
+  it "should exclude log files by default" do
+    mkdir_p "vendor"
+    touch "vendor/test.log"
+    config = Warbler::Config.new
+    config.exclude_logs.should == true
+    config.excludes.include?("vendor/test.log").should == true
+  end
+
+  it "should include log files if exclude_logs is false" do
+    mkdir_p "vendor"
+    touch "vendor/test.log"
+    config = Warbler::Config.new {|c| c.exclude_logs = false }
+    config.exclude_logs.should == false
+    config.excludes.include?("vendor/test.log").should == false
+  end
+
   it "should exclude Warbler itself when run as a plugin" do
     config = Warbler::Config.new
     config.excludes.include?("vendor/plugins/warbler").should == false
@@ -82,6 +98,10 @@ describe Warbler::Config do
     Warbler::Config.new.webxml.context_params.should_not have_key('booter')
   end
 
+  it "should have a helpful string representation for an empty key" do
+    Warbler::Config.new.webxml.missing_key.to_s.should =~ /No value for 'missing_key' found/
+  end
+
   #it "should automatically gems used by the web application" do
   #  gem "actionpack"
   #  config = Warbler::Config.new

data/spec/warbler/task_spec.rb

@@ -11,12 +11,14 @@ describe Warbler::Task do
     @rake = Rake::Application.new
     Rake.application = @rake
     mkdir_p "public"
+    mkdir_p "log"
     touch "public/index.html"
+    touch "log/test.log"
     @config = Warbler::Config.new do |config|
       config.staging_dir = "pkg/tmp/war"
       config.war_name = "warbler"
       config.gems = ["rake"]
-      config.dirs = %w(bin generators lib)
+      config.dirs = %w(bin generators log lib)
       config.public_html = FileList["public/**/*", "tasks/**/*"]
       config.webxml.jruby.max.runtimes = 5
     end
@@ -28,6 +30,7 @@ describe Warbler::Task do
     Rake::Task["warble:clean"].invoke
     rm_rf "public"
     rm_rf "config"
+    rm_rf "log"
   end
 
   def define_tasks(*tasks)
@@ -68,6 +71,13 @@ describe Warbler::Task do
     file_list(%r{WEB-INF/gems/specifications/rake.*\.gemspec}).should_not be_empty
   end
 
+  it "should define a app task for copying application files" do
+    define_tasks "app", "gems"
+    Rake::Task["warble:app"].invoke
+    file_list(%r{WEB-INF/log}).should_not be_empty
+    file_list(%r{WEB-INF/log/*.log}).should be_empty
+  end
+
   def expand_webxml
     define_tasks "webxml"
     Rake::Task["warble:webxml"].invoke
@@ -179,6 +189,16 @@ describe Warbler::Task do
     File.exist?("warbler.war").should == true
   end
 
+  it "should accept an autodeploy directory where the war should be created" do
+    define_tasks "jar"
+    require 'tempfile'
+    @config.autodeploy_dir = Dir::tmpdir
+    mkdir_p @config.staging_dir
+    touch "#{@config.staging_dir}/file.txt"
+    Rake::Task["warble:jar"].invoke
+    File.exist?(File.join("#{Dir::tmpdir}","warbler.war")).should == true
+  end
+
   it "should define a war task for bundling up everything" do
     app_ran = false; task "warble:app" do; app_ran = true; end
     public_ran = false; task "warble:public" do; public_ran = true; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warbler
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Nick Sieger
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-08 00:00:00 -07:00
+date: 2008-07-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -44,8 +45,8 @@ files:
 - generators/warble/templates
 - generators/warble/templates/warble.rb
 - generators/warble/warble_generator.rb
-- lib/jruby-complete-1.1.1.jar
-- lib/jruby-rack-0.9.jar
+- lib/jruby-complete-1.1.3.jar
+- lib/jruby-rack-0.9.1.jar
 - lib/warbler
 - lib/warbler/config.rb
 - lib/warbler/gems.rb
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Warbler chirpily constructs .war files of your Rails applications.