mizuno 0.6.6 → 0.6.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c43a932134c2f636fb431cf0f71383286f1c4b43
+  data.tar.gz: 3ec833e499411aa1c959d118e98d6924c05e3145
+SHA512:
+  metadata.gz: c92bf4e80e340fb0b11c6e1fd6f871a2a1e904a860d98a48b5a3bd784a61b9ad3703ceeb33602278537a95efbe926d8a7398a7ca7c9e06fd1ae785adb4e1f6a2
+  data.tar.gz: a1b785a6d715b5ed2bc2e137ef7111991e628501e9329cc97e11411e5bcaa00a1856d73ee72e06c1e5d2045cd280271b60375154b4d2b9244a715e05759077ae

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec

data/lib/mizuno/choices.rb

@@ -74,6 +74,13 @@ Choice.options do
         desc 'logfile (defaults to stderr)'
         default nil
     end
+        
+    option :log4j do
+      # e.g. jruby -J-Dlog4j.debug=true -J-Dlog4j.configuration=file:///log4j_config_dir/log4j.properties  /path_to_mizuno/mizuno --log4j
+      long '--log4j'
+      desc 'Disable default log4j configuration and allow confiuration via -J-Dlog4j.configuration=file://mypath/log4j.properties'
+      default false
+    end
 
     option :rewindable do
         long '--rewindable'

data/lib/mizuno/client.rb

@@ -1,12 +1,12 @@
-require 'thread'
-require 'mizuno'
+require "thread"
+require "mizuno"
 Mizuno.require_jars(%w(jetty-client jetty-http jetty-io jetty-util))
-require 'mizuno/client_exchange'
+require "mizuno/client_exchange"
 
 module Mizuno
     class Client
-        java_import 'org.eclipse.jetty.client.HttpClient'
-        java_import 'org.eclipse.jetty.util.thread.QueuedThreadPool'
+        java_import "org.eclipse.jetty.client.HttpClient"
+        java_import "org.eclipse.jetty.util.thread.QueuedThreadPool"
 
         @lock = Mutex.new
 

data/lib/mizuno/logger.rb

@@ -24,32 +24,34 @@ module Mizuno
             limit = options[:warn] ? "WARN" : "ERROR"
             limit = "DEBUG" if ($DEBUG or options[:debug])
 
-            # Base logging configuration.
-            config = <<-END
-                log4j.rootCategory = #{limit}, default
-                log4j.logger.org.eclipse.jetty.util.log = #{limit}, default
-                log4j.appender.default.Threshold = #{limit}
-                log4j.appender.default.layout = org.apache.log4j.PatternLayout
-            END
-
-            # Should we log to the console?
-            config.concat(<<-END) unless options[:log]
-                log4j.appender.default = org.apache.log4j.ConsoleAppender
-                log4j.appender.default.layout.ConversionPattern = %m\\n
-            END
-
-            # Are we logging to a file?
-            config.concat(<<-END) if options[:log]
-                log4j.appender.default = org.apache.log4j.FileAppender
-                log4j.appender.default.Append = true
-                log4j.appender.default.File = #{options[:log]}
-                log4j.appender.default.layout.ConversionPattern = %d %p %m\\n
-            END
-
-            # Set up Log4J via Properties.
-            properties = Properties.new
-            properties.load(ByteArrayInputStream.new(config.to_java_bytes))
-            PropertyConfigurator.configure(properties)
+            if !options[:log4j]
+              # Base logging configuration.
+              config = <<-END
+                  log4j.rootCategory = #{limit}, default
+                  log4j.logger.org.eclipse.jetty.util.log = #{limit}, default
+                  log4j.appender.default.Threshold = #{limit}
+                  log4j.appender.default.layout = org.apache.log4j.PatternLayout
+              END
+
+              # Should we log to the console?
+              config.concat(<<-END) unless options[:log]
+                  log4j.appender.default = org.apache.log4j.ConsoleAppender
+                  log4j.appender.default.layout.ConversionPattern = %m\\n
+              END
+
+              # Are we logging to a file?
+              config.concat(<<-END) if options[:log]
+                  log4j.appender.default = org.apache.log4j.FileAppender
+                  log4j.appender.default.Append = true
+                  log4j.appender.default.File = #{options[:log]}
+                  log4j.appender.default.layout.ConversionPattern = %d %p %m\\n
+              END
+
+              # Set up Log4J via Properties.
+              properties = Properties.new
+              properties.load(ByteArrayInputStream.new(config.to_java_bytes))
+              PropertyConfigurator.configure(properties)
+            end
 
             # Create the default logger that gets used everywhere.
             @logger = new

data/lib/mizuno/server.rb

@@ -18,6 +18,7 @@ module Mizuno
         java_import 'org.eclipse.jetty.server.nio.SelectChannelConnector'
         java_import 'org.eclipse.jetty.util.thread.QueuedThreadPool'
         java_import 'org.jruby.rack.servlet.RewindableInputStream'
+        java_import "org.eclipse.jetty.server.ssl.SslSelectChannelConnector"
 
         attr_accessor :logger
 
@@ -81,6 +82,9 @@ module Mizuno
             connector.setHost(options[:host])
             @server.addConnector(connector)
 
+            # SSL Connector
+            configure_https(options) if options[:ssl_port]
+
             # Switch to a different user or group if we were asked to.
             Runner.setgid(options) if options[:group]
             Runner.setuid(options) if options[:user]
@@ -104,7 +108,7 @@ module Mizuno
             return if options[:embedded]
 
             # Stop the server when we get The Signal.
-            trap("SIGINT") { @server.stop and exit }
+            trap("SIGTERM") { @server.stop and exit }
 
             # Join with the server thread, so that currently open file
             # descriptors don't get closed by accident.
@@ -140,5 +144,17 @@ module Mizuno
                 Rack::RewindableInput.new(input.to_io.binmode) :
                 RewindableInputStream.new(input).to_io.binmode
         end
+
+        private
+
+        def configure_https(options)
+            connector = SslSelectChannelConnector.new
+            connector.setPort(options[:ssl_port])
+            factory = connector.getSslContextFactory
+            factory.setKeyStore(options[:keystore] || "keystore")
+            factory.setKeyStorePassword(options[:keystore_password])
+            @server.addConnector(connector)
+            self
+        end
     end
 end

data/lib/mizuno/version.rb

@@ -1,3 +1,3 @@
 module Mizuno
-    VERSION = "0.6.6"
+    VERSION = "0.6.7"
 end

data/mizuno.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency('ffi', '>= 1.0.0')
     spec.add_dependency('choice', '>= 0.1.0')
     spec.add_dependency('childprocess', '>= 0.2.6')
+    spec.add_development_dependency('rake')
     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.0')

metadata

@@ -1,144 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: mizuno
 version: !ruby/object:Gem::Version
-  version: 0.6.6
-  prerelease:
+  version: 0.6.7
 platform: ruby
 authors:
 - Don Werve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: ffi
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: choice
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
   name: childprocess
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.6
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.6
-    none: false
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: json_pure
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
   prerelease: false
   type: :development
 description: Jetty-powered running shoes for JRuby/Rack.
@@ -155,86 +150,55 @@ files:
 - Gemfile
 - mizuno.gemspec
 - bin/mizuno
