appium_connect 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9b967c348561740f948f409e4c67caa1b5e3cba
-  data.tar.gz: 43929ae7578789df6c93e32ac54bfb5f26f36920
+  metadata.gz: 67cfec0c21a368389681c95da28ec295fe6e2ff6
+  data.tar.gz: 4d7f695ee3d94ff5a510a580771fbccd9825f93e
 SHA512:
-  metadata.gz: df25de0f3ab83297fac762e654b687b4a9151c5fc962d43c7dc1735eedf1d1ccdaaeb2d885c07bb2814196cdaedb97ee1a59b9c8edb9fd806d65ce3106e506ff
-  data.tar.gz: 8201cef269e960a3647276d93101fbcf1914ed6ab23fe5732d394ce4f894f92a4ae095e70c96fa204cdc192de9453440fa52c2425ef1238a343d4d590bb2cd70
+  metadata.gz: 521906a600fd91564b457f63655945bb5dfc1c2c3c24c55c8cd090032c6570be6bdab4d84968d91c1d5380cf533a8f881fe16d152bafaf6b9b953ca960069d63
+  data.tar.gz: 26b3f0c31c4529271ebcb81d5e60363bb4c86778d6404b8f5cb7bc7eb26e922bfdeba1325841b6e63e5d2c34a096c71ecb07f00748012c99ea0e69cc7ad43e3e

data/lib/AppiumConnect.rb

@@ -1,105 +1,33 @@
+#Copyright © 2016 Orasi Software, Inc., All rights reserved.
+
 require 'parallel'
 require 'json'
 require 'fileutils'
-
-def get_android_devices
-  ENV["DEVICES"] = JSON.generate((`adb devices`).lines.select { |line| line.match(/\tdevice$/) }.map.each_with_index { |line, index| { udid: line.split("\t")[0], thread: index + 1 } })
-end
-
-def get_ios_devices
-  ENV["IOS_DEVICES"] = JSON.generate((`system_profiler SPUSBDataType | sed -n -E -e '/(iPhone|iPad)/,/Serial/s/ *Serial Number: *(.+)/\\1/p'`).lines.map.each_with_index { |line, index| { udid: line.gsub(/\n/,""), thread: index + 1 } })
+require_relative 'FileSystemHelpers'
+require_relative 'Android'
+require_relative 'Appium'
+require_relative 'iOS.rb'
+
+
+platform = get_platform()
+if platform == :linux
+  nodeConfigDir = File.expand_path('~/AppiumConnect/')
+elsif platform == :mac
+  nodeConfigDir = File.expand_path('~/AppiumConnect/')
+elsif platform == :windows
+  nodeConfigDir = 'C:/temp/AppiumConnect'
 end
 
-def get_device_osv udid
-  command = "adb  -s #{udid} shell getprop ro.build.version.sdk"
-  `#{command}`
-end
-
-def appium_server_start(**options)
-  command = 'appium'
-  command << " --nodeconfig #{options[:config]}" if options.key?(:config)
-  command << " -p #{options[:port]}" if options.key?(:port)
-  command << " -bp #{options[:bp]}" if options.key?(:bp)
-  command << " --udid #{options[:udid]}" if options.key?(:udid)
-  command << " --automation-name #{options[:automationName]}" if options.key?(:automationName)
-  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)
-  command << " --command-timeout 180"
-  Dir.chdir('.') {
-    if Gem::Platform.local.os == 'linux'
-      pid = system('x-terminal-emulator -e ' + command)
-    elsif Gem::Platform.local.os == 'darwin'
-      `osascript -e 'tell app "Terminal" to do script "#{command}"'`
-    else
-      pid = system('start ' + command)
-    end
-
-    puts 'Waiting for Appium to start up...'
-    sleep 5
-
-    if pid.nil?
-      puts 'Appium server did not start :('
-    end
-  }
-end
-
-def generate_node_config(file_name, udid, appium_port, ip, hubIp, platform, browser)
-  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 , 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.close
-end
+create_dir nodeConfigDir
+create_dir nodeConfigDir + '/node_configs'
+create_dir nodeConfigDir + '/output'
 
-def launch_hub_and_nodes(ip, hubIp)
 
-  if Gem::Platform.local.os == 'darwin'
-
-    ios_devices = JSON.parse(get_ios_devices)
-
-    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'
-      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
-
-  else
-
-    devices = JSON.parse(get_android_devices)
-
-    devices.size.times do |index|
-      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'
-      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"], 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"], cp: cp
-      end
-    end
-  end
-end
-
-def create_dir(name)
-  FileUtils::mkdir_p name
-end
-
-create_dir 'node_configs'
-create_dir 'output'
-if File.exist?('config.json')
-  config = JSON.parse(File.read('config.json'))
+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:'
+  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() != ''
@@ -115,7 +43,7 @@ if File.exist?('config.json')
     ip = gets.chomp()
 
     config = {hubIp: hubIp, nodeIp: ip}
-    File.open('config.json', 'w') do |f|
+    File.open(nodeConfigDir + '/config.json', 'w') do |f|
       f.write(config.to_json)
     end
 
@@ -133,12 +61,12 @@ else
   ip = gets.chomp()
 
   config = {hubIp: hubIp, nodeIp: ip}
-  File.open('config.json', 'w') do |f|
+
+  File.open(nodeConfigDir + '/config.json', 'w') do |f|
     f.write(config.to_json)
   end
 
 end
 
 
-
-launch_hub_and_nodes(config['nodeIp'], config['hubIp'])
+launch_hub_and_nodes(config['nodeIp'], config['hubIp'], nodeConfigDir)

metadata

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