flaky 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12f730870c9c64675c02b19ff57381991a1ef42e
-  data.tar.gz: a49813af98d00d27ab97a19049e600cd31497271
+  metadata.gz: 40c7fce2c960f2266e8f7e3f7931c875974b4b54
+  data.tar.gz: c5e46bb2dbe776f720707543915ca8609f8d0afe
 SHA512:
-  metadata.gz: 722025d90f0d8a51fc1d19fa99af0241e1a01959eea66b0cf147fa201308b145009f824809e7de56fb08aa80c6963c315222fdfe41c3a183444cad6383b0ee02
-  data.tar.gz: d2367175c716d5072fce2b709b017340eaf1a6e24a6cd6991daac65ecdfccde418bb1845dbd85c48162ad430997cfbc143e78d02401af28dc5c16196c78ad7bd
+  metadata.gz: 9a0ad60c9f831be58811fb5d4d50e330c319ce76a3161c974621825cee3a69cb3fb8409069e265101116f30e7ced90ffe2c6737f30c7124d728cbd865fe313e8
+  data.tar.gz: 6b437e86dc50c10d7ebf755040aa72a62517d99a840d961b3a74516e96b7dc6933d290c9808db841521b698a0259cf4eec591782dd139fda6e790012fe0410ea

data/bin/flake

@@ -1,7 +1,17 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-usage_string = 'flaky [count] ios[test_name]'
+usage_string = <<-'MSG'
+flaky [count] ios[test_name]
+
+flaky 1 ios[sign_in]
+  Run the sign in test one time
+
+flaky 3 ios
+  Run all iOS tests up to 3 times
+  If one run passes or 3 runs fail, then we move onto the next test.
+MSG
+
 raise usage_string unless ARGV && ARGV.length === 2
 
 require File.expand_path '../../lib/flaky', __FILE__
@@ -9,8 +19,21 @@ require File.expand_path '../../lib/flaky', __FILE__
 # flaky 1 ios[test_name]
 
 count = ARGV.first
-match = ARGV.last.match(/(.+)\[(.*)\]$/)
-raise usage_string unless match && match.length === 3
-full, os, test_name = match.to_a # rake ios[Ok] => ["ios[Ok]", "ios", "Ok"]
 
-Flaky.run_one_test count: count, os: os, name: test_name
+single_test_match = ARGV.last.match(/(.+)\[(.*)\]$/)
+all_tests_match = ARGV.last.match(/(.+)$/)
+
+if single_test_match
+  # we're not using full, however we have to capture it anyway.
+  full, os, test_name = single_test_match.to_a # rake ios[Ok] => ["ios[Ok]", "ios", "Ok"]
+  name = File.basename test_name, '.*'
+  puts "Running #{name} #{count}x"
+  Flaky.run_one_test count: count, os: os, name: test_name
+elsif all_tests_match
+  os = all_tests_match.to_a.last
+  puts "Running all #{os} tests #{count}x"
+  Flaky.run_all_tests count: count, os: os
+else
+  puts usage_string
+  exit
+end

data/lib/flaky.rb

@@ -8,8 +8,8 @@ require 'escape_utils'
 require 'posix/spawn' # http://rubygems.org/gems/posix-spawn
 
 module Flaky
-  VERSION = '0.0.6' unless defined? ::Flaky::VERSION
-  DATE = '2013-10-03' unless defined? ::Flaky::DATE
+  VERSION = '0.0.7' unless defined? ::Flaky::VERSION
+  DATE = '2013-10-11' unless defined? ::Flaky::DATE
 
   # https://github.com/appium/ruby_lib/blob/0e203d76610abd519ba9d2fe9c14b50c94df5bbd/lib/appium_lib.rb#L24
   def self.add_to_path file, path=false
@@ -27,6 +27,6 @@ module Flaky
   require 'flaky/log'
   require 'flaky/run'
 
-  require 'flaky/run/glob_of_tests'
+  require 'flaky/run/all_tests'
   require 'flaky/run/one_test'
 end

data/lib/flaky/appium.rb

@@ -53,7 +53,7 @@ module Flaky
       @tail = nil
     end
 
-    def go
+    def start
       @log = ''
       self.stop # stop existing process
       self.class.remove_ios_apps
@@ -61,7 +61,7 @@ module Flaky
       @@thread.exit if @@thread
       @@thread = Thread.new do
         Thread.current.abort_on_exception = true
-        self.start.wait
+        self.launch.wait
       end
 
       while !self.ready
@@ -103,7 +103,7 @@ module Flaky
     end
 
     # Invoked inside a thread by `self.go`
-    def start
+    def launch
       @log = ''
       self.end_all_nodes
       @ready = false
@@ -114,7 +114,7 @@ module Flaky
       cmd = %Q(cd "#{appium_home}"; node server.js)
       @pid, @in, @out, @err = popen4 cmd
       @in.close
-      self # used to chain `start.wait`
+      self # used to chain `launch.wait`
     end
 
     def stop

