warbler 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 768a159b70a6e4427ada860ba1d8d8089035da25
-  data.tar.gz: 5a932aae7c9bc530be00044dccdb6d5179526abc
+  metadata.gz: a948686e291d17e74ba5a81f20ac44295eeaf5dc
+  data.tar.gz: 00179dc599932291918a6e740a9b242cd55aa1d1
 SHA512:
-  metadata.gz: f54bd8cf2c7fb1c8f44e897d02869393afa771d138a943b59ed4a986d0b5776aaf15e2062e0f6435b7ff5210f7eec24cdac628c7bfb9a3b64e9aec39de37de8f
-  data.tar.gz: 78483dd60bd77d29936f9298c2eb9b43fc7f2806324f905b33e1a2f9072b2c34aa403b8dc2a6e6a37c51c5d25b6cca53e8f6cfca9a869900e7da908c0eb6feaa
+  metadata.gz: 0b04a6a3f642fdeaf383e9cfa7d9bf1fcf2c5a2e620a586fc04a07db3fa98399e922071301ed0df5155de2fb36ab41698af1cb7e91ea7ebaca2f76926f789b05
+  data.tar.gz: a79aaf60d19436a6f71767de58ea6c19b932ea9807a85048b15685335538b420871f42da44ca22cbda2b160816c0c0801bf8be46858d10934fee6218d3bd91a1

data/.travis.yml

@@ -1,9 +1,10 @@
 rvm:
   - jruby-9.0.5.0
+  - jruby-9.1.0.0
 branches:
   only:
     - master
-    - 2.x-dev
+    - /-dev|-feature|-fix/
 env:
   - JRUBY_OPTS="--server -Xcompile.invokedynamic=false"
 matrix:

data/Gemfile

@@ -8,4 +8,9 @@ group :development do
   gem "childprocess", :platform => :mri
 end
 
-gem 'rubyzip', ENV['RUBYZIP_VERSION'] if ENV['RUBYZIP_VERSION']
+gem 'rubyzip', ENV['RUBYZIP_VERSION'] if ENV['RUBYZIP_VERSION']
+gem 'rake', ENV['RAKE_VERSION'], :require => nil if ENV['RAKE_VERSION']
+
+group :development, :test do
+  gem 'rdoc', ['>= 3.10', '< 4.3'], :require => nil
+end

data/bin/warble

@@ -8,4 +8,4 @@
 #++
 
 require 'warbler'
-Warbler::Application.new.run
+Warbler::Application.run

data/lib/warbler/application.rb

@@ -42,7 +42,7 @@ class Warbler::Application < Rake::Application
 
     desc "Feature: make a runnable archive (e.g. java -jar rails.war -S rake db:migrate)"
     task :runnable => "#{wt.name}:runnable"
-    
+
     desc "Feature: precompile all Ruby files"
     task :compiled => "#{wt.name}:compiled"
 
@@ -54,26 +54,28 @@ class Warbler::Application < Rake::Application
   def load_project_rakefile
     return if @project_loaded
     # Load any application rakefiles to aid in autodetecting applications
-    app = Warbler.project_application = Rake::Application.new
-    Rake.application = app
+    set_application Warbler.project_application = Rake::Application.new
     Rake::Application::DEFAULT_RAKEFILES.each do |rf|
       if File.exist?(rf)
         begin
           load rf
-        rescue LoadError => e
+        rescue LoadError
           load File.join(Dir.getwd, rf)
         end
         break
       end
     end
-    Rake.application = self
+    set_application
     @project_loaded = true
   end
 
   # Run the application: The equivalent code for the +warble+ command
-  # is simply <tt>Warbler::Application.new.run</tt>.
+  # is simply <tt>Warbler::Application.run</tt>.
+  def self.run; new.run end
+
+  # Run the application.
   def run
-    Rake.application = self
+    set_application
     super
   end
 
@@ -92,4 +94,11 @@ class Warbler::Application < Rake::Application
       end
     end
   end
+
+  private
+
+  def set_application(app = self)
+    Rake.application = app
+  end
+
 end

data/lib/warbler/gems.rb

