flaky 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 144d71285cb56132d67177ff0c825f98e1fde159
-  data.tar.gz: 59b262d5f66bd5d57601de1c1c756a2dee440d2f
+  metadata.gz: 814d8119a05329833700427fea7887b139bc28c4
+  data.tar.gz: 0eab2db86f250b57daac494f77146d9de5e336bc
 SHA512:
-  metadata.gz: 6a9d5ab7faf090b77da45d070029d3298d30aa05c61d37e900c123983ea9a8ab2e3020a3a0c301f6507e6dc3c6b36dc936e9b02ab396f75e894415e38dbf5885
-  data.tar.gz: e033e2722f59eefc7cc4c01a13b53658df33e6387a14f24690e0126f6bbf19c906f03cb848ffea871d58ff68b26e36f7e9945c1f428ef036bf304ae5b21cdf90
+  metadata.gz: cf645eb730fa486416d96b69c5db0b6869c375f4fcda4a7997aeb6f5e1acf64c7b3ae7a7b51ed4b5d72455e5fe8766e030da16200d81f126a1934d4c560d5097
+  data.tar.gz: f678c427c7eed2cbcc2e6d40b6adc601ed043220ccdba65df29e80d6e004698f3c9768dc7238cc8550b3afa0e20e4597ed66789df86450644d2581691771864f

data/bin/flake

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-
+require File.expand_path '../../lib/flaky', __FILE__
 usage_string = <<-'MSG'
 flake [count] ios[test_name]
 
@@ -10,12 +10,24 @@ flake 1 ios[sign_in]
 flake 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.
+
+flake 3 ios files.txt
+  Run select iOS tests in files.txt up to 3 times
+  If one run passes or 3 runs fail, then we move onto the next test.
 MSG
 
 if ARGV && ARGV.length === 1 && ARGV.first === 'auth'
-    require File.expand_path '../../lib/flaky', __FILE__
     Flaky::AppleScript.beat_security_agent
     exit
+elsif ARGV && ARGV.length === 3
+  # rake 3 ios files.txt
+  count = ARGV.first
+  os = ARGV[1]
+  file = ARGV.last
+  raise 'File must end in .txt' unless File.extname(ARGV.last).downcase == '.txt'
+  puts "Running select #{os} tests from file #{file} #{count}x"
+  Flaky.run_from_file count: count, os: os, file: file
+  exit
 else
   unless ARGV && ARGV.length === 2
     puts usage_string
@@ -30,8 +42,9 @@ require File.expand_path '../../lib/flaky', __FILE__
 
 count = ARGV.first
 
-single_test_match = ARGV.last.match(/(.+)\[(.*)\]$/)
-all_tests_match = ARGV.last.match(/(.+)$/)
+last = ARGV.last
+single_test_match = last.match(/(.+)\[(.*)\]$/)
+all_tests_match = last.match(/(.+)$/)
 
 if single_test_match
   # we're not using full, however we have to capture it anyway.
@@ -39,10 +52,12 @@ if single_test_match
   name = File.basename test_name, '.*'
   puts "Running #{name} #{count}x"
   Flaky.run_one_test count: count, os: os, name: test_name
+  exit
 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
+  exit
 else
   puts usage_string
   exit

data/lib/flaky.rb

@@ -9,8 +9,8 @@ require 'posix/spawn' # http://rubygems.org/gems/posix-spawn
 require 'digest/md5'
 
 module Flaky
-  VERSION = '0.0.14' unless defined? ::Flaky::VERSION
-  DATE = '2013-11-22' unless defined? ::Flaky::DATE
+  VERSION = '0.0.15' unless defined? ::Flaky::VERSION
+  DATE = '2013-12-05' 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
@@ -30,5 +30,6 @@ module Flaky
   require 'flaky/run'
 
   require 'flaky/run/all_tests'
+  require 'flaky/run/from_file'
   require 'flaky/run/one_test'
 end

data/lib/flaky/run/from_file.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+module Flaky
+  def self.run_from_file opts={}
+    raise 'Must pass :count, :os, and :file' unless opts && opts[:count] && opts[:os] && opts[:file]
+
+    count = opts[:count].to_i
+    os = opts[:os]
+    file = opts[:file]
+
+    raise ':count must be an int' unless count.kind_of?(Integer)
+    raise ':os must be a string' unless os.kind_of?(String)
+    raise ':file must be a string' unless file.kind_of?(String)
+
+    raise "#{file} doesn't exist" unless File.exists? file
+    tests = File.readlines(file).map { |line| File.basename(line.chomp, '.*') }
+    resolved_paths = []
+    # Convert file names into full paths
+    current_dir = Dir.pwd
+    Dir.glob(File.join current_dir, 'appium', os, 'specs', '**/*.rb') do |test_file|
+      if tests.include? File.basename(test_file, '.*')
+        resolved_paths << File.expand_path(test_file)
+      end
+    end
+
+    if tests.length != resolved_paths.length
+      missing_tests = []
+      tests.each do |test|
+        missing_tests << test unless File.exists? test
+      end
+      raise "Missing tests #{missing_tests}"
+    end
+
+    flaky = Flaky::Run.new
+    appium = Appium.new
+
+    raise "Rakefile doesn't exist in #{current_dir}" unless File.exists?(File.join(current_dir, 'Rakefile'))
+
+    resolved_paths.each 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/', '')
+      test_name = File.join(File.dirname(test_name), File.basename(test_name, '.*'))
+
+      count.times do
+        appium.start
+        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{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/readme.md

@@ -18,6 +18,7 @@ This only works with:
 
 - [Ruby / appium_lib iOS](https://github.com/appium/ruby_lib_ios)
 - iOS iPhone Simulator 6.1
+- Unique test names per platform
 
 #### Security dialogs
 

data/release_notes.md

@@ -1,3 +1,9 @@
+#### v0.0.14 2013-11-22
+
+- [6f21c6f](https://github.com/appium/flaky/commit/6f21c6fb899628a41e5e98e2a837e376222edf5c) Release 0.0.14
+- [0cf4855](https://github.com/appium/flaky/commit/0cf485536c066b85951f3ed4317ad593db8c3bf6) Fix crash on nil log
+
+
 #### v0.0.13 2013-11-12
 
 - [33fdc42](https://github.com/appium/flaky/commit/33fdc424ccf7534c13897a7c5bc1d6e7991bfa4e) Release 0.0.13

data/todo.md

@@ -1,6 +1,10 @@
 #### To Do
 
-- Save appium server log after each test.
 - Save execution time for each test. (this may already be in the minitest logs)
 - Save overall execution time.
-- Fix test numbering. 01, 02, etc.
+- Fix test numbering. 01, 02, etc.
+- Better ways to format test names
+
+```ruby
+ lines.split("\n").each { |l| puts File.basename(l.split(',').first) }; nil
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flaky
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
@@ -89,6 +89,7 @@ files:
 - lib/flaky/reset_android.rb
 - lib/flaky/run.rb
 - lib/flaky/run/all_tests.rb
+- lib/flaky/run/from_file.rb
 - lib/flaky/run/one_test.rb
 - readme.md
 - release_notes.md