parallel_calabash 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efbbc2a68f8afdd17130f1ca786be9471178900f
-  data.tar.gz: 0dbf0e57b693485d8bed88144d53df1d1e06d243
+  metadata.gz: 4c1de47f617c12e793aa8b98f2d22bcab741cc0f
+  data.tar.gz: 593c627f3f37adb741ce2b9ea943c86e39c40e96
 SHA512:
-  metadata.gz: b91350856d0c29d57e82a5103b3b53bfd8ed5517a219ad1cadf2bba34590b3b685de1f2b05ee832ae415ae0bb90b39c8b46810071a0c5f500072f684e84d8d65
-  data.tar.gz: 1c3c11ac5b97a6672db65a6cfe3d69cdeb459a54e9187c40299e2077b75e2b0eef5c87131921c7bc575ff7f1ac6903850b2cbfc956d31c589e680348d9c08f65
+  metadata.gz: c1ebe0e759e48292b1588d3983fd11aeb601cde950e96f9d586d687e4876b0648db8083757ace0e40c966b2bacbfc3c5bf296d0ac95701700f63f6b67af7260e
+  data.tar.gz: 4317dc8ed774b7026e414ad90e73a89ea3d529201c7afdc0a780829b9a321f47d9a4941f3a08e0eafcceb69d7363314abcfcfb325e707e7b0f83ef309588f10a

data/README.md

@@ -40,8 +40,9 @@ Example: parallel_calabash -a my.apk -o 'cucumber_opts_like_tags_profile_etc_her
     -d, --distribution-tag tag       divide features into groups as per occurrence of given tag
     -o, --cucumber_opts '[OPTIONS]'  execute with those cucumber options
     --serialize-stdout               Serialize stdout output, nothing will be written until everything is done
+    --group-by-scenarios             Distribute equally as per scenarios. This uses cucumber dry run
     --concurrent                     Run tests concurrently. Each test will run once on each device.
-        
+
 ## REPROTING
 
 use ENV['TEST_PROCESS_NUMBER'] environment variable in your ruby scripts to find out the process number. you can use this for reporting purpose OR process specific action.

data/bin/parallel_calabash

@@ -41,6 +41,10 @@ def parse_arguments(arguments)
       options[:concurrent] = true
     end
 
+    opts.on("--group-by-scenarios", "Distribute equally as per scenarios. This uses cucumber dry run") do
+      options[:group_by_scenarios] = true
+    end
+
   end
 
   opt_parser.parse!(arguments)

data/lib/parallel_calabash.rb

@@ -26,7 +26,7 @@ module ParallelCalabash
 
       test_results = nil
       report_time_taken do
-        groups = FeatureGrouper.feature_groups(options[:feature_folder], number_of_processes, options[:distribution_tag], options[:concurrent])
+        groups = FeatureGrouper.feature_groups(options, number_of_processes)
         threads = groups.size
 
         test_results = Parallel.map_with_index(groups, :in_threads => threads) do |group, index|

data/lib/parallel_calabash/feature_grouper.rb

@@ -1,14 +1,14 @@
+require 'json'
 module ParallelCalabash
   class FeatureGrouper
 
     class << self
 
-      def feature_groups(feature_folder, group_size,weighing_factor = nil, concurrent = nil)
-        if concurrent.nil?
-          weighing_factor.nil? ? feature_groups_by_feature_files(feature_folder, group_size) :  feature_groups_by_weight(feature_folder, group_size,weighing_factor)
-        else
-          concurrent_feature_groups(feature_folder, group_size)
-        end
+      def feature_groups(options, group_size)
+        return concurrent_feature_groups(options[:feature_folder], group_size) if options[:concurrent]
+        return scenario_groups group_size, options if options[:group_by_scenarios]
+        return feature_groups_by_weight(options[:feature_folder], group_size,options[:distribution_tag]) if options[:distribution_tag]
+        feature_groups_by_feature_files(options[:feature_folder], group_size)
       end
 
       def concurrent_feature_groups(feature_folder, number_of_groups)
@@ -19,6 +19,11 @@ module ParallelCalabash
 
       def feature_groups_by_feature_files(feature_folder, group_size)
         files = feature_files_in_folder feature_folder
+        groups = group_creator group_size,files
+        groups.reject(&:empty?)
+      end
+
+      def group_creator group_size, files
         min_number_files_per_group = files.size/group_size
         remaining_number_of_files = files.size % group_size
         groups = Array.new(group_size) { [] }
@@ -30,7 +35,19 @@ module ParallelCalabash
             group << files.delete_at(0)
           end
         end