@@ -11,6 +11,7 @@ module Warbler
   # It would be easier to just use a hash.
   class Gems < Hash
     ANY_VERSION = nil
+    private_constant :ANY_VERSION
 
     def initialize(gems = nil)
       if gems.is_a?(Hash)

data/lib/warbler/jar.rb

@@ -208,7 +208,7 @@ module Warbler
 
     # Add gems to WEB-INF/gems
     def find_gems_files(config)
-      unless @compiled and config.compile_gems
+      unless @compiled && config.compile_gems
         config.gems.specs(config.gem_dependencies).each {|spec| find_single_gem_files(config, spec) }
       end
     end
@@ -272,7 +272,7 @@ module Warbler
 
     def expand_erb(file, config)
       require 'erb'
-      erb = ERB.new(File.open(file) {|f| f.read })
+      erb = ERB.new(File.read(file), nil, '-')
       StringIO.new(erb.result(erb_binding(config)))
     end
 

data/lib/warbler/templates/bundler.erb

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

data/lib/warbler/templates/jar.erb

@@ -1,9 +1,11 @@
-<% assignment_operator = config.override_gem_home ? "=" : "||=" %>
-<% if config.relative_gem_path.empty? %>
-ENV['GEM_HOME'] <%= assignment_operator %> File.expand_path('../..', __FILE__)
-<% else %>
-ENV['GEM_HOME'] <%= assignment_operator %> File.expand_path('../../<%= config.relative_gem_path %>', __FILE__)
-<% end %>
-<% if config.bundler && config.bundler[:gemfile_path] %>
+<% if config.relative_gem_path.empty? -%>
+ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> File.expand_path('../..', __FILE__)
+<% else -%>
+ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> File.expand_path('../../<%= config.relative_gem_path %>', __FILE__)
+<% end -%>
+<% if config.override_gem_home -%>
+ENV['GEM_PATH'] = ENV['GEM_HOME']
+<% end -%>
+<% if config.bundler && config.bundler[:gemfile_path] -%>
 ENV['BUNDLE_GEMFILE'] = File.expand_path('../../<%= config.bundler[:gemfile_path] %>', __FILE__)
-<% end %>
+<% end -%>

data/lib/warbler/templates/rails.erb

@@ -1 +1 @@
-ENV['RAILS_ENV'] ||= '<%=  config.webxml.rails.env %>'
+ENV['RAILS_ENV'] ||= '<%= config.webxml.rails.env %>'

data/lib/warbler/templates/war.erb

@@ -1,12 +1,17 @@
-<% assignment_operator = config.override_gem_home ? "=" : "||=" %>
 if $servlet_context.nil?
-  ENV['GEM_HOME'] <%= assignment_operator %> File.expand_path(File.join('..', '..', '<%= config.gem_path %>'), __FILE__)
-<% if config.bundler && config.bundler[:gemfile_path] %>
+  ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> File.expand_path(File.join('..', '..', '<%= config.gem_path %>'), __FILE__)
+<% if config.override_gem_home -%>
+  ENV['GEM_PATH'] = ENV['GEM_HOME']
+<% end -%>
+<% if config.bundler && config.bundler[:gemfile_path] -%>
   ENV['BUNDLE_GEMFILE'] ||= File.expand_path(File.join('..', '..', '<%= config.bundler[:gemfile_path] %>'), __FILE__)
-<% end %>
+<% end -%>
 else
-  ENV['GEM_HOME'] <%= assignment_operator %> $servlet_context.getRealPath('<%= config.gem_path %>')
-<% if config.bundler && config.bundler[:gemfile_path] %>
+  ENV['GEM_HOME'] <%= config.override_gem_home ? '=' : '||=' %> $servlet_context.getRealPath('<%= config.gem_path %>')
+<% if config.override_gem_home -%>
+  ENV['GEM_PATH'] = ENV['GEM_HOME']
+<% end -%>
+<% if config.bundler && config.bundler[:gemfile_path] -%>
   ENV['BUNDLE_GEMFILE'] ||= $servlet_context.getRealPath('/<%= config.bundler[:gemfile_path] %>')
-<% end %>
+<% end -%>
 end

data/lib/warbler/traits/bundler.rb

