appium_connect 0.1.5 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22106caa71b05333c6f628a8fe3804c44cf66650
-  data.tar.gz: bc7dc488e4e52fe1443b5bffa817bb9380a8f268
+  metadata.gz: 9499963c414ccadaed30c8b2b02452dddaccf721
+  data.tar.gz: aa61c1d8b01d16be36fe630405733032a95fcd9d
 SHA512:
-  metadata.gz: fc40dbf93ea35296a036577a3acfd00aa86062138c6f612c1fca50d96bab0cffed1140d6b43573a863c0c0ea4ca06c49bbf743885c442d114b1a19e5d290a006
-  data.tar.gz: 09d1e8ce94a569bc509ed4143c8a9a7b7b50b1cc3721d76c1876e19d54e24ad82dfc77e6f3cf2c7d67116404d979fd2b30d278b37bd0742b470eb350f5bc82ad
+  metadata.gz: 26d713a0e8255d79375b6b3a5e71fe016607f9af466792cb0e7e4aec3477379c64c67fdf98d45a3c45992352c62d90f4dc28d2bae81107248140705794e8b295
+  data.tar.gz: db856f86c9443ce76acfa7f112d199dc1d95ad27002bf6e0b238f03b76159d004a6e280b766ab3ead57e7b1e0e23943980166ce563e0b71d139f873997afa709

data/lib/AppiumConnect.rb

@@ -25,6 +25,7 @@ def appium_server_start(**options)
   command << " --selendroid-port #{options[:selendroidPort]}" if options.key?(:selendroidPort)
   command << " --log #{Dir.pwd}/output/#{options[:log]}" if options.key?(:log)
   command << " --tmp /tmp/#{options[:tmp]}" if options.key?(:tmp)
+  command << " --chromedriver-port #{options[:cp]}" if options.key?(:cp)
   Dir.chdir('.') {
     if Gem::Platform.local.os == 'linux'
       pid = system('x-terminal-emulator -e ' + command)
@@ -43,9 +44,9 @@ def appium_server_start(**options)
   }
 end
 
-def generate_node_config(file_name, udid, appium_port, ip, hubIp, platform, browser)
+def generate_node_config(file_name, udid, appium_port, ip, hubIp, platform)
   f = File.new(Dir.pwd + "/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 }],
+  f.write( JSON.generate({ capabilities: [{ udid: udid, browserName: udid, maxInstances: 1, platform: platform,  deviceName: udid },{ browserName: 'chrome', maxInstances: 1,  deviceName: udid, udid: udid, seleniumProtocol: 'WebDriver', platform: platform }],
                            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.close
@@ -60,7 +61,7 @@ def launch_hub_and_nodes(ip, hubIp)
     ios_devices.size.times do |index|
       port = 4100 + index
       config_name = "#{ios_devices[index]["udid"]}.json"
-      generate_node_config config_name, ios_devices[index]["udid"], port, ip, hubIp, 'MAC', 'safari'
+      generate_node_config config_name, ios_devices[index]["udid"], port, ip, hubIp, 'MAC'
       node_config = Dir.pwd + '/node_configs/' +"#{config_name}"
       appium_server_start config: node_config, port: port, udid: ios_devices[index]["udid"], log: "appium-#{ios_devices[index]["udid"]}.log", tmp: ios_devices[index]["udid"]
     end
@@ -73,14 +74,15 @@ def launch_hub_and_nodes(ip, hubIp)
       port = 4000 + index
       bp = 2250 + index
       sdp = 5000 + index
+      cp = 6000 + index
       sdkv = get_device_osv(devices[index]['udid']).strip.to_i
       config_name = "#{devices[index]["udid"]}.json"
-      generate_node_config config_name, devices[index]["udid"], port, ip, hubIp, 'android', 'chrome'
+      generate_node_config config_name, devices[index]["udid"], port, ip, hubIp, 'android'
       node_config = Dir.pwd + '/node_configs/' +"#{config_name}"
       if sdkv === 16 || sdkv === 17
-        appium_server_start config: node_config, port: port, bp: bp, udid: devices[index]["udid"], automationName: "selendroid", selendroidPort: sdp, log: "appium-#{devices[index]["udid"]}.log", tmp: devices[index]["udid"]
+        appium_server_start config: node_config, port: port, bp: bp, udid: devices[index]["udid"], automationName: "selendroid", selendroidPort: sdp, log: "appium-#{devices[index]["udid"]}.log", tmp: devices[index]["udid"], cp: cp
       else
-        appium_server_start config: node_config, port: port, bp: bp, udid: devices[index]["udid"], log: "appium-#{devices[index]["udid"]}.log", tmp: devices[index]["udid"]
+        appium_server_start config: node_config, port: port, bp: bp, udid: devices[index]["udid"], log: "appium-#{devices[index]["udid"]}.log", tmp: devices[index]["udid"], cp: cp
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appium_connect
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.5
 platform: ruby
 authors:
 - Matt Watson
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Quickly Connect USB connected device to Selenium Grid