ki-repo 0.1.1 → 0.1.2

data/lib/util/ruby_extensions.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -82,14 +82,6 @@ end
 
 class Array
   include Ki::KiEnumerable
-
-  def Array.wrap(maybe_arr)
-    if maybe_arr.kind_of?(Array)
-      maybe_arr
-    else
-      [maybe_arr]
-    end
-  end
 end
 
 module Enumerable
@@ -109,7 +101,7 @@ class File
         end
       end
       FileUtils.mv(tmp, dest)
-    rescue Exception => e
+    rescue Exception
       FileUtils.remove_entry_secure(tmp)
       raise
     end
@@ -117,17 +109,6 @@ class File
 end
 
 class Hash
-  original_get = self.instance_method(:[])
-
-  define_method(:[]) do |key, default=nil|
-    value = original_get.bind(self).call(key)
-    if value || include?(key)
-      value
-    else
-      default
-    end
-  end
-
   def require(key)
     if !include?(key)
       raise "'#{key}' is not defined!"
@@ -135,3 +116,59 @@ class Hash
     self[key]
   end
 end
+
+class Object
+  # if block raises an exception outputs the error message. returns block's exit value or reraises the exception
+  def show_errors(&block)
+    begin
+      block.call
+    rescue Exception => e
+      puts "Exception '#{e.message}':\n#{e.backtrace.join("\n")}"
+      raise
+    end
+  end
+
+  # Resolves fully qualified class named including modules: Ki::KiCommand
+  def Object.const_get_full(full_class_name)
+    class_or_module = self
+    full_class_name.split("::").each do |name|
+      class_or_module = class_or_module.const_get(name)
+    end
+    class_or_module
+  end
+
+  def try(retries, retry_sleep, &block)
+    c = 0
+    start = Time.now
+    while c < retries
+      begin
+        return block.call(c+1)
+      rescue Exception => e
+        c += 1
+        if c < retries
+          sleep retry_sleep
+        else
+          raise e.class, e.message + " (tried #{c} times, waited #{sprintf("%.2f", Time.now - start)} seconds)", e.backtrace
+        end
+      end
+    end
+  end
+end
+
+class String
+  def split_strip(separator=",")
+    split(separator).map{|s| s.strip}
+  end
+end
+
+module ObjectSpace
+  def ObjectSpace.all_classes
+    arr = []
+    each_object do |o|
+      if o.kind_of?(Class)
+        arr << o
+      end
+    end
+    arr
+  end
+end

data/lib/util/service_registry.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/util/shell.rb

@@ -0,0 +1,96 @@
+# encoding: UTF-8
+
+# Copyright 2012-2013 Mikko Apo
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Ki
+  # Executes a command and logs using HashLog
+  class ShellCommandExecution
+    attr_chain :cmd, :require
+    attr_chain :exitstatus, :require
+    attr_chain :pid, :require
+    attr_chain :env, :require
+    attr_chain :options, :require
+    attr_chain :out, :require
+    attr_chain :err, :require
+  end
+  class DummyHashLog
+    def log(*arr, &block)
+      block.call
+    end
+  end
+  class HashLogShell
+    attr_chain :env
+    attr_chain :chdir
+    attr_chain :ignore_error
+    attr_reader :previous
+    attr_chain :root_log, -> { DummyHashLog.new }
+
+    def spawn(*arr)
+      run_env = {}
+      run_options = {}
+      if (env)
+        run_env.merge!(env)
+      end
+      if (arr.first.kind_of?(Hash))
+        run_env.merge!(arr.delete_at(0))
+      end
+      if (arr.last.kind_of?(Hash))
+        run_options.merge!(arr.delete_at(-1))
+      end
+      if (chdir && !run_options[:chdir])
+        run_options[:chdir] = chdir
+      end
+      rout = wout = rerr = werr = nil
+      if (!run_options[:out])
+        rout, wout = IO.pipe
+        run_options[:out]=wout
+      end
+      if (!run_options[:err])
+        rerr, werr = IO.pipe
+        run_options[:err]=werr
+      end
+      cmd = arr.first
+      root_log.log("Shell command '#{cmd}'") do
+        pid = system_spawn(run_env, cmd, run_options)
+        pid, status = Process.waitpid2(pid)
+        exitstatus = status.exitstatus
+        @previous = ShellCommandExecution.new.
+            cmd(cmd).
+            exitstatus(exitstatus).
+            pid(pid).
+            env(run_env).
+            options(run_options)
+        if rout
+          wout.close
+          @previous.out(rout.readlines.join("\n"))
+          rout.close
+        end
+        if rerr
+          werr.close
+          @previous.err(rerr.readlines.join("\n"))
+          rerr.close
+        end
+        if (exitstatus != 0 && !ignore_error)
+          raise "Shell command '#{cmd}' failed with exit code #{exitstatus}"
+        end
+        @previous
+      end
+    end
+
+    def system_spawn(run_env, cmd, run_options)
+      Process.spawn(run_env, cmd, run_options)
+    end
+  end
+end

data/lib/util/simple_optparse.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -36,12 +36,14 @@ module Ki
       if block.nil?
         raise "Option without parser block: " + args.join(", ")
       end
-      if args.size == 3
-        short = args.delete_at(0)
+      if args.size == 2 || args.size == 3
+        short = args.size == 3 ? args.delete_at(0) : nil
         long, *params = args.delete_at(0).split(" ")
         comment = args.delete_at(0)
         options_for_to_s << {short: short, long: long, comment: comment, params: params, block: block }
-        options << {opt: short, comment: comment, params: params, block: block }
+        if short
+          options << {opt: short, comment: comment, params: params, block: block }
+        end
         options << {opt: long, comment: comment, params: params, block: block }
       else
         raise "unsupported option configuration size: " + args.join(", ")

data/lib/util/test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2012 Mikko Apo
+# Copyright 2012-2013 Mikko Apo
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -318,6 +318,18 @@ module Ki
       def write(s)
         self.<< s
       end
+      def flush
+
+      end
+    end
+
+    def restore_extensions
+      original_commands = KiCommand::KiExtensions.dup
+      cleaners << lambda do
+        KiCommand::KiExtensions.clear
+        KiCommand::KiExtensions.register(original_commands)
+      end
     end
+
   end
 end

data/lib/web/default_rack_handler.rb

@@ -0,0 +1,43 @@
+# encoding: UTF-8
+
+# Copyright 2012-2013 Mikko Apo
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Ki
+
+  # Tries to launch Rack handlers in default order
+  # @see RackCommand
+  class DefaultRackHandler
+    def run(rack_app, config={})
+      detect_rack_handler.run(rack_app, config) do |server|
+        @server = server
+      end
+    end
+
+    def stop
+      @server.stop
+    end
+
+    def detect_rack_handler
+      servers = %W(thin mongrel webrick)
+      servers.each do |server_name|
+        begin
+          return Rack::Handler.get(server_name.to_s)
+        rescue Exception
+        end
+      end
+      fail "Could not resolve server handlers for any of '#{servers.join(', ')}'."
+    end
+  end
+end

data/lib/web/rack_cmd.rb

@@ -0,0 +1,161 @@
+# encoding: UTF-8
+
+# Copyright 2012-2013 Mikko Apo
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'socket'
+require 'net/http'
+
+require 'sinatra/base'
+require 'sass'
+require 'coffee-script'
+
+module Ki
+
+  class WebContext
+    attr_accessor :ki_home
+    attr_accessor :development
+    attr_chain :started, -> { Time.now.to_i }
+    attr_chain :resource_hash, -> { started.to_s(16) }
+  end
+
+  module KiWebBase
+    def web_ctx
+      RackCommand.web_ctx
+    end
+
+    def ki_home
+      web_ctx.ki_home
+    end
+
+    def res_url(path)
+      if path.include?("..")
+        raise "File '#{path}' cannot reference parent directories with '..'!"
+      end
+      "/file/web/#{ RackCommand.web_ctx.resource_hash}/#{self.class.name}:#{path}"
+    end
+  end
+
+  # When starting up, looks for /web extension classes loaded from ki-scripts and starts up a web site
+  #    class MyApp2 < Sinatra::Base
+  #      get '/' do
+  #        "MyApp2"
+  #      end
+  #    end
+  #    KiCommand.register("/web/test", MyApp2)
+  #
+  # @see DefaultRackHandler
+  class RackCommand
+    @@web_ctx = WebContext.new
+
+    attr_chain :shell_command, :require
+    attr_chain :handler, -> { DefaultRackHandler }
+
+    def ki_app
+      extensions = KiCommand::KiExtensions.by_parent["/web"]
+      if extensions.nil? || extensions.empty?
+        raise "No /web extensions defined!"
+      end
+      RackCommand.build_app(extensions.map{|p,c| [p[4..-1], c]})
+    end
+
+    def RackCommand.build_app(path_class_list)
+      Rack::Builder.new do
+        path_class_list.each do |path, clazz|
+          map(path) do
+            run(clazz)
+          end
+        end
+      end
+    end
+
+    def RackCommand.find_free_tcp_port
+      socket = Socket.new(:INET, :STREAM, 0)
+      socket.bind(Addrinfo.tcp("127.0.0.1", 0))
+      begin
+        socket.local_address.ip_port
+      ensure
+        socket.close
+      end
+    end
+
+    def RackCommand.wait_until_url_responds(url, &block)
+      try(20, 0.1) do
+        response = Net::HTTP.get_response(URI(url))
+        if block
+          block.call(response)
+        else
+          if (code = response.code) == "200"
+            return response
+          else
+            raise "Response code from #{url} was #{code}"
+          end
+        end
+      end
+    end
+
+    def start_server
+      @server = handler.new
+      [:INT, :TERM].each { |sig| trap(sig) { stop_server } }
+      @server.run(ki_app, :Port => (@port || 8290))
+    end
+
+    def stop_server
+      @server.stop
+    end
+
+    def execute(ctx, args)
+      RackCommand.web_ctx.ki_home=ctx.ki_home
+      @port = nil
+      opts.parse(args)
+      start_server
+    end
+
+    def opts
+      OptionParser.new do |opts|
+        opts.banner = ""
+        opts.on("--handler HANDLER", "Use specified Rack Handler") do |v|
+          handler(Object.const_get_full(v))
+        end
+        opts.on("--development", "Development mode, resource urls are reloaded") do |v|
+          RackCommand.web_ctx.development=true
+        end
+        opts.on("-p", "--port PORT", "Use specified port") do |v|
+          @port = Integer(v)
+        end
+      end
+    end
+
+    def self.web_ctx
+      @@web_ctx
+    end
+
+    attr_chain :summary, -> { "Starts Ki web server and uses code from Ki packages" }
+
+    def help
+      <<EOF
+ki-repo has a built in web server.
+
+### Usage
+
+    #{shell_command} - Starts Ki web server
+
+### Parameters
+#{opts}
+EOF
+    end
+  end
+
+  KiCommand.register_cmd("web", RackCommand)
+end