mizuno 0.4.0 → 0.4.1

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/README.markdown

@@ -17,7 +17,8 @@ Mizuno is the fastest option for Rack applications on JRuby:
     Jetty (via jruby-rack): 2011.67 req/s (mean)
     Mongrel: 1479.15 req/sec (mean)
 
-Mizuno also supports asynchronous request handling.
+Mizuno also supports asynchronous request handling, via the Java Servlet
+3.0 asynchronous processing mechanism
 
 All the speed comes from Jetty 7; Mizuno just ties it to Rack through
 JRuby's Ruby/Java integration layer.
@@ -28,10 +29,9 @@ Rack application for installation in a Java web container.
 
 There's also a few features that I have yet to implement:
 
-1. Integrate the cometd servlet to provide Comet/Bayeux.
-2. Route Jetty's logs into Rack::Logger.
-3. Add hooks for realtime monitoring of server performance.
-4. Add the ability to run multiple Rack apps in a single JVM.
+1. Route Jetty's logs into Rack::Logger.
+2. Add hooks for realtime monitoring of server performance.
+3. Fast restarts of the Rack application.
 
 Mizuno is licensed under the Apache Public License, version 2.0; see
 the LICENSE file for details, and was developed on behalf of 

data/Rakefile

@@ -0,0 +1,80 @@
+require 'rspec/core/rake_task'
+require 'open-uri'
+require 'nokogiri'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
+namespace :jetty do
+    desc "Grab the latest Jetty from its Maven repository."
+    task :update do
+        # Manipulate files under the gem root.
+        base_path = File.dirname(__FILE__)
+        jar_path = File.join(base_path, 'lib', 'java')
+
+        # Information about the Maven repository.
+        group = "org.eclipse.jetty"
+        artifact = "jetty-distribution"
+        repository = 'http://repo1.maven.org/maven2/'
+
+        # Parse Maven metadata and get the latest release version.
+        url = File.join(repository, group.gsub('.', '/'), artifact)
+        metadata_url = File.join(url, 'maven-metadata.xml')
+        metadata = Nokogiri::XML(open(metadata_url))
+        release = metadata.at_xpath('//release').content
+        puts "Latest Jetty release is #{release}"
+
+        # Download the latest version to our tmpdir.
+        filename = "#{artifact}-#{release}.tar.gz"
+        artifact_url = File.join(url, release, filename)
+        tempfile = File.join(base_path, 'tmp', filename)
+        if(File.exists?(tempfile))
+            puts "Using cached #{tempfile}"
+        else
+            File.open(tempfile, "wb") { |f| 
+                f.write(open(artifact_url).read) }
+            puts "Downloaded to #{tempfile}"
+        end
+
+        # Inventory contents of the tarball we picked up.
+        inventory = `tar tzf #{tempfile}`.split(/\n/)
+
+        # Find replacements from our downloaded tarball for each of our jars.
+        replacements = {}
+        Dir.entries(jar_path).each do |entry|
+            next unless (entry =~ /^\w.*\d\.jar$/)
+            name = entry.sub(/\-\d.*$/, '')
+            matcher = /\/#{name}\-[^\/]+\d\.jar$/
+            archive_file = inventory.find { |i| i =~ matcher }
+            raise("Archive missing replacement for #{entry}") \
+                unless archive_file
+            replacements[entry] = archive_file
+        end
+
+        # Extract replacements and verify that they aren't corrupted.
+        replacements.keys.each do |original|
+            replacement = replacements[original]
+            outfile = File.join(base_path, 'tmp', 
+                File.basename(replacement))
+            system("tar xzOf #{tempfile} #{replacement} > #{outfile}") \
+                unless File.exists?(outfile)
+            system("jar tf #{outfile} >/dev/null 2>/dev/null")
+            raise("#{outfile} from #{tempfile} corrupt.") unless ($? == 0)
+            replacements[original] = outfile
+        end
+
+        # Remove old JARs, then add new JARs.
+        replacements.keys.each do |entry| 
+            file = File.join(jar_path, entry)
+            puts "deleting: #{file}"
+            FileUtils.rm(file)
+        end
+        replacements.values.each do |entry| 
+            file = File.join(jar_path, File.basename(entry))
+            puts "copying: #{file}"
+            FileUtils.move(entry, file)
+        end 
+        puts "Update complete."
+    end
+end

data/lib/mizuno/http_server.rb

@@ -68,19 +68,24 @@ module Mizuno
             puts "Listening on #{connector.getHost}:#{connector.getPort}"
             @server.start
 
+            # If we're embeded, we're done.
+            return if options[:embedded]
+
             # Stop the server when we get The Signal.
             trap("SIGINT") { @server.stop and exit }
 
             # Join with the server thread, so that currently open file
             # descriptors don't get closed by accident.
             # http://www.ruby-forum.com/topic/209252
-            @server.join unless options[:embedded]
+            @server.join
         end
 
         #
         # Shuts down an embedded Jetty instance.
         #
         def self.stop
+            return unless @server
+            puts "Stopping Jetty..."
             @server.stop
         end
     end
@@ -88,3 +93,6 @@ end
 
 # Register ourselves with Rack when this file gets loaded.
 Rack::Handler.register 'mizuno', 'Mizuno::HttpServer'
+
+# Ensure that we shutdown the server on exit.
+at_exit { Mizuno::HttpServer.stop }

data/lib/mizuno/rack_servlet.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 #
 # Wraps a Rack application in a Java servlet.
 #
@@ -120,6 +122,14 @@ module Mizuno
             env['rack.multithread'] = true
             env['rack.run_once'] = false
 
