kirk 0.1.8-java → 0.2.0.beta.1-java

data/lib/kirk/server/hot_deployable.rb

@@ -0,0 +1,63 @@
+require 'digest/sha1'
+
+module Kirk
+  # This class extends a native Java class
+  class Server::HotDeployable < Native::HotDeployableApplication
+
+    def initialize(config)
+      super(config)
+      deploy
+    end
+
+    def key
+      gemfile  = "#{application_path}/Gemfile"
+      lockfile = "#{application_path}/Gemfile.lock"
+
+      if File.exist?(gemfile) && File.exist?(lockfile)
+        str = File.read(gemfile) + File.read(lockfile)
+        Digest::SHA1.hexdigest(str)
+      end
+    end
+
+    def add_watcher(watcher)
+      add_life_cycle_listener(watcher)
+    end
+
+    def application_path
+      config.application_path
+    end
+
+    def rackup_path
+      config.rackup
+    end
+
+    def last_modified
+      mtimes = config.watch.map do |path|
+        path = File.expand_path(path, application_path)
+        File.exist?(path) ? File.mtime(path).to_i : 0
+      end
+
+      mtimes.max
+    end
+
+    def deploy(deploy = nil)
+      deploy ||= build_deploy
+
+      if deploy
+        deploy.prepare
+        super(deploy)
+        true
+      end
+    rescue Exception => e
+      Kirk.logger.warning "Deploying `#{application_path}` failed: #{e.message}"
+      nil
+    end
+
+    def build_deploy
+      super
+    rescue Exception => e
+      Kirk.logger.warning "Warming up `#{application_path}` failed: #{e.message}"
+      nil
+    end
+  end
+end

data/lib/kirk/server/input_stream.rb

@@ -0,0 +1,114 @@
+module Kirk
+  class Server
+    class InputStream
+      Native # Trigger the autoload
+      READL_SIZE  = 1_024
+      CHUNK_SIZE  = 8_192
+      BUFFER_SIZE = 1_024 * 50
+      BUFFER_POOL = LinkedBlockingQueue.new
+
+      def initialize(io)
+        @io, @buffer = init_rewindable_input(io)
+      end
+
+      def read(size = nil, buffer = nil)
+        one_loop = nil
+        read_all = size.nil?
+
+        buffer ? buffer.slice!(0..-1) : buffer = ''
+
+        raise ArgumentError, "negative length #{size} given" if size && size < 0
+
+        loop do
+          limit = size && size < CHUNK_SIZE ? size : CHUNK_SIZE
+          data  = @io.read(limit)
+
+          break unless data
+
+          one_loop = true
+
+          buffer << String.from_java_bytes(data)
+
+          break if size && ( size -= data.length ) <= 0
+        end
+
+        return "" if read_all && !one_loop
+
+        one_loop && buffer
+      end
+
+      def gets(sep = $/)
+        return read unless sep
+
+        sep    = "#{$/}#{$/}" if sep == ""
+        buffer = ''
+        curpos = pos
+
+        while chunk = read(READL_SIZE)
+          buffer << chunk
+
+          if i = buffer.index(sep, 0)
+            i += sep.bytesize
+            buffer.slice!(i..-1)
+            seek(curpos + buffer.bytesize)
+            break
+          end
+        end
+
+        buffer
+      end
+
+      def each
+        while chunk = read(CHUNK_SIZE)
+          yield chunk
+        end
+
+        self
+      end
+
+      def pos
+        @io.position
+      end
+
+      def seek(pos)
+        raise Errno::EINVAL, "Invalid argument - invalid seek value" if pos < 0
+        @io.seek(pos)
+      end
+
+      def rewind
+        @io.rewind
+      end
+
+      def close
+        @io.close
+      end
+
+      def recycle
+        @io.close
+
+        BUFFER_POOL.put(@buffer)
+
+        @buffer, @io = nil, nil
+      end
+
+      def to_inputstream
+        @io
+      end
+
+      def to_raw_inputstream
+        @io.unbuffered_input_stream
+      end
+
+    private
+
+      def grab_buffer
+        BUFFER_POOL.poll || ByteBuffer.allocate(BUFFER_SIZE)
+      end
+
+      def init_rewindable_input(io)
+        buf = grab_buffer
+        [ Native::RewindableInputStream.new(io, buf), buf ]
+      end
+    end
+  end
+end

data/lib/kirk/{applications → server}/redeploy_client.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 module Kirk
-  class Applications::RedeployClient
+  class Server::RedeployClient
     def self.redeploy(socket, path, &blk)
       new(socket).redeploy(path, &blk)
     end

data/lib/kirk/version.rb

@@ -1,4 +1,4 @@
 module Kirk
   NAME    = "kirk".freeze
-  VERSION = "0.1.8".freeze
+  VERSION = "0.2.0.beta.1".freeze
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: kirk
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.8
+  prerelease: 6
+  version: 0.2.0.beta.1
 platform: java
 authors: 
   - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -08:00
+date: 2011-02-23 00:00:00 -08:00
 default_executable: kirk
 dependencies: []
 
@@ -29,29 +29,32 @@ extra_rdoc_files: []
 
 files: 
   - lib/kirk.rb
-  - 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
+  - lib/kirk/native.rb
   - lib/kirk/server.rb
   - lib/kirk/version.rb
-  - lib/kirk/applications/config.rb
-  - lib/kirk/applications/deploy_watcher.rb
-  - lib/kirk/applications/hot_deployable.rb
-  - lib/kirk/applications/rack.rb
-  - lib/kirk/applications/redeploy_client.rb
-  - lib/kirk/client/connection.rb
   - lib/kirk/client/exchange.rb
