hive-runner-android 1.2.9 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3f9abd6596eb7a64374be57d2f8b2d3bb853dbf
-  data.tar.gz: 8dd1e096d59981911a9e5a78ef82a9d4dea73119
+  metadata.gz: bf1f2542f542b5b0ed152c23d60a44f134c5dcdd
+  data.tar.gz: 246810545eb824b4be5a053ce55eeca54b438964
 SHA512:
-  metadata.gz: 4bd38d437bd66bdd0cdee951e193a5ff0aee6c3f14adc8e2580c9ce6d73272724685edb0443d20c31d370915788917a28a58ef18ede74972096993dbf68560af
-  data.tar.gz: 392357e6c5e51badb0eec571bd5d3372bc2f375d75772b6eb913552e9a058f0972e7d750a3f83590cc3df2f6f2e00e178b361ad590b15853b0e3fb44e85c5a1e
+  metadata.gz: 383167bb0c08cc36b32749fdfdd888c811481993603ce1339b8d7aef3b08a1c7b2181dc833b492fe8c416f5f6d8a785e3881df701fcad95a9290b5f452ae6ebc
+  data.tar.gz: 02f6df58f2af851153d24da588cc63ebba1026a2d8a021854416f4fe3f338bf7d1400e2702a513df298351f9c07b6d084fb46e36157d6ca100e7126c035ebcf3

data/lib/hive/controller/android.rb

@@ -42,9 +42,21 @@ module Hive
             Hive.logger.debug("A previously registered device has disappeared: #{device}")
           else
             # A previously registered device is attached, poll it
-            Hive.logger.debug("Setting #{device} to be polled")
+
+            Hive.logger.debug("Setting #{device['name']} to be polled")
             Hive.logger.debug("Device: #{registered_device.inspect}")
             begin
+              Hive.logger.debug("#{device['name']} OS version: #{registered_device[0].version}")
+              # Check OS version and update if necessary
+              if device['operating_system_version'] != registered_device[0].version
+                Hive.logger.info("Updating OS version of #{device['name']} from #{device['operating_system_version']} to #{registered_device[0].version}")
+                Hive.hive_mind.register(
+                  id: device['id'],
+                  operating_system_name: 'android',
+                  operating_system_version: registered_device[0].version
+                )
+              end
+
               attached_devices << self.create_device(device.merge('os_version' => registered_device[0].version))
               to_poll << device['id']
             rescue DeviceAPI::DeviceNotFound => e

data/lib/hive/diagnostic/android/battery.rb

@@ -7,31 +7,41 @@ module Hive
       def battery
         self.device_api.battery_info
       end
+
+      def units
+        {
+          :temperature => "K",
+          :voltage => "mV"
+        }
+      end
       
       def diagnose
-        result = nil
+        data = {}
         battery_info = battery
-        begin
-          if config != nil && config.keys.count != 0  
-            temperature = battery_info['temperature']
-            if temperature.to_i < config['temperature'].to_i
-              result = self.pass("Temperature: #{temperature}\n Battery status: OK", "battery")
-            else
-              result = self.fail("Battery temperature above threshold. Temperature: #{temperature} ", "battery")
-            end
-          else
-            result = self.pass("No parameter specified for battery", "battery")
+        result = "pass"
+        config.keys.each do |c| 
+        raise InvalidParameterError.new("Battery Parameter should be any of #{battery_info.keys}") if !battery_info.has_key? c
+          begin
+            data[:"#{c}"] = { :value => battery_info[c], :unit => units[:"#{c}"] }
+            result = "fail" if battery_info[c].to_i > config[c].to_i
+          rescue => e
+            Hive.logger.error "Incorrect battery parameter => #{e}"                
+            return self.fail("Incorrect parameter #{c} specified. Battery Parameter can be any of #{battery_info.keys}", "Battery") 
           end
-        rescue
-          Hive.logger.error("Invalid Battery Parameter")
-          raise InvalidParameterError.new("Invalid Parameter for battery") if !result
         end
