rubylet-tasks 0.1.0-java → 1.0.0-java

data/VERSION

@@ -1 +1 @@
-0.1.0
+1.0.0

data/examples/Gemfile

@@ -1,4 +1,5 @@
 source 'http://rubygems.org'
 gem 'rubylet-tasks', :path => '../'
+gem 'rubylet-jetty', :path => '../../rubylet-jetty'
 gem 'rubylet', :path => '../../rubylet'
 gem 'rack'

data/examples/Gemfile.lock

@@ -1,22 +1,33 @@
 PATH
   remote: ../
   specs:
-    rubylet-tasks (0.1.0-java)
+    rubylet-tasks (1.0.0-java)
       builder
+      mini_aether
       rake
+      version
       zip
 
 PATH
   remote: ../../rubylet
   specs:
-    rubylet (0.1-java)
+    rubylet (1.0.0-java)
+      rack
+
+PATH
+  remote: ../../rubylet-jetty
+  specs:
+    rubylet-jetty (1.0.0-java)
+      mini_aether
 
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.1.4)
+    builder (3.0.4)
+    mini_aether (0.0.5-java)
     rack (1.4.1)
-    rake (10.0.2)
+    rake (10.0.3)
+    version (1.0.0)
     zip (2.0.2)
 
 PLATFORMS
@@ -25,4 +36,5 @@ PLATFORMS
 DEPENDENCIES
   rack
   rubylet!
+  rubylet-jetty!
   rubylet-tasks!

data/examples/Gemfile~

@@ -1,2 +1,5 @@
 source 'http://rubygems.org'
-gemspec
+gem 'rubylet-tasks', :path => '../'
+gem 'rubylet-jetty', :path => '../'
+gem 'rubylet', :path => '../../rubylet'
+gem 'rack'

data/examples/config.ru~

@@ -0,0 +1,3 @@
+run proc {
+  [200, {'Content-Type' => 'text/plain'}, ['Hello, World']]
+}

data/lib/rubylet/war_task.rb

@@ -1,5 +1,7 @@
 require 'fileutils'
+require 'mini_aether'
 require 'rake/tasklib'
+require 'version'
 require 'zip/zipfilesystem'
 
 require 'rubylet/webapp_descriptor_builder'
@@ -100,20 +102,20 @@ module CommonParams
   param_accessor :local_context_scope
 
   def common_params
-    yield 'jrubyHome', jruby_home
+    yield 'rubylet.jrubyHome', jruby_home
     env.each do |key, value|
-      yield "env.#{key}", value
+      yield "rubylet.env.#{key}", value
     end
     gems.each do |(name, req)|
-      yield "gem.#{name}", req
+      yield "rubylet.gem.#{name}", req
     end
-    yield 'bundleExec', bundle_exec
-    yield 'boot', boot
-    yield 'servletClass', servlet_class
-    yield 'appRoot', app_root
-    yield 'compileMode', compile_mode
-    yield 'compatVersion', compat_version
-    yield 'localContextScope', local_context_scope
+    yield 'rubylet.bundleExec', bundle_exec
+    yield 'rubylet.boot', boot
+    yield 'rubylet.servletClass', servlet_class
+    yield 'rubylet.appRoot', app_root
+    yield 'rubylet.compileMode', compile_mode
+    yield 'rubylet.compatVersion', compat_version
+    yield 'rubylet.localContextScope', local_context_scope
   end
 end
 
@@ -149,11 +151,16 @@ class RubyletDescriptor
   extend ParamAccessor
   include CommonParams
 
+  # erase the defaults on these; they will be inherited from the
+  # context params if not set explicitly
+  param_accessor :bundle_exec
+  param_accessor :app_root
+
   param_accessor :name do
     "Rubylet - #{File.basename(app_root)}"
   end
 
-  param_accessor :java_servlet_class, 'com.commongroundpublishing.rubylet.Servlet'
+  param_accessor :java_servlet_class, 'com.commongroundpublishing.rubylet.RestartableServlet'
 
   param_accessor :url_pattern, '/*'
 
@@ -194,6 +201,8 @@ end
 
 module Rubylet
   class WarTask < Rake::TaskLib
+    is_versioned
+
     extend ParamAccessor
     include CommonParams
 
@@ -228,8 +237,15 @@ module Rubylet
       filters << block
     end
 
+    def servlet_context_logger
+      listeners << proc do |w|
+        w.listener! 'com.commongroundpublishing.slf4j.impl.ServletContextListenerSCL'
+      end
+    end
+
     def external_jruby
       listeners << proc do |w|
+        w.listener! 'com.commongroundpublishing.slf4j.impl.ServletContextLoggerSCL'
         w.listener! 'com.commongroundpublishing.rubylet.ExternalJRubyLoader'
       end
     end
@@ -325,19 +341,46 @@ module Rubylet
           glassfish_descriptor(:target => f)
         end
 
-        container = rubylet_jar
-        z.dir.mkdir('WEB-INF/lib')
-        z.file.open("WEB-INF/lib/#{::File.basename(container)}", 'w') do |f|
-          ::File.open(container) do |input|
-            buf = ''
-            while input.read(4096, buf)
-              f.write(buf)
+        begin
+          # we are using ruby version number with "a" suffix as
+          # equivalent to java/maven "-SNAPSHOT"
+          ee_version = if VERSION.to_s =~ /(.*)a$/
+                         "#{$1}-SNAPSHOT"
+                       else
+                         VERSION.to_s
+                       end
+
+          deps = MiniAether::Spec.new do
+            group 'com.commongroundpublishing' do
+              jar "rubylet-ee:#{ee_version}"
+              jar 'slf4j-servletcontext:1.0.0'
+            end
+          end.resolve
+
+          dir = 'WEB-INF/lib'
+          z.dir.mkdir(dir)
+          deps.each do |source|
+            dest = "#{dir}/#{::File.basename(source)}"
+            z.file.open(dest, 'w') do |output|
+              ::File.open(source) { |input| copy_stream(input, output) }
             end
           end
+        rescue => e
+          raise "Error resolving dependencies: #{e}"
         end
       end
     end
 
+    # Bug in JRuby prevents IO.copy_stream
+    #
+    # See https://github.com/jruby/jruby/issues/437
+    def copy_stream(input, output)
+      buf = ''
+      while input.read(4096, buf)
+        output.write(buf)
+      end
+    end
+
     # Runs maven if we are a JRuby process.  Currently not used.
     #
     # See http://watchitlater.com/blog/2011/08/jruby-rake-and-maven/

data/spec/rubylet/war_task_spec.rb

@@ -39,7 +39,7 @@ module Rubylet
 
       # puts xml
       xml.must_match %r{<servlet-name>myname</servlet-name>}
-      xml.must_match %r{rubylet.Servlet</servlet-class>}
+      xml.must_match %r{rubylet.RestartableServlet</servlet-class>}
     end
 
     # it 'generate war' do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rubylet-tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.0
   prerelease:
+  version: 1.0.0
 platform: java
 authors:
 - CG Labs
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -30,7 +30,7 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: mini_aether
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -48,7 +48,7 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: zip
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: mini_aether
+  name: zip
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -82,9 +82,9 @@ dependencies:
           MA==
     none: false
   prerelease: false
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: version
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -100,9 +100,9 @@ dependencies:
           MA==
     none: false
   prerelease: false
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: minitest-matchers
+  name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: version
+  name: minitest-matchers
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -148,19 +148,19 @@ files:
 - MIT-LICENSE
 - lib/rubylet/builder_alias_tag.rb
 - lib/rubylet/builder_defaults.rb
+- lib/rubylet/glassfish_descriptor_builder.rb
+- lib/rubylet/jetty_descriptor_builder.rb
 - lib/rubylet/war_task.rb
 - lib/rubylet/webapp_descriptor_builder.rb
-- lib/rubylet/jetty_descriptor_builder.rb
-- lib/rubylet/glassfish_descriptor_builder.rb
-- lib/rubylet-ee-0.1.0-SNAPSHOT.jar
+- lib/rubylet-ee-0.2.0-SNAPSHOT.jar
 - spec/spec_helper.rb
 - spec/rubylet/war_task_spec.rb
-- examples/Gemfile~
+- examples/config.ru
+- examples/config.ru~
 - examples/Gemfile
-- examples/Rakefile~
 - examples/Gemfile.lock
+- examples/Gemfile~
 - examples/Rakefile
-- examples/config.ru
 - examples/pkg/test_app.war
 - examples/tmp/restart.txt
 homepage:
@@ -173,6 +173,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
       version: !binary |-
         MA==
   none: false
@@ -180,6 +183,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
       version: !binary |-
         MA==
   none: false

data/examples/Rakefile~

@@ -1 +0,0 @@
-require 'rubylet/war_task'