+            # The input stream is a wrapper around the Java InputStream.
+            env['rack.input'] = request.getInputStream.to_io.binmode
+
+            # Force encoding if we're on Ruby 1.9
+            env['rack.input'].set_encoding(Encoding.find("ASCII-8BIT")) \
+                if env['rack.input'].respond_to?(:set_encoding)
+#            puts "**** rack.input.encoding: #{env['rack.input'].encoding}"
+
             # Populate the HTTP headers.
             request.getHeaderNames.each do |header_name|
                 header = header_name.upcase.tr('-', '_')
@@ -133,9 +143,6 @@ module Mizuno
             env["CONTENT_LENGTH"] = env.delete("HTTP_CONTENT_LENGTH") \
                 if env["HTTP_CONTENT_LENGTH"]
 
-            # The input stream is a wrapper around the Java InputStream.
-            env['rack.input'] = request.getInputStream.to_io
-
             # The output stream defaults to stderr.
             env['rack.errors'] ||= $stderr
 

data/mizuno.gemspec

@@ -1,34 +1,34 @@
 Gem::Specification.new do |spec|
     spec.name = "mizuno"
-    spec.version = "0.4.0"
+    spec.version = "0.4.1"
     spec.required_rubygems_version = Gem::Requirement.new(">= 1.2") \
         if spec.respond_to?(:required_rubygems_version=)
     spec.authors = [ "Don Werve" ]
     spec.description = 'Jetty-powered running shoes for JRuby/Rack.'
     spec.summary = 'Rack handler for Jetty 7 on JRuby.  Features multithreading, event-driven I/O, and async support.'
     spec.email = 'don@madwombat.com'
+    # FIXME: We're not getting put in bin/
     spec.executables = [ "mizuno" ]
-    spec.files = %w( .gitignore
+    spec.files = %w(.gitignore
         README.markdown
         LICENSE
+        Rakefile
+        Gemfile
         mizuno.gemspec
-        lib/java/jetty-continuation-7.3.0.v20110203.jar
-        lib/java/jetty-http-7.3.0.v20110203.jar
-        lib/java/jetty-io-7.3.0.v20110203.jar
-        lib/java/jetty-jmx-7.3.0.v20110203.jar
-        lib/java/jetty-security-7.3.0.v20110203.jar
-        lib/java/jetty-server-7.3.0.v20110203.jar
-        lib/java/jetty-servlet-7.3.0.v20110203.jar
-        lib/java/jetty-servlets-7.3.0.v20110203.jar
-        lib/java/jetty-util-7.3.0.v20110203.jar
-        lib/java/servlet-api-2.5.jar
+        tmp/.gitkeep
         lib/mizuno/http_server.rb
         lib/mizuno/rack_servlet.rb
         lib/mizuno.rb
-        bin/mizuno )
+        bin/mizuno)
+    jars = Dir.entries("lib/java").grep(/\.jar$/)
+    spec.files.concat(jars.map { |j| "lib/java/#{j}" })
     spec.homepage = 'http://github.com/matadon/mizuno'
     spec.has_rdoc = false
     spec.require_paths = [ "lib" ]
     spec.rubygems_version = '1.3.6'
     spec.add_dependency('rack', '>= 1.0.0')
+    spec.add_development_dependency('rspec', '>= 2.7.0')
+    spec.add_development_dependency('rspec-core', '>= 2.7.0')
+    spec.add_development_dependency('json_pure', '>= 1.6.1')
+    spec.add_development_dependency('nokogiri')
 end

metadata

@@ -2,7 +2,7 @@
 name: mizuno
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
   - Don Werve
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-13 00:00:00 +09:00
+date: 2011-11-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -24,6 +24,50 @@ dependencies:
             version: 1.0.0
     type: :runtime
     version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.7.0
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rspec-core
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.7.0
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: json_pure
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.6.1
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: nokogiri
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id005
 description: Jetty-powered running shoes for JRuby/Rack.
 email: don@madwombat.com
 executables: 
@@ -36,21 +80,24 @@ files:
   - .gitignore
   - README.markdown
   - LICENSE
+  - Rakefile
+  - Gemfile
   - mizuno.gemspec
-  - lib/java/jetty-continuation-7.3.0.v20110203.jar
-  - lib/java/jetty-http-7.3.0.v20110203.jar
-  - lib/java/jetty-io-7.3.0.v20110203.jar
-  - lib/java/jetty-jmx-7.3.0.v20110203.jar
-  - lib/java/jetty-security-7.3.0.v20110203.jar
-  - lib/java/jetty-server-7.3.0.v20110203.jar
-  - lib/java/jetty-servlet-7.3.0.v20110203.jar
-  - lib/java/jetty-servlets-7.3.0.v20110203.jar
-  - lib/java/jetty-util-7.3.0.v20110203.jar
-  - lib/java/servlet-api-2.5.jar
+  - tmp/.gitkeep
   - lib/mizuno/http_server.rb
   - lib/mizuno/rack_servlet.rb
   - lib/mizuno.rb
   - bin/mizuno
+  - lib/java/jetty-continuation-8.0.4.v20111024.jar
+  - lib/java/jetty-http-8.0.4.v20111024.jar
+  - lib/java/jetty-io-8.0.4.v20111024.jar
+  - lib/java/jetty-jmx-8.0.4.v20111024.jar
+  - lib/java/jetty-security-8.0.4.v20111024.jar
+  - lib/java/jetty-server-8.0.4.v20111024.jar
+  - lib/java/jetty-servlet-8.0.4.v20111024.jar
+  - lib/java/jetty-servlets-8.0.4.v20111024.jar
+  - lib/java/jetty-util-8.0.4.v20111024.jar
+  - lib/java/servlet-api-3.0.jar
 has_rdoc: true
 homepage: http://github.com/matadon/mizuno
 licenses: []
@@ -75,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Rack handler for Jetty 7 on JRuby.  Features multithreading, event-driven I/O, and async support.