hive-runner-android 1.2.12 → 1.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39de89de80a97f15ff8eb190ccb9f6ef4a519ae7
-  data.tar.gz: 28e454b0589019ae978601afa503c9d0f1c75f89
+  metadata.gz: 574e6cc55a35a36a03cc1b50a132fdb6256721eb
+  data.tar.gz: 4665af1ca9034370704aec0a6f10f8118785cfdf
 SHA512:
-  metadata.gz: 995370f9dbca65f791054cdaab5bf32f1fd4dd9f3dc2977d89cf533b75d8f8f35822bd4f75a50f021eedd3255961b8669495be36f61c306abeb2f8393cc86954
-  data.tar.gz: 0a16608ea0bceb72bf65130eafba3eead28029feb8c00ffaf6e32cef7059b0b67842a7a9d802e6d0117dcd82d96533b357a010632faccc9bff58969a556c4d9f
+  metadata.gz: 47986ab630f8103e587c377ad7fc7baf4808e5a7ca11fe31625c9d54a407bfef5496db0a112e0e6d80a195ccc1ffbcdad1f47bceaf90b1e5563709156264efcb
+  data.tar.gz: 535aa17aecf859bfa8e78a5a5e674126dcd7afa8572a0aa1fa56c6fff96c0541ba3ecc949d8af798113db1e2845d0d86b077c30aba869e1be89c5ef222fe0182

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

@@ -40,7 +40,7 @@ module Hive
       end
 
       def repair(result)
-        self.fail("Unplug device from hive", "Battery")
+        self.fail("Unplug device from hive")
       end
 
     end

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

@@ -19,7 +19,7 @@ module Hive
           memory_status = memory
           config.each do |key, value|
             raise InvalidParameterError.new("Battery Parameter should be any of ':free', ':used', ':total'") if !memory_status.has_key? key.to_sym
-            data[:"#{key}_memory"] = {:value => value, :unit => "kB"}
+            data[:"#{key}_memory"] = {:value => memory_status[:"#{key}"], :unit => "kB"}
             result = "fail" if !memory_status[:"#{key}"].to_i.send(operator[:"#{key}"], value.to_i)
           end 
 
@@ -32,7 +32,7 @@ module Hive
 
         def repair(result)
           # Add repair for memory
-          self.fail("Cannot repair memory", "memory")
+          self.fail("Cannot repair memory")
         end
 
       end

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

@@ -9,7 +9,7 @@ module Hive
           @device_api.screenshot(filename: screenshot_file)
           hive_device = Hive.hive_mind.device_details['connected_devices'].select { |d| d['serial'] == @device_api.serial }.first
           Hive.hive_mind.send_screenshot( { device_id: hive_device[:id], screenshot: screenshot_file } ) unless hive_device.nil?
-          self.pass('Screenshot captured', 'Screenshot')
+          self.pass('Screenshot captured')
         end
         
         def repair(result)
@@ -19,4 +19,4 @@ module Hive
       end
     end
   end
-end
+end

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

@@ -10,44 +10,38 @@ module Hive
       end
 
       def diagnose
-        result = nil
+        result = "pass"
         wifi_status = wifi
+        data = {}
+        data[:access_point] = {:value => "#{wifi_status[:"#{key}"]}"}
 
         if wifi_status[:access_point].capitalize == "Xxxx"
-          result = self.pass("Kindle returns wifi 'xxxx'", "wifi")
+          result = self.pass("Kindle returns wifi 'xxxx'", data)
           return result
         end
 
         config.each do |key, value|
-          if config != nil && config.keys.count != 0
-            begin
-              if wifi_status[:"#{key}"].capitalize == value.capitalize 
-                result = self.pass("#{key.capitalize} : #{wifi_status[:"#{key}"]}", "wifi" )
-              else
-                result = self.fail(" Error: #{key.capitalize} : #{wifi_status[:"#{key}"]} ", "wifi")
-                break
-              end
-            rescue 
-              Hive.logger.error("Invalid Parameter for Wifi #{key}")
-              raise InvalidParameter.new("Invalid Wifi Parameter for Wifi: #{key}") if !result
-            end
-          else
-            result = self.pass("No parameter specified", "wifi")
-          end
+            result = "fail" if wifi_status[:"#{key}"].capitalize != value.capitalize 
+        end
+        
+        if result == "pass" 
+          self.pass("#{key.capitalize} : #{wifi_status[:"#{key}"]}", data )
+        else
+          self.fail("#{key.capitalize} : #{wifi_status[:"#{key}"]}", data )
         end
-        result
       end 
 
       def repair(result)
-        Hive.logger.info("Trying to repair wifi")
-        options = {:apk => '/path/to/apk/to/toggle/wifi', :package => '/pkg/name/ex: com.wifi.togglewifi'} 
+        Hive.logger.info("Start wifi setting and select first access point")
         begin
-          self.device_api.install(options[:apk])
-          self.device_api.start_intent("-n com.wifi.togglewifi/.MainActivity -e wifi true")
-          sleep 5 
-          self.device_api.uninstall(options[:package])
+          self.device_api.intent("start -a android.intent.action.MAIN -n com.android.settings/.wifi.WifiSettings")
+          # Select first access point available in list
+          system("adb -s #{@serial} shell input keyevent 20") 
+          system("adb -s #{@serial} shell input keyevent 23")
+          # Press home button
+          system("adb -s #{@serial} shell input keyevent 3")
         rescue
-          Hive.logger.error("Unable to fix wifi issue")
+          Hive.logger.error("Unable to resolve wifi issue")
         end
         diagnose
       end
@@ -55,4 +49,4 @@ module Hive
     end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hive-runner-android
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors:
 - Jon Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_api-android