flick 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1416274c61ae0bf9e0ac1bb3d0a4d7ca830db636
-  data.tar.gz: f2eab5fc3f3d4d6a7ce8b04fa9a14a3babc822ed
+  metadata.gz: 60d13cf15fcb434c0b80b607bb2c2738ccbb75bb
+  data.tar.gz: c42fade179a5c818b199265388bc2461c65fbc64
 SHA512:
-  metadata.gz: 2351634c48f1212af1312623b58080a1d260b8e15f080047b6420dae84e4fde1ebd6d8ed55c24f11da56a017ffe4067ae15026962839086b7cae52c7ed3be46a
-  data.tar.gz: b3aa9011da22783a3b2183f6db18afdfdbdc8b682cce1ef5dfc61e899029712f8efde62eba58929877c9046b855a327af2be4331835ace7a5194b699fd96554a
+  metadata.gz: 6cede6e57d25d167777303ca2e60b70b71407ffe98f7c436816999356fd562fef50426928e9a0c3cbea40a7486ef4b34c4bc7ec5291484da69c6debd568c8c59
+  data.tar.gz: 145947a4e3c90f17505c5a7ad88c5945c1dd76c6d5a7c1439a781bd6e83e0ffe4f5acc882d3e87d64cbbc345203494b8e4adb4136968c37694a6c4c5fd038d01

data/README.md

@@ -90,7 +90,8 @@ Usage:
     manager    Manage apps on devices           
     screenshot Take a screenshot                
     video      Record video             
-    vitals     Android Only! Get apps and device vitals - App Memory Used, App CPU %. System Stats: (User, System, IQW, IRQ) 
+    vitals     Android Only! Get apps and device vitals - App Memory Used, App CPU %. System Stats: (User, System, IQW, IRQ)
+    applitools Validte image with Applitools 
 
     GLOBAL OPTIONS:
 
@@ -132,6 +133,9 @@ Usage:
 	 $ flick vitals --help
 		$ flick vitals -p android -n com.awsome-package.name
 
+    $ flick applitools --help
+      $ flick flick applitools -p android --appName Twitter --testName Messages 
+
 ##Demo
 <img src="https://www.dropbox.com/s/9be37gc1c2dlxa6/flick-demo.gif?raw=1" width="600">
 

data/bin/flick

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 require_relative '../lib/flick'
 require 'commander/import'
+require 'digest'
 
-program :version, '0.4.3'
+program :version, '0.4.4'
 program :description, 'A CLI to capture screenshots, video, logs, and device info for Android (Devices & Emulators) and iOS (Devices).'
 
 command :video do |c|
@@ -50,6 +51,62 @@ command :screenshot do |c|
   end
 end
 
+command :applitools do |c|
+  c.syntax = 'flick applitools [options]'
+  c.summary = 'Validte image with Applitools'
+  c.description = c.summary
+  c.example 'description', "flick applitools -p android --appName Twitter --testName Messages"
+  c.option '-p', '--platform PLATFORM', String, 'Set platform: android or ios'
+  c.option '-u', '--udid UDID', String, 'Set device UDID.'
+  c.option '-o', '--outdir OUTDIR', String, "Set output directory. Default: #{Dir.pwd}"
+  c.option '-k', '--keep', "Keep image after capture. Default: false"
+  c.option '--appName appName', String, "Set your App Name. Example: --appName Twitter. Default is the platform value"
+  c.option '--testName testName', String, "Set Test Name. Example: --testName 'Home View'"
+  c.option '--autoSave autoSave', String, "Automatically save failed tests."
+  c.option '--apiKey apiKey', String, "Applitools API Key"
+  c.option '--showLogs showLogs', String, "Display Applitools Logs"
+  c.option '--matchLevel matchLevel', String, "Set match level to one of 'strict, layout, or content'. Default: strict"
+  c.option '--server Server', String, "Set Applitools server url. Default: https://eyes.applitools.com"
+  c.option '--proxy Proxy', String, "Set proxy address"
+  c.option '--baseline Baseline', String, "Set your baseline name"
+  c.option '--batchName BatchName', String, "Set your batch (folder) name"
+  c.option '--batchId BatchId', String, "Set a batch ID. Flick, by default creates a unique batch ID based on the platform and appName values"
+  #These will be added later...
+  # c.option '--hostApp', String, "Set Host-app identifier for the screens under test"
+  # c.option '--baseline', String, "Set baseline name"
+  # c.option '--branch', String, "Set branch name"
+  # c.option '--hostOs', String, "Set OS identifier for the screens under test"
+  # c.option '--parentBranch', String, "Set parent branch name, optional when working with branches"
+  c.action do |args, options|
+    options.default \
+    :outdir => Dir.pwd,
+    :keep => false,
+    :matchLevel => 'strict',
+    :server => 'https://eyes.applitools.com',
+    :showLogs => false,
+    :apiKey => ENV['APPLITOOLS_API_KEY'],
+    :appName => options.platform,
+    :baseline => nil,
+    :batchName => options.appName,
+    :batchId => Digest::MD5.hexdigest("#{options.platform.downcase}-#{options.appName.downcase}").scan(/\d/).join('')
+        
+    [:testName, :apiKey].each do |o|
+      if options.default[o].nil?
+        puts "\n--#{o.to_s} is required... Please set it before running!\n".red
+        abort
+      end
+    end
+    
+    match_levels = ['strict', 'layout', 'content']
+    unless match_levels.include? options.matchLevel
+      puts "You entered an incorrect match level. Please choose any of these: #{match_levels}"
+      abort
+    end
+
+    Applitoolz.new(options.default).upload_to_applitools
+  end
+end
+
 command :log do |c|
   c.syntax = 'flick log [options]'
   c.summary = 'Get device log output'

data/flick.gemspec

@@ -30,12 +30,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", '~> 3.4', '>= 3.4.0'
   spec.add_dependency "parallel", '~> 1.6', '>= 1.6.2'
   spec.add_dependency "colorize", "~> 0.8.1"
-  spec.add_dependency "commander", '~> 4.4', '>= 4.4.0'
-  spec.add_dependency "json", '~> 1.8', '>= 1.8.3'
+  spec.add_dependency "commander"
+  spec.add_dependency "json"
   spec.add_dependency "wannabe_bool", "~> 0.5.0"
   spec.add_dependency "awesome_print", '~> 1.6', '>= 1.6.1'
   spec.add_dependency "os", "~> 0.9.6"
   spec.add_dependency "sys-proctable", '~> 1.1', '>= 1.1.1'
   spec.add_dependency "apktools", '~> 0.7.1', '>= 0.7.1'
   spec.add_dependency "ffi"
+  spec.add_dependency "eyes_images"
+  spec.add_dependency "pry"
 end

data/lib/flick.rb

@@ -8,6 +8,13 @@ require 'tempfile'
 require 'sys/proctable'
 require 'apktools/apkxml'
 require 'open3'
+require 'eyes_images'
+require 'pry'
+require 'openssl'
+original_verbose = $VERBOSE
+$VERBOSE = nil
+OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+$VERBOSE = original_verbose
 
 require "flick/version"
 require_relative "./flick/android"
@@ -20,4 +27,5 @@ require_relative "./flick/simple_daemon"
 require_relative "./flick/system"
 require_relative "./flick/video"
 require_relative "./flick/manager"
-require_relative "./flick/vitals"
+require_relative "./flick/vitals"
+require_relative "./flick/applitools"

data/lib/flick/applitools.rb

@@ -0,0 +1,38 @@
+require 'date'
+
+class Applitoolz
+
+  attr_accessor :platform, :driver, :eyes, :app_name, :test_name, :keep
+
+  def initialize options
+    self.platform = options[:platform]
+    self.driver = Screenshot.new options
+    self.eyes = Applitools::Images::Eyes.new
+    eyes.api_key = options[:apiKey]
+    eyes.server_url = options[:server]
+    eyes.log_handler = Logger.new(STDOUT) if options[:showLogs]
+    eyes.proxy = Applitools::Connectivity::Proxy.new options[:proxy] if options[:proxy] 
+    eyes.match_level = options[:matchLevel].downcase.to_sym
+    eyes.baseline_name = options[:baseline]
+    self.app_name = options[:appName]
+    self.test_name = options[:testName]
+    batch_info = Applitools::BatchInfo.new(options[:batchName])
+    batch_info.id = options[:batchId] #Date.today.to_time.to_i
+    eyes.batch = batch_info
+    self.keep = options[:keep]
+  end
+  
+  def upload_to_applitools
+    image_info = driver.screenshot
+    eyes.test(app_name: app_name, test_name: test_name) do
+      eyes.check_image(image_path: image_info[:path], tag: image_info[:udid])
+      remove_image image_info[:path] unless keep
+    end
+  end
+  
+  private
+  
+  def remove_image image
+    File.delete image if File.exists? image
+  end
+end

data/lib/flick/screenshot.rb

@@ -5,7 +5,7 @@ class Screenshot
   def initialize options
     Flick::Checker.platform options[:platform]
     self.platform = options[:platform]
-    case @platform
+    case platform
     when "ios"
       options[:todir] = options[:outdir]
       self.driver = Flick::Ios.new options
@@ -16,9 +16,15 @@ class Screenshot
   end
 
   def screenshot
-    puts "Saving to #{driver.outdir}/#{driver.name}.png"
     driver.screenshot driver.name
     driver.pull_file "#{driver.dir_name}/#{driver.name}.png", driver.outdir if android
+    if File.exists? "#{driver.outdir}/#{driver.name}.png"
+      puts "Saved image to: #{driver.outdir}/#{driver.name}.png" 
+      return { path: "#{driver.outdir}/#{driver.name}.png", udid: driver.udid }
+    else
+      puts "\nThere appears to be an issue capturing the #{platform} image. Run flick with --trace for more details.\n".red
+      abort
+    end
   end
 
   private

data/lib/flick/version.rb

@@ -1,3 +1,3 @@
 module Flick
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flick
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Justin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-30 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,42 +96,30 @@ dependencies:
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wannabe_bool
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +222,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: eyes_images
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A CLI with helpful QA tools for iOS and Android from the command line
 email:
 - justin.ison@gmail.com
@@ -256,6 +272,7 @@ files:
 - flick.gemspec
 - lib/flick.rb
 - lib/flick/android.rb
+- lib/flick/applitools.rb
 - lib/flick/checker.rb
 - lib/flick/info.rb
 - lib/flick/ios.rb