warbler 1.3.0.beta1 → 1.3.0

data/spec/warbler/task_spec.rb

@@ -1,14 +1,15 @@
 #--
-# Copyright (c) 2010 Engine Yard, Inc.
+# Copyright (c) 2010-2011 Engine Yard, Inc.
 # Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
 # See the file LICENSE.txt for details.
 #++
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe Warbler::Task do
   run_in_directory "spec/sample_war"
+  use_fresh_environment
 
   let :config do
     Warbler::Config.new do |config|
@@ -112,24 +113,32 @@ describe Warbler::Task do
     File.exist?('app/helpers/application_helper.class').should be_false
   end
 
-  it "should process symlinks by storing a file in the archive that has the same contents as the source" do
-    File.open("config/special.txt", "wb") {|f| f << "special"}
-    Dir.chdir("config") { ln_s "special.txt", "link.txt" }
-    silence { run_task "warble" }
-    Zip::ZipFile.open("#{config.jar_name}.war") do |zf|
-      special = zf.get_input_stream('WEB-INF/config/special.txt') {|io| io.read }
-      link = zf.get_input_stream('WEB-INF/config/link.txt') {|io| io.read }
-      link.should == special
-    end
-  end
-
-  it "should process directory symlinks by copying the whole subdirectory" do
-    Dir.chdir("lib") { ln_s "tasks", "rakelib" }
-    silence { run_task "warble" }
-    Zip::ZipFile.open("#{config.jar_name}.war") do |zf|
-      zf.find_entry("WEB-INF/lib/tasks/utils.rake").should_not be_nil
-      zf.find_entry("WEB-INF/lib/rakelib/").should_not be_nil
-      zf.find_entry("WEB-INF/lib/rakelib/utils.rake").should_not be_nil if defined?(JRUBY_VERSION)
+  context "where symlinks are available" do
+    begin
+      ln_s "README.txt", "r.txt.symlink", :verbose => false
+      it "should process symlinks by storing a file in the archive that has the same contents as the source" do
+        File.open("config/special.txt", "wb") {|f| f << "special"}
+        Dir.chdir("config") { ln_s "special.txt", "link.txt" }
+        silence { run_task "warble" }
+        Zip::ZipFile.open("#{config.jar_name}.war") do |zf|
+          special = zf.get_input_stream('WEB-INF/config/special.txt') {|io| io.read }
+          link = zf.get_input_stream('WEB-INF/config/link.txt') {|io| io.read }
+          link.should == special
+        end
+      end
+
+      it "should process directory symlinks by copying the whole subdirectory" do
+        Dir.chdir("lib") { ln_s "tasks", "rakelib" }
+        silence { run_task "warble" }
+        Zip::ZipFile.open("#{config.jar_name}.war") do |zf|
+          zf.find_entry("WEB-INF/lib/tasks/utils.rake").should_not be_nil
+          zf.find_entry("WEB-INF/lib/rakelib/").should_not be_nil
+          zf.find_entry("WEB-INF/lib/rakelib/utils.rake").should_not be_nil if defined?(JRUBY_VERSION)
+        end
+      end
+
+      rm_f "r.txt.symlink", :verbose => false
+    rescue NotImplementedError
     end
   end
 

data/spec/warbler/traits_spec.rb

@@ -1,10 +1,11 @@
 #--
-# Copyright (c) 2010 Engine Yard, Inc.
+# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
 # See the file LICENSE.txt for details.
 #++
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe Warbler::Traits do
   it "are ordered by fewer dependencies first" do

data/spec/warbler/war_spec.rb

@@ -1,10 +1,11 @@
 #--
-# Copyright (c) 2010 Engine Yard, Inc.
+# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2007-2009 Sun Microsystems, Inc.
 # This source code is available under the MIT license.
 # See the file LICENSE.txt for details.
 #++
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe Warbler::War do
   it "is deprecated, replace occurrences with Warbler::Jar" do

data/warble.rb

@@ -115,6 +115,9 @@ Warbler::Config.new do |config|
   # Application booter to use, one of :rack, :rails, or :merb (autodetected by default)
   # config.webxml.booter = :rails
 
+  # Set JRuby to run in 1.9 mode.
+  # config.webxml.jruby.compat.version = "1.9"
+
   # When using the :rack booter, "Rackup" script to use.
   # - For 'rackup.path', the value points to the location of the rackup
   # script in the web archive file. You need to make sure this file

data/web.xml.erb

@@ -22,11 +22,11 @@
     <listener-class><%= webxml.servlet_context_listener %></listener-class>
   </listener>
 
-<% if webxml.jndi then webxml.jndi.each do |jndi| %>
+<% if webxml.jndi then [webxml.jndi].flatten.each do |jndi| %>
   <resource-ref>
     <res-ref-name><%= jndi %></res-ref-name>
     <res-type>javax.sql.DataSource</res-type>
     <res-auth>Container</res-auth>
   </resource-ref>
 <% end; end %>
-</web-app>
+</web-app>

metadata

@@ -1,98 +1,86 @@
 --- !ruby/object:Gem::Specification 
 name: warbler
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 27
+  prerelease: 
   segments: 
-    - 1
-    - 3
-    - 0
-    - beta1
-  version: 1.3.0.beta1
+  - 1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
-  - Nick Sieger
+- Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -06:00
-default_executable: 
+date: 2011-04-18 00:00:00 Z
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rake
-    version_requirements: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 8
-              - 7
-            version: 0.8.7
-    requirement: *id001
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: jruby-jars
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 4
-              - 0
-            version: 1.4.0
-    requirement: *id002
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: jruby-rack
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 1
-              - 0
-              - 0
-            version: 1.0.0
-    requirement: *id003
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: rubyzip
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 0
-              - 9
-              - 4
-            version: 0.9.4
-    requirement: *id004
-    prerelease: false
-    type: :runtime
-  - !ruby/object:Gem::Dependency 
-    name: rubyforge
-    version_requirements: &id005 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            segments: 
-              - 2
-              - 0
-              - 4
-            version: 2.0.4
-    requirement: *id005
-    prerelease: false
-    type: :development
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  version_requirements: *id001
+  name: rake
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  version_requirements: *id002
+  name: jruby-jars
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  version_requirements: *id003
+  name: jruby-rack
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
+  version_requirements: *id004
+  name: rubyzip
+  prerelease: false
 description: |-
   Warbler is a gem to make a Java jar or war file out of any Ruby,
   Rails, Merb, or Rack application. Warbler provides a minimal,
@@ -100,118 +88,132 @@ description: |-
   deployment to a Java environment.
 email: nick@nicksieger.com
 executables: 
-  - warble
+- warble
 extensions: []
 
 extra_rdoc_files: 
-  - History.txt
-  - LICENSE.txt
-  - Manifest.txt
-  - README.txt
+- History.txt
+- LICENSE.txt
+- Manifest.txt
+- README.txt
 files: 
