stacksondeck 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f66f37dd14473800a167656562303d6535266f9
-  data.tar.gz: 3ab570735e3e1e9147053170145f5cf3b64892ea
+  metadata.gz: c09d73c08333b89973b871c50d3933a4da3949b6
+  data.tar.gz: 102aae303c3c519a4ce4d0d80e3938d51cb6cefc
 SHA512:
-  metadata.gz: 668f029bf4253411e1069126729fb0b75913ed22cf22cf9c07e2a42d690a7ee868d4fc7d9adaf7b00bd5a3d88e5b66740a2eab998419838842b88f7aab39c0b2
-  data.tar.gz: 9e177ac38b433a46c479c88674c44d7743cd20d7d883b9ba5111bebb14b098a9a19716ce2763e519b45105dfde794f82beb7cf3ee40ac838ad82251a9b20c384
+  metadata.gz: 5a4ff31882cdcbf2107f8ecdc1df8b4b16339acbf51df03f2fd3f5aad1d067058dc270dd23b574789585ba0730b1c8e2f9c8bd3bdf6de7d985ecbd5d03018793
+  data.tar.gz: abb759e8f7e115d544e3a4439cbcd96fd7d5fe802a5344aa23fa531cf51243b5527309cbc658ae107040e606b54b4adab55977849936ac26414637ac40c87825

data/VERSION

@@ -1 +1 @@
-1.0.10
+1.1.0

data/lib/stacksondeck/app.rb

@@ -4,7 +4,6 @@ require 'json'
 require 'yaml'
 
 require 'ridley'
-require 'daybreak'
 require 'sinatra/base'
 
 require_relative 'metadata'
@@ -14,8 +13,12 @@ module StacksOnDeck
   class App < Sinatra::Application
 
     def self.run!
-      at_exit { close! }
-      open!
+      log.info event: 'run!'
+
+      @@db = {}
+      @@db_dump = ''
+      @@last_modified = Time.now
+      @@ridley = Ridley.from_chef_config settings.config
 
       Thread.new do
         loop do
@@ -40,38 +43,16 @@ module StacksOnDeck
     end
 
 
-  private
 
+  private
 
     def self.log ; settings.log end
 
     def log ; settings.log end
 
 
-    def self.db_copy
-      @@db.lock do
-        @@db.inject({}) { |h,(k,v)| h[k] = v ; h }
-      end
-    end
-
-
-    def self.open!
-      log.info event: 'open!', db: settings.database
-      @@db = Daybreak::DB.new settings.database
-      @@db_dump = YAML.dump db_copy
-      @@last_modified = Time.now
-      @@ridley = Ridley.from_chef_config settings.config
-    end
-
-
-    def self.close!
-      log.info event: 'close!', db: settings.database
-      @@db.flush
-      @@db.close
-    end
-
-
     def self.refresh!
+      log.info event: 'refresh!'
       started = Time.now
 
       nodes = @@ridley.partial_search :node, 'name:*', %w[
@@ -87,7 +68,7 @@ module StacksOnDeck
         platform
       ]
 
-      node_resources = {}
+      @@db = {}
 
       nodes.each do |n|
         name = n.name
@@ -104,7 +85,7 @@ module StacksOnDeck
 
         next if n.hostname.nil?
 
-        node_resources[name] = {
+        @@db[name] = {
           'hostname' => n.hostname,
           'description' => n.fqdn,
           'osArch' => n.kernel.machine,
@@ -118,18 +99,13 @@ module StacksOnDeck
         }
       end
 
-      @@db.lock do
-        @@db.clear
-        @@db.update! node_resources
-      end
-
-      @@db_dump = YAML.dump node_resources
+      @@db_dump = YAML.dump @@db
 
       @@last_modified = Time.now
 
-      log.info event: 'refreshed!', elapsed: (Time.now - started)
+      log.info event: 'refreshed', elapsed: (Time.now - started)
 
-      return node_resources
+      return @@db
     end
 
 

data/lib/stacksondeck/main.rb

@@ -45,11 +45,6 @@ module StacksOnDeck
       aliases: %w[ -c ],
       desc: 'Location of Chef configuration',
       default: '/etc/chef/knife.rb'
-    option :database, \
-      type: :string,
-      aliases: %w[ -d ],
-      desc: 'Location of state database',
-      default: '/etc/sod.db'
     option :username, \
       type: :string,
       aliases: %w[ -u ],
@@ -67,7 +62,6 @@ module StacksOnDeck
       App.set :port, options.port
       App.set :config, options.config
       App.set :refresh, options.refresh
-      App.set :database, options.database
       App.set :username, options.username
       App.set :environment, options.environment
 

data/stacksondeck.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'slog', '~> 1'
   s.add_runtime_dependency 'hashie', '~> 2'
   s.add_runtime_dependency 'sinatra', '~> 1.4'
-  s.add_runtime_dependency 'daybreak', '~> 0.3'
   s.add_runtime_dependency 'ridley', '~> 4.1'
   s.add_runtime_dependency 'thin', '~> 1'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stacksondeck
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: daybreak
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement