warbler 1.3.2 → 1.3.4

data/.gitignore

@@ -0,0 +1,4 @@
+coverage*
+pkg
+doc
+.bundle

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - jruby
+branches:
+  only:
+    - master

data/Gemfile

@@ -6,11 +6,10 @@ gem "jruby-jars"
 gem "jruby-rack"
 
 group :development do
-  gem "jruby-openssl"
+  gem "jruby-openssl", :platform => :jruby
   gem "rspec", "~> 1.3"
   gem "diff-lcs"
   gem "rcov", ">= 0.9.8"
-  gem "rubyforge"
-  gem "hoe", ">= 2.3.2"
   gem "rdoc"
+  gem "childprocess"
 end

data/Gemfile.lock

@@ -0,0 +1,35 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    bouncy-castle-java (1.5.0146.1)
+    childprocess (0.2.2)
+      ffi (~> 1.0.6)
+    diff-lcs (1.1.2)
+    ffi (1.0.11)
+    ffi (1.0.11-java)
+    jruby-jars (1.6.3)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
+    jruby-rack (1.0.9)
+    rake (0.9.2.2)
+    rcov (0.9.10)
+    rcov (0.9.10-java)
+    rdoc (3.9.2)
+    rspec (1.3.2)
+    rubyzip (0.9.4)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  childprocess
+  diff-lcs
+  jruby-jars
+  jruby-openssl
+  jruby-rack
+  rake
+  rcov (>= 0.9.8)
+  rdoc
+  rspec (~> 1.3)
+  rubyzip

data/History.txt

@@ -1,3 +1,23 @@
+== 1.3.4
+
+- #77, #78: Handle the case when multiple gems exists in a git path
+  (Patrick Cheng)
+- #66: On Windows, File#unlink does not delete the file like it does
+  on POSIX (Greg Mefford)
+- Check config/environment.rb in addition to production.rb for
+  threadsafe (Joe Kutner)
+- #37, #64: Fix issues with Bundler and recent Rubygems/Rails
+
+== 1.3.3
+
+- Note: 1.3.3 was YANKED due to #62
+- Move all jars to WEB-INF/lib, and leave an empty jar in the original
+  place
+- Deal with private Kernel#gem method in recent RubyGems
+- Deal with Gem::Specification#full_gem_path changes in RG 1.8.x
+- GH #42: Tricks to allow Bundler to find git repo gems even when they
+  are excluded form production
+
 == 1.3.2
 
 - Compatibility with rake 0.9.x, avoid deprecation warnings and deal
@@ -12,7 +32,7 @@
 == 1.3.0
 
 - Warbler can now package regular Ruby projects as executable jar
-  files. See the README.txt file for details.
+  files. See the README.rdoc file for details.
 - WARBLER-18: Heed BUNDLE_GEMFILE in environment
 - WARBLER-17: Allow config.excludes to work for files in public/
 - GH#3, #12, #17: Properly bundle when BUNDLE_PATH is set or

data/LICENSE.txt

@@ -2,7 +2,7 @@
 
 Warbler is provided under the terms of the MIT license.
 
-Warbler (c) 2010-2011 Engine Yard, Inc.
+Warbler (c) 2010-2012 Engine Yard, Inc.
 Warbler (c) 2007-2009 Sun Microsystems, Inc.
 
 Permission is hereby granted, free of charge, to any person

data/{README.txt → README.rdoc}

@@ -11,9 +11,11 @@ Ruby applications to assemble and Just Work.
 == Getting Started
 
 1. Install the gem: <tt>gem install warbler</tt>.
+
 2. Run warbler in the top directory of your application: <tt>warble</tt>.
-3a. For a web project, deploy your myapp.war file to your favorite Java
-    application server.
+
+3a. For a web project, deploy your myapp.war file to your favorite Java application server.
+
 3b. For a standalone applications, just run it: <tt>java -jar myapp.jar</tt>.
 
 == Usage
@@ -47,7 +49,7 @@ You can either add features to the warbler command line:
 
     warble FEATURE war
 
-or configure them in config/warble.rb to always be used.
+or configure them in <tt>config/warble.rb</tt> to always be used.
 
    config.features = %w(FEATURE)
 
@@ -63,11 +65,26 @@ Currently, three features are available.
   (Note: jar-based applications are executable by default.)
 * +compiled+: This uses +jrubyc+ to precompile all .rb files in your
   application to .class files and includes those in the .war instead
-  of the Ruby sources.
+  of the Ruby sources. NOTE: The war file will still contain .rb
+  files, but they will be short stubs containing the following code:
+
+    require __FILE__.sub(/\.rb$/, '.class')
 
 Features may form the basis for a third-party plugin system in the
 future if there is demand.
 
+NOTE: Feature tasks must be included in the same command invocation
+and inserted before the +war+ task in order to take effect. For
+example, <tt>warble compiled; warble war</tt> does not compile and
+obfuscate +.rb+ sources because the second invocation of +warble+ does
+not run the +compiled+ feature and creates a basic war with the
+sources included. Always make sure you run
+
+    warble compiled war
+
+or, if it's important that the war always be compiled, use the option
+above to put the feature in your <tt>config/warble.rb</tt>.
+
 == War or Jar?
 
 War-based projects are for Rails, Merb, or Rack-based web
@@ -121,13 +138,10 @@ found in the +Gemfile+ and will refuse to include it in the archive.
 Rails applications are detected automatically and configured appropriately.
 The following items are set up for you:
 
-* Your application runs in the +production+ environment by default.
-Change it in <tt>config/warble.rb</tt> (see below).
+* Your application runs in the +production+ environment by default. Change it in <tt>config/warble.rb</tt> (see below).
 * The Rails gem is packaged if you haven't vendored Rails (Rails <= 2.x).
-* Other gems configured in Rails.configuration.gems are packaged
-(Rails 2.1 - 2.3)
-* 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 - 2.3)
+* Multi-thread-safe execution (as introduced in Rails 2.2) is detected and runtime pooling is disabled.
 
 === Merb applications
 
@@ -143,7 +157,7 @@ probably need to specify framework and application gems in
 config/warble.rb unless you're using Bundler to manage your gems.
 <tt>ENV['RACK_ENV']</tt> will be set to +production+.
 
-See {the examples in the jruby-rack project}[http://github.com/nicksieger/jruby-rack/tree/master/examples/]
+See {the examples in the jruby-rack project}[http://github.com/jruby/jruby-rack/tree/master/examples/]
 of how to configure Warbler to package Camping and Sinatra apps.
 
 === Configuration auto-detect notes
@@ -233,11 +247,11 @@ http://kenai.com/jira/browse/WARBLER.
 You can get the Warbler source using Git, in any of the following ways:
 
    git clone git://git.caldersphere.net/warbler.git
-   git clone git://github.com/nicksieger/warbler.git
+   git clone git://github.com/jruby/warbler.git
    git clone git://kenai.com/warbler~main
 
 You can also download a tarball of Warbler source at
-http://github.com/nicksieger/warbler/tree/master.
+https://github.com/jruby/warbler/tarball/master.
 
 == Development
 

data/Rakefile

@@ -1,54 +1,27 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.
 #++
 
 begin
+  require 'bundler'
+  gem_helper = Bundler::GemHelper.new(Dir.pwd)
+  gem_helper.install
+  gemspec = gem_helper.gemspec
   require 'bundler/setup'
 rescue LoadError
+  puts $!
   puts "Please install Bundler and run 'bundle install' to ensure you have all dependencies"
 end
 
-
-MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "Gemfile",
-                    "LICENSE.txt", "Rakefile", "*.erb", "*.rb", "bin/*",
-                    "ext/**/*", "lib/**/*", "spec/**/*.rb", "spec/sample*/**/*.*"
-                   ].to_a.reject{|f| f=~%r{spec/sample/(MANIFEST|link|web.xml)}}.sort.uniq
-
-begin
-  File.open("Manifest.txt", "wb") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
-  require 'hoe'
-  require File.dirname(__FILE__) + '/lib/warbler/version'
-  Hoe.plugin :rubyforge
-  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', 1...2).join("\n\n")
-    p.extra_deps += [['rake', '>= 0.8.7'], ['jruby-jars', '>= 1.4.0'], ['jruby-rack', '>= 1.0.0'], ['rubyzip', '>= 0.9.4']]
-    p.clean_globs += %w(MANIFEST web.xml init.rb).map{|f| "spec/sample*/#{f}*" }
-  end
-  hoe.spec.files = MANIFEST
-  hoe.spec.rdoc_options += ["-SHN", "-f", "darkfish"]
-
-  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
+require 'rake/clean'
+CLEAN << "pkg" << "doc"
 
 require 'spec/rake/spectask'
-require 'spec/rake/verify_rcov'
 
-Spec::Rake::SpecTask.new(:spec) do |t|
+Spec::Rake::SpecTask.new do |t|
   t.spec_opts ||= []
   t.spec_opts << "--options" << "spec/spec.opts"
 end
@@ -61,6 +34,8 @@ Spec::Rake::SpecTask.new("spec:rcov") do |t|
   t.rcov = true
 end
 
+require 'spec/rake/verify_rcov'
+
 RCov::VerifyTask.new(:rcov => "spec:rcov") do |t|
   t.threshold = 100
 end
@@ -88,11 +63,29 @@ rescue LoadError
 end
 
 # Make sure jar gets compiled before the gem is built
-task Rake::Task['gem'].prerequisites.first => :jar
+task Rake::Task['build'].prerequisites.first => :jar
 
 task :warbler_jar => 'pkg' do
   ruby "-rubygems", "-Ilib", "-S", "bin/warble"
   mv "warbler.jar", "pkg/warbler-#{Warbler::VERSION}.jar"
 end
 
-task :package => :warbler_jar
+task :build => :warbler_jar
+
+require 'rdoc/task'
+RDoc::Task.new(:docs) do |rd|
+  rd.rdoc_dir = "doc"
+  rd.rdoc_files.include("README.rdoc", "History.txt", "LICENSE.txt")
+  rd.rdoc_files += gemspec.require_paths
+  rd.options << '--title' << "#{gemspec.name}-#{gemspec.version} Documentation"
+  rd.options += gemspec.rdoc_options
+end
+
+task :release => :docs do
+  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml"))) rescue nil
+  if config
+    dir  = "/var/www/gforge-projects/#{gemspec.rubyforge_project}/#{gemspec.name}"
+    dest "#{config["username"]}@rubyforge.org:#{dir}"
+    sh %{rsync -av --delete doc/ #{dest}}
+  end
+end

data/lib/warbler/application.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.

data/lib/warbler/config.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.

data/lib/warbler/gems.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.

data/lib/warbler/jar.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.
@@ -17,6 +17,7 @@ module Warbler
   # * Any object responding to +read+ representing an in-memory blob
   # * A String filename pointing to a file on disk
   class Jar
+    include PathmapHelper
     include RakeHelper
 
     DEFAULT_MANIFEST = %{Manifest-Version: 1.0\nCreated-By: Warbler #{Warbler::VERSION}\n\n}
@@ -129,7 +130,8 @@ module Warbler
         # skip development dependencies
         return if gem.respond_to?(:type) and gem.type != :runtime
 
-        matched = Gem.source_index.search(gem)
+        # Deal with deprecated Gem.source_index and #search
+        matched = gem.respond_to?(:to_spec) ? [gem.to_spec] : Gem.source_index.search(gem)
         fail "gem '#{gem}' not installed" if matched.empty?
         spec = matched.last
       end
@@ -196,15 +198,6 @@ module Warbler
       binding
     end
 
-    def apply_pathmaps(config, file, pathmaps)
-      file = file[2..-1] if file =~ /^\.\//
-      pathmaps = config.pathmaps.send(pathmaps)
-      pathmaps.each do |p|
-        file = file.pathmap(p)
-      end if pathmaps
-      file
-    end
-
     def ensure_directory_entries
       files.select {|k,v| !v.nil? }.each do |k,v|
         dir = File.dirname(k)

data/lib/warbler/pathmap_helper.rb

@@ -0,0 +1,20 @@
+#--
+# Copyright (c) 2010-2012 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.
+#++
+
+module Warbler
+  module PathmapHelper
+    def apply_pathmaps(config, file, pathmaps)
+      file = file.to_s
+      file = file[2..-1] if file =~ /^\.\//
+      pathmaps = config.pathmaps.send(pathmaps)
+      pathmaps.each do |p|
+        file = file.pathmap(p)
+      end if pathmaps
+      file
+    end
+  end
+end

data/lib/warbler/rake_helper.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.

data/lib/warbler/task.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.

data/lib/warbler/templates/bundler.erb

@@ -1,3 +1,2 @@
 ENV['BUNDLE_WITHOUT'] = '<%= config.bundle_without.join(':') %>'
-ENV['BUNDLE_GEMFILE'] = '<%= config.bundler[:gemfile].basename %>'
 <% if config.bundler[:frozen] %>ENV['BUNDLE_FROZEN'] = '1'<% end %>

data/lib/warbler/templates/jar.erb

@@ -3,3 +3,6 @@ ENV['GEM_HOME'] ||= File.expand_path('../..', __FILE__)
 <% else %>
 ENV['GEM_HOME'] ||= File.expand_path('../../<%= config.relative_gem_path %>', __FILE__)
 <% end %>
+<% if config.bundler && config.bundler[:gemfile_path] %>
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../../<%= config.bundler[:gemfile_path] %>', __FILE__)
+<% end %>

data/lib/warbler/templates/war.erb

@@ -1 +1,6 @@
 ENV['GEM_HOME'] ||= $servlet_context.getRealPath('<%= config.gem_path %>')
+<% if config.bundler && config.bundler[:gemfile_path] %>
+ENV['BUNDLE_GEMFILE'] = $servlet_context.getRealPath('/<%= config.bundler[:gemfile_path] %>')
+<% end %>
+
+

data/lib/warbler/traits/bundler.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.
@@ -11,6 +11,7 @@ module Warbler
     # be added to the project.
     class Bundler
       include Trait
+      include PathmapHelper
 
       def self.detect?
         File.exist?(ENV['BUNDLE_GEMFILE'] || "Gemfile")
@@ -42,7 +43,10 @@ module Warbler
             full_gem_path = Pathname.new(spec.full_gem_path)
             tries = 2
             (full_gem_path = full_gem_path.dirname; tries -= 1) while tries > 0 && !full_gem_path.join('bundler.gemspec').exist?
-            spec.loaded_from = full_gem_path.to_s
+            spec.loaded_from = full_gem_path.join('bundler.gemspec').to_s
+            # RubyGems 1.8.x: @full_gem_path is cached, so we have to set it
+            def spec.full_gem_path=(p); @full_gem_path = p; end
+            spec.full_gem_path = full_gem_path.to_s
           end
 
           case spec.source
@@ -58,6 +62,7 @@ module Warbler
           end
         end
         config.bundler[:gemfile]  = ::Bundler.default_gemfile
+        config.bundler[:gemfile_path] = apply_pathmaps(config, relative_from_pwd(::Bundler.default_gemfile), :application)
         config.bundler[:lockfile] = ::Bundler.default_lockfile
         config.bundler[:frozen] = ::Bundler.settings[:frozen]
         path = ::Bundler.settings[:path]
@@ -71,12 +76,11 @@ module Warbler
 
       # Add Bundler Gemfiles and git repositories to the archive.
       def add_bundler_files(jar)
-        pwd = Pathname.new(Dir.pwd)
-        gemfile  = config.bundler[:gemfile].relative_path_from(pwd).to_s
-        lockfile = config.bundler[:lockfile].relative_path_from(pwd).to_s
-        jar.files[jar.apply_pathmaps(config, gemfile, :application)] = config.bundler[:gemfile].to_s
+        gemfile  = relative_from_pwd(config.bundler[:gemfile])
+        lockfile = relative_from_pwd(config.bundler[:lockfile])
+        jar.files[apply_pathmaps(config, gemfile, :application)] = config.bundler[:gemfile].to_s
         if File.exist?(lockfile)
-          jar.files[jar.apply_pathmaps(config, lockfile, :application)] = config.bundler[:lockfile].to_s
+          jar.files[apply_pathmaps(config, lockfile, :application)] = config.bundler[:lockfile].to_s
         end
         if config.bundler[:git_specs]
           pathmap = "#{config.relative_gem_path}/bundler/gems/%p"
@@ -84,25 +88,50 @@ module Warbler
           config.pathmaps.git = [pathmap]
           config.bundler[:git_specs].each do |spec|
             full_gem_path = Pathname.new(spec.full_gem_path)
-            FileList["#{full_gem_path.to_s}/**/*"].each do |src|
+
+            gem_relative_path = full_gem_path.relative_path_from(::Bundler.install_path)
+            filenames = []
+            gem_relative_path.each_filename { |f| filenames << f }
+
+            exclude_gems = true
+            unless filenames.empty?
+              full_gem_path = Pathname.new(::Bundler.install_path) + filenames.first
+              exclude_gems = false
+            end
+
+            if spec.groups.include?(:warbler_excluded)
+              pattern = "#{full_gem_path.to_s}/**/#{spec.name}.gemspec" # #42: gemspec only to avert Bundler error
+            else
+              pattern = "#{full_gem_path.to_s}/**/*"
+            end
+
+            FileList[pattern].each do |src|
               f = Pathname.new(src).relative_path_from(full_gem_path).to_s
-              next if config.gem_excludes && config.gem_excludes.any? {|rx| f =~ rx }
-              jar.files[jar.apply_pathmaps(config, File.join(full_gem_path.basename, f), :git)] = src
+              next if exclude_gems && config.gem_excludes && config.gem_excludes.any? {|rx| f =~ rx }
+              jar.files[apply_pathmaps(config, File.join(full_gem_path.basename, f), :git)] = src
             end
           end
         end
       end
 
+      def relative_from_pwd(path)
+        if path.relative?
+          path
+        else
+          path.relative_path_from(Pathname.new(Dir.pwd)).to_s
+        end
+      end
+
       private
 
       def bundler_specs
-	original_without = ::Bundler.settings.without
-	::Bundler.settings.without = config.bundle_without
-
-	::Bundler::Definition.build(::Bundler.default_gemfile, ::Bundler.default_lockfile, nil).requested_specs
-      ensure
-	# need to set the settings back, otherwise they get persisted in .bundle/config
-	::Bundler.settings[:without] = original_without.join(':')
+	bundle_without = config.bundle_without.map {|s| s.to_sym}
+	definition = ::Bundler.definition
+        all = definition.specs.to_a
+        requested = definition.specs_for(definition.groups - bundle_without).to_a
+        excluded_git_specs = (all - requested).select {|spec| ::Bundler::Source::Git === spec.source }
+        excluded_git_specs.each {|spec| spec.groups << :warbler_excluded }
+        requested + excluded_git_specs
       end
     end
   end

data/lib/warbler/traits/gemspec.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.
@@ -11,6 +11,7 @@ module Warbler
     # executables, require paths, and dependencies for a project.
     class Gemspec
       include Trait
+      include PathmapHelper
 
       def self.detect?
         !Dir['*.gemspec'].empty?
@@ -33,14 +34,14 @@ module Warbler
 
       def update_archive(jar)
         (Dir['**/*'] - config.compiled_ruby_files).each do |f|
-          jar.files[jar.apply_pathmaps(config, f, :application)] = f
+          jar.files[apply_pathmaps(config, f, :application)] = f
         end
         config.compiled_ruby_files.each do |f|
           f = f.sub(/\.rb$/, '.class')
           next unless File.exist?(f)
-          jar.files[jar.apply_pathmaps(config, f, :application)] = f
+          jar.files[apply_pathmaps(config, f, :application)] = f
         end
-        bin_path = jar.apply_pathmaps(config, default_executable, :application)
+        bin_path = apply_pathmaps(config, default_executable, :application)
         add_main_rb(jar, bin_path)
       end
 

data/lib/warbler/traits/jar.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.

data/lib/warbler/traits/merb.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.

data/lib/warbler/traits/nogemspec.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.
@@ -12,6 +12,7 @@ module Warbler
     # +lib+ directories.
     class NoGemspec
       include Trait
+      include PathmapHelper
 
       def self.detect?
         Jar.detect? && !Gemspec.detect?
@@ -28,7 +29,7 @@ module Warbler
       end
 
       def update_archive(jar)
-        add_main_rb(jar, jar.apply_pathmaps(config, default_executable, :application))
+        add_main_rb(jar, apply_pathmaps(config, default_executable, :application))
       end
 
       def default_executable

data/lib/warbler/traits/rack.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.

data/lib/warbler/traits/rails.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2010-2011 Engine Yard, Inc.
+# Copyright (c) 2010-2012 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.
@@ -45,7 +45,8 @@ module Warbler
         config.init_contents << "#{config.warbler_templates}/rails.erb"
         begin
           rails_env = config.webxml.rails.env
-          unless IO.readlines("config/environments/#{rails_env}.rb").grep(/^\s*config\.threadsafe!/).empty?
+          unless IO.readlines("config/environments/#{rails_env}.rb").grep(/^\s*config\.threadsafe!/).empty? &&
+                 IO.readlines("config/environment.rb").grep(/^\s*config\.threadsafe!/).empty?
             config.webxml.jruby.min.runtimes = 1 unless Integer === config.webxml.jruby.min.runtimes
             config.webxml.jruby.max.runtimes = 1 unless Integer === config.webxml.jruby.max.runtimes
           end