appium_connect 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b316d9bb56d7a0565fa57483ba95cd22b69a4d77
-  data.tar.gz: 2fcc77265659a86929b1445f02f4abe68e75f3d9
+  metadata.gz: d2a5f9c5a5a5d27ce721efffc2c6fd09bf3634d8
+  data.tar.gz: 29337ccca15d19298f16149a809ba257c5fcde3f
 SHA512:
-  metadata.gz: 0f2ff892b7685cf6fc2d1bb00211272383b001b1aca00b15173346fc10cd947258a33dd5dc54b43a02b1697b7ad2c1767c3161a94e9d91e5b62c0fc37a331315
-  data.tar.gz: 1f0cd78db530ec78bc4aa8faa333bdd6ccdb3f62ed2d8dcdd034da64083bb1a0817ccdf751937b958fc8ec383d2e951e8dc7de138bf7b95ffe9171fd695212ee
+  metadata.gz: e1d82dae6cd811883bd9f4e8645f0bde65ff82ee11a3ca4b1b7ba9de236becaff173bc811a2071dd8097d47954994dc53db42e4a779f75ff269c06235333908a
+  data.tar.gz: 377b93bfbe764064b48d52163a76741d0a98235ba2bac5683c27e74b9a3690d9592d8f23cce17dbf66624d660df376899d415f6ed37ed6be228d64bd5e4bc39f

data/lib/Android.rb

@@ -6,3 +6,10 @@ def get_device_osv udid
   command = "adb  -s #{udid} shell getprop ro.build.version.sdk"
   `#{command}`
 end
+
+def restart_devices
+  get_android_devices
+  ENV["DEVICES"].each do |device|
+    `adb -s #{device['udid']} reboot}`
+  end
+end

data/lib/AppiumConnect.rb

@@ -8,29 +8,55 @@ require_relative 'Android'
 require_relative 'Appium'
 require_relative 'iOS.rb'
 
+input_array = ARGV
+if '--restart'.in? input_array
+
+
+else
 
-platform = get_platform()
-if platform == :linux
-  nodeConfigDir = File.expand_path('~/AppiumConnect/')
-elsif platform == :mac
-  nodeConfigDir = File.expand_path('~/AppiumConnect/')
-elsif platform == :windows
-  nodeConfigDir = Dir.home() + '/AppiumConnect'
-end
 
-create_dir nodeConfigDir
-create_dir nodeConfigDir + '/node_configs'
-create_dir nodeConfigDir + '/output'
 
 
-if File.exist?(nodeConfigDir + '/config.json')
-  config = JSON.parse(File.read(nodeConfigDir +'/config.json'))
+  platform = get_platform()
+  if platform == :linux
+    nodeConfigDir = File.expand_path('~/AppiumConnect/')
+  elsif platform == :mac
+    nodeConfigDir = File.expand_path('~/AppiumConnect/')
+  elsif platform == :windows
+    nodeConfigDir = Dir.home() + '/AppiumConnect'
+  end
+
+  create_dir nodeConfigDir
+  create_dir nodeConfigDir + '/node_configs'
+  create_dir nodeConfigDir + '/output'
 
-  puts ''
-  puts 'Config file detected. Press enter to use last setting or any other key to edit:'
-  puts "Hub: #{config['hubIp']}   Node: #{config['nodeIp']}"
 
-  if gets.chomp() != ''
+  if File.exist?(nodeConfigDir + '/config.json')
+    config = JSON.parse(File.read(nodeConfigDir +'/config.json'))
+
+    puts ''
+    puts 'Config file detected. Press enter to use last setting or any other key to edit:'
+    puts "Hub: #{config['hubIp']}   Node: #{config['nodeIp']}"
+
+    if gets.chomp() != ''
+
+      puts ''
+      puts 'Please Enter IP address of Hub:'
+      hubIp = gets.chomp()
+
+      puts ''
+      puts ''
+      puts 'Please Enter IP address of Node:'
+
+      ip = gets.chomp()
+
+      config = {hubIp: hubIp, nodeIp: ip}
+      File.open(nodeConfigDir + '/config.json', 'w') do |f|
+        f.write(config.to_json)
+      end
+
+    end
+  else
 
     puts ''
     puts 'Please Enter IP address of Hub:'
@@ -39,33 +65,16 @@ if File.exist?(nodeConfigDir + '/config.json')
     puts ''
     puts ''
     puts 'Please Enter IP address of Node:'
-
     ip = gets.chomp()
 
     config = {hubIp: hubIp, nodeIp: ip}
+
     File.open(nodeConfigDir + '/config.json', 'w') do |f|
       f.write(config.to_json)
     end
 
   end
-else
-
-  puts ''
-  puts 'Please Enter IP address of Hub:'
-  hubIp = gets.chomp()
-
-  puts ''
-  puts ''
-  puts 'Please Enter IP address of Node:'
-  ip = gets.chomp()
-
-  config = {hubIp: hubIp, nodeIp: ip}
-
-  File.open(nodeConfigDir + '/config.json', 'w') do |f|
-    f.write(config.to_json)
-  end
-
-end
 
 
-launch_hub_and_nodes config['nodeIp'], config['hubIp'], nodeConfigDir
+  launch_hub_and_nodes config['nodeIp'], config['hubIp'], nodeConfigDir
+end

data/lib/FileSystemHelpers.rb

@@ -12,9 +12,32 @@ end
 def generate_node_config(nodeDir, file_name, udid, appium_port, ip, hubIp, platform, browser)
   f = File.new(nodeDir + "/node_configs/#{file_name}", "w")
 
-  f.write( JSON.generate({ capabilities: [{ udid: udid, browserName: udid, maxInstances: 1, platform: platform,  deviceName: udid },{ browserName: browser, maxInstances: 1,  deviceName: udid, udid: udid, seleniumProtocol: 'WebDriver', platform: platform , applicationName: udid}],
-                           configuration: { cleanUpCycle: 2000, timeout: 180000, registerCycle: 5000, proxy: "org.openqa.grid.selenium.proxy.DefaultRemoteProxy", url: "http://#{ip}:#{appium_port}/wd/hub",
-                                            host: ip, port: appium_port, maxSession: 1, register: true, hubPort: 4444, hubHost: hubIp } } ) )
+  f.write( JSON.generate({ capabilities: [
+                                          { udid: udid,
+                                            browserName: udid,
+                                            maxInstances: 1,
+                                            platform: platform,
+                                            deviceName: udid },
+
+                                          { browserName: browser,
+                                            maxInstances: 1,
+                                            deviceName: udid,
+                                            udid: udid,
+                                            seleniumProtocol: 'WebDriver',
+                                            platform: platform ,
+                                            applicationName: udid}],
+
+                           configuration: { cleanUpCycle: 2000,
+                                            timeout: 299000,
+                                            registerCycle: 5000,
+                                            proxy: "org.openqa.grid.selenium.proxy.DefaultRemoteProxy",
+                                            url: "http://#{ip}:#{appium_port}/wd/hub",
+                                            host: ip,
+                                            port: appium_port,
+                                            maxSession: 1,
+                                            register: true,
+                                            hubPort: 4444,
+                                            hubHost: hubIp } } ) )
   f.close
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appium_connect
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Matt Watson