yi_appium_caps_util 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c24c7da614da4a53449dae6497bc91455ff2c4d2
-  data.tar.gz: eaaba695007d06ba2c154e0f47568e1386914252
+  metadata.gz: 74c28bbcfc62227846b11eee48b0590ed94ba29b
+  data.tar.gz: 71fe978783b00f7d6b55499b97825346c3fb3647
 SHA512:
-  metadata.gz: a413f8114c8e9d82dde2bf8491317d37a1f55dc034071e151228efec16806ffb89a0a87a19dd6fe14d9fce3e4b305c597b562571c2f50642b24ba7cfbef3faef
-  data.tar.gz: 596fcbf9eb9b6bb597994753e97ae33461d6cb05a394bef71634e8e970b3ca14d36764daa1584e91a7e00ee0e23acee7c99b4d1d3f7b8ec08f70a42517a9fda1
+  metadata.gz: 2f38e1bfad5f45aa6f6505098a3e135745bdcfbdb3b5fd7a477eba1c39982a5ad946d84c09b58769d198ef53b1fb997a42e1251c458dac050935e01d551ecab9
+  data.tar.gz: 6b3dfd61bc0a2f86bec5e75ed0a10073db45504e0135b5969b596265cb5b165facce11e4e539fd8da146f5388662ca1d7602b5084f54efa918f37b02bf373ed6

data/bin/yi_appium_caps_util

@@ -11,23 +11,29 @@ OptionParser.new do |opts|
   opts.banner = "You.i Utility for appium.txt capabilities"
   puts opts.banner
 
-  opts.on("-u", "--update [PLATFORM]", "update device ID and IP address") do |p|
-    options[:update] = true
-    options[:platform] = p
-  end
   opts.on("-cPLATFORM", "--create PLATFORM", "creates the appium.txt file for specified platform") do |c|
     options[:create_caps] = c
   end
   opts.on("-fFILE", "--file FILE", "capabilities path and file name (default: ./appium.txt)") do |f|
     options[:file] = f
   end
+  opts.on("-u", "--update [PLATFORM]", "update device ID and IP address") do |p|
+    options[:update] = true
+    options[:platform] = p
+  end
+  opts.on("-xFORMFACTOR", "--formfactor FORMFACTOR", "update the form factor") do |x|
+    options[:form_factor] = x
+  end
   opts.on("-h", "--help", "Prints this help") do
     puts opts
     exit
   end
 end.parse!
 
-raise "You should pass -u or -c PLATFORM as an input argument. Type -h for help" if options[:update] == nil and options[:create_caps] == nil
+if options[:update] == nil and options[:create_caps] == nil
+  puts "You should pass -u or -c PLATFORM as an input argument. Type -h for help"
+  exit
+end
 
 if options[:update]
   if options[:file] && options[:platform]
@@ -42,5 +48,9 @@ if options[:update]
 end
 
 if options[:create_caps]
-  YiAppiumCapsUtil.create(options[:create_caps].downcase)
+  if options[:create_caps] && options[:form_factor]
+    YiAppiumCapsUtil.create(options[:create_caps].downcase, options[:form_factor].downcase)
+  elsif options[:create_caps]
+    YiAppiumCapsUtil.create(options[:create_caps].downcase, "handheld")
+  end
 end

data/lib/yi_appium_caps_util.rb

@@ -24,12 +24,27 @@ class YiAppiumCapsUtil
       end
     end
 
-    def create (platform_name)
+    def create (platform_name, form_factor)
+      form_factors = ["handheld", "tablet", "10foot"]
+      
+      found = false
+      form_factors.each do |i|
+        if i == form_factor
+          found = true
+        end
+      end
+
+      if found == false
+        puts "ERROR: formFactor: '#{form_factor}' is not supported (#{form_factors})"
+        exit
+      end
+      
       template = {"caps"=>{"app"=>"",
       "automationName"=>"YouiEngine",
       "deviceName"=>"DeviceName",
       "platformName"=>"#{platform_name}",
-      "youiEngineAppAddress"=>""}}
+      "youiEngineAppAddress"=>""},
+      "parameters"=>{"formFactor"=>"#{form_factor}"}}
 
       File.open("./appium.txt","w") do |f|
         f.puts(TOML::Generator.new(template).body)
@@ -77,8 +92,13 @@ class YiAppiumCapsUtil
         update_android_caps (output_data)
       when 'ios'
         update_ios_caps (output_data)
+      when 'mac'
+        update_mac_caps (output_data)
+      when 'yimac'
+        update_mac_caps (output_data)
       else
-        raise 'platformName: ' + platformName_value + ' is not supported'
+        puts "ERROR: platformName '#{platformName_value}' is not supported"
+        exit
       end
       return output_data
     end
@@ -102,12 +122,10 @@ class YiAppiumCapsUtil
       #Replace value of youiEngineAppAddress
       output_data['caps']['youiEngineAppAddress'] = new_address[0]
       puts 'IP address: ' + new_address[0]
-    rescue RuntimeError => ex
-      puts ex.message
-      raise
-    rescue Exception => ex
-      puts "An error of type #{ex.class} happened, message is #{ex.message}"
-      raise
+      #Add fullReset to have app reinstalled between runs
+      output_data['caps']['fullReset'] = true
+    rescue Exception, RuntimeError => ex
+      raise "An error of type #{ex.class} happened, message is #{ex.message}"
     end
 
     def update_ios_caps (output_data)
@@ -181,11 +199,18 @@ class YiAppiumCapsUtil
         elsif (xcodeBuildVersion.to_f>8) then
             puts "Change to xcode version to xcode 7! Current version is: "+xcodeBuildVersion
         end
+      end  
+    rescue Exception, RuntimeError => ex
+      raise "An error of type #{ex.class} happened, message is #{ex.message}"
     end
 
-    rescue Exception => ex
-      puts "An error of type #{ex.class} happened, message is #{ex.message}"
-      exit
+    def update_mac_caps (output_data)
+      #Replace value of deviceName
+      output_data['caps']['deviceName'] = "macOS device"
+      #Replace value of youiEngineAppAddress
+      output_data['caps']['youiEngineAppAddress'] = "localhost"
+    rescue Exception, RuntimeError => ex
+      raise "An error of type #{ex.class} happened, message is #{ex.message}"
     end
 
     def write_caps(caps_file_name, output_data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yi_appium_caps_util
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Simon Granger
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ipaddress
@@ -32,16 +32,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
-description: This utility updates the caps for iOS and Android devices. Please refer
-  to homepage for ruther details on usage
+        version: 0.2.0
+description: This utility updates the caps for iOS, Android and macOS devices. Please
+  refer to homepage for ruther details on usage
 email: simon.granger@youi.tv
 executables:
 - yi_appium_caps_util
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Updates your appium.txt capabilities for iOS and Android