zygote 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2994a2e5d4616b4b1b0c39f9796f733a65ef5d76
-  data.tar.gz: 591d695efd51df62d38be73844ef4555fe21ccee
+  metadata.gz: b78db9a651e1cda67167ffa88e926df3cab9fd62
+  data.tar.gz: ba8540429aa499f8613f0b1964d2a50886bf9155
 SHA512:
-  metadata.gz: d09fd0845bb835e317aa70f84658abf38e6ae41066ef15a0c57f59ecc1eab924e2e2626aab4580a2a43e2754f4ddae5fd3ccfe026d899e3df2705f9310721256
-  data.tar.gz: 697211d6109bdb7607b55fba918cc417b9012f12f475e12ccd1bf2b613178ca3959f31d4264505668042782be15254c857634e02d0c5ed3bab4bc420402eec54
+  metadata.gz: e792b386ece097ebdbe99cc518d2ae714389d04637bf8c24f8185ce4b830b2e3f78705c70c7721d7b1a153afb0cae3f8c3d8e14a7de04346b0d9316db0a18243
+  data.tar.gz: c02407331e5644fba8699cb9f98e5388f85923abb1dea8f83a2c05ed1ffdec42f206a5f338eec9258486b079d8a105041d718574d37157c3d34518fb18c59c23

data/lib/zygote.rb

@@ -2,3 +2,4 @@ $LOAD_PATH.unshift(File.expand_path('../lib', __FILE__))
 
 require 'zygote/version'
 require 'zygote/http'
+require 'zygote/server'

data/lib/zygote/http.rb

@@ -1,24 +1,28 @@
 require 'yaml'
 require 'json'
-require 'genesisreactor'
-require 'genesis/protocol/http'
+
 require 'active_support/all'
+require 'sinatra/async'
+require 'tilt/erubis'
 
 require 'zygote/util'
 require 'zygote/cell_queue'
 
 # Main HTTP class, handles routing methods
 # Uses sinatra format (all sinatra docs on routing methods apply)
-class ZygoteWeb < Genesis::Http::Handler
+class ZygoteWeb < Sinatra::Base
+  register Sinatra::Async
+
+  set :show_exceptions, ENV['DEBUG'] || false
   # Requested by iPXE on boot, chains into /boot.
   # This enables us to customize what details we want iPXE to send us
   # The iPXE undionly.kpxe should contain an embedded script to call this URL
-  get '/' do
+  aget '/' do
     body { erb :boot }
   end
 
   # Chainload the primary menu
-  get '/chain' do
+  aget '/chain' do
     # Clean params into a simple hash
     cleaned = clean_params(params.to_h)
     # Add the request ip into the params
@@ -31,12 +35,11 @@ class ZygoteWeb < Genesis::Http::Handler
     # Check if there are is any queued data for this SKU, and if so, merge it in to params
     queued_data = CellQueue.shift(sku)
     cleaned.merge!(queued_data) if queued_data
-    @channel << cleaned
     body { erb :menu, locals: { opts: ZygoteWeb.cell_config.merge('params' => cleaned || {}) } }
   end
 
   # Render an action for a particular cell
-  get %r{/cell/(?<cell>\S*)/(?<action>\S*)$} do
+  aget %r{/cell/(?<cell>\S*)/(?<action>\S*)$} do
     # Clean params into a simple hash
     cleaned = clean_params(params.to_h)
     # Add the cell to the parameters
@@ -44,16 +47,15 @@ class ZygoteWeb < Genesis::Http::Handler
     # Merge the cleaned params in with any cell options
     cell_opts = ZygoteWeb.cell_config['index']['cells'][cell] || {}
     opts = cell_opts.merge('params' => cleaned || {})
-    @channel << opts # for debugging
     body { erb :"#{cell}/#{cleaned['action']}".to_sym, locals: { opts: opts } }
   end
 
   # Show the queue for a SKU
-  get %r{/queue/(?<sku>\S*)$} do
+  aget %r{/queue/(?<sku>\S*)$} do
     body { JSON.pretty_generate(CellQueue.show(params['sku'])) }
   end
 
-  get %r{/queue} do
+  aget %r{/queue} do
     response = {}
     CellQueue.all.each do |queue_entry|
       response[queue_entry.name] = queue_entry.data
@@ -62,12 +64,12 @@ class ZygoteWeb < Genesis::Http::Handler
   end
 
   # Delete the queue for a SKU
-  delete %r{/queue$} do
+  adelete %r{/queue$} do
     CellQueue.purge(params['sku'])
     body { JSON.pretty_generate(CellQueue.show(params['sku'])) }
   end
 
-  post %r{/queue/bulk$} do
+  apost %r{/queue/bulk$} do
     bulk_queue = JSON.parse(request.body.read)
     bulk_queue.each do |asset, queue|
       queue = [queue] unless queue.is_a?(Array)
@@ -80,7 +82,7 @@ class ZygoteWeb < Genesis::Http::Handler
   end
 
   # Enable push cells (with optional data) to the cell queue for a SKU
-  post %r{/queue/(?<sku>\S*)/(?<selected_cell>\S*)$} do
+  apost %r{/queue/(?<sku>\S*)/(?<selected_cell>\S*)$} do
     # Clean params into a simple hash
     cleaned = clean_params(params.to_h)
     # Enqueue some data for this sku
@@ -89,10 +91,6 @@ class ZygoteWeb < Genesis::Http::Handler
     body { JSON.pretty_generate(CellQueue.show(sku)) }
   end
 
-  subscribe do |args|
-    puts args if ENV['DEBUG']
-  end
-
   def self::cell_config
     @@cell_config
    end
@@ -100,25 +98,44 @@ class ZygoteWeb < Genesis::Http::Handler
   def self::cell_config=(value)
     @@cell_config = value
   end
-end
 
-def zygote(port: 7000, threads:1000, config_path: nil, cells: [], debug:false)
-  debug ||= ENV['DEBUG']
-
-  cell_config = YAML.load(File.read(config_path || File.join(Dir.pwd, 'config', 'cells.yml')))
-  ZygoteWeb.cell_config = cell_config
-  zygote = Genesis::Reactor.new(
-    threads: threads,
-    protocols: {
-      Genesis::Http::Protocol => port
-    },
-    handlers: [ZygoteWeb],
-    views: [File.expand_path('../../../views', __FILE__), cells].flatten,
-    debug: debug
-  )
-  if debug
-    $stdout.sync = true
-    $stderr.sync = true
+  def self::views
+    @@views
+   end
+
+  def self::views=(value)
+    @@views = value
+  end
+
+  helpers do
+    # Enable partial template rendering
+    def partial(template, locals = {})
+      erb(template, layout: false, locals: locals)
+    end
+
+    # Override template search directorys to add spells
+    def find_template(_views, *a, &block)
+      Array(ZygoteWeb.views).each { |v| super(v, *a, &block) }
+    end
+
+    # Define our asynchronous scheduling mechanism, could be anything
+    # Chose EM.defer for simplicity
+    # This powers our asynchronous requests, and keeps us from blocking the main thread.
+    def native_async_schedule(&b)
+      EM.defer(&b)
+    end
+
+    # Needed to properly catch exceptions in async threads
+    def handle_exception!(context)
+      if context.message == 'Sinatra::NotFound'
+        error_msg = "Resource #{request.path} does not exist"
+        puts error_msg
+        ahalt(404, error_msg)
+      else
+        puts context.message
+        puts context.backtrace.join("\n")
+        ahalt(500, 'Uncaught exception occurred')
+      end
+    end
   end
-  zygote
 end

data/lib/zygote/memory.rb

@@ -8,11 +8,11 @@ require 'supermodel'
 # https://github.com/maccman/supermodel/blob/master/README
 module Memory
   extend self
-  DATABASE_PATH = (ENV['DATABASE_PATH'] || File.expand_path('../data/memory.db', $0)).freeze
+  DATABASE_PATH = (ENV['DATABASE_PATH'] || File.expand_path('../data/memory.db', $PROGRAM_NAME)).freeze
   SuperModel::Marshal.path = DATABASE_PATH
 
   def save
-    FileUtils.mkdir_p(File.dirname(DATABASE_PATH)) # FIXME - don't make if it already exists
+    FileUtils.mkdir_p(File.dirname(DATABASE_PATH)) # FIXME: - don't make if it already exists
     SuperModel::Marshal.dump
   end
 

data/lib/zygote/server.rb