data/lib/flaky/run/all_tests.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+module Flaky
+  def self.run_all_tests opts={}
+    raise 'Must pass :count and :os' unless opts && opts[:count] && opts[:os]
+
+    count = opts[:count].to_i
+    os = opts[:os]
+
+    raise ':count must be an int' unless count.kind_of?(Integer)
+    raise ':os must be a string' unless os.kind_of?(String)
+
+    flaky = Flaky::Run.new
+    appium = Appium.new
+
+    current_dir = Dir.pwd
+    raise "Rakefile doesn't exist in #{current_dir}" unless File.exists?(File.join(current_dir, 'Rakefile'))
+
+    Dir.glob(File.join current_dir, 'appium', os, 'specs', '**/*.rb') do |test_file|
+      file = test_file
+      name = File.basename file, '.*'
+
+      raise "#{test_file} does not exist." if file.empty?
+      test_name = file.sub(current_dir + '/appium/', '').gsub('/', '_')
+
+      count.times do
+        appium.start
+        run_cmd = "cd #{current_dir}; rake ios['#{name}']"
+        passed = flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium
+        break if passed # move onto the next test after one successful run
+      end
+    end
+
+    appium.stop
+    flaky.report
+  end
+end # module Flaky

data/lib/flaky/run/one_test.rb

@@ -29,9 +29,8 @@ module Flaky
     raise "#{test_file} does not exist." if file.empty?
     test_name = file.sub(current_dir + '/appium/', '').gsub('/', '_')
 
-    puts "Running #{name} #{count}x"
     count.times do
-      appium.go # start appium
+      appium.start
       run_cmd = "cd #{current_dir}; rake ios['#{name}']"
       flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium
     end

data/readme.md

@@ -22,5 +22,5 @@ This only works with:
 - All `iPhone Simulator/6.1/Applications/*` are removed
 - Appium server is restarted
 - [spec](https://github.com/bootstraponline/spec) test logs are saved and colored
-- Appium logs are saved and colored
-- iOS Simulator logs are saved `/var/log/system.log`
+- [Appium](https://github.com/appium/appium) logs are saved and colored
+- iOS Simulator logs are saved `/var/log/system.log`

data/release_notes.md

@@ -1,3 +1,15 @@
+#### v0.0.6 2013-10-03
+
+- [86d8137](https://github.com/appium/flaky/commit/86d8137e3f1f348be8ee76e42bea0de36280d5a5) Release 0.0.6
+- [0ed637c](https://github.com/appium/flaky/commit/0ed637c213ba59d82fe72a6eb8a22567a9f06a60) Don't escape the iOS simulator logs
+- [6a16eef](https://github.com/appium/flaky/commit/6a16eefde288b68a6695e2e093693c68274fb4f5) Add todo
+- [b8395d7](https://github.com/appium/flaky/commit/b8395d7fc78b75a11a5517f1e6b4c8784522ecee) Save tail of /var/log/system.log
+- [d153c91](https://github.com/appium/flaky/commit/d153c91d072d691d2e499b633f69f10751f8e9bd) Stop appium once we're done
+- [a80dbb1](https://github.com/appium/flaky/commit/a80dbb1062ee11ad53a092c3f3f5a5796d987d84) Update readme.md
+- [6b3ebe8](https://github.com/appium/flaky/commit/6b3ebe8a5ee432206c582f4b0d1e9f877d712ae3) Explain what the gem does
+- [125f960](https://github.com/appium/flaky/commit/125f9608b49a8c939d74699ad3e73f743638bf57) Update links
+
+
 #### v0.0.5 2013-09-30
 
 - [f4c64f7](https://github.com/appium/flaky/commit/f4c64f721f80bc0ce6519ce3f115486cd097d4e0) Release 0.0.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flaky
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
@@ -82,7 +82,7 @@ files:
 - lib/flaky/appium.rb
 - lib/flaky/log.rb
 - lib/flaky/run.rb
-- lib/flaky/run/glob_of_tests.rb
+- lib/flaky/run/all_tests.rb
 - lib/flaky/run/one_test.rb
 - readme.md
 - release_notes.md

data/lib/flaky/run/glob_of_tests.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-module Flaky
-  # TODO: Rewrite to run without system specific dependencies.
-  def self.run_glob_of_tests
-    flaky = Flaky::Run.new
-
-    txt = File.join File.expand_path('../..', __FILE__), 'automation.txt'
-    dir = File.readlines(txt)[0].strip
-    spec_dir = File.join dir, 'appium', 'ios', 'specs'
-    ios = File.join spec_dir, '**', '*.rb'
-
-    appium = Appium.new
-
-    Dir.glob(ios) do |file|
-      next unless file.include?('view_album')
-      next unless File.extname(file).downcase == '.rb'
-
-      appium.go
-
-      rake_file = File.basename file, '.*'
-      run_cmd = "cd #{dir}; rake ios['#{rake_file}']"
-      flaky.execute run_cmd: run_cmd, test_name: file.sub(dir, '').gsub('/', '_')
-    end
-
-    appium.stop
-    flaky.report
-  end
-end # module Flaky