-        result
+
+        if result != "fail"
+          self.pass("Battery", data)
+        else
+          self.fail("Battery", data)
+        end
+ 
       end
 
       def repair(result)
-        result = self.fail("Battery temperature above threshold.", "battery")
+        self.fail("Unplug device from hive", "Battery")
       end
+
     end
     end
   end

data/lib/hive/diagnostic/android/memory.rb

@@ -7,33 +7,27 @@ module Hive
         def memory
           @memory = self.device_api.memory unless @memory
           mem = @memory.mem_info
-          return {:free => mem.free.split(' ')[0], 
-                  :total => mem.total.split(' ')[0], 
-                  :used => mem.used.split(' ')[0], }
+          return {:free => mem.free.split(' ').first, 
+                  :total => mem.total.split(' ').first, 
+                  :used => mem.used.split(' ').first, }
         end
 
         def diagnose
-          result = nil
+          data = {}
+          result = "pass"
           operator = {:free => :>=, :used => :<= , :total => :==}
           memory_status = memory
-          if config != nil && config.keys.count != 0
-            config.each do |key, value|
-              begin
-                if memory_status[:"#{key}"].to_i.send(operator[:"#{key}"], value.to_i) 
-                  result = self.pass("#{key.capitalize} Memory (#{memory_status[:"#{key}"]}) #{operator[:"#{key}"]} #{value}", "memory" )
-                else
-                  result = self.fail("Error: #{key.capitalize} Memory (#{memory_status[:"#{key}"]}) is not #{operator[:"#{key}"]} #{value}", "memory")
-                  break
-                end
-              rescue
-                Hive.logger.error("Invalid Memory Parameter")
-                raise InvalidParameterError.new("Invalid Parameter for memory") if !result
-              end
-            end 
-          else 
-            result = self.pass("No parameter specified", "memory")
+          config.each do |key, value|
+            raise InvalidParameterError.new("Battery Parameter should be any of ':free', ':used', ':total'") if !memory_status.has_key? key
+            data[:"#{key}_memory"] = {:value => value, :unit => "kB"}
+            result = "fail" if !memory_status[:"#{key}"].to_i.send(operator[:"#{key}"], value.to_i)
+          end 
+
+          if result != "pass"
+            self.fail("Memory", data)  
+          else
+            self.pass("Memory", data)  
           end
-        result
         end
 
         def repair(result)
@@ -44,4 +38,4 @@ module Hive
       end
     end
   end
-end
+end

data/lib/hive/diagnostic/android/uptime.rb

@@ -4,27 +4,31 @@ module Hive
     class Android
       class Uptime < Diagnostic
         
-        def diagnose
+        def diagnose(data={})
           if config.has_key?(:reboot_timeout)
             uptime = self.device_api.uptime 
             if  uptime < config[:reboot_timeout]
-              self.pass("Time for next reboot: #{config[:reboot_timeout] - uptime}s", "Reboot")
+              data[:next_reboot_in] = {:value => "#{config[:reboot_timeout] - uptime}", :unit => "s"}
+              self.pass("Time for next reboot: #{config[:reboot_timeout] - uptime}s", data)
             else
-              self.fail("Reboot required", "Reboot")
+              self.fail("Reboot required", data)
             end
           else
-            self.pass("Not configured for reboot", "Reboot")
+            data[:reboot] = {:value => "Not configured for reboot. Set in config {:reboot_timeout => '2400'}"}
+            self.pass("Not configured for reboot", data)
           end
         end
         
         def repair(result)
+          data = {}
           Hive.logger.info("Rebooting the device")
           begin  
             self.device_api.reboot
+            data[:last_rebooted] = {:value => Time.now}
           rescue
             Hive.logger.error("Device not found")
           end
-          diagnose
+          diagnose(data)
         end
 
       end

metadata

@@ -1,89 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner-android
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.11
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api-android
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: hive-runner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.18
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.22'
 description: The Android controller module for Hive Runner
@@ -112,17 +112,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Hive Runner Android