-        groups.reject(&:empty?)
+        groups
+      end
+
+      def scenario_groups group_size, options
+        generate_dry_run_report options
+        raise "Can not create dry run for scenario distribution" unless File.exists?("parallel_calabash_dry_run.json")
+        distribution_data = JSON.parse(File.read("parallel_calabash_dry_run.json"))
+        all_runnable_scenarios = distribution_data.map { |feature| feature["elements"].map { |scenario| "#{feature["uri"]}:#{scenario["line"]}" } }.flatten
+        groups = group_creator group_size,all_runnable_scenarios
+      end
+
+      def generate_dry_run_report options
+        `cucumber #{options[:cucumber_options]}  -f usage --dry-run -f json --out parallel_calabash_dry_run.json #{options[:feature_folder].first}`
       end
 
       def feature_files_in_folder(feature_dir)

data/lib/parallel_calabash/version.rb

@@ -1,3 +1,3 @@
 module ParallelCalabash
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/lib/parallel_calabash/feature_grouper_spec.rb

@@ -14,37 +14,37 @@ describe ParallelCalabash::FeatureGrouper do
   describe :feature_groups do
 
     it 'should group all features in only one group' do
-      expect(ParallelCalabash::FeatureGrouper.feature_groups(['spec/test_data/features'], 1)).to eq \
+      expect(ParallelCalabash::FeatureGrouper.feature_groups({:feature_folder =>['spec/test_data/features'],:concurrent=>nil}, 1)).to eq \
       [["spec/test_data/features/aaa.feature", "spec/test_data/features/bbb.feature", "spec/test_data/features/ccc.feature", "spec/test_data/features/ddd.feature", "spec/test_data/features/eee.feature", "spec/test_data/features/fff.feature"]]
     end
 
     it 'should divide features in 2 groups' do
-      expect(ParallelCalabash::FeatureGrouper.feature_groups(['spec/test_data/features'], 2)).to eq \
+      expect(ParallelCalabash::FeatureGrouper.feature_groups({:feature_folder =>['spec/test_data/features'],:concurrent=>nil}, 2)).to eq \
       [["spec/test_data/features/aaa.feature", "spec/test_data/features/bbb.feature", "spec/test_data/features/ccc.feature"], ["spec/test_data/features/ddd.feature", "spec/test_data/features/eee.feature", "spec/test_data/features/fff.feature"]]
     end
 
     it 'should divide features in 3 groups' do
-      expect(ParallelCalabash::FeatureGrouper.feature_groups(['spec/test_data/features'], 3)).to eq \
+      expect(ParallelCalabash::FeatureGrouper.feature_groups({:feature_folder =>['spec/test_data/features'],:concurrent=>nil}, 3)).to eq \
       [["spec/test_data/features/aaa.feature", "spec/test_data/features/bbb.feature"], ["spec/test_data/features/ccc.feature", "spec/test_data/features/ddd.feature"], ["spec/test_data/features/eee.feature", "spec/test_data/features/fff.feature"]]
     end
 
     it 'should divide features in 4 groups' do
-      expect(ParallelCalabash::FeatureGrouper.feature_groups(['spec/test_data/features'], 4)).to eq \
+      expect(ParallelCalabash::FeatureGrouper.feature_groups({:feature_folder =>['spec/test_data/features'],:concurrent=>nil}, 4)).to eq \
       [["spec/test_data/features/aaa.feature", "spec/test_data/features/eee.feature"], ["spec/test_data/features/bbb.feature", "spec/test_data/features/fff.feature"], ["spec/test_data/features/ccc.feature"], ["spec/test_data/features/ddd.feature"]]
     end
 
     it 'should divide features in 5 groups' do
-      expect(ParallelCalabash::FeatureGrouper.feature_groups(['spec/test_data/features'], 5)).to eq \
+      expect(ParallelCalabash::FeatureGrouper.feature_groups({:feature_folder =>['spec/test_data/features'],:concurrent=>nil}, 5)).to eq \
       [["spec/test_data/features/aaa.feature", "spec/test_data/features/fff.feature"], ["spec/test_data/features/bbb.feature"], ["spec/test_data/features/ccc.feature"], ["spec/test_data/features/ddd.feature"], ["spec/test_data/features/eee.feature"]]
     end
 
     it 'should create 1 group for concurrent 1 process' do
-      expect(ParallelCalabash::FeatureGrouper.feature_groups(['spec/test_data/features'], 1, nil, true)).to eq \
+      expect(ParallelCalabash::FeatureGrouper.feature_groups({:feature_folder =>['spec/test_data/features'],:concurrent=>true}, 1)).to eq \
       [["spec/test_data/features/aaa.feature", "spec/test_data/features/bbb.feature", "spec/test_data/features/ccc.feature", "spec/test_data/features/ddd.feature", "spec/test_data/features/eee.feature", "spec/test_data/features/fff.feature"]]
     end
 
     it 'should create 2 group for concurrent 2 processes' do
