warbler 1.3.6 → 1.3.7

data/lib/warbler/task.rb

@@ -43,7 +43,7 @@ module Warbler
     def initialize(name = nil, config = nil)
       @config = config
       if @config.nil? && File.exists?(Config::FILE)
-        @config = eval(File.open(Config::FILE) {|f| f.read})
+        @config = eval(File.read(Config::FILE), binding, Config::FILE, 0)
       end
       @config ||= Config.new
       unless @config.kind_of? Config
@@ -162,13 +162,13 @@ module Warbler
 
     def define_pluginize_task
       task "pluginize" do
-        if !Dir["vendor/plugins/warbler*"].empty? && ENV["FORCE"].nil?
-          puts "I found an old nest in vendor/plugins; please trash it so I can make a new one"
-          puts "(directory vendor/plugins/warbler* exists)"
+        if !Dir["lib/tasks/warbler*"].empty? && ENV["FORCE"].nil?
+          puts "I found an old nest in lib/tasks; please trash it so I can make a new one"
+          puts "(directory lib/tasks/warbler* exists)"
         else
-          rm_rf FileList["vendor/plugins/warbler*"], :verbose => false
-          mkdir_p "vendor/plugins/warbler/tasks"
-          File.open("vendor/plugins/warbler/tasks/warbler.rake", "w") do |f|
+          rm_rf FileList["lib/tasks/warbler*"], :verbose => false
+          mkdir_p "lib/tasks/warbler"
+          File.open("lib/tasks/warbler/warbler.rake", "w") do |f|
             f.puts "require 'warbler'"
             f.puts "Warbler::Task.new"
           end

data/lib/warbler/templates/jar.erb

@@ -1,7 +1,8 @@
+<% assignment_operator = config.override_gem_home ? "=" : "||=" %>
 <% if config.relative_gem_path.empty? %>
-ENV['GEM_HOME'] ||= File.expand_path('../..', __FILE__)
+ENV['GEM_HOME'] <%= assignment_operator %> File.expand_path('../..', __FILE__)
 <% else %>
-ENV['GEM_HOME'] ||= File.expand_path('../../<%= config.relative_gem_path %>', __FILE__)
+ENV['GEM_HOME'] <%= assignment_operator %> 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__)

data/lib/warbler/templates/war.erb

@@ -1,6 +1,4 @@
 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] %>')
+ENV['BUNDLE_GEMFILE'] ||= $servlet_context.getRealPath('/<%= config.bundler[:gemfile_path] %>')
 <% end %>
-
-

data/lib/warbler/traits/bundler.rb

@@ -23,7 +23,7 @@ module Warbler
 
       def before_configure
         config.bundler = true
-        config.bundle_without = ["development", "test"]
+        config.bundle_without = ["development", "test", "assets"]
       end
 
       def after_configure
@@ -41,8 +41,16 @@ module Warbler
           # 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?
+
+            while !full_gem_path.join('bundler.gemspec').exist?
+              full_gem_path = full_gem_path.dirname
+              # if at top of the path, meaning we cannot find bundler.gemspec, abort.
+              if full_gem_path.to_s=~/^[\.\/]$/
+                $stderr.puts("warning: Unable to detect bundler spec under '#{spec.full_gem_path}'' and is sub-dirs")
+                exit
+              end
+            end
+
             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

data/lib/warbler/traits/gemspec.rb

@@ -49,7 +49,7 @@ module Warbler
         if !@spec.executables.empty?
           "bin/#{@spec.executables.first}"
         else
-          exe = Dir['bin/*'].first
+          exe = Dir['bin/*'].sort.first
           raise "No executable script found" unless exe
           warn "No default executable found in #{@spec_file}, using #{exe}"
           exe

data/lib/warbler/traits/jar.rb

@@ -33,8 +33,11 @@ module Warbler
       end
 
       def update_archive(jar)
-        jar.files['META-INF/MANIFEST.MF'] = StringIO.new(Warbler::Jar::DEFAULT_MANIFEST.chomp + "Main-Class: JarMain\n") unless config.manifest_file
-        jar.files['JarMain.class'] = jar.entry_in_jar("#{WARBLER_HOME}/lib/warbler_jar.jar", "JarMain.class")
+        unless config.manifest_file
+          manifest = Warbler::Jar::DEFAULT_MANIFEST.chomp + "Main-Class: JarMain\n"
+          jar.files['META-INF/MANIFEST.MF'] = StringIO.new(manifest)
+        end
+        jar.files['JarMain.class'] = jar.entry_in_jar(WARBLER_JAR, "JarMain.class")
       end
 
       def default_pathmaps

data/lib/warbler/traits/nogemspec.rb

@@ -33,8 +33,13 @@ module Warbler
       end
 
       def default_executable
-        exes = Dir['bin/*']
-        exe = exes.grep(/#{config.jar_name}/).first || exes.first
+        exes = Dir['bin/*'].sort
+        unless(exe = exes.grep(/#{config.jar_name}/).first)
+          exe = exes.first
+          if exe
+            warn "No executable matching config.jar_name found, using #{exe}"
+          end
+        end
         raise "No executable script found" unless exe
         exe
       end

data/lib/warbler/traits/war.rb

@@ -77,6 +77,7 @@ module Warbler
         add_public_files(jar)
         add_webxml(jar)
         move_jars_to_webinf_lib(jar)
+        add_runnables(jar) if config.features.include?("runnable")
         add_executables(jar) if config.features.include?("executable")
         add_gemjar(jar) if config.features.include?("gemjar")
       end
@@ -99,11 +100,21 @@ module Warbler
         end
       end
 
+      def add_runnables(jar, main_class = 'WarMain')
+        main_class = main_class.sub('.class', '') # handles WarMain.class
+        unless config.manifest_file
+          manifest = Warbler::Jar::DEFAULT_MANIFEST.chomp + "Main-Class: #{main_class}\n"
+          jar.files['META-INF/MANIFEST.MF'] = StringIO.new(manifest)
+        end
+        [ 'JarMain', 'WarMain', main_class ].uniq.each do |klass|
+          jar.files["#{klass}.class"] = jar.entry_in_jar(WARBLER_JAR, "#{klass}.class")
+        end
+      end
+      
       def add_executables(jar)
         webserver = WEB_SERVERS[config.webserver.to_s]
         webserver.add(jar)
-        jar.files['META-INF/MANIFEST.MF'] = StringIO.new(Warbler::Jar::DEFAULT_MANIFEST.chomp + "Main-Class: WarMain\n")
-        jar.files['WarMain.class'] = jar.entry_in_jar("#{WARBLER_HOME}/lib/warbler_jar.jar", webserver.main_class)
+        add_runnables jar, webserver.main_class || 'WarMain'
       end
 
       def add_gemjar(jar)

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.3.6"
+  VERSION = "1.3.7"
 end

data/lib/warbler/web_server.rb

@@ -65,9 +65,9 @@ PROPS
 
   class JenkinsWinstoneServer < WinstoneServer
     def initialize
-      @artifact = Artifact.new("http://maven.jenkins-ci.org/content/repositories/releases",
+      @artifact = Artifact.new("http://repo.jenkins-ci.org/public",
                                "org.jenkins-ci", "winstone",
-                               ENV["WEBSERVER_VERSION"] || "0.9.10-jenkins-35")
+                               ENV["WEBSERVER_VERSION"] || "0.9.10-jenkins-43")
     end
   end
 

data/spec/sample_war/Rakefile

@@ -6,6 +6,10 @@
 
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+begin
+  require 'rdoc/task'
+rescue LoadError
+  require 'rake/rdoctask'
+end
 
 #require 'tasks/rails'

data/spec/sample_war/lib/ruby_one_nine.rb

@@ -0,0 +1,8 @@
+class RubyOneNine
+  
+  RUBY_ONE_NINE_HASH = {
+    test: 'some ruby 1.9 syntax',
+    another: -> { puts 'foo' },
+  }
+
+end

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ raise %{Error: detected running Warbler specs in a Rails app;
 Warbler specs are destructive to application directories.} if File.directory?("app")
 
 require 'rbconfig'
-RUBY_EXE = File.join Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']
+RUBY_EXE = File.join RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name']
 
 require 'fileutils'
 require 'stringio'

data/spec/warbler/application_spec.rb

@@ -26,7 +26,7 @@ describe Warbler::Application do
     Warbler.application = nil
     Warbler.framework_detection = @detection
     @argv.reverse.each {|a| ARGV.unshift a}
-    rm_rf FileList['vendor/plugins/warbler']
+    rm_rf FileList['lib/tasks/warbler']
   end
 
   it "should be able to list its tasks" do
@@ -67,17 +67,17 @@ describe Warbler::Application do
     end
   end
 
-  it "should refuse to pluginize if the vendor/plugins/warbler directory exists" do
-    mkdir_p "vendor/plugins/warbler"
+  it "should refuse to pluginize if the lib/tasks/warbler directory exists" do
+    mkdir_p "lib/tasks/warbler"
     ARGV.unshift "pluginize"
     silence { Warbler::Application.new.run }
-    File.exist?("vendor/plugins/warbler/tasks/warbler.rake").should_not be_true
+    File.exist?("lib/tasks/warbler/warbler.rake").should_not be_true
   end
 
   it "should define a pluginize task for adding the tasks to a Rails application" do
     ARGV.unshift "pluginize"
     silence { Warbler::Application.new.run }
-    File.exist?("vendor/plugins/warbler/tasks/warbler.rake").should be_true
+    File.exist?("lib/tasks/warbler/warbler.rake").should be_true
   end
 
   it "should provide a means to load the project Rakefile" do

data/spec/warbler/bundler_spec.rb

@@ -20,6 +20,15 @@ describe Warbler::Jar, "with Bundler" do
     @extra_config = block
   end
 
+  def hide_shallow_git_clone
+    git_shallow_marker = File.join(Warbler::WARBLER_HOME, ".git/shallow")
+    tmp_marker = File.join(Warbler::WARBLER_HOME, ".git/shallow.tmp")
+    File.rename(git_shallow_marker, tmp_marker) if File.exists?(git_shallow_marker)
+    yield
+  ensure
+    File.rename(tmp_marker, git_shallow_marker) if File.exist?(tmp_marker)
+  end
+
   let(:config) { drbclient.config(@extra_config) }
   let(:jar) { drbclient.jar }
 
@@ -61,19 +70,23 @@ describe Warbler::Jar, "with Bundler" do
     end
 
     it "works with :git entries in Gemfiles" do
-      File.open("Gemfile", "w") {|f| f << "gem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\n"}
-      `#{RUBY_EXE} -S bundle install --local`
-      jar.apply(config)
-      file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/lib/warbler/version\.rb}).should_not be_empty
-      file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/warbler.gemspec}).should_not be_empty
+      hide_shallow_git_clone do
+        File.open("Gemfile", "w") {|f| f << "gem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\n"}
+        `#{RUBY_EXE} -S bundle install --local`
+        jar.apply(config)
+        file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/lib/warbler/version\.rb}).should_not be_empty
+        file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/warbler.gemspec}).should_not be_empty
+      end
     end
 
     it "bundles only the gemspec for :git entries that are excluded" do
-      File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngroup :test do\ngem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\nend\n"}
-      `#{RUBY_EXE} -S bundle install --local`
-      jar.apply(config)
-      file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/lib/warbler/version\.rb}).should be_empty
-      file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/warbler.gemspec}).should_not be_empty
+      hide_shallow_git_clone do
+        File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngroup :test do\ngem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\nend\n"}
+        `#{RUBY_EXE} -S bundle install --local`
+        jar.apply(config)
+        file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/lib/warbler/version\.rb}).should be_empty
+        file_list(%r{WEB-INF/gems/bundler/gems/warbler[^/]*/warbler.gemspec}).should_not be_empty
+      end
     end
 
     it "does not work with :path entries in Gemfiles" do
@@ -96,13 +109,13 @@ describe Warbler::Jar, "with Bundler" do
       jar.add_init_file(config)
       contents = jar.contents('META-INF/init.rb')
       contents.should =~ /ENV\['BUNDLE_WITHOUT'\]/
-      contents.should =~ /'development:test'/
+      contents.should =~ /'development:test:assets'/
     end
 
     it "adds BUNDLE_GEMFILE to init.rb" do
       jar.add_init_file(config)
       contents = jar.contents('META-INF/init.rb')
-      contents.should =~ Regexp.new(Regexp.quote("ENV['BUNDLE_GEMFILE'] = $servlet_context.getRealPath('/WEB-INF/Gemfile')"))
+      contents.should =~ Regexp.new(Regexp.quote("ENV['BUNDLE_GEMFILE'] ||= $servlet_context.getRealPath('/WEB-INF/Gemfile')"))
     end
 
     it "uses ENV['BUNDLE_GEMFILE'] if set" do
@@ -117,14 +130,16 @@ describe Warbler::Jar, "with Bundler" do
     cleanup_temp_files
 
     it "works with :git entries in Gemfiles" do
-      File.open("Gemfile", "w") {|f| f << "gem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\n"}
-      `#{RUBY_EXE} -S bundle install --local`
-      jar.apply(config)
-      file_list(%r{^bundler/gems/warbler[^/]*/lib/warbler/version\.rb}).should_not be_empty
-      file_list(%r{^bundler/gems/warbler[^/]*/warbler.gemspec}).should_not be_empty
-      jar.add_init_file(config)
-      contents = jar.contents('META-INF/init.rb')
-      contents.should =~ /ENV\['BUNDLE_GEMFILE'\] = File.expand_path(.*, __FILE__)/
+      hide_shallow_git_clone do
+        File.open("Gemfile", "w") {|f| f << "gem 'warbler', :git => '#{Warbler::WARBLER_HOME}'\n"}
+        `#{RUBY_EXE} -S bundle install --local`
+        jar.apply(config)
+        file_list(%r{^bundler/gems/warbler[^/]*/lib/warbler/version\.rb}).should_not be_empty
+        file_list(%r{^bundler/gems/warbler[^/]*/warbler.gemspec}).should_not be_empty
+        jar.add_init_file(config)
+        contents = jar.contents('META-INF/init.rb')
+        contents.should =~ /ENV\['BUNDLE_GEMFILE'\] = File.expand_path(.*, __FILE__)/
+      end
     end
 
     it "adds BUNDLE_GEMFILE to init.rb" do
@@ -155,4 +170,16 @@ describe Warbler::Jar, "with Bundler" do
       contents.split("\n").grep(/ENV\['BUNDLE_FROZEN'\] = '1'/).should_not be_empty
     end
   end
+
+  context "when deployment" do
+    run_in_directory "spec/sample_bundler"
+
+    it "includes the bundler gem" do
+      `#{RUBY_EXE} -S bundle install --deployment`
+      jar.apply(config)
+      file_list(%r{gems/rake-0.8.7/lib}).should_not be_empty
+      file_list(%r{gems/bundler-}).should_not be_empty
+      file_list(%r{gems/bundler-.*/lib}).should_not be_empty
+    end
+  end
 end

data/spec/warbler/config_spec.rb

@@ -19,6 +19,7 @@ describe Warbler::Config do
       config = Warbler::Config.new
       config.includes.should be_empty
       config.jar_name.size.should > 0
+      config.override_gem_home.should be_false
     end
   end
 
@@ -32,12 +33,13 @@ describe Warbler::Config do
     it "should have suitable default values" do
       config = Warbler::Config.new
       config.dirs.should include(*Warbler::Config::TOP_DIRS.select{|d| File.directory?(d)})
-      config.includes.should be_empty
+      config.excludes.should be_empty
       config.java_libs.should_not be_empty
       config.jar_name.size.should > 0
       config.webxml.should be_kind_of(OpenStruct)
       config.pathmaps.should be_kind_of(OpenStruct)
       config.pathmaps.public_html.should == ["%{public/,}p"]
+      config.override_gem_home.should be_false
     end
 
     it "should allow configuration through an initializer block" do

data/spec/warbler/jar_spec.rb

@@ -55,10 +55,17 @@ describe Warbler::Jar do
       contents.split("\n").grep(/require 'rubygems'/).should_not be_empty
     end
 
-    it "adds ENV['GEM_HOME'] to init.rb" do
+    it "does not override ENV['GEM_HOME'] by default" do
       jar.add_init_file(config)
       contents = jar.contents('META-INF/init.rb')
-      contents.should =~ /ENV\['GEM_HOME'\]/
+      contents.should =~ %r{ENV['GEM_HOME'] ||=}
+    end
+
+    it "overrides ENV['GEM_HOME'] when override_gem_home is set" do
+      config.override_gem_home = true
+      jar.add_init_file(config)
+      contents = jar.contents('META-INF/init.rb')
+      contents.should =~ /ENV\['GEM_HOME'\] =/
     end
 
     it "adds a main.rb" do
@@ -137,7 +144,7 @@ describe Warbler::Jar do
         jar.compile(config)
         jar.apply(config)
         file_list(%r{^sample_jar/lib/sample_jar\.class$}).should_not be_empty
-        jar.contents('sample_jar/lib/sample_jar.rb').should =~ /require __FILE__\.sub/
+        jar.contents('sample_jar/lib/sample_jar.rb').should =~ /load __FILE__\.sub/
       end
     end
 
@@ -475,16 +482,30 @@ describe Warbler::Jar do
     context "with the executable feature" do
       use_test_webserver
 
-      it "adds a WarMain class" do
+      it "adds WarMain (and JarMain) class" do
         use_config do |config|
           config.webserver = "test"
           config.features << "executable"
         end
         jar.apply(config)
         file_list(%r{^WarMain\.class$}).should_not be_empty
+        file_list(%r{^JarMain\.class$}).should_not be_empty
       end
     end
 
+    context "with the runnable feature" do
+      
+      it "adds WarMain (and JarMain) class" do
+        use_config do |config|
+          config.features << "runnable"
+        end
+        jar.apply(config)
+        file_list(%r{^WarMain\.class$}).should_not be_empty
+        file_list(%r{^JarMain\.class$}).should_not be_empty
+      end
+      
+    end
+    
     context "in a Rails application" do
       before :each do
         @rails = nil

data/spec/warbler/task_spec.rb

@@ -105,7 +105,23 @@ describe Warbler::Task do
       ruby_class_definition = zf.get_input_stream('WEB-INF/app/helpers/application_helper.rb') {|io| io.read }
 
       java_class_header.should == java_class_magic_number
-      ruby_class_definition.should == %{require __FILE__.sub(/.rb$/, '.class')}
+      ruby_class_definition.should == %{load __FILE__.sub(/.rb$/, '.class')}
+    end
+  end
+
+  it "should compile ruby 1.9 mode" do
+    config.features << "compiled"
+    config.webxml.jruby.compat.version = '1.9'
+    silence { run_task "warble" }
+
+    java_class_magic_number = [0xCA,0xFE,0xBA,0xBE].map { |magic_char| magic_char.chr }.join
+
+    Zip::ZipFile.open("#{config.jar_name}.war") do |zf|
+      java_class_header     = zf.get_input_stream('WEB-INF/lib/ruby_one_nine.class') {|io| io.read }[0..3]
+      ruby_class_definition = zf.get_input_stream('WEB-INF/lib/ruby_one_nine.rb') {|io| io.read }
+
+      java_class_header.should == java_class_magic_number
+      ruby_class_definition.should == %{load __FILE__.sub(/.rb$/, '.class')}
     end
   end