automate-standard-baseline 0.0.6 → 0.0.7

data/bin/asb-stop

@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+
+require 'helpers'
+require 'logger'
+require 'yaml'
+require 'sys/proctable'
+require 'optparse'
+
+include Sys
+
+END {
+
+options = opt_parse(ARGV)
+
+pid_file = '.pid'
+
+unless File.exists?(pid_file)
+log("pid file doesn't exist!")
+exit
+end
+
+pid_content = YAML.load_file(pid_file)
+options.each do |k, v|
+str_key = k.to_s
+
+str_key = 'main' if str_key == 'all'
+str_key = v if str_key == 'serial'
+
+log "Stopping '#{str_key}' processes"
+
+pids = pid_content.delete(str_key)
+do_stop(pids)
+end
+
+if not pid_content.empty? and options[:all].nil?
+IO.write(pid_file, pid_content.to_yaml)
+else
+File.delete(pid_file)
+end
+
+} # end of END
+
+def opt_parse(args)
+
+options = {}
+
+opts = OptionParser.new do |opt|
+opt.banner = "Usage: stop [options]"
+opt.separator ""
+
+opt.on("-a", "--all", "Stop all processes [default]") do |v|
+options[:all] = v
+end
+
+opt.on("-l", "--logcat", "Stop logcat processes") do |v|
+options[:logcat] = v
+end
+
+opt.on("-t", "--tcpdump", "Stop tcpdump processes") do |v|
+options[:tcpdump] = v
+end
+
+opt.on("-s", "--serial [SERIAL_NUMBER]", "Stop all processes related the specified device serial number") do |v|
+options[:serial] = v
+end
+
+opt.separator ""
+opt.on_tail("-h", "--help", "Show this message") do
+puts opt
+exit
+end
+end
+
+opts.parse!(args)
+# stop all processes by default
+options[:all] = true if options.length == 0
+
+options
+end
+
+def do_stop(pids)
+return if pids.nil?
+
+log "Stopping #{pids.to_s}"
+to_kill = pids
+
+# find the sub-processes of these pids
+ProcTable.ps do |proc|
+to_kill << proc.pid if to_kill.include?(proc.ppid)
+end
+log "Processes will be killed (including sub-processes): #{to_kill}"
+
+to_kill.each do |pid|
+Process.kill("KILL", pid) rescue nil # in case of the process doesn't exist.
+end
+log "Done!"
+end

data/bin/automate-standard-baseline

@@ -109,16 +109,10 @@ end
 def trap_signals
     Signal.trap("INT") do
       logger.info "Terminating..."
-      to_kill = [Process.pid]
-      ProcTable.ps do |proc|
-          to_kill << proc.pid if to_kill.include?(proc.ppid)
-      end
-      logger.info "Processes will be killed (including sub-processes): #{to_kill}"
-      to_kill.each do |pid|
-          Process.kill("KILL", pid) rescue nil # in case of the process doesn't exist. 
-      end
-# process logcat
-# process execution status (if there is)
+      
+      #pull_out_tcpdump(devices)
+      stop_test([Process.pid])
+     
       delete_pid_file($pid_file)
       exit 1
     end
@@ -138,11 +132,7 @@ def check_if_old_process_killed(pid_f)
   end
 end
 
-def delete_pid_file(pid_f)
-  if File.exists?(pid_f)
-    File.delete(pid_f)
-    end
-end
+
 
 def archive_logs(devices)
 # if there is any existing tcpdump files on devices' sdcard, pull them
@@ -187,6 +177,13 @@ def load_config()
   
 end
 
+def delete_pid_file(pid_f)
+  if File.exists?(pid_f)
+    File.delete(pid_f)
+    end
+end
+
+
 ## operation steps ---start test ...
 
 trap_signals()
@@ -294,17 +291,7 @@ rescue Timeout::Error
   #main = [Process.pid]
   #logger.info "Main process #{main}"
   
-  to_kill=[Process.pid]
-  ProcTable.ps do |proc|
-     to_kill << proc.pid if to_kill.include?(proc.ppid)
-  end
-  
-  #delete the main process in case of kill itself 
-  to_kill.delete_at(0)
-  logger.info "Processes will be killed : #{to_kill}"
-  to_kill.each do |pid|
-     Process.kill("KILL", pid) rescue nil # in case of the process doesn't exist. 
-  end
+  stop_test([Process.pid])
   
   delete_pid_file($pid_file) 
   logger.info "Done."

