warbler 2.0.0 → 2.0.1

data/spec/sample_bundler/vendor/bundle/jruby/2.3.0/gems/rake-10.5.0/test/test_trace_output.rb

@@ -0,0 +1,52 @@
+require File.expand_path('../helper', __FILE__)
+require 'stringio'
+
+class TestTraceOutput < Rake::TestCase
+  include Rake::TraceOutput
+
+  class PrintSpy
+    attr_reader :result, :calls
+
+    def initialize
+      @result = ""
+      @calls = 0
+    end
+
+    def print(string)
+      @result << string
+      @calls += 1
+    end
+  end
+
+  def test_trace_issues_single_io_for_args_with_empty_args
+    spy = PrintSpy.new
+    trace_on(spy)
+    assert_equal "\n", spy.result
+    assert_equal 1, spy.calls
+  end
+
+  def test_trace_issues_single_io_for_args_multiple_strings
+    spy = PrintSpy.new
+    trace_on(spy, "HI\n", "LO")
+    assert_equal "HI\nLO\n", spy.result
+    assert_equal 1, spy.calls
+  end
+
+  def test_trace_handles_nil_objects
+    spy = PrintSpy.new
+    trace_on(spy, "HI\n", nil, "LO")
+    assert_equal "HI\nLO\n", spy.result
+    assert_equal 1, spy.calls
+  end
+
+  def test_trace_issues_single_io_for_args_multiple_strings_and_alternate_sep
+    old_sep = $\
+    $\ = "\r"
+    spy = PrintSpy.new
+    trace_on(spy, "HI\r", "LO")
+    assert_equal "HI\rLO\r", spy.result
+    assert_equal 1, spy.calls
+  ensure
+    $\ = old_sep
+  end
+end

data/spec/sample_bundler/vendor/bundle/jruby/2.3.0/specifications/rake-10.5.0.gemspec