@@ -15,7 +15,7 @@ module Warbler
       include BundlerHelper
 
       def self.detect?
-        File.exist?(ENV['BUNDLE_GEMFILE'] || "Gemfile")
+        File.exist?(ENV['BUNDLE_GEMFILE'] || 'Gemfile')
       end
 
       def self.requirements
@@ -23,19 +23,18 @@ module Warbler
       end
 
       def before_configure
-        config.bundler = true
-        config.bundle_without = ["development", "test", "assets"]
+        config.bundler ||= true
+        config.bundle_without = ['development', 'test', 'assets']
       end
 
       def after_configure
         add_bundler_gems if config.bundler
       end
 
-      def add_bundler_gems
-        require 'bundler'
-        config.gems.clear
+      def add_bundler_gems; require 'bundler'
+        # config.gems.clear allow to add `config.gems` on top of those bundled
         config.gem_dependencies = false # Bundler takes care of these
-        config.bundler = {}
+        config.bundler = {} if config.bundler == true
 
         bundler_specs.each do |spec|
           spec = to_spec(spec)
@@ -53,8 +52,6 @@ module Warbler
             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
             spec.full_gem_path = full_gem_path.to_s
           end
 
@@ -64,9 +61,16 @@ module Warbler
             config.bundler[:git_specs] << spec
           when ::Bundler::Source::Path
             unless bundler_source_is_warbled_gem_itself?(spec.source)
-              warn("Bundler `path' components are not currently supported.\n" +
-                   "The `#{spec.full_name}' component was not bundled.\n" +
-                   "Your application may fail to boot!")
+              if spec.source.path && spec.source.path.relative?
+                # include (assuming) relative *[APP_ROOT]/gem/path*
+                # NOTE: might be tuned to only add gemspec.files ...
+                config.includes += FileList[File.join(spec.source.path, '**/*')]
+                config.gems << spec # probably not really needed
+              else
+                warn("Bundler `path' components are not fully supported.\n" +
+                     "The `#{spec.full_name}' component was not bundled.\n" +
+                     "Your application may fail to boot!")
+              end
             end
           else
             config.gems << spec

data/lib/warbler/traits/gemspec.rb

@@ -21,8 +21,8 @@ module Warbler
       def before_configure
         @spec_file = Dir['*.gemspec'].first
         require 'yaml'
-        @spec = File.open(@spec_file) {|f| Gem::Specification.from_yaml(f) } rescue Gem::Specification.load(@spec_file)
-        @spec.runtime_dependencies.each {|g| config.gems << g }
+        @spec = File.open(@spec_file) { |f| Gem::Specification.from_yaml(f) } rescue Gem::Specification.load(@spec_file)
+        @spec.runtime_dependencies.each { |g| config.gems << g }
         config.dirs = []
         config.compiled_ruby_files = @spec.files.select {|f| f =~ /\.rb$/}
       end
@@ -54,11 +54,11 @@ module Warbler
       end
 
       def default_executable
-        if !@spec.executables.empty?
+        if ! @spec.executables.empty?
           bundler_version =
             Gem.loaded_specs.include?("bundler") ?
               Gem.loaded_specs["bundler"].version :
-              Gem::Version.create("0.0.0")
+                Gem::Version.create("0.0.0")
           if (bundler_version <=> Gem::Version.create("1.8.0")) < 0
             "bin/#{@spec.executables.first}"
           else

data/lib/warbler/traits/nogemspec.rb

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

data/lib/warbler/traits/rails.rb

@@ -12,7 +12,7 @@ module Warbler
       include Trait
 
       def self.detect?
-        File.exist?("config/environment.rb")
+        File.exist?('config/environment.rb')
       end
 
       def self.requirements
@@ -24,15 +24,15 @@ module Warbler
         config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
 
         return unless Warbler.framework_detection
-        return false unless task = Warbler.project_application.lookup("environment")
+        return false unless task = Warbler.project_application.lookup('environment')
 
         task.invoke rescue nil
         return false unless defined?(::Rails)
 
-        config.dirs << "tmp" if File.directory?("tmp")
+        config.dirs << 'tmp' if File.directory?('tmp')
         config.webxml.booter = :rails
