luffa 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d9621bd408e38894694a62ef51be69b8ea6a1e
-  data.tar.gz: e133693a756dc9f489b7b8178a8d3d27c97afa75
+  metadata.gz: 1c5d68c05ecf69ea3ca0cf6dd4150ad74e797db7
+  data.tar.gz: 5376fe89a90277fed46b63c5954fb3e9d878413d
 SHA512:
-  metadata.gz: 25e713220ee99cbf68382d53e511d1183a6a0d0c3dc077e94208b137467260c67c756199ac1cd50e98c9f78ae1a0ab40d4d212a28396d57c1ae99e417dad6688
-  data.tar.gz: 5eb34d2d9c71f63f666ee4dcac9fc215a26c26578b5c299d07d810a5560674976fc6b6410222dac180615f1813d090477b8789c80c7f8a346def6969a35b4628
+  metadata.gz: a1c3df3d0e6a2a7ab03745e05a76dbb0435d0da4f9e7ec964698c219683571ce95445929436a52a1d01aa5527bf1e873ff5a069ef1c4d678c973a38dd558e15d
+  data.tar.gz: fd95cd4549c405b910ec4e7e3dbcecf10e10fe202b540f6163c5fe504ce4a54c930d1c56d7b1662cd111a1e391e0eb5f818ee03f618dd7967fbfd33c63b4eaea

data/lib/luffa/ios/ideviceinstaller.rb

@@ -36,7 +36,7 @@ module Luffa
     end
 
     # Can only be called when RunLoop is available.
-    def self.physical_devices_for_testing(xcode_tools)
+    def self.physical_devices_for_testing(instruments)
       # Xcode 6 + iOS 8 - devices on the same network, whether development or
       # not, appear when calling $ xcrun instruments -s devices. For the
       # purposes of testing, we will only try to connect to devices that are
@@ -44,7 +44,7 @@ module Luffa
       #
       # Also idevice_id, which ideviceinstaller relies on, will sometimes report
       # devices 2x which will cause ideviceinstaller to fail.
-      devices = xcode_tools.instruments(:devices)
+      devices = instruments.physical_devices
       if IDeviceInstaller.idevice_id_available?
         white_list = `#{self.idevice_id_bin_path} -l`.strip.split("\n")
         devices.select do | device |
@@ -81,9 +81,9 @@ module Luffa
       on_retry = Proc.new do |_, try, elapsed_time, next_interval|
         # Retriable 2.0
         if elapsed_time && next_interval
-          Luffa.log_info "LLDB: attempt #{try} failed in '#{elapsed_time}'; will retry in '#{next_interval}'"
+          Luffa.log_info "ideviceinstaller: attempt #{try} failed in '#{elapsed_time}'; will retry in '#{next_interval}'"
         else
-          Luffa.log_info "LLDB: attempt #{try} failed; will retry"
+          Luffa.log_info "ideviceinstaller: attempt #{try} failed; will retry"
         end
       end
 

data/lib/luffa/unix_command.rb

@@ -5,7 +5,8 @@ module Luffa
                     :exit_on_nonzero_status => true,
                     :env_vars => {},
                     :log_cmd => true,
-                    :obscure_fields => []}
+                    :obscure_fields => [],
+                    :split_cmd => false}
     merged_opts = default_opts.merge(opts)
 
     obscure_fields = merged_opts[:obscure_fields]
@@ -29,8 +30,22 @@ module Luffa
     end
 
     env_vars = merged_opts[:env_vars]
-    res = system(env_vars, cmd)
+
+    if merged_opts[:split_cmd]
+      ['|', '>', '&'].each do |character|
+        if cmd.include?(character)
+          raise "Cannot split command '#{cmd}' because it contains character '#{character}'"
+        end
+      end
+
+      tokens = cmd.split(' ')
+      res = system(env_vars, tokens.shift, *tokens)
+    else
+      res = system(env_vars, cmd)
+    end
+
     exit_code = $?.exitstatus
+
     if res
       Luffa.log_pass merged_opts[:pass_msg]
     else
@@ -41,3 +56,4 @@ module Luffa
     exit_code
   end
 end
+

data/lib/luffa/version.rb

@@ -1,5 +1,5 @@
 module Luffa
-  VERSION = '1.0.7'
+  VERSION = '1.1.0'
 
   # A model of a software release version that can be used to compare two versions.
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luffa
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Jonas Maturana Larsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A gem for testing the Calabash Toolchain