warbler 1.3.0.beta1 → 1.3.0

data/History.txt

@@ -2,6 +2,15 @@
 
 - Warbler can now package regular Ruby projects as executable jar
   files. See the README.txt 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
+  --deployment flag is used
+- JRUBY-5077, WARBLER-24: Gems from git repositories are now packaged
+  correctly
+- GH#20: Ruby 1.9.2 support
+- GH#8: Clean up compiled .class files after building war
+- GH#15: Simplify detection of thread-safe Rails
 
 == 1.2.1
 

data/LICENSE.txt

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

data/Manifest.txt

@@ -17,9 +17,12 @@ lib/warbler/gems.rb
 lib/warbler/jar.rb
 lib/warbler/task.rb
 lib/warbler/templates
+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
 lib/warbler/traits.rb
 lib/warbler/traits/bundler.rb
@@ -33,6 +36,24 @@ 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
+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
+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
+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
+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
+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
+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
@@ -60,6 +81,7 @@ 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

data/README.txt

@@ -93,8 +93,7 @@ require paths, and the files to be included in the archive. For best
 results make sure your gemspec specifies all of the following
 attributes:
 
-* +default_executable+
-* +files+
+* +executables+
 * +require_paths+
 * runtime dependencies added with +add_dependency+
 
@@ -111,6 +110,10 @@ archive along with the Gemfile. The Bundler groups named
 +:development+ and +:test+ will be excluded by default, unless you
 specify with +config.bundle_without+ in +config/warble.rb+.
 
+Warbler supports Bundler for gems and git repositories, but not for
+plain path components. Warbler will warn when a +:path+ component is
+found in the +Gemfile+ and will refuse to include it in the archive.
+
 == War Files
 
 === Rails applications
@@ -248,5 +251,5 @@ After that, simply run "rake".
 
 Warbler is provided under the terms of the MIT license.
 
-Warbler (c) 2010 Engine Yard, Inc.
+Warbler (c) 2010-2011 Engine Yard, Inc.
 Warbler (c) 2007-2009 Sun Microsystems, Inc.

data/Rakefile

@@ -1,5 +1,5 @@
 #--
-# 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.
@@ -20,7 +20,7 @@ MANIFEST = FileList["History.txt", "Manifest.txt", "README.txt", "Gemfile",
                    ].to_a.reject{|f| f=~%r{spec/sample/(MANIFEST|link|web.xml)}}.sort.uniq
 
 begin
-  File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
+  File.open("Manifest.txt", "wb") {|f| MANIFEST.each {|n| f << "#{n}\n"} }
   require 'hoe'
   require File.dirname(__FILE__) + '/lib/warbler/version'
   hoe = Hoe.spec("warbler") do |p|

data/bin/warble

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 #
 #--
-# 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.

data/ext/JarMain.java

@@ -1,5 +1,6 @@
 /**
- * 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.
  */
