smart_monkey 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 847d8e2008d02e4d0dea00c85c4bf3c7bb106792
-  data.tar.gz: 4646d1a3da95b94cc90ae2601f9706a93ed83732
+  metadata.gz: f5ddbe7279314292b43fa557cc7b04b52bb00cce
+  data.tar.gz: 0c43f1a91725bcc6775017c65f76100aa374c1f1
 SHA512:
-  metadata.gz: 0bda662b08477fee72e67f081d16404a01651e02424e6b99931ba3f41172bb8d2e5210b79955f654a40569fb60eb274a419939795841a0d21ff05224f4c7c97e
-  data.tar.gz: 241f3eeec81ba69252e271b0e8e79d1e842239b61ad21ef78767b9e0e64f98eb3e73326c3eaadd125a60901632953d5fe7d0849723646c097a3853ae752ad9c7
+  metadata.gz: 7bc77e9fa56e837a4a257f05d7d5b9bdae04f3b809176795330ac5e71b93ecf84d673f15165f38e71b0ae6a42d497593ab71917571adee9c31266b3c88a8e4e3
+  data.tar.gz: c3d6be6f49773bc7b6717e144c73ac5e71bb26a996ede8d19fd4ef964ac91bfa67e917454cb906b6af5a6e0c668e8cf4f3e44d484a27ea4bb0dc905c450f0690

data/README.md

@@ -32,6 +32,7 @@ iOS Monkey Test Tool.
 ###### 安装Release版
 `gem install smart_monkey`, 执行入口: 终端下直接使用`smart_monkey`
 ###### 安装开发版
+安装Ruby模块`gem install erubis`(如安装release版，此模块会自动配置加载。)
 直接clone本项目, 执行入口: `/CrashMonkey4IOS/bin/smart_monkey`
 
 ###### 执行命令

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/lib/smart_monkey/command_helper.rb

@@ -4,6 +4,19 @@ module UIAutoMonkey
   module CommandHelper
     require 'open3'
 
+    def instruments_deviceinfo(device)
+      `"instruments" -s devices | grep "#{device}"`.strip
+    end
+
+    def is_simulator
+      deviceinfo = instruments_deviceinfo(device)
+      if deviceinfo.include? "－"
+        true
+      else
+        false
+      end
+    end
+
     def shell(cmds)
       puts "Shell: #{cmds.inspect}"
       Open3.popen3(*cmds) do |stdin, stdout, stderr|
@@ -18,7 +31,11 @@ module UIAutoMonkey
     # end
 
     def relaunch_app(device,app)
-      `idevicedebug -u #{device} run #{app} >/dev/null 2>&1 &`
+      if is_simulator
+        `xcrun simctl launch #{device}  #{app} >/dev/null 2>&1 &`
+      else
+        `idevicedebug -u #{device} run #{app} >/dev/null 2>&1 &`
+      end
     end
 
     def run_process(cmds)

data/lib/smart_monkey/monkey_runner.rb

@@ -8,7 +8,6 @@ module UIAutoMonkey
   require 'json'
 
   class MonkeyRunner
-    TRACE_TEMPLATE='/Applications/Xcode.app/Contents/Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.xrplugin/Contents/Resources/Automation.tracetemplate'
     RESULT_BASE_PATH = File.expand_path('smart_monkey_result')
     INSTRUMENTS_TRACE_PATH = File.expand_path('*.trace')
     TIME_STAP = Time.new.strftime("%Y%m%d%H%M%S")
@@ -82,9 +81,9 @@ module UIAutoMonkey
       watch_syslog do
         begin
           unless time_limit_sec.nil?
-            run_process(%W(instruments -w #{device} -l #{time_limit} -t #{TRACE_TEMPLATE} #{app_path} -e UIASCRIPT #{ui_custom_path} -e UIARESULTSPATH #{result_base_dir}))
+            run_process(%W(instruments -w #{device} -l #{time_limit} -t #{automation_template_path} #{app_path} -e UIASCRIPT #{ui_custom_path} -e UIARESULTSPATH #{result_base_dir}))
           else
-            run_process(%W(instruments -w #{device} -t #{TRACE_TEMPLATE} #{app_path} -e UIASCRIPT #{ui_custom_path} -e UIARESULTSPATH #{result_base_dir}))
+            run_process(%W(instruments -w #{device} -t #{automation_template_path} #{app_path} -e UIASCRIPT #{ui_custom_path} -e UIARESULTSPATH #{result_base_dir}))
           end
         rescue Timeout::Error
           kill_all('instruments', '9')
@@ -413,6 +412,10 @@ module UIAutoMonkey
     def xcode_path
       `dirname #{xcode_developer_path}`.strip
     end
+
+    def automation_template_path
+      `find #{xcode_path} -name Automation.tracetemplate`.strip
+    end
     
     def symbolicatecrash_base_path()
       `find #{xcode_path} -name symbolicatecrash`.strip

data/lib/ui-auto-monkey/UIAutoMonkey.js

@@ -193,7 +193,7 @@ UIAutoMonkey.prototype.allEvents = {
 	},
 
 	clickVolumeDown: function() {
-		this.target().clickVolumeUp();
+		this.target().clickVolumeDown();
 	},
 
 	lock: function() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_monkey
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - vigossjjj