zygote 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6453638ec4693e43b0a13c53933f4f8e2f7e2273
-  data.tar.gz: 998e036ab3605422f0d3efd18b36e722f06c5ba9
+  metadata.gz: eebe118f907539d05c38e4364bd52a89e6d0191a
+  data.tar.gz: 52be5146b4bf92e912ee2ff8fb0c43a3a3fbe0e7
 SHA512:
-  metadata.gz: cca8f9c8f57e42fceb778d7f5e1ee79f64255c28ad92c32ea2e0a33fc657ba0e57d7ad769ae17c4fb3f68952a028285044bb2b0a964e6369d84ce36e111834bd
-  data.tar.gz: 56d20bf591b3dd195762c9a4e3151e8e8837b924703c94a95cf879c21b584c3b7744a765e8c8afc931ed7b74bc90b5a29391002d71169fad64b2acfe1524afd2
+  metadata.gz: 8fca27b1b6f6fb84e97fd01f058bf651bbaa08915e895d085561a1379eefdfb79079fd8e1cb722c9b3a17763302df584e1914e08af6f5a8efd9eb81896a641c5
+  data.tar.gz: ef8dbc472d282de13ae75c6566a033cbd68e31858c1c67bb619ea4c228f9c5a69145d487e5ceb85d4a4a3757f2f176eebcc78548463d271a73ef9f0de378c7be

data/lib/zygote/cell_queue.rb

@@ -43,7 +43,7 @@ module CellQueue
     entry.save if entry
   end
 
-  def all()
+  def all
     CellQueueEntry.all
   end
 end

data/lib/zygote/http.rb

@@ -10,7 +10,6 @@ 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
-
   # 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
@@ -24,7 +23,7 @@ class ZygoteWeb < Genesis::Http::Handler
     cleaned = clean_params(params.to_h)
     # Add the request ip into the params
     ip = request.ip == '127.0.0.1' ? @env['HTTP_X_FORWARDED_FOR'] : request.ip
-    ip = '127.0.0.1' if (ENV['TESTING'] || ip.nil? || ip.empty?)
+    ip = '127.0.0.1' if ENV['TESTING'] || ip.nil? || ip.empty?
     cleaned['ip'] = ip
     # Compute SKU from parameters
     sku = compute_sku(cleaned['manufacturer'], cleaned['serial'], cleaned['board-serial'])
@@ -33,7 +32,7 @@ class ZygoteWeb < Genesis::Http::Handler
     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 || {}) } }
+    body { erb :menu, locals: { opts: ZygoteWeb.cell_config.merge('params' => cleaned || {}) } }
   end
 
   # Render an action for a particular cell
@@ -43,7 +42,7 @@ class ZygoteWeb < Genesis::Http::Handler
     # Add the cell to the parameters
     cell = cleaned['cell']
     # Merge the cleaned params in with any cell options
-    cell_opts = ZygoteWeb::cell_config['index']['cells'][cell] || {}
+    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 } }
@@ -59,7 +58,7 @@ class ZygoteWeb < Genesis::Http::Handler
     CellQueue.all.each do |queue_entry|
       response[queue_entry.name] = queue_entry.data
     end
-    body { JSON.pretty_generate(response)}
+    body { JSON.pretty_generate(response) }
   end
 
   # Delete the queue for a SKU
@@ -69,7 +68,6 @@ class ZygoteWeb < Genesis::Http::Handler
   end
 
   post %r{/queue/bulk$} do
-
     bulk_queue = JSON.parse(request.body.read)
     bulk_queue.each do |asset, queue|
       queue = [queue] unless queue.is_a?(Array)
@@ -95,11 +93,11 @@ class ZygoteWeb < Genesis::Http::Handler
     puts args if ENV['DEBUG']
   end
 
- def ZygoteWeb::cell_config
+  def self::cell_config
     @@cell_config
-  end
+   end
 
-  def ZygoteWeb::cell_config= (value)
+  def self::cell_config=(value)
     @@cell_config = value
   end
 end
@@ -107,15 +105,15 @@ 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
+  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,
+    views: [File.expand_path('../../../views', __FILE__), cells].flatten,
     debug: debug
   )
   if debug

data/lib/zygote/test.rb

@@ -0,0 +1,81 @@
+require 'net/http'
+require 'socket'
+require 'fileutils'
+
+require 'rspec'
+require 'em-synchrony'
+require 'em-synchrony/em-http'
+
+module Zygote
+
+  module TestConfig
+    extend self
+    attr_reader :config_path, :cells, :port, :fixtures
+    def setup(fixtures: fixtures, config_path: config_path, cells: cells, port: port)
+      @fixtures = fixtures || File.expand_path('../../../spec/fixtures', __FILE__)
+      @config_path = config_path || File.join(@fixtures, 'cells.yml')
+      @cells = cells || File.join(@fixtures, 'cells')
+      @port = port || 7000
+    end
+  end
+
+  # Run within synchrony block to prevent blocking
+  module ZygoteSpec
+    def self.append_features(mod)
+      mod.class_eval %[
+        around(:each) do |example|
+          EM.synchrony do
+            zygote(
+              config_path: TestConfig.config_path,
+              cells: TestConfig.cells
+            ).start
+            example.run
+            EM.stop
+          end
+        end
+      ]
+    end
+  end
+
+  # Use a fresh database fro seed for each run
+  module MemorySpec
+    def self.append_features(mod)
+      mod.class_eval %[
+        around(:each) do |example|
+          seed = File.join(TestConfig.fixtures, 'memory_seed.db')
+          FileUtils.cp(seed, ENV['DATABASE_PATH'])
+          Memory::load
+          example.run
+        end
+      ]
+    end
+  end
+
+  def match_fixture(name, actual)
+    path = File.join(TestConfig.fixtures, 'data', "#{name}.txt")
+    File.open(path, 'w') { |f| f.write(actual) } if ENV['FIXTURE_RECORD']
+    expect(actual).to eq(File.read(path))
+  end
+
+  # 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))
+  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))
+  end
+
+  # Returns EventMachine::HttpClient
+  def post(uri, params = {})
+    EM::Synchrony.sync(EventMachine::HttpRequest.new("http://#{Socket.gethostname}:#{TestConfig.port}/#{uri}").apost(body: params))
+  end
+
+  def parameterize(params)
+    q = params.to_query
+    q.empty? ? '' : "?#{q}"
+  end
+end

data/lib/zygote/util.rb

@@ -28,7 +28,7 @@ def clean_params(params)
 end
 
 def my_ip
-  Socket.ip_address_list.find{|x| x.ipv4? && !x.ipv4_loopback?}.ip_address
+  Socket.ip_address_list.find { |x| x.ipv4? && !x.ipv4_loopback? }.ip_address
 end
 
 def discover_domain

data/lib/zygote/version.rb

@@ -1,4 +1,4 @@
 # Namespace for our gem
 module Zygote
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zygote
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Dale Hamel
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: supermodel
   requirement: !ruby/object:Gem::Requirement
@@ -53,47 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.3
-  type: :development
+        version: 1.1.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 0.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 0.10.3
 - !ruby/object:Gem::Dependency
-  name: em-http-request
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ files:
 - lib/zygote/cell_queue.rb
 - lib/zygote/http.rb
 - lib/zygote/memory.rb
+- lib/zygote/test.rb
 - lib/zygote/util.rb
 - lib/zygote/version.rb
 - views/boot.erb