flaky 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5f94aa17cb93d97950dec074ca80ad912b61c9b
-  data.tar.gz: 405486923ed99be2c3a0165e5ba8b3300b0169ac
+  metadata.gz: 731535ecad6aee9b747f751cd654a7ad183a13a1
+  data.tar.gz: 892cd6407dcfa844edc09a5b0b601bfaaaed6861
 SHA512:
-  metadata.gz: 176333a8a05f759a6017ed360cbcef1ed74f41c23476c514640e76ef935dc5a853d68ae41e7a4aec96c0b7c6cccacd178685b82afd9123fd0b6716f7cf415683
-  data.tar.gz: 1b66ac9b571df99316574fc7438e950a670230354a85eef8a52412fd7b779f1f45ce15e0fa41d7cfcfaa3f1122123ce7a41712a779fe6e03b4cc4574288ad739
+  metadata.gz: 3f2ebac794607daaf52a4281f7b01a6f09273e13853712938698cd7dd630912a6b4334f02ece2d3d2c777b9b24aae7a71aae91c8939dd278afee379527a299ca
+  data.tar.gz: 8ec671c657925c5f6781dc0ef887dc7230e73bfb7efb40588e0ac0b5a21ad9161358625619db09a8870303c377519c4e61003e230f2ae3e817d381619018185c

data/lib/flaky.rb

@@ -10,8 +10,8 @@ require 'digest/md5'
 require 'toml'
 
 module Flaky
-  VERSION = '0.1.1' unless defined? ::Flaky::VERSION
-  DATE = '2014-05-19' unless defined? ::Flaky::DATE
+  VERSION = '0.1.2' unless defined? ::Flaky::VERSION
+  DATE = '2015-04-28' unless defined? ::Flaky::DATE
 
   class << self; attr_accessor :no_video; end
   self.no_video = false; # set default value

data/lib/flaky/appium.rb

@@ -163,7 +163,7 @@ module Flaky
       raise "ENV['APPIUM_HOME'] must be set!" if appium_home.nil? || appium_home.empty?
       contains_appium = File.exists?(File.join(ENV['APPIUM_HOME'], 'bin', 'appium.js'))
       raise "Appium home `#{appium_home}` doesn't contain bin/appium.js!" unless contains_appium
-      cmd = %Q(cd "#{appium_home}"; node .)
+      cmd = %Q(cd "#{appium_home}"; node . --log-level debug)
       @pid, @in, @out, @err = popen4 cmd
       @in.close
       self # used to chain `launch.wait`

data/lib/flaky/run/all_tests.rb

@@ -18,7 +18,6 @@ module Flaky
     rakefile = File.expand_path(File.join(current_dir, 'Rakefile'))
     raise "Rakefile doesn't exist in #{current_dir}" unless File.exists? rakefile
     flaky_txt = File.expand_path(File.join(current_dir, 'flaky.txt'))
-
     parsed = TOML.load File.read flaky_txt
     puts "flaky.txt: #{parsed}"
     android_dir = parsed['android']
@@ -34,10 +33,8 @@ module Flaky
       test_file = File.expand_path test_file
 
       test_name = test_file.sub(File.expand_path(File.join(current_dir, active_dir)), '')
-
       # remove leading /
       test_name.sub!(test_name.match(/^\//).to_s, '')
-
       test_name = File.join(File.dirname(test_name), File.basename(test_name, '.*'))
 
       count.times do

data/lib/flaky/run/one_test.rb

@@ -12,7 +12,8 @@ module Flaky
     raise ':name must be a string' unless name.kind_of?(String)
 
     # ensure file name does not contain an extension
-    name = File.basename name, '.*'
+    # don't expand the path because it's joined and expanded in final_path.
+    name = File.join(File.dirname(name), File.basename(name, '.*'))
 
     running_on_sauce = ENV['SAUCE_USERNAME'] ? true : false
     flaky = Flaky::Run.new
@@ -22,20 +23,28 @@ module Flaky
     current_dir = Dir.pwd
 
     raise "Rakefile doesn't exist in #{current_dir}" unless File.exists?(File.join(current_dir, 'Rakefile'))
-
-    file = ''
-    Dir.glob(File.join current_dir, 'appium', os, 'specs', "**/#{name}.rb") do |test_file|
-      file = test_file
+    flaky_txt = File.expand_path(File.join(current_dir, 'flaky.txt'))
+    parsed = TOML.load File.read flaky_txt
+    puts "flaky.txt: #{parsed}"
+    android_dir = parsed['android']
+    ios_dir = parsed['ios']
+    active_dir = is_android ? android_dir : ios_dir
+    final_path = File.expand_path File.join current_dir, active_dir, name + '.rb'
+    test_file = ''
+    Dir.glob(final_path) do |file|
+      test_file = file
     end
 
-    raise "#{name} does not exist." if file.empty?
+    raise "#{test_file} does not exist." unless File.exists?(test_file)
 
-    test_name = file.sub(current_dir + '/appium/', '')
+    test_name = test_file.sub(File.expand_path(File.join(current_dir, active_dir)), '')
+    # remove leading /
+    test_name.sub!(test_name.match(/^\//).to_s, '')
     test_name = File.join(File.dirname(test_name), File.basename(test_name, '.*'))
 
     count.times do
       appium.start unless running_on_sauce
-      run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}',#{Flaky.no_video}]"
+      run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{test_file}',#{Flaky.no_video}]"
       flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium, sauce: running_on_sauce
     end
 

data/release_notes.md

@@ -1,3 +1,11 @@
+#### v0.1.1 2014-05-19
+
+- [98f3c87](https://github.com/appium/flaky/commit/98f3c87c1caa7c64b1d1da26f43642f4bdef04d1) Release 0.1.1
+- [62d4278](https://github.com/appium/flaky/commit/62d427893f19fea1729a5c3c6f79ce72e1a11919) Fix test name
+- [963978f](https://github.com/appium/flaky/commit/963978f041f2198dda07779505a058e971e13273) Default to no video
+- [dd0ea3a](https://github.com/appium/flaky/commit/dd0ea3a99180e3c687ce67aae6cbf6abe2dac163) Fix paren
+
+
 #### v0.1.0 2014-04-30
 
 - [f8a79a4](https://github.com/appium/flaky/commit/f8a79a47fe01bd0e1f9e668b0a97d7d9ba6d41b7) Release 0.1.0

data/test/adb.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'posix-spawn'
+
+Process::waitpid(POSIX::Spawn::spawn('killall', '-9', 'adb', :in => '/dev/null', :out => '/dev/null', :err => '/dev/null'))
+
+puts 'Locating device...'
+
+while `adb shell echo "ping"`.strip != 'ping'
+  `adb kill-server`
+  `adb devices` # std err is printed
+  sleep 5
+end
+
+puts 'Device found!'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flaky
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
@@ -93,6 +93,7 @@ files:
 - lib/screen_recording.rb
 - readme.md
 - release_notes.md
+- test/adb.rb
 - test/all_tests.rb
 - test/mock_execute.rb
 - test/test_run.rb
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Measure flaky Ruby Appium tests