@@ -29,7 +30,7 @@ public class JarMain implements Runnable {
         this.args = args;
         URL mainClass = getClass().getResource(MAIN);
         this.path = mainClass.toURI().getSchemeSpecificPart();
-        this.jarfile = mainClass.getFile().replace("!" + MAIN, "").replace("file:", "");
+        this.jarfile = this.path.replace("!" + MAIN, "").replace("file:", "");
         this.debug = isDebug();
         this.extractRoot = File.createTempFile("jruby", "extract");
         this.extractRoot.delete();

data/ext/WarMain.java

@@ -1,5 +1,6 @@
 /**
- * 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.
  */
@@ -26,7 +27,7 @@ public class WarMain implements Runnable {
         this.args = args;
         URL mainClass = getClass().getResource(MAIN);
         this.path = mainClass.toURI().getSchemeSpecificPart();
-        this.warfile = mainClass.getFile().replace("!" + MAIN, "").replace("file:", "");
+        this.warfile = this.path.replace("!" + MAIN, "").replace("file:", "");
         this.debug = isDebug();
         this.webroot = File.createTempFile("winstone", "webroot");
         this.webroot.delete();

data/ext/WarblerJar.java

@@ -1,5 +1,6 @@
 /**
- * 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.
  */

data/ext/WarblerJarService.java

@@ -1,5 +1,6 @@
 /**
- * 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.
  */

data/lib/warbler.rb

@@ -1,5 +1,5 @@
 #--
-# 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.

data/lib/warbler/application.rb

@@ -1,5 +1,5 @@
 #--
-# 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.
@@ -67,4 +67,20 @@ class Warbler::Application < Rake::Application
     Rake.application = self
     super
   end
+
+  # Remap the version option to display Warbler version.
+  def standard_rake_options
+    super.map do |opt|
+      if opt.first == '--version'
+        ['--version', '-V', "Display the program version.",
+         lambda { |value|
+           puts "Warbler version #{Warbler::VERSION}"
+           exit
+         }
+        ]
+      else
+        opt
+      end
+    end
+  end
 end

data/lib/warbler/config.rb

@@ -1,5 +1,5 @@
 #--
-# 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.
@@ -184,15 +184,24 @@ module Warbler
       @gem_path[1..-1]
     end
 
+    def define_tasks
+      task "gemjar" do
+        self.features << "gemjar"
+      end
+      task "executable" do
+        self.features << "executable"
+      end
+    end
+
     # Deprecated
     def war_name
-      warn "config.war_name deprecated; replace with config.jar_name" #:nocov:
+      $stderr.puts "config.war_name deprecated; replace with config.jar_name" #:nocov:
       jar_name                  #:nocov:
     end
 
     # Deprecated
     def war_name=(w)
-      warn "config.war_name deprecated; replace with config.jar_name" #:nocov:
+      $stderr.puts "config.war_name deprecated; replace with config.jar_name" #:nocov:
       self.jar_name = w         #:nocov:
     end
 

data/lib/warbler/gems.rb

@@ -1,5 +1,5 @@
 #--
-# 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.

data/lib/warbler/jar.rb

@@ -1,5 +1,6 @@
 #--
-# 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.
 #++
@@ -24,6 +25,11 @@ module Warbler
       @files = {}
     end
 
+    def contents(entry)
+      file = files[entry]
+      file.respond_to?(:read) ? file.read : File.open(file) {|f| f.read }
+    end
+
     def compile(config)
       # Compiling all Ruby files we can find -- do we need to allow an
       # option to configure what gets compiled?
@@ -125,16 +131,15 @@ module Warbler
         spec = matched.last
       end
 
-      # skip gems with no load path
-      return if spec.loaded_from == ""
+      full_gem_path = Pathname.new(spec.full_gem_path)
+
+      # skip gems whose full_gem_path does not exist
+      ($stderr.puts "warning: skipping #{spec.name} (#{full_gem_path.to_s} does not exist)" ; return) unless full_gem_path.exist?
 
-      add_with_pathmaps(config, spec.loaded_from, :gemspecs)
-      spec.files.each do |f|
-        f = f[2..-1] if f =~ /^\.\//
+      @files[apply_pathmaps(config, "#{spec.full_name}.gemspec", :gemspecs)] = StringIO.new(spec.to_ruby)
+      FileList["#{full_gem_path.to_s}/**/*"].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 }
-        src = File.join(spec.full_gem_path, f)
-        # some gemspecs may have incorrect file listings
-        next unless File.exist?(src)
         @files[apply_pathmaps(config, File.join(spec.full_name, f), :gems)] = src
       end
 
@@ -145,7 +150,7 @@ module Warbler
     def find_application_files(config)
       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
+        $stderr.puts "warning: application directory `#{d}' does not exist or is not a directory; skipping" unless exists
         exists
       end.each do |d|
         @files[apply_pathmaps(config, d, :application)] = nil
@@ -214,7 +219,7 @@ module Warbler
           if src.respond_to?(:read)
             zipfile.get_output_stream(entry) {|f| f << src.read }
           elsif src.nil? || File.directory?(src)
-            warn "directory symlinks are not followed unless using JRuby; #{entry} contents not in archive" \
+            $stderr.puts "directory symlinks are not followed unless using JRuby; #{entry} contents not in archive" \
               if File.symlink?(entry) && !defined?(JRUBY_VERSION)
             zipfile.mkdir(entry)
           elsif File.symlink?(src)
@@ -241,7 +246,7 @@ module Warbler
   class War < Jar
     def initialize(*)
       super
-      warn "Warbler::War is deprecated. Please replace all occurrences with Warbler::Jar."
+      $stderr.puts "Warbler::War is deprecated. Please replace all occurrences with Warbler::Jar."
     end
   end
 end

data/lib/warbler/task.rb

@@ -1,5 +1,5 @@
 #--
-# 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.
@@ -45,7 +45,7 @@ module Warbler
       end
       @config ||= Config.new
       unless @config.kind_of? Config
-        warn "Warbler::Config not provided by override in initializer or #{Config::FILE}; using defaults"
+        $stderr.puts "Warbler::Config not provided by override in initializer or #{Config::FILE}; using defaults"
         @config = Config.new
       end
       @name = name || @config.jar_extension
@@ -66,11 +66,10 @@ module Warbler
         define_files_task
         define_jar_task
         define_debug_task
-        define_gemjar_task
         define_config_task
         define_pluginize_task
-        define_executable_task
         define_version_task
+        define_extra_tasks
       end
     end
 
@@ -81,7 +80,7 @@ module Warbler
           @config.features.each do |feature|
             t = "#@name:#{feature}"
             unless Rake.application.lookup(t)
-              warn "unknown feature `#{feature}', ignoring"
+              $stderr.puts "unknown feature `#{feature}', ignoring"
               next
             end
             Rake::Task[t].invoke
@@ -141,10 +140,8 @@ module Warbler
       end
     end
 
-    def define_gemjar_task
-      task "gemjar" do
-        @config.features << "gemjar"
-      end
+    def define_extra_tasks
+      @config.define_tasks
     end
 
     def define_config_task
@@ -177,12 +174,6 @@ module Warbler
       end
     end
 
-    def define_executable_task
-      task "executable" do
-        @config.features << "executable"
-      end
-    end
-
     def define_version_task
       task "version" do
         puts "Warbler version #{Warbler::VERSION}"

data/lib/warbler/templates/bundler.erb

@@ -0,0 +1,3 @@
+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

@@ -0,0 +1,5 @@
+<% if config.relative_gem_path.empty? %>
+ENV['GEM_HOME'] ||= File.expand_path('../..', __FILE__)
+<% else %>
+ENV['GEM_HOME'] ||= File.expand_path('../../<%= config.relative_gem_path %>', __FILE__)
+<% end %>

data/lib/warbler/templates/rack.erb

@@ -1 +1 @@
-ENV['RACK_ENV'] = '<%= (params = config.webxml.context_params; params['rack.env'] || params['rails.env']) %>'
+ENV['RACK_ENV'] = '<%= (params = config.webxml.context_params; params['rack.env']) %>'

data/lib/warbler/templates/war.erb

@@ -0,0 +1 @@
+ENV['GEM_HOME'] ||= $servlet_context.getRealPath('<%= config.gem_path %>')

data/lib/warbler/traits.rb

@@ -1,5 +1,6 @@
 #--
-# 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.
 #++
@@ -87,8 +88,9 @@ module Warbler
       if config.gem_path != default_gem_path
         config.gem_path = "/#{config.gem_path}" unless config.gem_path =~ %r{^/}
         sub_gem_path = config.gem_path[1..-1]
-        config.pathmaps.gemspecs.each {|p| p.sub!(default_gem_path[1..-1], sub_gem_path)}
-        config.pathmaps.gems.each {|p| p.sub!(default_gem_path[1..-1], sub_gem_path)}
+        config.pathmaps.marshal_dump.keys.each do |pm|
+          config.pathmaps.send(pm).each {|p| p.sub!(default_gem_path[1..-1], sub_gem_path)}
+        end
         config.webxml["gem"]["path"] = config.gem_path if config.webxml
       end
     end

data/lib/warbler/traits/bundler.rb

@@ -1,5 +1,6 @@
 #--
-# 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.
 #++
@@ -12,7 +13,7 @@ module Warbler
       include Trait
 
       def self.detect?
-        File.exist?("Gemfile")
+        File.exist?(ENV['BUNDLE_GEMFILE'] || "Gemfile")
       end
 
       def self.requires?(trait)
@@ -31,26 +32,63 @@ module Warbler
       def add_bundler_gems
         config.gems.clear
         config.gem_dependencies = false # Bundler takes care of these
-
+        config.bundler = {}
+        ENV['BUNDLE_WITHOUT'] ||= config.bundle_without.join(':')
         require 'bundler'
-        gemfile = Pathname.new("Gemfile").expand_path
-        root = gemfile.dirname
-        lockfile = root.join('Gemfile.lock')
-        definition = ::Bundler::Definition.build(gemfile, lockfile, nil)
-        groups = definition.groups - config.bundle_without.map {|g| g.to_sym}
-        definition.specs_for(groups).each {|spec| config.gems << spec }
-        config.init_contents << StringIO.new("ENV['BUNDLE_WITHOUT'] = '#{config.bundle_without.join(':')}'\n")
+        ::Bundler.setup.requested_specs.each do |spec|
+          # Bundler HAX -- fixup bad #loaded_from attribute in fake
+          # bundler gemspec from bundler/source.rb
+          if spec.name == "bundler"
+            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
+          end
+
+          case spec.source
+          when ::Bundler::Source::Git
+            config.bundler[:git_specs] ||= []
+            config.bundler[:git_specs] << spec
+          when ::Bundler::Source::Path
+            $stderr.puts("warning: Bundler `path' components are not currently supported.",
+                         "The `#{spec.full_name}' component was not bundled.",
+                         "Your application may fail to boot!")
+          else
+            config.gems << spec
+          end
+        end
+        config.bundler[:gemfile]  = ::Bundler.default_gemfile
+        config.bundler[:lockfile] = ::Bundler.default_lockfile
+        config.bundler[:frozen] = ::Bundler.settings[:frozen]
+        config.excludes += [::Bundler.settings[:path]] if ::Bundler.settings[:path]
+        config.init_contents << "#{config.warbler_templates}/bundler.erb"
       end
 
       def update_archive(jar)
         add_bundler_files(jar) if config.bundler
       end
 
-      # Add Bundler Gemfiles to the archive.
+      # Add Bundler Gemfiles and git repositories to the archive.
       def add_bundler_files(jar)
-        jar.files[jar.apply_pathmaps(config, 'Gemfile', :application)] = 'Gemfile'
-        if File.exist?('Gemfile.lock')
-          jar.files[jar.apply_pathmaps(config, 'Gemfile.lock', :application)] = 'Gemfile.lock'
+        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
+        if File.exist?(lockfile)
+          jar.files[jar.apply_pathmaps(config, lockfile, :application)] = config.bundler[:lockfile].to_s
+        end
+        if config.bundler[:git_specs]
+          pathmap = "#{config.relative_gem_path}/bundler/gems/%p"
+          pathmap.sub!(%r{^/+}, '')
+          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|
+              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
+            end
+          end
         end
       end
     end