fwtoolkit 0.8.1 → 0.8.2

data/lib/fwtoolkit/tasks/ci.rb

@@ -18,7 +18,7 @@ module FWToolkit
             end
                         
             desc 'Clean, build and test'
-            task :build => ["ci:bundle", "ci:update_submodules", "xcode:debug_simulator:cleanbuild", "frank:build", "frank:ci_test"]
+            task :build => ["ci:bundle", "ci:update_submodules", "xcode:debug_simulator:cleanbuild", "frank:build", "frank:ci_test_rerun_failures"]
 
             desc 'Clean, build and test for Cocoapods projects'
             task :pod_build => ["ci:bundle", "pod:update_specs", "pod:clean_install", "ci:build"]          

data/lib/fwtoolkit/tasks/frank.rb

@@ -44,12 +44,24 @@ module FWToolkit
               factory_template =  File.join 'templates', 'models', 'factories.rb.erb'
               template(factory_template, File.join(output_dir, 'factories.rb'))
             end
+            
+            desc 'Run CI Frank with rerun option'
+            task :ci_test_rerun_failures do |t|
+              exception = FWToolkit::Tasks.run_rake_task("frank:ci_test")
+              exception = FWToolkit::Tasks.run_rake_task("frank:ci_test_rerun") if exception
+              raise exception if exception
+            end
 
             Cucumber::Rake::Task.new(:ci_test, 'Run Frank acceptance tests with CI options') do |t|
               ENV['APP_BUNDLE_PATH'] = File.join( Dir.pwd, 'Frank/frankified_build/Frankified.app' )
               ENV['USE_SIM_LAUNCHER_SERVER'] = 'YES'
               artifacts_dir = FWToolkit::Tasks.cc_artifacts_dir
-              t.cucumber_opts = "Frank/features --tags ~@wip --format pretty --format html --out '#{artifacts_dir}/frank_results.html' --format rerun --out '#{artifacts_dir}/frank_rerun.txt'"
+              t.cucumber_opts = "Frank/features --tags @dev --format pretty --format html --out '#{artifacts_dir}/frank_results.html' --format rerun --out '#{artifacts_dir}/frank_rerun.txt'"
+            end
+            
+            Cucumber::Rake::Task.new(:ci_test_rerun, 'Run failed Frank acceptance tests with CI options') do |t|
+              artifacts_dir = FWToolkit::Tasks.cc_artifacts_dir
+              t.cucumber_opts = "@#{artifacts_dir}/frank_rerun.txt --format pretty --require Frank/features"
             end
 
             desc 'Run Frank acceptance tests'

data/lib/fwtoolkit/tasks/helper.rb

@@ -3,5 +3,14 @@ module FWToolkit
     def self.cc_artifacts_dir
       ENV['CC_BUILD_ARTIFACTS'] ? ENV['CC_BUILD_ARTIFACTS'] : File.join(Dir.pwd, 'artifacts')
     end
+    
+    def self.run_rake_task(name)
+      begin
+        Rake::Task[name].invoke
+      rescue Exception => e
+        return e
+      end
+      nil
+    end
   end
 end

data/lib/fwtoolkit/version.rb

@@ -1,3 +1,3 @@
 module FWToolkit
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fwtoolkit
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -329,7 +329,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2478113075848411974
+      hash: -2581004337018425377
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -338,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2478113075848411974
+      hash: -2581004337018425377
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25