parallel_calabash 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd0310f0eceb97f606c062f75d86fe31a34e2ef8
-  data.tar.gz: d2d5e1269d34ebb3888dc97da4ec38d3b6c9b107
+  metadata.gz: e879ca3647451388fb5429149327e3a78b2ea8b3
+  data.tar.gz: 84378d216b1ad7eac7bca413e54b0230612005a2
 SHA512:
-  metadata.gz: 5f597394492d9a43b51271e7137711a18f067af855fa2577c9c99002e362d943e870909e8f83dd244410467c52b05236dd459b119e530bc7a96501dd322ccf78
-  data.tar.gz: a303594e563948734facfbccbe86a423706d8e38516124ab5c3ce273db8bef29d39de2ec835b4859cd403f4c80e0bc7f778c3167a322b5c88b9bbf40d8c53e4a
+  metadata.gz: cbbe67b571e6eab5bee71e7efb4227ca090667d9b345199df947a7547de8a8cc96f9a23fe93ea3ec299e10ce2e4813ec05c4093099a4ae00c952c00e91ecdb83
+  data.tar.gz: 5a35b7b92c7efcdb0a620f0263b60feffec4f13083f00f47f22654e74b3bbc4c7a1b09616d3b5019b4c69e9a69e6ab2126bdd16575c0293c06fba6ff6a9eb980

data/README.md

@@ -7,8 +7,8 @@ https://www.youtube.com/watch?v=sK3s0txeJvc
 
 Run calabash-android or calabash-ios tests in parallel on multiple connected devices. This is inspired by parallel_tests  https://rubygems.org/gems/parallel_tests
 
-eg. bundle exec parallel_calabash --apk my.apk -o'--format pretty' features/ --serialize-stdout
-eg. bundle exec parallel_calabash --app my.app -o'--format pretty' features/ --serialize-stdout
+eg. Android: bundle exec parallel_calabash --apk my.apk -o'--format pretty' features/ --serialize-stdout  
+eg. iOS: bundle exec parallel_calabash --app my.app -o'--format pretty' features/ --serialize-stdout
 
 ## Installation
 

data/lib/parallel_calabash/adb_helper.rb

@@ -18,19 +18,27 @@ module ParallelCalabash
       @filter = filter
     end
 
+    def adb_devices_l
+      `adb devices -l`
+    end
+
     def connected_devices_with_model_info
       begin
         list =
-            `adb devices -l`.split("\n").collect do |line|
+            adb_devices_l.split("\n").collect do |line|
               device = device_id_and_model(line)
               filter_device(device)
             end
-        list.compact
+        list.compact.each { |device_data| device_data << screenshot_prefix(device_data.first) }
       rescue
         []
       end
     end
 
+    def screenshot_prefix device_id
+      device_id.gsub('.', '_').gsub(/:(.*)/, '').to_s + '_'
+    end
+
     def device_id_and_model line
       if line.match(/device(?!s)/)
         [line.split(" ").first, line.scan(/model:(.*) device/).flatten.first]

data/lib/parallel_calabash/runner.rb

@@ -60,13 +60,13 @@ module ParallelCalabash
 
     def command_for_test(process_number, base_command, apk_path, cucumber_options, test_files)
       cmd = [base_command, apk_path, cucumber_options, *test_files].compact*' '
-      device_id, device_info = @device_helper.device_for_process process_number
+      device_id, device_info, screenshot_prefix = @device_helper.device_for_process process_number
       env = {
           AUTOTEST: '1',
           ADB_DEVICE_ARG: device_id,
           DEVICE_INFO: device_info,
           TEST_PROCESS_NUMBER: (process_number+1).to_s,
-          SCREENSHOT_PATH: device_id.to_s + '_'
+          SCREENSHOT_PATH: screenshot_prefix
       }
       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.2.3"
+  VERSION = "0.2.4"
 end

data/parallel_calabash.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Rajdeep"]
   spec.email         = ["mail.rajvarma@gmail.com"]
   spec.summary       = %q{calabash android tests in parallel}
-  spec.description   = %q{Run different calabash android tests in parallel on different devices}
+  spec.description   = %q{Run different calabash android and iOS tests in parallel on different devices and simulators}
   spec.homepage      = "https://github.com/rajdeepv/parallel_calabash"
   spec.license       = "MIT"
 

data/spec/lib/parallel_calabash/adb_helper_spec.rb

@@ -50,6 +50,18 @@ describe ParallelCalabash::AdbHelper do
     end
   end
 
+  describe :connected_devices_with_model_info do
+
+    it 'should return device_id, device_name and screenshot_prefix details' do
+      adb_helper = ParallelCalabash::AdbHelper.new([])
+      def adb_helper.adb_devices_l
+        "List of devices attached \n192.168.57.101:5555    device product:vbox86p model:device2 device:vbox86p\n192.168.57.102:5555    device product:vbox86p model:device3 device:vbox86p\n\n"
+      end
+      expect(adb_helper.connected_devices_with_model_info).to eq [["192.168.57.101:5555", "device2", "192_168_57_101_"], ["192.168.57.102:5555", "device3", "192_168_57_102_"]]
+    end
+
+  end
+
 end
 
 describe ParallelCalabash::IosHelper do

data/spec/lib/parallel_calabash/runner_spec.rb

@@ -6,7 +6,7 @@ describe ParallelCalabash::Runner do
   describe :command_for_process do
     it 'should return command with env variables' do
       adb_helper = MiniTest::Mock.new
-      adb_helper.expect(:device_for_process, ["4d00fa3cb814c03f", "GT_N7100"], [0])
+      adb_helper.expect(:device_for_process, ["4d00fa3cb814c03f", "GT_N7100", "4d00fa3cb814c03f_"], [0])
       expect(ParallelCalabash::AndroidRunner.new(adb_helper, true)
                  .command_for_test(0, 'base_command', 'some.apk', '-some -options', %w(file1 file2)))
           .to eq 'AUTOTEST=1;export AUTOTEST;ADB_DEVICE_ARG=4d00fa3cb814c03f;export ADB_DEVICE_ARG;'\

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_calabash
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Rajdeep
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Run different calabash android tests in parallel on different devices
+description: Run different calabash android and iOS tests in parallel on different
+  devices and simulators
 email:
 - mail.rajvarma@gmail.com
 executables: