parallel_calabash 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbfcdf254dae2ce04a16ac134e29380063893b60
-  data.tar.gz: cba4c0855b92d9c3edb2b95a108ee69a8bb0faaa
+  metadata.gz: efbbc2a68f8afdd17130f1ca786be9471178900f
+  data.tar.gz: 0dbf0e57b693485d8bed88144d53df1d1e06d243
 SHA512:
-  metadata.gz: e76605cc0a097f870b93966deefacfa52809047c09e3a07462a9da11a2baf4ab0ef69edaf802dad26bc48774daebc763ec7042934d2373b8a218ee50e18b5af3
-  data.tar.gz: d5065c95805a678c532d008c72cb37c169dc447113c8348b254b8eae948d4f493c551174301205cff9df958289f212282412cdf82f116007c8ed73b98fe2b43a
+  metadata.gz: b91350856d0c29d57e82a5103b3b53bfd8ed5517a219ad1cadf2bba34590b3b685de1f2b05ee832ae415ae0bb90b39c8b46810071a0c5f500072f684e84d8d65
+  data.tar.gz: 1c3c11ac5b97a6672db65a6cfe3d69cdeb459a54e9187c40299e2077b75e2b0eef5c87131921c7bc575ff7f1ac6903850b2cbfc956d31c589e680348d9c08f65

data/README.md

@@ -37,11 +37,10 @@ Example: parallel_calabash -a my.apk -o 'cucumber_opts_like_tags_profile_etc_her
     -h, --help                       Show this message
     -v, --version                    Show version
     -a, --apk apk_path               apk file path
+    -d, --distribution-tag tag       divide features into groups as per occurrence of given tag
     -o, --cucumber_opts '[OPTIONS]'  execute with those cucumber options
-
-    -d distribution_tag,             divide features into groups as per occurrence of given tag
-            --distribution-tag
-        --serialize-stdout           Serialize stdout output show output only after process completion
+    --serialize-stdout               Serialize stdout output, nothing will be written until everything is done
+    --concurrent                     Run tests concurrently. Each test will run once on each device.
         
 ## REPROTING
 

data/bin/parallel_calabash

@@ -25,7 +25,7 @@ def parse_arguments(arguments)
       options[:apk_path] = apk_path
     end
 
-    opts.on("-d", "--distribution-tag distribution_tag", "divide features into groups as per occurrence of given tag") do |distribution_tag|
+      opts.on("-d", "--distribution-tag tag", "divide features into groups as per occurrence of given tag") do |distribution_tag|
       options[:distribution_tag] = distribution_tag
     end
 
@@ -37,6 +37,10 @@ def parse_arguments(arguments)
       options[:mute_output] = mute_output
     end
 
+    opts.on("--concurrent", "Run tests concurrently. Each test will run once on each device") do |concurrent_opt|
+      options[:concurrent] = true
+    end
+
   end
 
   opt_parser.parse!(arguments)

data/lib/parallel_calabash.rb

@@ -26,10 +26,11 @@ module ParallelCalabash
 
       test_results = nil
       report_time_taken do
-        groups = FeatureGrouper.feature_groups(options[:feature_folder], number_of_processes,options[:distribution_tag])
-        puts "#{number_of_processes} processes for #{groups.flatten.size} features"
-        test_results = Parallel.map(groups, :in_threads => groups.size) do |group|
-          Runner.run_tests(group, groups.index(group), options)
+        groups = FeatureGrouper.feature_groups(options[:feature_folder], number_of_processes, options[:distribution_tag], options[:concurrent])
+        threads = groups.size
+
+        test_results = Parallel.map_with_index(groups, :in_threads => threads) do |group, index|
+          Runner.run_tests(group, index, options)
         end
         ResultFormatter.report_results(test_results)
       end

data/lib/parallel_calabash/feature_grouper.rb

@@ -3,8 +3,18 @@ module ParallelCalabash
 
     class << self
 
-      def feature_groups(feature_folder, group_size,weighing_factor = nil)
-        weighing_factor.nil? ? feature_groups_by_feature_files(feature_folder, group_size) :  feature_groups_by_weight(feature_folder, group_size,weighing_factor)
+      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
+      end
+
+      def concurrent_feature_groups(feature_folder, number_of_groups)
+        groups = []
+        (0...number_of_groups).each{ groups << feature_files_in_folder(feature_folder) }
+        groups
       end
 
       def feature_groups_by_feature_files(feature_folder, group_size)
@@ -50,6 +60,7 @@ module ParallelCalabash
         features.each do |feature|
           feature_groups[index_of_lightest_group(feature_groups)] << feature
         end
+        feature_groups.reject!{|group|  group.empty?}
         feature_groups.map{|group| group.map{|feature_hash| feature_hash[:feature]}}
       end
 

data/lib/parallel_calabash/version.rb

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

data/spec/lib/parallel_calabash/feature_grouper_spec.rb

@@ -38,6 +38,17 @@ describe ParallelCalabash::FeatureGrouper do
       [["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 \
+      [["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 \
+      [["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
+
   end
 
   describe :feature_weight do

metadata

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