+  - lib/kirk/client/group.rb
   - lib/kirk/client/request.rb
   - lib/kirk/client/response.rb
-  - lib/kirk/client/session.rb
+  - lib/kirk/server/application_config.rb
+  - lib/kirk/server/bootstrap.rb
+  - lib/kirk/server/builder.rb
+  - lib/kirk/server/deploy_watcher.rb
+  - lib/kirk/server/handler.rb
+  - lib/kirk/server/hot_deployable.rb
+  - lib/kirk/server/input_stream.rb
+  - lib/kirk/server/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/jetty-client-7.3.0.v20110203.jar
+  - lib/kirk/jetty/jetty-continuation-7.3.0.v20110203.jar
+  - lib/kirk/jetty/jetty-http-7.3.0.v20110203.jar
+  - lib/kirk/jetty/jetty-io-7.3.0.v20110203.jar
+  - lib/kirk/jetty/jetty-server-7.3.0.v20110203.jar
+  - lib/kirk/jetty/jetty-util-7.3.0.v20110203.jar
   - lib/kirk/jetty/servlet-api-2.5.jar
   - bin/kirk
   - README.md

data/lib/kirk/applications/config.rb

@@ -1,50 +0,0 @@
-module Kirk
-  module Applications
-    class Config
-      include Native::ApplicationConfig
-
-      attr_accessor :env,
-                    :hosts,
-                    :listen,
-                    :watch,
-                    :rackup,
-                    :application_path,
-                    :bootstrap_path
-
-      def initialize
-        @env    = {}
-        @hosts  = []
-        @listen = listen
-      end
-
-      def application_path
-        @application_path || File.dirname(rackup)
-      end
-
-      # Handle the java interface
-      alias getApplicationPath    application_path
-      alias getRackupPath         rackup
-      alias getBootstrapPath      bootstrap_path
-
-      def getEnvironment
-        map = java.util.HashMap.new
-        env = ENV.dup
-
-        self.env.each do |key, val|
-          env[key.to_s] = val
-        end
-
-        env.each do |key, val|
-          next unless val
-
-          key = key.to_java_string
-          val = val.to_s.to_java_string
-
-          map.put(key, val)
-        end
-
-        map
-      end
-    end
-  end
-end

data/lib/kirk/applications/hot_deployable.rb

@@ -1,65 +0,0 @@
-require 'digest/sha1'
-
-module Kirk
-  module Applications
-    # This class extends a native Java class
-    class HotDeployable < Native::HotDeployableApplication
-
-      def initialize(config)
-        super(config)
-        deploy
-      end
-
-      def key
-        gemfile  = "#{application_path}/Gemfile"
-        lockfile = "#{application_path}/Gemfile.lock"
-
-        if File.exist?(gemfile) && File.exist?(lockfile)
-          str = File.read(gemfile) + File.read(lockfile)
-          Digest::SHA1.hexdigest(str)
-        end
-      end
-
-      def add_watcher(watcher)
-        add_life_cycle_listener(watcher)
-      end
-
-      def application_path
-        config.application_path
-      end
-
-      def rackup_path
-        config.rackup
-      end
-
-      def last_modified
-        mtimes = config.watch.map do |path|
-          path = File.expand_path(path, application_path)
-          File.exist?(path) ? File.mtime(path).to_i : 0
-        end
-
-        mtimes.max
-      end
-
-      def deploy(deploy = nil)
-        deploy ||= build_deploy
-
-        if deploy
-          deploy.prepare
-          super(deploy)
-          true
-        end
-      rescue Exception => e
-        Kirk.logger.warning "Deploying `#{application_path}` failed: #{e.message}"
-        nil
-      end
-
-      def build_deploy
-        super
-      rescue Exception => e
-        Kirk.logger.warning "Warming up `#{application_path}` failed: #{e.message}"
-        nil
-      end
-    end
-  end
-end

data/lib/kirk/applications/rack.rb

@@ -1,21 +0,0 @@
-gem "rack", ">= 1.0.0"
-require "rack"
-
-module Kirk
-  module Applications
-    # This class extends a native Java class
-    class Rack < Jetty::AbstractHandler
-      def self.new(app)
-        inst     = super()
-        inst.app = Handler.new(app)
-        inst
-      end
-
-      attr_accessor :app
-
-      def handle(target, base_request, request, response)
-        app.handle(target, base_request, request, response)
-      end
-    end
-  end
-end

data/lib/kirk/bootstrap.rb

@@ -1,59 +0,0 @@
-require 'java'
-
-module Kirk
-  class Bootstrap
-    def warmup(application_path)
-      Dir.chdir File.expand_path(application_path)
-
-      load_rubygems
-
-      load_bundle.tap do
-        add_kirk_to_load_path
-
-        load_rack
-        load_kirk
-      end
-    end
-
-    def run(rackup)
-      app, options = Rack::Builder.parse_file(rackup)
-
-      Kirk::Handler.new(app)
-    end
-
-  private
-
-    def load_rubygems
-      require 'rubygems'
-    end
-
-    def load_bundle
-      if File.exist?('Gemfile')
-        require 'bundler/setup'
-
-        if File.exist?('Gemfile.lock')
-          require 'digest/sha1'
-          str = File.read('Gemfile') + File.read('Gemfile.lock')
-          Digest::SHA1.hexdigest(str)
-        end
-      end
-    end
-
-    def add_kirk_to_load_path
-      $:.unshift File.expand_path('../..', __FILE__)
-    end
-
-    def load_rack
-      gem "rack", ">= 1.0.0"
-      require 'rack'
-    end
-
-    def load_kirk
-      require 'kirk/version'
-      require 'kirk/input_stream'
-      require 'kirk/handler'
-    end
-  end
-end
-
-Kirk::Bootstrap.new