-- !binary |-
-  bGliL21penVuby5yYg==
-- !binary |-
-  bGliL21penVuby9jaG9pY2VzLnJi
-- !binary |-
-  bGliL21penVuby9jbGllbnQucmI=
-- !binary |-
-  bGliL21penVuby9jbGllbnRfZXhjaGFuZ2UucmI=
-- !binary |-
-  bGliL21penVuby9jbGllbnRfcmVzcG9uc2UucmI=
-- !binary |-
-  bGliL21penVuby9sb2dnZXIucmI=
-- !binary |-
-  bGliL21penVuby9yYWNrX2hhbmRsZXIucmI=
-- !binary |-
-  bGliL21penVuby9yZWxvYWRlci5yYg==
-- !binary |-
-  bGliL21penVuby9ydW5uZXIucmI=
-- !binary |-
-  bGliL21penVuby9zZXJ2ZXIucmI=
-- !binary |-
-  bGliL21penVuby92ZXJzaW9uLnJi
-- !binary |-
-  bGliL21penVuby9yYWNrL2NodW5rZWQucmI=
-- !binary |-
-  bGliL3JhY2svaGFuZGxlci9taXp1bm8ucmI=
-- !binary |-
-  bGliL2phdmEvamV0dHktY2xpZW50LTguMS4zLnYyMDEyMDQxNi5qYXI=
-- !binary |-
-  bGliL2phdmEvamV0dHktY29udGludWF0aW9uLTguMS4zLnYyMDEyMDQxNi5q
-  YXI=
-- !binary |-
-  bGliL2phdmEvamV0dHktaHR0cC04LjEuMy52MjAxMjA0MTYuamFy
-- !binary |-
-  bGliL2phdmEvamV0dHktaW8tOC4xLjMudjIwMTIwNDE2Lmphcg==
-- !binary |-
-  bGliL2phdmEvamV0dHktam14LTguMS4zLnYyMDEyMDQxNi5qYXI=
-- !binary |-
-  bGliL2phdmEvamV0dHktc2VjdXJpdHktOC4xLjMudjIwMTIwNDE2Lmphcg==
-- !binary |-
-  bGliL2phdmEvamV0dHktc2VydmVyLTguMS4zLnYyMDEyMDQxNi5qYXI=
-- !binary |-
-  bGliL2phdmEvamV0dHktc2VydmxldC04LjEuMy52MjAxMjA0MTYuamFy
-- !binary |-
-  bGliL2phdmEvamV0dHktc2VydmxldHMtOC4xLjMudjIwMTIwNDE2Lmphcg==
-- !binary |-
-  bGliL2phdmEvamV0dHktdXRpbC04LjEuMy52MjAxMjA0MTYuamFy
-- !binary |-
-  bGliL2phdmEvbG9nNGotMS4yLjE2Lmphcg==
-- !binary |-
-  bGliL2phdmEvcmV3aW5kYWJsZS1pbnB1dC1zdHJlYW0uamFy
-- !binary |-
-  bGliL2phdmEvc2VydmxldC1hcGktMy4wLmphcg==
-- !binary |-
-  bGliL2phdmEvc2xmNGotYXBpLTEuNi40Lmphcg==
-- !binary |-
-  bGliL2phdmEvc2xmNGotbG9nNGoxMi0xLjYuNC5qYXI=
+- lib/mizuno.rb
+- lib/mizuno/choices.rb
+- lib/mizuno/client.rb
+- lib/mizuno/client_exchange.rb
+- lib/mizuno/client_response.rb
+- lib/mizuno/logger.rb
+- lib/mizuno/rack_handler.rb
+- lib/mizuno/reloader.rb
+- lib/mizuno/runner.rb
+- lib/mizuno/server.rb
+- lib/mizuno/version.rb
+- lib/mizuno/rack/chunked.rb
+- lib/rack/handler/mizuno.rb
+- lib/java/jetty-client-8.1.10.v20130312.jar
+- lib/java/jetty-continuation-8.1.10.v20130312.jar
+- lib/java/jetty-http-8.1.10.v20130312.jar
+- lib/java/jetty-io-8.1.10.v20130312.jar
+- lib/java/jetty-jmx-8.1.10.v20130312.jar
+- lib/java/jetty-security-8.1.10.v20130312.jar
+- lib/java/jetty-server-8.1.10.v20130312.jar
+- lib/java/jetty-servlet-8.1.10.v20130312.jar
+- lib/java/jetty-servlets-8.1.10.v20130312.jar
+- lib/java/jetty-util-8.1.10.v20130312.jar
+- lib/java/log4j-1.2.17.jar
+- lib/java/rewindable-input-stream.jar
+- lib/java/servlet-api-3.0.jar
+- lib/java/slf4j-api-1.7.5.jar
+- lib/java/slf4j-log4j12-1.7.5.jar
 homepage: http://github.com/matadon/mizuno
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.2'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Rack handler for Jetty 8 on JRuby. Features multithreading, event-driven I/O, and async support.
 test_files: []