-  - Gemfile
-  - History.txt
-  - LICENSE.txt
-  - Manifest.txt
-  - README.txt
-  - Rakefile
-  - bin/warble
-  - ext/JarMain.java
-  - ext/WarMain.java
-  - ext/WarblerJar.java
-  - ext/WarblerJarService.java
-  - lib/warbler.rb
-  - lib/warbler/application.rb
-  - lib/warbler/config.rb
-  - lib/warbler/gems.rb
-  - lib/warbler/jar.rb
-  - lib/warbler/task.rb
-  - lib/warbler/templates/config.erb
-  - lib/warbler/templates/rack.erb
-  - lib/warbler/templates/rails.erb
-  - lib/warbler/traits.rb
-  - lib/warbler/traits/bundler.rb
-  - lib/warbler/traits/gemspec.rb
-  - lib/warbler/traits/jar.rb
-  - lib/warbler/traits/merb.rb
-  - lib/warbler/traits/nogemspec.rb
-  - lib/warbler/traits/rack.rb
-  - lib/warbler/traits/rails.rb
-  - lib/warbler/traits/war.rb
-  - lib/warbler/version.rb
-  - lib/warbler/war.rb
-  - lib/warbler_jar.jar
-  - spec/sample_jar/History.txt
-  - spec/sample_jar/Manifest.txt
-  - spec/sample_jar/README.txt
-  - spec/sample_jar/lib/sample_jar.rb
-  - spec/sample_jar/sample_jar.gemspec
-  - spec/sample_jar/test/test_sample_jar.rb
-  - spec/sample_war/app/controllers/application.rb
-  - spec/sample_war/app/helpers/application_helper.rb
-  - spec/sample_war/config/boot.rb
-  - spec/sample_war/config/database.yml
-  - spec/sample_war/config/environment.rb
-  - spec/sample_war/config/environments/development.rb
-  - spec/sample_war/config/environments/production.rb
-  - spec/sample_war/config/environments/test.rb
-  - spec/sample_war/config/initializers/inflections.rb
-  - spec/sample_war/config/initializers/mime_types.rb
-  - spec/sample_war/config/initializers/new_rails_defaults.rb
-  - spec/sample_war/config/routes.rb
-  - spec/sample_war/lib/tasks/utils.rake
-  - spec/sample_war/public/404.html
-  - spec/sample_war/public/422.html
-  - spec/sample_war/public/500.html
-  - spec/sample_war/public/favicon.ico
-  - spec/sample_war/public/index.html
-  - spec/sample_war/public/robots.txt
-  - spec/spec_helper.rb
-  - spec/warbler/application_spec.rb
-  - spec/warbler/config_spec.rb
-  - spec/warbler/gems_spec.rb
-  - spec/warbler/jar_spec.rb
-  - spec/warbler/task_spec.rb
-  - spec/warbler/traits_spec.rb
-  - spec/warbler/war_spec.rb
-  - warble.rb
-  - web.xml.erb
-has_rdoc: true
+- Gemfile
+- History.txt
+- LICENSE.txt
+- Manifest.txt
+- README.txt
+- Rakefile
+- bin/warble
+- ext/JarMain.java
+- ext/WarMain.java
+- ext/WarblerJar.java
+- ext/WarblerJarService.java
+- lib/warbler.rb
+- lib/warbler/application.rb
+- lib/warbler/config.rb
+- lib/warbler/gems.rb
+- lib/warbler/jar.rb
+- lib/warbler/task.rb
+- lib/warbler/templates/bundler.erb
+- lib/warbler/templates/config.erb
+- lib/warbler/templates/jar.erb
+- lib/warbler/templates/rack.erb
+- lib/warbler/templates/rails.erb
+- lib/warbler/templates/war.erb
+- lib/warbler/traits.rb
+- lib/warbler/traits/bundler.rb
+- lib/warbler/traits/gemspec.rb
+- lib/warbler/traits/jar.rb
+- lib/warbler/traits/merb.rb
+- lib/warbler/traits/nogemspec.rb
+- lib/warbler/traits/rack.rb
+- lib/warbler/traits/rails.rb
+- lib/warbler/traits/war.rb
+- lib/warbler/version.rb
+- lib/warbler/war.rb
+- lib/warbler_jar.jar
+- spec/drb_helper.rb
+- spec/sample_bundler/Gemfile.lock
+- spec/sample_bundler/config.ru
+- spec/sample_bundler/vendor/bundle/jruby/1.8/cache/rake-0.8.7.gem
+- spec/sample_bundler/vendor/bundle/jruby/1.8/gems/rake-0.8.7/lib/rake.rb
+- spec/sample_bundler/vendor/bundle/jruby/1.8/specifications/rake-0.8.7.gemspec
+- spec/sample_bundler/vendor/bundle/ruby/1.8/cache/rake-0.8.7.gem
+- spec/sample_bundler/vendor/bundle/ruby/1.8/gems/rake-0.8.7/lib/rake.rb
+- spec/sample_bundler/vendor/bundle/ruby/1.8/specifications/rake-0.8.7.gemspec
+- spec/sample_bundler/vendor/bundle/ruby/1.9.1/cache/rake-0.8.7.gem
+- spec/sample_bundler/vendor/bundle/ruby/1.9.1/gems/rake-0.8.7/lib/rake.rb
+- spec/sample_bundler/vendor/bundle/ruby/1.9.1/specifications/rake-0.8.7.gemspec
+- spec/sample_jar/History.txt
+- spec/sample_jar/Manifest.txt
+- spec/sample_jar/README.txt
+- spec/sample_jar/lib/sample_jar.rb
+- spec/sample_jar/sample_jar.gemspec
+- spec/sample_jar/test/test_sample_jar.rb
+- spec/sample_war/app/controllers/application.rb
+- spec/sample_war/app/helpers/application_helper.rb
+- spec/sample_war/config/boot.rb
+- spec/sample_war/config/database.yml
+- spec/sample_war/config/environment.rb
+- spec/sample_war/config/environments/development.rb
+- spec/sample_war/config/environments/production.rb
+- spec/sample_war/config/environments/test.rb
+- spec/sample_war/config/initializers/inflections.rb
+- spec/sample_war/config/initializers/mime_types.rb
+- spec/sample_war/config/initializers/new_rails_defaults.rb
+- spec/sample_war/config/routes.rb
+- spec/sample_war/lib/tasks/utils.rake
+- spec/sample_war/public/404.html
+- spec/sample_war/public/422.html
+- spec/sample_war/public/500.html
+- spec/sample_war/public/favicon.ico
+- spec/sample_war/public/index.html
+- spec/sample_war/public/robots.txt
+- spec/spec_helper.rb
+- spec/warbler/application_spec.rb
+- spec/warbler/bundler_spec.rb
+- spec/warbler/config_spec.rb
+- spec/warbler/gems_spec.rb
+- spec/warbler/jar_spec.rb
+- spec/warbler/task_spec.rb
+- spec/warbler/traits_spec.rb
+- spec/warbler/war_spec.rb
+- warble.rb
+- web.xml.erb
 homepage: http://caldersphere.rubyforge.org/warbler
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-  - --main
-  - README.txt
-  - -SHN
-  - -f
-  - darkfish
+- --main
+- README.txt
+- -SHN
+- -f
+- darkfish
 require_paths: 
-  - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2
-        segments: 
-          - 0
-        version: "0"
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 1
-          - 3
-          - 1
-        version: 1.3.1
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: caldersphere
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Warbler chirpily constructs .war files of your Rails applications.