hive-runner 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e207ec510637bfa6487c519394b19e812d0b8cb7
-  data.tar.gz: bf62fa9fdcd02e893bf1c774c72f106684d343dc
+  metadata.gz: 801e57ca7ffec41f0d9562eb17b6063c484512cf
+  data.tar.gz: eaa8edea829f29ab1439cd82c113a90340fdaf04
 SHA512:
-  metadata.gz: fe11351de90fc9333ef2c16c1fd67bb24795c3cc0539716d37f6026ba20c229d6abff2e749a5802834a97871b13d60347ac12bed5b8f904ff310ee37483b91f8
-  data.tar.gz: 038c7db4752776eee051e410ce40b7ec65fc3b024113fe5bff48bfea692b0853565b2ac305496394de7e5d113ce9693602f7422ede8357000f727f879ba8b0ba
+  metadata.gz: 04c436ec9a2438a8381e184d2ddbc4f23737a811a3258848d82ec448eb9405919bea5d76d8c9d2f506c7be0acd316b39669a862b277d0bdb8ba24b02ee4454c3
+  data.tar.gz: 6b4e17418f1fce51951ef4c60a35114257e15146c2bdce69327858a505f8dfae1368c7be9467080db052758bcfca6b06993d950e0930b29d37e9a02b57fe7044

data/lib/hive.rb

@@ -30,9 +30,7 @@ module Hive
   else
     fail 'Missing logging section in configuration file'
   end
-  @hive_mind = MindMeld.new(
-    url: Chamber.env.network.hive_mind? ? Chamber.env.network.hive_mind : nil
-  )
+
   DeviceDBComms.configure do |config|
     config.url = Chamber.env.network.devicedb
     config.pem_file = Chamber.env.network.cert
@@ -63,34 +61,27 @@ module Hive
   end
 
   def self.hive_mind
-    @hive_mind
-  end
-
-  def self.register
-    @register ||= Hive::Register.new
-  end
-
-  # Get the id of the hive from the device database
-  def self.hive_mind_id
-    if ! @hive_mind_id
-      Hive.logger.info "About to poll"
-      reg = @hive_mind.register(
+    @hive_mind ||= MindMeld.new(
+      url: Chamber.env.network.hive_mind? ? Chamber.env.network.hive_mind : nil,
+      device: {
         hostname: Hive.hostname,
         version: Gem::Specification.find_by_name('hive-runner').version.to_s,
-        runner_plugins: Hash[Gem::Specification.find_all_by_name(/hive-runner-*/).map { |p| [p.name, p.version.to_s] }],
+        runner_plugins: Hash[Gem::Specification.find_all_by_name(/hive-runner-/).map { |p| [p.name, p.version.to_s] }],
         macs: [Hive.mac_address],
         ips: [Hive.ip_address],
         brand: Hive.config.brand? ? Hive.config.brand : 'BBC',
         model: Hive.config.model? ? Hive.config.model : 'Hive',
         device_type: 'Hive'
-       )
-      @hive_mind_id = reg['id']
-    end
-    @hive_mind_id || -1
+      }
+    )
   end
 
-   # Get the id of the hive from the device database
-   def self.id
+  def self.register
+    @register ||= Hive::Register.new
+  end
+
+  # Get the id of the hive from the device database
+  def self.id
     if ! @devicedb_id
       Hive.logger.info "Attempting to register the hive as #{Hive.hostname}"
       register_response = self.devicedb('Hive').register(Hive.hostname, Hive.mac_address, Hive.ip_address)
@@ -127,22 +118,13 @@ module Hive
     end
 
     # Hive Mind
-    id = self.hive_mind_id
-    if id and  id > 0
-      Hive.logger.debug "Polling hive: #{id}"
-#      rtn = @hivemind.poll(id)
-#      Hive.logger.debug "Return data: #{rtn}"
-#      if rtn['error'].present?
-#        Hive.logger.warn "Hive polling failed: #{rtn['error']}"
-#      else
-#        Hive.logger.info "Successfully polled hive"
-#      end
+    Hive.logger.debug "Polling hive: #{id}"
+    rtn = Hive.hive_mind.poll
+    Hive.logger.debug "Return data: #{rtn}"
+    if rtn['error'].present?
+      Hive.logger.warn "Hive polling failed: #{rtn['error']}"
     else
-      if id
-        Hive.logger.debug "Skipping polling of hive"
-      else
-        Hive.logger.warn "Unable to poll hive"
-      end
+      Hive.logger.info "Successfully polled hive"
     end
   end
 
@@ -161,4 +143,5 @@ module Hive
   def self.hostname
     Socket.gethostname.split('.').first
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chamber
@@ -146,16 +146,22 @@ dependencies:
   name: mind_meld
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: code_cache
   requirement: !ruby/object:Gem::Requirement