@@ -0,0 +1,41 @@
+require 'zygote/http'
+require 'thin'
+
+class ZygoteServer
+  def initialize(port: 7000, threads:1000, host: '0.0.0.0', config_path: nil, cells: [], debug:false)
+    debug ||= ENV['DEBUG']
+
+    cell_config = YAML.load(File.read(config_path || File.join(Dir.pwd, 'config', 'cells.yml')))
+    ZygoteWeb.views = [File.expand_path('../../../views', __FILE__), cells].flatten
+    ZygoteWeb.cell_config = cell_config
+    if debug
+      $stdout.sync = true
+      $stderr.sync = true
+    end
+
+    app = ZygoteWeb.new
+    dispatch = Rack::Builder.app do
+      map '/' do
+        run app
+      end
+    end
+    @server = Thin::Server.new(port, host, dispatch, threadpool_size: threads).backend
+  end
+
+  def start
+    @server.start
+  end
+
+  def run
+    EM.run do
+      init_sighandlers
+      @server.start
+    end
+  end
+end
+
+def init_sighandlers
+  trap(:INT)  { 'Got interrupt'; EM.stop; exit }
+  trap(:TERM) { 'Got term';      EM.stop; exit }
+  trap(:KILL) { 'Got kill';      EM.stop; exit }
+end

data/lib/zygote/test.rb

@@ -24,7 +24,7 @@ module Zygote
       mod.class_eval %[
         around(:each) do |example|
           EM.synchrony do
-            zygote(
+            ZygoteServer.new(
               config_path: TestConfig.config_path,
               cells: TestConfig.cells
             ).start
@@ -59,18 +59,18 @@ module Zygote
   # Returns EventMachine::HttpClient
   def get(uri, params = {})
     uriq = "#{uri}#{parameterize(params)}"
-    EM::Synchrony.sync(EventMachine::HttpRequest.new(File.join("http://#{Socket.gethostname}:#{TestConfig.port}/", uriq)).aget(query: params))
+    EM::Synchrony.sync(EventMachine::HttpRequest.new(File.join("http://127.0.0.1:#{TestConfig.port}/", uriq)).aget(query: params))
   end
 
   # Returns EventMachine::HttpClient
   def delete(uri, params = {})
     uriq = "#{uri}#{parameterize(params)}"
-    EM::Synchrony.sync(EventMachine::HttpRequest.new(File.join("http://#{Socket.gethostname}:#{TestConfig.port}/", uriq)).adelete(query: params))
+    EM::Synchrony.sync(EventMachine::HttpRequest.new(File.join("http://127.0.0.1:#{TestConfig.port}/", uriq)).adelete(query: params))
   end
 
   # Returns EventMachine::HttpClient
   def post(uri, params = {})
-    EM::Synchrony.sync(EventMachine::HttpRequest.new("http://#{Socket.gethostname}:#{TestConfig.port}/#{uri}").apost(body: params))
+    EM::Synchrony.sync(EventMachine::HttpRequest.new("http://127.0.0.1:#{TestConfig.port}/#{uri}").apost(body: params))
   end
 
   def parameterize(params)

data/lib/zygote/util.rb

@@ -9,14 +9,14 @@ def compute_sku(vendor, serial, board_serial)
 
   serial = board_serial unless board_serial.empty?
 
-  case vendor
-  when 'DellInc'
-    sku = 'DEL'
-  when 'Supermicro'
-    sku = 'SPM'
-  else
-    sku = 'UKN' # unknown manufacturer
-  end
+  sku = case vendor
+        when 'DellInc'
+          'DEL'
+        when 'Supermicro'
+          'SPM'
+        else
+          'UKN' # unknown manufacturer
+        end
 
   sku = "#{sku}-#{serial}"
   sku
@@ -36,5 +36,5 @@ def discover_domain
 end
 
 def kernel_params(hash)
-  hash.map{ |k,v| v == true ? k : "#{k}=#{v}" }.join(' ')
+  hash.map { |k, v| v == true ? k : "#{k}=#{v}" }.join(' ')
 end

data/lib/zygote/version.rb

@@ -1,4 +1,4 @@
 # Namespace for our gem
 module Zygote
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zygote
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Dale Hamel
@@ -25,47 +25,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: genesisreactor
+  name: supermodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
-  name: supermodel
+  name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: async_sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: em-synchrony
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +174,7 @@ files:
 - lib/zygote/cell_queue.rb
 - lib/zygote/http.rb
 - lib/zygote/memory.rb
+- lib/zygote/server.rb
 - lib/zygote/test.rb
 - lib/zygote/util.rb
 - lib/zygote/version.rb