parallel_calabash 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e12a0efd9b281f2bbe7c74af79a2a8e7a2bd9c59
-  data.tar.gz: a437a645b653017572a96b95308aef696b11f1ca
+  metadata.gz: bbfcdf254dae2ce04a16ac134e29380063893b60
+  data.tar.gz: cba4c0855b92d9c3edb2b95a108ee69a8bb0faaa
 SHA512:
-  metadata.gz: 70c0107dd2be2f79a138b99f4fc58465d5d1626ca854212e1402ef38e3589030b26dee25a16a8d77c0181c6505567b118cb021e739d53ce12efdcfa42e303221
-  data.tar.gz: da3bbb993ff63c6ea6b2bf3475965e319cf4eb9e76a105c6391f615e387ce6759872d8bce1dbdda866a3ff186b1d70f8221f7a74a2df1022fe319f1df3ffe664
+  metadata.gz: e76605cc0a097f870b93966deefacfa52809047c09e3a07462a9da11a2baf4ab0ef69edaf802dad26bc48774daebc763ec7042934d2373b8a218ee50e18b5af3
+  data.tar.gz: d5065c95805a678c532d008c72cb37c169dc447113c8348b254b8eae948d4f493c551174301205cff9df958289f212282412cdf82f116007c8ed73b98fe2b43a

data/README.md

@@ -1,5 +1,7 @@
 # calabash parallel execution
 
+# Now Supported on Windows
+
 ## Watch a quick demo here:
 
 https://www.youtube.com/watch?v=sK3s0txeJvc
@@ -43,11 +45,13 @@ Example: parallel_calabash -a my.apk -o 'cucumber_opts_like_tags_profile_etc_her
         
 ## 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.
+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.
+
+To get device model info, use ENV['DEVICE_INFO'] env variable.
 
 eg. modify default profile in cucumber.yml as below to get different report from different process
 
-default: --format html --out reports/Automation_report_<%= ENV['TEST_PROCESS_NUMBER'] %>.html --format pretty
+default: --format html --out reports/Report_<%=ENV['DEVICE_INFO']%>_<%= ENV['TEST_PROCESS_NUMBER']%>.html --format pretty
 
 ## Contributing
 

data/lib/parallel_calabash/adb_helper.rb

@@ -2,20 +2,26 @@ module ParallelCalabash
   module AdbHelper
     class << self
 
-      def connected_devices
+      def device_for_process process_num
+        connected_devices_with_model_info[process_num]
+      end
+
+      def number_of_connected_devices
+        connected_devices_with_model_info.size
+      end
+
+      def connected_devices_with_model_info
         begin
-          `adb devices`.scan(/\n(.*)\t/).flatten
+          `adb devices -l`.split("\n").collect{|line|  device_id_and_model(line)}.compact
         rescue
           []
         end
       end
 
-      def device_for_process process_num
-        connected_devices[process_num]
-      end
-
-      def number_of_connected_devices
-        connected_devices.size
+      def device_id_and_model line
+        if line.include?("device ")
+          [line.split(" ").first,line.scan(/model:(.*) device/).flatten.first]
+        end
       end
 
     end

data/lib/parallel_calabash/runner.rb

@@ -25,8 +25,8 @@ module ParallelCalabash
 
       def command_for_process process_number, cmd
         env = {}
-        device_for_current_process = ParallelCalabash::AdbHelper.device_for_process process_number
-        env = env.merge({'AUTOTEST' => '1', 'ADB_DEVICE_ARG' => device_for_current_process, "TEST_PROCESS_NUMBER" => (process_number+1).to_s})
+        device_id, device_info = ParallelCalabash::AdbHelper.device_for_process process_number
+        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)
         exports + separator + cmd

data/lib/parallel_calabash/version.rb

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

data/spec/lib/parallel_calabash/runner_spec.rb

@@ -4,9 +4,9 @@ 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("5555")
+      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 \
-      "AUTOTEST=1;export AUTOTEST ADB_DEVICE_ARG=5555;export ADB_DEVICE_ARG TEST_PROCESS_NUMBER=1;export TEST_PROCESS_NUMBER;base_command"
+      "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
 

metadata

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