-      expect(ParallelCalabash::FeatureGrouper.feature_groups(['spec/test_data/features'], 2, nil, true)).to eq \
+      expect(ParallelCalabash::FeatureGrouper.feature_groups({:feature_folder =>['spec/test_data/features'],:concurrent=>true}, 2)).to eq \
       [["spec/test_data/features/aaa.feature", "spec/test_data/features/bbb.feature", "spec/test_data/features/ccc.feature", "spec/test_data/features/ddd.feature", "spec/test_data/features/eee.feature", "spec/test_data/features/fff.feature"],
        ["spec/test_data/features/aaa.feature", "spec/test_data/features/bbb.feature", "spec/test_data/features/ccc.feature", "spec/test_data/features/ddd.feature", "spec/test_data/features/eee.feature", "spec/test_data/features/fff.feature"]]
     end
@@ -96,5 +96,23 @@ describe ParallelCalabash::FeatureGrouper do
     end
   end
 
+  describe :scenario_groups do
+    it 'should groups all @runnable scenario equally into 2 groups' do
+      expect(ParallelCalabash::FeatureGrouper.scenario_groups(2,{:feature_folder => ["spec/test_data/features"],:cucumber_options => "--tags @runnable"})).to eq \
+      [["spec/test_data/features/aaa.feature:10", "spec/test_data/features/aaa.feature:16", "spec/test_data/features/aaa.feature:19", "spec/test_data/features/bbb.feature:13"], ["spec/test_data/features/bbb.feature:16", "spec/test_data/features/ccc.feature:11", "spec/test_data/features/ddd.feature:7", "spec/test_data/features/ddd.feature:10"]]
+    end
+
+    it 'should groups all @runnable scenario equally into 2 groups' do
+      expect(ParallelCalabash::FeatureGrouper.scenario_groups(3,{:feature_folder => ["spec/test_data/features"],:cucumber_options => "--tags @runnable"})).to eq \
+      [["spec/test_data/features/aaa.feature:10", "spec/test_data/features/aaa.feature:16", "spec/test_data/features/ddd.feature:7"], ["spec/test_data/features/aaa.feature:19", "spec/test_data/features/bbb.feature:13", "spec/test_data/features/ddd.feature:10"], ["spec/test_data/features/bbb.feature:16", "spec/test_data/features/ccc.feature:11"]]
+    end
+
+    it 'should groups all @runnable scenario equally into 2 groups' do
+      expect(ParallelCalabash::FeatureGrouper.scenario_groups(4,{:feature_folder => ["spec/test_data/features"],:cucumber_options => "--tags @runnable"})).to eq \
+      [["spec/test_data/features/aaa.feature:10", "spec/test_data/features/aaa.feature:16"], ["spec/test_data/features/aaa.feature:19", "spec/test_data/features/bbb.feature:13"], ["spec/test_data/features/bbb.feature:16", "spec/test_data/features/ccc.feature:11"], ["spec/test_data/features/ddd.feature:7", "spec/test_data/features/ddd.feature:10"]]
+    end
+
+  end
+
 
 end

data/spec/test_data/features/aaa.feature

@@ -6,16 +6,16 @@ Feature: aaa feature
   @tag1
   Scenario:
 
-  @tag1
+  @tag1 @runnable
   Scenario:
 
   @tag1
   Scenario:
 
-  @tag1
+  @tag1 @runnable
   Scenario:
 
-  @tag1
+  @tag1 @runnable
   Scenario:
 
   @tag1

data/spec/test_data/features/bbb.feature

@@ -9,10 +9,10 @@ Feature: bbb.feature
   @tag12
   Scenario:
 
-  @tag1
+  @tag1 @runnable
   Scenario:
 
-  @tag1
+  @tag1 @runnable
   Scenario:
 
   @tag1

data/spec/test_data/features/ccc.feature

@@ -7,7 +7,7 @@ Feature: ccc.feature
   @tag1
   Scenario:
 
-  @tag1
+  @tag1 @runnable
   Scenario:
 
   @tag1

data/spec/test_data/features/ddd.feature

@@ -3,8 +3,8 @@ Feature: ddd.feature
   @tag1
   Scenario:
 
-  @tag1
+  @tag1 @runnable
   Scenario:
 
-  @tag1
+  @tag1 @runnable
   Scenario:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_calabash
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rajdeep
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler