kirk 0.1.6-java → 0.1.7-java

data/README.md

@@ -51,6 +51,9 @@ we are going to put the following configuration file at `/path/to/Kirkfile`.
       # on. This defaults to "*"
       hosts "example.com", "*.example.org"
 
+      # Set arbitrary ENV variables
+      env :RAILS_ENV => "production"
+
       # Set the file that controls the redeploys. This is relative to
       # the applications root (the directory that the rackup file lives
       # in). Touch this file to redepoy the application.

data/lib/kirk.rb

@@ -33,6 +33,7 @@ module Kirk
   end
 
   require 'kirk/builder'
+  require 'kirk/client'
   require 'kirk/handler'
   require 'kirk/input_stream'
   require 'kirk/server'

data/lib/kirk/bootstrap.rb

@@ -1,9 +1,6 @@
 require 'java'
 
 module Kirk
-  import 'java.util.zip.GZIPInputStream'
-  import 'java.util.zip.InflaterInputStream'
-
   class Bootstrap
     def warmup(application_path)
       Dir.chdir File.expand_path(application_path)

data/lib/kirk/client.rb

@@ -0,0 +1,5 @@
+module Kirk
+  class Client
+    # stuff
+  end
+end

data/lib/kirk/handler.rb

@@ -1,5 +1,8 @@
 module Kirk
   class Handler
+    import "java.util.zip.GZIPInputStream"
+    import "java.util.zip.InflaterInputStream"
+
     # Required environment variable keys
     REQUEST_METHOD = 'REQUEST_METHOD'.freeze
     SCRIPT_NAME    = 'SCRIPT_NAME'.freeze

data/lib/kirk/input_stream.rb

@@ -124,12 +124,12 @@ module Kirk
 
       else
 
-        read_chunk_from_mem(missing, string)
+        read_chunk_from_mem(size, string, missing)
 
       end
     end
 
-    def read_chunk_from_mem(missing, string)
+    def read_chunk_from_mem(size, string, missing)
       # We gonna have to read from the input stream
       if missing > 0 && !@eof
 
@@ -155,8 +155,11 @@ module Kirk
 
       end
 
+      limit = @position + size
+      limit = @read if @read < limit
+
       # Now move the amount read into the string
-      @buffer.position(@position).limit(@read)
+      @buffer.position(@position).limit(limit)
 
       append_buffer_to_string(@buffer, string)
     end

data/lib/kirk/jetty.rb

@@ -1,14 +1,19 @@
+require "kirk/jetty/jetty-client-7.2.2.v20101205"
 require "kirk/jetty/jetty-server-7.2.2.v20101205"
 require "kirk/jetty/servlet-api-2.5"
 
 module Kirk
   module Jetty
     # Gimme Jetty
+    import "org.eclipse.jetty.client.HttpClient"
+    import "org.eclipse.jetty.client.HttpExchange"
+
     import "org.eclipse.jetty.server.nio.SelectChannelConnector"
     import "org.eclipse.jetty.server.handler.AbstractHandler"
     import "org.eclipse.jetty.server.handler.ContextHandler"
     import "org.eclipse.jetty.server.handler.ContextHandlerCollection"
     import "org.eclipse.jetty.server.Server"
+
     import "org.eclipse.jetty.util.component.LifeCycle"
     import "org.eclipse.jetty.util.log.Log"
     import "org.eclipse.jetty.util.log.JavaUtilLog"

data/lib/kirk/version.rb

@@ -1,4 +1,4 @@
 module Kirk
   NAME    = "kirk".freeze
-  VERSION = "0.1.6".freeze
+  VERSION = "0.1.7".freeze
 end

metadata

@@ -2,7 +2,7 @@
 name: kirk
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: java
 authors: 
   - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -08:00
+date: 2011-02-14 00:00:00 -08:00
 default_executable: kirk
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
   - lib/kirk/bootstrap.rb
   - lib/kirk/builder.rb
   - lib/kirk/cli.rb
+  - lib/kirk/client.rb
   - lib/kirk/handler.rb
   - lib/kirk/input_stream.rb
   - lib/kirk/jetty.rb
@@ -44,6 +45,7 @@ files:
   - lib/kirk/applications/redeploy_client.rb
   - lib/rack/handler/kirk.rb
   - lib/kirk/native.jar
+  - lib/kirk/jetty/jetty-client-7.2.2.v20101205.jar
   - lib/kirk/jetty/jetty-server-7.2.2.v20101205.jar
   - lib/kirk/jetty/servlet-api-2.5.jar
   - bin/kirk
@@ -73,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: kirk
-rubygems_version: 1.4.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A JRuby Rack Server Based on Jetty