parallel_calabash 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e707fea978908c069d5ee8b7ed755c61b923f15
-  data.tar.gz: 78ae4ba1f33793908c81fa7e64d1d07fe4fef9a0
+  metadata.gz: c5e86fb602e2958bb44e857ec0cb81c1755904e1
+  data.tar.gz: 79a70e5354ac574d03691b929e8025d1c8e0106a
 SHA512:
-  metadata.gz: aba39d6219d67792d46963955bf44760de1f44192c8542c82d9d182b13bcc0fed255fe5fd673a6c735613632bac6ead9fc4aa06da1119e7f19760a569f28f130
-  data.tar.gz: 2fd7b19d29b811ca11c89a005009771cc8508e4d52e27dffdd70111832808ba125c95b8a831e9084d88edf09dbb1fcaa3b9b3d203ef3bec7c1827ad3f28518d5
+  metadata.gz: d26a69315b401ecc609ab9c8a3a934754276f1fb037b7d711da7ac5e165e7f809d533b71708879f6ae5b60de31c10973a37a000c0ced03ccc13d1ab82a1c65ea
+  data.tar.gz: 24bf3870f338d3a75664d33da1e607a5f08cc53642159956b54142a8ae335a48f8442b5c524fd27228617c49f6ba7e1562327647a4233745a9a8c440948ecd18

data/README.md

@@ -36,10 +36,23 @@ Example: parallel_calabash -a my.apk -o 'cucumber_opts_like_tags_profile_etc_her
     -v, --version                    Show version
     -a, --apk apk_path               apk file path
     -o, --cucumber_opts '[OPTIONS]'  execute with those cucumber options
+    -f, --filter                     Filter devices to run tests against using partial device id or model name matching. Multiple filters seperated by ','
     --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.
 
+
+## FILTERING
+Filters are partial matches on the device id, or model name.
+> adb devices -l
+List of devices attached
+4100142545f271b5       device usb:14200000 product:sltexx model:SM_G850F device:slte
+4366432135f271c6       device usb:14200000 product:sltexx model:SM_G9901 device:slte
+emulator-5554          device product:sdk_phone_x86_64 model:Android_SDK_built_for_x86_64 device:generic_x86_64
+
+To run against just the emulator: -f emulator
+To run against a device id list: -f 4100142545f271b5,4366432135f271c6
+
 ## 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

@@ -29,6 +29,10 @@ def parse_arguments(arguments)
       options[:distribution_tag] = distribution_tag
     end
 
+    opts.on("-f", "--filter filter", "Filter devices to run tests against using partial device id or model name matching. Multiple filters seperated by ','") do |filter_opts|
+      options[:filter] = filter_opts.split(",")
+    end
+
     opts.on("-o", "--cucumber_opts '[OPTIONS]'", "execute with those cucumber options") do |cucumber_opts|
       options[:cucumber_options] = cucumber_opts
     end

data/lib/parallel_calabash.rb

@@ -12,8 +12,8 @@ module ParallelCalabash
   WINDOWS = (RbConfig::CONFIG['host_os'] =~ /cygwin|mswin|mingw|bccwin|wince|emx/)
   class << self
 
-    def number_of_processes_to_start
-      number_of_processes = AdbHelper.number_of_connected_devices
+    def number_of_processes_to_start options
+      number_of_processes = AdbHelper.number_of_connected_devices(options[:filter])
       raise "\n**** NO DEVICE FOUND ****\n" if number_of_processes==0
       puts "*******************************"
       puts " #{number_of_processes} DEVICES FOUND"
@@ -22,7 +22,7 @@ module ParallelCalabash
     end
 
     def run_tests_in_parallel(options)
-      number_of_processes = number_of_processes_to_start
+      number_of_processes = number_of_processes_to_start(options)
 
       test_results = nil
       report_time_taken do

data/lib/parallel_calabash/adb_helper.rb

@@ -2,17 +2,22 @@ module ParallelCalabash
   module AdbHelper
     class << self
 
-      def device_for_process process_num
-        connected_devices_with_model_info[process_num]
+      def device_for_process process_num, filter=[]
+        connected_devices_with_model_info(filter)[process_num]
       end
 
-      def number_of_connected_devices
-        connected_devices_with_model_info.size
+      def number_of_connected_devices filter=[]
+        connected_devices_with_model_info(filter).size
       end
 
-      def connected_devices_with_model_info
+      def connected_devices_with_model_info filter
         begin
-          `adb devices -l`.split("\n").collect{|line|  device_id_and_model(line)}.compact
+          list =
+            `adb devices -l`.split("\n").collect do |line|
+              device = device_id_and_model(line)
+              filter_device(device, filter)
+            end
+          list.compact
         rescue
           []
         end
@@ -24,6 +29,14 @@ module ParallelCalabash
         end
       end
 
+      def filter_device device, filter
+        if filter && !filter.empty? && device
+          device unless filter.collect{|f| device[0].match(f) || device[1].match(f) }.compact.empty?
+        else
+          device
+        end
+      end
+
     end
 
   end

data/lib/parallel_calabash/feature_grouper.rb

@@ -66,6 +66,9 @@ module ParallelCalabash
         if File.directory?(feature_dir.first)
           files = Dir[File.join(feature_dir, "**{,/*/**}/*")].uniq
           files.grep(/\.feature$/)
+        elsif File.file?(feature_dir.first)
+          scenarios = File.open(feature_dir.first).collect{ |line| line.split(' ') }
+          scenarios.flatten
         end
       end
 
@@ -105,4 +108,4 @@ module ParallelCalabash
     end
 
   end
-end
+end

data/lib/parallel_calabash/runner.rb

@@ -7,11 +7,11 @@ module ParallelCalabash
 
       def run_tests(test_files, process_number, options)
         cmd = [base_command, options[:apk_path], options[:cucumber_options], *test_files].compact*' '
-        execute_command_for_process(process_number, cmd, options[:mute_output])
+        execute_command_for_process(process_number, cmd, options[:mute_output], options[:filter])
       end
 
-      def execute_command_for_process(process_number, cmd, silence)
-        command_for_current_process = command_for_process(process_number, cmd)
+      def execute_command_for_process(process_number, cmd, silence, filter)
+        command_for_current_process = command_for_process(process_number, cmd, filter)
         output = open("|#{command_for_current_process}", "r") { |output| show_output(output, silence) }
         exitstatus = $?.exitstatus
 
@@ -23,9 +23,9 @@ module ParallelCalabash
         {:stdout => output, :exit_status => exitstatus}
       end
 
-      def command_for_process process_number, cmd
+      def command_for_process(process_number, cmd, filter)
         env = {}
-        device_id, device_info = ParallelCalabash::AdbHelper.device_for_process process_number
+        device_id, device_info = ParallelCalabash::AdbHelper.device_for_process process_number, filter
         env = env.merge({'AUTOTEST' => '1', 'ADB_DEVICE_ARG' => device_id, 'DEVICE_INFO' => device_info, "TEST_PROCESS_NUMBER" => (process_number+1).to_s})
         separator = (WINDOWS ? ' & ' : ';')
         exports = env.map { |k, v| WINDOWS ? "(SET \"#{k}=#{v}\")" : "#{k}=#{v};export #{k}" }.join(separator)

data/lib/parallel_calabash/version.rb

@@ -1,3 +1,3 @@
 module ParallelCalabash
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/lib/parallel_calabash/adb_helper_spec.rb

@@ -9,7 +9,7 @@ describe ParallelCalabash::AdbHelper do
     end
 
     it 'should match devices if there is a space after the word device' do
-       expect(ParallelCalabash::AdbHelper.device_id_and_model("emulator-5554  device ")).to eq \
+      expect(ParallelCalabash::AdbHelper.device_id_and_model("emulator-5554  device ")).to eq \
          ["emulator-5554", nil]
     end
 
@@ -27,4 +27,27 @@ describe ParallelCalabash::AdbHelper do
       expect(ParallelCalabash::AdbHelper.device_id_and_model(output)).to eq ["192.168.56.101:5555", "device1"]
     end
   end
+
+  describe :filter_device do
+    it 'should return devices if no filter is specified' do
+      device = ["192.168.56.101:5555", "device1"]
+      expect(ParallelCalabash::AdbHelper.filter_device(device, [])).to eq device
+    end
+
+    it 'should match devices that match the filter' do
+      device = ["192.168.56.101:5555", "device1"]
+      expect(ParallelCalabash::AdbHelper.filter_device(device, ["device1"])).to eq device
+    end
+
+    it 'should not return devices that do not match the filter' do
+      device = ["192.168.56.101:5555", "device1"]
+      expect(ParallelCalabash::AdbHelper.filter_device(device, ["notmatching"])).to eq nil
+    end
+
+    it 'can also match on ip address' do
+      device = ["192.168.56.101:5555", "device1"]
+      expect(ParallelCalabash::AdbHelper.filter_device(device, ["192.168.56.101"])).to eq device
+    end
+  end
+
 end

data/spec/lib/parallel_calabash/feature_grouper_spec.rb

@@ -9,6 +9,11 @@ describe ParallelCalabash::FeatureGrouper do
       expect(ParallelCalabash::FeatureGrouper.feature_files_in_folder ['spec/test_data/features']).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 find all the feature files in a rerun text file' do
+      expect(ParallelCalabash::FeatureGrouper.feature_files_in_folder ['spec/test_data/rerun.txt']).to eq \
+        ["features/aaa.feature:3", "features/aaa.feature:6", "features/aaa.feature:9", "features/bbb.feature:3", "features/bbb.feature:6", "features/bbb.feature:9"]
+    end
   end
 
   describe :feature_groups do
@@ -115,4 +120,4 @@ describe ParallelCalabash::FeatureGrouper do
   end
 
 
-end
+end

data/spec/lib/parallel_calabash/runner_spec.rb

@@ -4,8 +4,8 @@ require 'parallel_calabash'
 describe ParallelCalabash::Runner do
   describe :command_for_process do
     it 'should return command with env variables' do
-      ParallelCalabash::AdbHelper.should_receive(:device_for_process).with(0).and_return(["4d00fa3cb814c03f", "GT_N7100"])
-      expect(ParallelCalabash::Runner.command_for_process(0, 'base_command')).to eq \
+      ParallelCalabash::AdbHelper.should_receive(:device_for_process).with(0,nil).and_return(["4d00fa3cb814c03f", "GT_N7100"])
+      expect(ParallelCalabash::Runner.command_for_process(0, 'base_command', nil)).to eq \
       "AUTOTEST=1;export AUTOTEST;ADB_DEVICE_ARG=4d00fa3cb814c03f;export ADB_DEVICE_ARG;DEVICE_INFO=GT_N7100;export DEVICE_INFO;TEST_PROCESS_NUMBER=1;export TEST_PROCESS_NUMBER;base_command"
     end
   end
@@ -13,12 +13,12 @@ describe ParallelCalabash::Runner do
 
   describe :execute_command_for_process do
     it 'should execute the command with correct env variables set and return exit status 0 when command gets executed successfully' do
-      ParallelCalabash::AdbHelper.should_receive(:device_for_process).with(3).and_return("DEVICE3")
-      expect(ParallelCalabash::Runner.execute_command_for_process(3,'echo $ADB_DEVICE_ARG;echo $TEST_PROCESS_NUMBER',true)).to eq ({:stdout=>"DEVICE3\n4\n", :exit_status=>0})
+      ParallelCalabash::AdbHelper.should_receive(:device_for_process).with(3,nil).and_return("DEVICE3")
+      expect(ParallelCalabash::Runner.execute_command_for_process(3,'echo $ADB_DEVICE_ARG;echo $TEST_PROCESS_NUMBER',true,nil)).to eq ({:stdout=>"DEVICE3\n4\n", :exit_status=>0})
     end
 
     it 'should return exit status of 1' do
-      expect(ParallelCalabash::Runner.execute_command_for_process(3,"ruby -e 'exit(1)'",true)).to eq ({:stdout=>"", :exit_status=>1})
+      expect(ParallelCalabash::Runner.execute_command_for_process(3,"ruby -e 'exit(1)'",true,nil)).to eq ({:stdout=>"", :exit_status=>1})
     end
   end
 

data/spec/test_data/rerun.txt

@@ -0,0 +1 @@
+features/aaa.feature:3 features/aaa.feature:6 features/aaa.feature:9 features/bbb.feature:3 features/bbb.feature:6 features/bbb.feature:9

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_calabash
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Rajdeep
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,7 @@ files:
 - spec/test_data/features/ddd.feature
 - spec/test_data/features/eee.feature
 - spec/test_data/features/fff.feature
+- spec/test_data/rerun.txt
 homepage: https://github.com/rajdeepv/parallel_calabash
 licenses:
 - MIT
@@ -121,3 +122,4 @@ test_files:
 - spec/test_data/features/ddd.feature
 - spec/test_data/features/eee.feature
 - spec/test_data/features/fff.feature
+- spec/test_data/rerun.txt