@@ -0,0 +1,43 @@
+# -*- encoding: utf-8 -*-
+# stub: rake 10.5.0 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "rake".freeze
+  s.version = "10.5.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.2".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Eric Hodel".freeze, "Jim Weirich".freeze]
+  s.date = "2016-01-13"
+  s.description = "Rake is a Make-like program implemented in Ruby. Tasks and dependencies are\nspecified in standard Ruby syntax.\n\nRake has the following features:\n\n* Rakefiles (rake's version of Makefiles) are completely defined in\n  standard Ruby syntax.  No XML files to edit.  No quirky Makefile\n  syntax to worry about (is that a tab or a space?)\n\n* Users can specify tasks with prerequisites.\n\n* Rake supports rule patterns to synthesize implicit tasks.\n\n* Flexible FileLists that act like arrays but know about manipulating\n  file names and paths.\n\n* A library of prepackaged tasks to make building rakefiles easier. For example,\n  tasks for building tarballs and publishing to FTP or SSH sites.  (Formerly\n  tasks for building RDoc and Gems were included in rake but they're now\n  available in RDoc and RubyGems respectively.)\n\n* Supports parallel execution of tasks.".freeze
+  s.email = ["drbrain@segment7.net".freeze, "".freeze]
+  s.executables = ["rake".freeze]
+  s.extra_rdoc_files = ["CONTRIBUTING.rdoc".freeze, "History.rdoc".freeze, "Manifest.txt".freeze, "README.rdoc".freeze, "doc/command_line_usage.rdoc".freeze, "doc/glossary.rdoc".freeze, "doc/proto_rake.rdoc".freeze, "doc/rakefile.rdoc".freeze, "doc/rational.rdoc".freeze, "doc/release_notes/rake-0.4.14.rdoc".freeze, "doc/release_notes/rake-0.4.15.rdoc".freeze, "doc/release_notes/rake-0.5.0.rdoc".freeze, "doc/release_notes/rake-0.5.3.rdoc".freeze, "doc/release_notes/rake-0.5.4.rdoc".freeze, "doc/release_notes/rake-0.6.0.rdoc".freeze, "doc/release_notes/rake-0.7.0.rdoc".freeze, "doc/release_notes/rake-0.7.1.rdoc".freeze, "doc/release_notes/rake-0.7.2.rdoc".freeze, "doc/release_notes/rake-0.7.3.rdoc".freeze, "doc/release_notes/rake-0.8.0.rdoc".freeze, "doc/release_notes/rake-0.8.2.rdoc".freeze, "doc/release_notes/rake-0.8.3.rdoc".freeze, "doc/release_notes/rake-0.8.4.rdoc".freeze, "doc/release_notes/rake-0.8.5.rdoc".freeze, "doc/release_notes/rake-0.8.6.rdoc".freeze, "doc/release_notes/rake-0.8.7.rdoc".freeze, "doc/release_notes/rake-0.9.0.rdoc".freeze, "doc/release_notes/rake-0.9.1.rdoc".freeze, "doc/release_notes/rake-0.9.2.2.rdoc".freeze, "doc/release_notes/rake-0.9.2.rdoc".freeze, "doc/release_notes/rake-0.9.3.rdoc".freeze, "doc/release_notes/rake-0.9.4.rdoc".freeze, "doc/release_notes/rake-0.9.5.rdoc".freeze, "doc/release_notes/rake-0.9.6.rdoc".freeze, "doc/release_notes/rake-10.0.0.rdoc".freeze, "doc/release_notes/rake-10.0.1.rdoc".freeze, "doc/release_notes/rake-10.0.2.rdoc".freeze, "doc/release_notes/rake-10.0.3.rdoc".freeze, "doc/release_notes/rake-10.1.0.rdoc".freeze, "MIT-LICENSE".freeze]
+  s.files = ["CONTRIBUTING.rdoc".freeze, "History.rdoc".freeze, "MIT-LICENSE".freeze, "Manifest.txt".freeze, "README.rdoc".freeze, "bin/rake".freeze, "doc/command_line_usage.rdoc".freeze, "doc/glossary.rdoc".freeze, "doc/proto_rake.rdoc".freeze, "doc/rakefile.rdoc".freeze, "doc/rational.rdoc".freeze, "doc/release_notes/rake-0.4.14.rdoc".freeze, "doc/release_notes/rake-0.4.15.rdoc".freeze, "doc/release_notes/rake-0.5.0.rdoc".freeze, "doc/release_notes/rake-0.5.3.rdoc".freeze, "doc/release_notes/rake-0.5.4.rdoc".freeze, "doc/release_notes/rake-0.6.0.rdoc".freeze, "doc/release_notes/rake-0.7.0.rdoc".freeze, "doc/release_notes/rake-0.7.1.rdoc".freeze, "doc/release_notes/rake-0.7.2.rdoc".freeze, "doc/release_notes/rake-0.7.3.rdoc".freeze, "doc/release_notes/rake-0.8.0.rdoc".freeze, "doc/release_notes/rake-0.8.2.rdoc".freeze, "doc/release_notes/rake-0.8.3.rdoc".freeze, "doc/release_notes/rake-0.8.4.rdoc".freeze, "doc/release_notes/rake-0.8.5.rdoc".freeze, "doc/release_notes/rake-0.8.6.rdoc".freeze, "doc/release_notes/rake-0.8.7.rdoc".freeze, "doc/release_notes/rake-0.9.0.rdoc".freeze, "doc/release_notes/rake-0.9.1.rdoc".freeze, "doc/release_notes/rake-0.9.2.2.rdoc".freeze, "doc/release_notes/rake-0.9.2.rdoc".freeze, "doc/release_notes/rake-0.9.3.rdoc".freeze, "doc/release_notes/rake-0.9.4.rdoc".freeze, "doc/release_notes/rake-0.9.5.rdoc".freeze, "doc/release_notes/rake-0.9.6.rdoc".freeze, "doc/release_notes/rake-10.0.0.rdoc".freeze, "doc/release_notes/rake-10.0.1.rdoc".freeze, "doc/release_notes/rake-10.0.2.rdoc".freeze, "doc/release_notes/rake-10.0.3.rdoc".freeze, "doc/release_notes/rake-10.1.0.rdoc".freeze]
+  s.homepage = "https://github.com/ruby/rake".freeze
+  s.licenses = ["MIT".freeze]
+  s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.8.7".freeze)
+  s.rubygems_version = "2.6.4".freeze
+  s.summary = "Rake is a Make-like program implemented in Ruby".freeze
+
+  s.installed_by_version = "2.6.4" if s.respond_to? :installed_by_version
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<minitest>.freeze, ["~> 5.8"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.0"])
+      s.add_development_dependency(%q<hoe>.freeze, ["~> 3.14"])
+    else
+      s.add_dependency(%q<minitest>.freeze, ["~> 5.8"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 4.0"])
+      s.add_dependency(%q<hoe>.freeze, ["~> 3.14"])
+    end
+  else
+    s.add_dependency(%q<minitest>.freeze, ["~> 5.8"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 4.0"])
+    s.add_dependency(%q<hoe>.freeze, ["~> 3.14"])
+  end
+end

data/spec/sample_jbundler/vendor/bundle/jruby/1.8/gems

@@ -0,0 +1 @@
+../../gems

data/spec/sample_jbundler/vendor/bundle/jruby/1.8/specifications

@@ -0,0 +1 @@
+../../specifications

data/spec/sample_jbundler/vendor/bundle/jruby/1.9/gems

@@ -0,0 +1 @@
+../../gems

data/spec/sample_jbundler/vendor/bundle/jruby/1.9/specifications

@@ -0,0 +1 @@
+../../specifications

data/spec/sample_jbundler/vendor/bundle/ruby/1.8/gems

@@ -0,0 +1 @@
+../../gems

data/spec/sample_jbundler/vendor/bundle/ruby/1.8/specifications

@@ -0,0 +1 @@
+../../specifications

data/spec/sample_jbundler/vendor/bundle/ruby/1.9.1/gems

@@ -0,0 +1 @@
+../../gems

data/spec/sample_jbundler/vendor/bundle/ruby/1.9.1/specifications

@@ -0,0 +1 @@
+../../specifications

data/spec/sample_war/gems/.keep

@@ -0,0 +1 @@
+

data/spec/spec_helper.rb

@@ -86,50 +86,17 @@ module ExampleGroupHelpers
 
   def create_git_gem(gem_name)
     before do
-      @gem_dir = Dir.mktmpdir("#{gem_name}-#{rand(100)}")
-      cur_dir = Dir.pwd
-      Dir.chdir(@gem_dir) do
+      @gem_dir = generate_gem(gem_name) do |gem_dir|
         `git init`
         `git config user.email "warbler-test@null.com"`
         `git config user.name  "Warbler Test"`
 
-        # create the gemspec and Gemfile
-        File.open("Gemfile", "w") do |f|
-          f << <<-RUBY
-          source "http://rubygems.org/"
-          gemspec
-          RUBY
-        end
-
-        File.open("#{gem_name}.gemspec", "w") do |f|
-          f << <<-RUBY
-          # -*- encoding: utf-8 -*-
-          Gem::Specification.new do |gem|
-            gem.name = "#{gem_name}"
-            gem.version = '1.0'
-            gem.authors = ['John Doe']
-            gem.summary = "Gem for testing"
-            gem.platform = Gem::Platform::RUBY
-            gem.files = `git ls-files`.split("\n")
-            gem.add_runtime_dependency 'rake', [">= 10.4.2"]
-          end
-          RUBY
-        end
-
-        Dir.mkdir("lib")
-        Dir.mkdir("lib/#{gem_name}")
-
-        File.open("lib/#{gem_name}/version.rb", "w") do |f|
-          f << <<-RUBY
-          VERSION = "1.0"
-          RUBY
-        end
-
         # `bundle install --local`
         `git add .`
         `git commit -am "first commit"`
+
+        gem_dir
       end
-      Dir.chdir(cur_dir)
     end
 
     after do
@@ -197,11 +164,56 @@ module ExampleGroupHelpers
       Warbler::WEB_SERVERS.delete('test')
     end
   end
+
+  module InstanceMethods
+
+    def generate_gem(gem_name, gem_dir = Dir.mktmpdir("#{gem_name}-#{Time.now.to_f}"))
+      Dir.chdir(gem_dir) do
+
+        # create the gemspec and Gemfile
+        File.open("Gemfile", "w") do |f|
+          f << <<-RUBY
+          source "http://rubygems.org/"
+          gemspec
+          RUBY
+        end
+
+        File.open("#{gem_name}.gemspec", "w") do |f|
+          f << <<-RUBY
+          # -*- encoding: utf-8 -*-
+          Gem::Specification.new do |gem|
+            gem.name = "#{gem_name}"
+            gem.version = '1.0'
+            gem.authors = ['John Doe']
+            gem.summary = "Gem for testing"
+            gem.platform = Gem::Platform::RUBY
+            gem.files = `git ls-files`.split("\n")
+            gem.add_runtime_dependency 'rake', ['>= 0.8.7']
+          end
+          RUBY
+        end
+
+        Dir.mkdir("lib")
+        Dir.mkdir("lib/#{gem_name}")
+
+        File.open("lib/#{gem_name}/version.rb", "w") do |f|
+          f << <<-RUBY
+          VERSION = "1.0"
+          RUBY
+        end
+
+        block_given? ? yield(gem_dir) : gem_dir
+      end
+    end
+
+  end
+
 end
 
 RSpec.configure do |config|
   config.include Warbler::RakeHelper
   config.extend ExampleGroupHelpers
+  config.include ExampleGroupHelpers::InstanceMethods
 
   class << ::Object
     public :remove_const

data/spec/warbler/bundler_spec.rb

@@ -84,12 +84,36 @@ describe Warbler::Jar, "with Bundler" do
         file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/tester.gemspec}).should_not be_empty
       end
 
-      it "does not work with :path entries in Gemfiles" do
+    end
+
+    context 'with :path entries in the Gemfile' do
+
+      after { FileUtils.rm_r(@gem_dir) rescue nil if @gem_dir }
+
+      it "does not work with absolute :path" do
+        @gem_dir = generate_gem('tester', Dir.mktmpdir("gems-#{Time.now.to_i}"))
         File.open("Gemfile", "w") {|f| f << "gem 'tester', :path => '#{@gem_dir}'\n"}
         bundle_install '--local'
         silence { jar.apply(config) }
         file_list(%r{tester}).should be_empty
       end
+
+      it "does work with relative :path" do
+        gem_dir = File.join(Dir.pwd, 'gems/tester')
+        #begin
+          Dir.mkdir(gem_dir)
+          @gem_dir = generate_gem('tester', 'gems/tester') # spec/sample_war/gems
+          File.open("Gemfile", "w") {|f| f << "gem 'rake'\ngem 'tester', :path => 'gems/tester'\n"}
+          bundle_install '--local'
+          jar.apply(config)
+          file_list(%r{tester}).should_not be_empty # included from :path as is
+          file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/lib/tester/version\.rb}).should be_empty
+          file_list(%r{WEB-INF/gems/bundler/gems/tester[^/]*/tester.gemspec}).should be_empty
+        #ensure
+          #FileUtils.rm_r(gem_dir) rescue nil
+        #end
+      end
+
     end
 
     it "does not bundle dependencies in the test group by default" do
@@ -210,7 +234,7 @@ describe Warbler::Jar, "with Bundler" do
     it "includes the bundler gem" do
       bundle_install '--deployment'
       jar.apply(config)
-      file_list(%r{gems/rake-10.4.2/lib}).should_not be_empty
+      file_list(%r{gems/rake-10.5.0/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

data/spec/warbler/config_spec.rb

@@ -110,14 +110,41 @@ describe Warbler::Config do
       config = Warbler::Config.new
       config.webxml.booter = :rack
       config.webxml.servlet_context_listener.should == "org.jruby.rack.RackServletContextListener"
+      config.webxml.booter = :rails
+      config.webxml.servlet_context_listener.should == "org.jruby.rack.rails.RailsServletContextListener"
       config = Warbler::Config.new
       config.webxml.servlet_context_listener.should == "org.jruby.rack.rails.RailsServletContextListener"
     end
 
+    it "allows for adjusting of context listeners" do
+      config = Warbler::Config.new
+      config.webxml.booter = :rack
+      config.webxml.servlet_context_listeners.should == [ 'org.jruby.rack.RackServletContextListener' ]
+      config.webxml.servlet_context_listeners.clear
+      config.webxml.servlet_context_listeners.should == [ ]
+
+      config = Warbler::Config.new
+      config.webxml.booter = :rails
+      config.webxml.servlet_context_listeners << 'org.kares.jruby.rack.WorkerContextListener'
+      config.webxml.servlet_context_listeners.should == [ 'org.jruby.rack.rails.RailsServletContextListener', 'org.kares.jruby.rack.WorkerContextListener' ]
+
+      config.webxml.context_params.should_not have_key('servlet_context_listener')
+    end
+
+    it "provides rack filter defaults" do
+      config = Warbler::Config.new
+      config.webxml.servlet_filter.should == 'org.jruby.rack.RackFilter'
+      config.webxml.servlet_filter_name.should == 'RackFilter'
+      config.webxml.servlet_filter_url_pattern.should == '/*'
+      config.webxml.servlet_filter_async
+    end
+
     it "should not include ignored webxml keys in the context params hash" do
+      config = Warbler::Config.new
+      config.webxml.booter = :rack
+      config.webxml.context_params.should_not have_key('booter')
       Warbler::Config.new.webxml.context_params.should_not have_key('ignored')
       Warbler::Config.new.webxml.context_params.should_not have_key('jndi')
-      Warbler::Config.new.webxml.context_params.should_not have_key('booter')
     end
 
     it "should have a helpful string representation for an empty key" do

data/spec/warbler/jar_spec.rb

@@ -338,7 +338,7 @@ describe Warbler::Jar do
 
     it "collects gem files" do
       use_config do |config|
-        config.gems << "rake"
+        config.gems << 'rake'
       end
       jar.apply(config)
       file_list(%r{WEB-INF/gems/gems/rake.*/lib/rake.rb}).should_not be_empty
@@ -347,22 +347,39 @@ describe Warbler::Jar do
 
     it "collects gem files with dependencies" do
       use_config do |config|
-        config.gems << "rdoc"
+        config.gems << 'virtus'
         config.gem_dependencies = true
       end
       jar.apply(config)
-      file_list(%r{WEB-INF/gems/gems/json.*/lib/json.rb}).should_not be_empty
-      file_list(%r{WEB-INF/gems/specifications/json.*\.gemspec}).should_not be_empty
+      file_list(%r{WEB-INF/gems/gems/axiom-types.*/lib}).should_not be_empty
+      file_list(%r{WEB-INF/gems/specifications/axiom-types.*\.gemspec}).should_not be_empty
+      file_list(%r{WEB-INF/gems/gems/equalizer.*/lib/equalizer/version.rb$}).should_not be_empty
+      # NOTE: rdoc is tricky as its dependency json is a default gem
+      #use_config do |config|
+      #  config.gems << "rdoc"
+      #  config.gem_dependencies = true
+      #end
+      #jar.apply(config)
+      #file_list(%r{WEB-INF/gems/gems/json.*/lib/json.rb}).should_not be_empty
+      #file_list(%r{WEB-INF/gems/specifications/json.*\.gemspec}).should_not be_empty
     end
 
     it "collects gem files without dependencies" do
       use_config do |config|
-        config.gems << "rdoc"
+        config.gems << 'virtus'
         config.gem_dependencies = false
       end
       jar.apply(config)
-      file_list(%r{WEB-INF/gems/gems/json.*/lib/json.rb}).should be_empty
-      file_list(%r{WEB-INF/gems/specifications/json.*\.gemspec}).should be_empty
+      file_list(%r{WEB-INF/gems/gems/axiom-types.*/lib}).should be_empty
+      file_list(%r{WEB-INF/gems/specifications/axiom-types.*\.gemspec}).should be_empty
+      file_list(%r{WEB-INF/gems/gems/equalizer.*/lib/equalizer/version.rb$}).should be_empty
+      #use_config do |config|
+      #  config.gems << "rdoc"
+      #  config.gem_dependencies = false
+      #end
+      #jar.apply(config)
+      #file_list(%r{WEB-INF/gems/gems/json.*/lib/json.rb}).should be_empty
+      #file_list(%r{WEB-INF/gems/specifications/json.*\.gemspec}).should be_empty
     end
 
     it "adds ENV['GEM_HOME'] to init.rb" do
@@ -394,6 +411,7 @@ describe Warbler::Jar do
 
     it "creates a web.xml file" do
       use_config do |config|
+        config.webxml.booter = :rack
         config.webxml.jruby.max.runtimes = 5
       end
       elements = expand_webxml
@@ -403,6 +421,26 @@ describe Warbler::Jar do
       elements.to_a(
                     "context-param/param-name[text()='jruby.max.runtimes']/../param-value"
                     ).first.text.should == "5"
+
+      filters = elements.to_a("filter/filter-class")
+      expect( filters.size ).to eql 1
+      expect( filters.first.text ).to eql 'org.jruby.rack.RackFilter'
+      filters = elements.to_a("filter/filter-name")
+      expect( filters.size ).to eql 1
+      expect( filters.first.text ).to eql 'RackFilter'
+      filters = elements.to_a("filter/async-supported")
+      expect( filters.size ).to eql 1
+      expect( filters.first.text ).to eql 'false'
+      filters = elements.to_a("filter-mapping/filter-name")
+      expect( filters.size ).to eql 1
+      expect( filters.first.text ).to eql 'RackFilter'
+      filters = elements.to_a("filter-mapping/url-pattern")
+      expect( filters.size ).to eql 1
+      expect( filters.first.text ).to eql '/*'
+
+      listeners = elements.to_a("listener/listener-class")
+      expect( listeners.size ).to eql 1
+      expect( listeners.first.text ).to eql 'org.jruby.rack.RackServletContextListener'
     end
 
     it "includes custom context parameters in web.xml" do

data/warble.rb

@@ -5,9 +5,10 @@
 Warbler::Config.new do |config|
   # Features: additional options controlling how the jar is built.
   # Currently the following features are supported:
-  # - gemjar: package the gem repository in a jar file in WEB-INF/lib
-  # - executable: embed a web server and make the war executable
-  # - compiled: compile .rb files to .class files
+  # - *gemjar*: package the gem repository in a jar file in WEB-INF/lib
+  # - *executable*: embed a web server and make the war executable
+  # - *runnable*: allows to run bin scripts e.g. `java -jar my.war -S rake -T`
+  # - *compiled*: compile .rb files to .class files
   # config.features = %w(gemjar)
 
   # Application directories to be included in the webapp.
@@ -123,6 +124,11 @@ Warbler::Config.new do |config|
 
   # === War files only below here ===
 
+  # Embedded webserver to use with the 'executable' feature. Currently supported
+  # webservers are:
+  # - *jetty* - Embedded Jetty from Eclipse
+  # config.webserver = 'jetty'
+
   # Path to the pre-bundled gem directory inside the war file. Default
   # is 'WEB-INF/gems'. Specify path if gems are already bundled
   # before running Warbler. This also sets 'gem.path' inside web.xml.
@@ -141,14 +147,12 @@ Warbler::Config.new do |config|
   # Pathmaps for controlling how public HTML files are copied into the .war
   # config.pathmaps.public_html = ["%{public/,}p"]
 
-  # Embedded webserver to use with the 'executable' feature. Currently supported
-  # webservers are:
-  # * <tt>jetty</tt> - Embedded Jetty from Eclipse
-  # config.webserver = 'jetty'
-
   # Value of RAILS_ENV for the webapp -- default as shown below
   # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
 
+  # Public ROOT mapping, by default assets are copied into .war ROOT directory.
+  # config.public.root = ''
+
   # Application booter to use, either :rack or :rails (autodetected by default)
   # config.webxml.booter = :rails