-        unless (defined?(::Rails.vendor_rails?) && ::Rails.vendor_rails?) || File.directory?("vendor/rails")
-          config.gems["rails"] = ::Rails::VERSION::STRING
+        unless (defined?(::Rails.vendor_rails?) && ::Rails.vendor_rails?) || File.directory?('vendor/rails')
+          config.gems['rails'] = ::Rails::VERSION::STRING unless Bundler.detect?
         end
         if defined?(::Rails.configuration.gems)
           ::Rails.configuration.gems.each do |g|

data/lib/warbler/traits/war.rb

@@ -177,6 +177,8 @@ module Warbler
         def initialize(key = 'webxml')
           @key = key
           @table = Hash.new { |h, k| h[k] = WebxmlOpenStruct.new(k) }
+
+          @servlet_filter_async = nil # true/false
         end
 
         def [](key)
@@ -209,23 +211,38 @@ module Warbler
           @table.key?(mid.to_s.chomp('=').to_sym) || super
         end
 
+        def servlet_filter; @servlet_filter ||= 'org.jruby.rack.RackFilter' end
+        attr_writer :servlet_filter
+
+        def servlet_filter_name; @servlet_filter_name ||= 'RackFilter' end
+        attr_writer :servlet_filter_name
+
+        def servlet_filter_url_pattern; @servlet_filter_url_pattern ||= '/*' end
+        attr_writer :servlet_filter_url_pattern
+
+        attr_accessor :servlet_filter_async
+
         def servlet_context_listener
-          case self.booter
+          case booter
           when :rack
-            "org.jruby.rack.RackServletContextListener"
-          else # :rails, default
-            "org.jruby.rack.rails.RailsServletContextListener"
+            'org.jruby.rack.RackServletContextListener'
+          when :rails
+            'org.jruby.rack.rails.RailsServletContextListener'
+          else # default (due compatibility)
+            'org.jruby.rack.rails.RailsServletContextListener'
           end
         end
 
-        def context_params(escape = true)
-          require 'cgi'
-          params = {}
+        def servlet_context_listeners
+          @cservlet_ontext_listeners ||= [ servlet_context_listener ]
+        end
+
+        def servlet_context_params(escape = true)
+          require 'cgi'; params = {}
           @table.each do |k,v|
             case v
             when WebxmlOpenStruct
-              nested_params = v.context_params
-              nested_params.each do |nk,nv|
+              v.context_params.each do |nk,nv|
                 params["#{escape ? CGI::escapeHTML(k.to_s) : k.to_s}.#{nk}"] = nv
               end
             else
@@ -236,6 +253,8 @@ module Warbler
           params.delete_if { |k,_| ['ignored', *extra_ignored].include?(k.to_s) }
           params
         end
+        # @deprecated
+        alias_method :context_params, :servlet_context_params
 
         def to_s
           "No value for '#@key' found"

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/sample_bundler/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem 'rake'
+gem 'rake', '10.5.0'

data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.5.0/.autotest

@@ -0,0 +1,7 @@
+require 'autotest/restart'
+
+Autotest.add_hook :initialize do |at|
+  at.testlib = ''
+  at.add_exception '.git'
+end
+

data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.5.0/.rubocop.yml

@@ -0,0 +1,27 @@
+StringLiterals:
+  Enabled: false
+
+MultilineBlocks:
+  Enabled: false
+
+SingleLineBlocks:
+  Enabled: false
+
+NewLambdaLiteral:
+  Enabled: false
+
+SpaceAroundEqualsInParameterDefault:
+  Enabled: false
+
+HashSyntax:
+  Enabled: false
+
+LineLength:
+  Enabled: true
+  Max: 90
+
+WhileUntilModifier:
+  Enabled: false
+
+IfUnlessModifier:
+  Enabled: false

data/spec/sample_bundler/vendor/bundle/jruby/2.2.0/gems/rake-10.5.0/.togglerc

@@ -0,0 +1,7 @@
+(add-to-list
+ 'toggle-mapping-styles
+ '(rake . (
+           ("test/test_rake_\\1.rb"   . "lib/rake/\\1.rb")
+           ) ))
+
+(buffer-toggle-style 'rake)