data/lib/automate-standard-baseline/helpers.rb

@@ -27,6 +27,21 @@ def log(message)
 end
 
 
+def stop_test(pid)
+  to_kill=pid
+  ProcTable.ps do |proc|
+     to_kill << proc.pid if to_kill.include?(proc.ppid)
+  end
+  
+  #delete the main process in case of kill itself 
+  to_kill.delete_at(0)
+  logger.info "Processes will be killed : #{to_kill}"
+  to_kill.each do |pid|
+     Process.kill("KILL", pid) rescue nil # in case of the process doesn't exist. 
+  end
+end 
+
+
 def pull_out_apk(device_serial, package_name, to_path = nil)
     out_path = File.expand_path(to_path) if to_path
     out_path ||= File.expand_path("#{package_name}.apk")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automate-standard-baseline
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
-  requirement: &14437900 !ruby/object:Gem::Requirement
+  requirement: &19010180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14437900
+  version_requirements: *19010180
 - !ruby/object:Gem::Dependency
   name: sys-proctable
-  requirement: &14436380 !ruby/object:Gem::Requirement
+  requirement: &19009640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,12 +32,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14436380
+  version_requirements: *19009640
 description: auomated standard baseline test
 email: rfu@seven.com
 executables:
 - automate-standard-baseline
-- abs-stop
+- asb-stop
 extensions: []
 extra_rdoc_files: []
 files:
@@ -45,7 +45,7 @@ files:
 - lib/automate-standard-baseline/operations.rb
 - lib/automate-standard-baseline/helpers.rb
 - bin/automate-standard-baseline
-- bin/abs-stop
+- bin/asb-stop
 homepage: http://rubygems.org/gems/automate-standard-baseline
 licenses: []
 post_install_message: 

data/bin/abs-stop

@@ -1,101 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
-
-require 'helpers'
-require 'logger'
-require 'yaml'
-require 'sys/proctable'
-require 'optparse'
-
-include Sys
-
-END {
-
-options = opt_parse(ARGV)
-
-pid_file = '.pid'
-
-unless File.exists?(pid_file)
-	log("pid file doesn't exist!")
-	exit 
-end
-
-pid_content = YAML.load_file(pid_file)
-options.each do |k, v|
-    str_key = k.to_s
-
-    str_key = 'main' if str_key == 'all'
-    str_key = v if str_key == 'serial'
-
-    log "Stopping '#{str_key}' processes"
-
-    pids = pid_content.delete(str_key)
-    do_stop(pids)
-end
-
-if not pid_content.empty? and options[:all].nil?
-    IO.write(pid_file, pid_content.to_yaml)
-else
-    File.delete(pid_file)
-end
-
-} # end of END
-
-def opt_parse(args)
-
-    options = {}
-
-    opts = OptionParser.new do |opt|
-        opt.banner = "Usage: stop [options]"
-        opt.separator ""
-
-        opt.on("-a", "--all", "Stop all processes [default]") do |v|
-            options[:all] = v
-        end
-
-        opt.on("-l", "--logcat", "Stop logcat processes") do |v|
-            options[:logcat] = v
-        end
-
-        opt.on("-t", "--tcpdump", "Stop tcpdump processes") do |v|
-            options[:tcpdump] = v
-        end
-
-        opt.on("-s", "--serial [SERIAL_NUMBER]", "Stop all processes related the specified device serial number") do |v|
-            options[:serial] = v
-        end
-
-        opt.separator ""
-        opt.on_tail("-h", "--help", "Show this message") do
-            puts opt
-            exit
-        end
-    end
-
-    opts.parse!(args)
-    # stop all processes by default
-    options[:all] = true if options.length == 0
-
-    options
-end
-
-def do_stop(pids)
-    return if pids.nil?
-
-	log "Stopping #{pids.to_s}"
-    to_kill = pids
-
-	# find the sub-processes of these pids
-    ProcTable.ps do |proc|
-        to_kill << proc.pid if to_kill.include?(proc.ppid)
-    end
-    log "Processes will be killed (including sub-processes): #{to_kill}"
-
-    to_kill.each do |pid|
-        Process.kill("KILL", pid) rescue nil # in case of the process doesn't exist. 
-    end
-    log "Done!"
-end
-
-