luffa 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 788f5398ad79dc3be466b7bfacebfebc7ed41845
-  data.tar.gz: f01d3aa2b4ab91cf745021cebf9bc2349262b2e7
+  metadata.gz: 68615d981766a9547734862737395a68ac6d7c49
+  data.tar.gz: b1f9eb0a801122f3a2f164b24b88018258519bc3
 SHA512:
-  metadata.gz: f11db976ea3fab737dd67457db0290a1673c85fc561e9d46bbae27331d542e3e3ee7f9744e53fde34c64f1a136c39f2a223fa963c16f79c9dc3a7d6f1175fb9e
-  data.tar.gz: b45ed6f7363b9a1d95e789e0508293160da1733bbc846d0f5972d4dbeaca3672beac1f840d1f8584d2c95eca0037b7604f912f24cc8e82a7ef9fdc3e035d921a
+  metadata.gz: 98fd49d02bd2e5f44f05aff150cb614f894cfcc82972c25c768b3d275ee7ac96c47a14027433f3c1867854144e6a6030be4dbc05e1049a4ad7f3a0f35d47c0bb
+  data.tar.gz: 392b369b42d408bbabee85cfa6adf5988131c8b69735f2249a7ac2e9e96e98569458ba1d06f20af13b4a02e58c99208f31b119f9380499d1da32c0541a0e0e59

data/lib/luffa/ios/ideviceinstaller.rb

@@ -12,23 +12,23 @@ module Luffa
       @bundle_id = bundle_id
     end
 
-    def ideviceinstaller_available?
+    def self.ideviceinstaller_available?
       path = bin_path
       path and File.exist? bin_path
     end
 
-    def idevice_id_available?
+    def self.idevice_id_available?
       path = idevice_id_bin_path
       path and File.exist? path
     end
 
     def install(udid, options={})
-      unless options.is_a? Hash
+      if options.is_a? Hash
+        merged_options = DEFAULT_OPTIONS.merge(options)
+      else
         Luffa.log_warn 'API CHANGE: install now takes an options hash as 2nd arg'
         Luffa.log_warn "API CHANGE: ignoring '#{options}'; will use defaults"
         merged_options = DEFAULT_OPTIONS
-      else
-        merged_options = DEFAULT_OPTIONS.merge(options)
       end
 
       uninstall(udid, merged_options)
@@ -36,7 +36,7 @@ module Luffa
     end
 
     # Can only be called when RunLoop is available.
-    def physical_devices_for_testing(xcode_tools)
+    def self.physical_devices_for_testing(xcode_tools)
       # 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,17 +44,15 @@ module Luffa
       #
       # Also idevice_id, which ideviceinstaller relies on, will sometimes report
       # devices 2x which will cause ideviceinstaller to fail.
-      @physical_devices_for_testing ||= lambda {
-        devices = xcode_tools.instruments(:devices)
-        if idevice_id_available?
-          white_list = `#{idevice_id_bin_path} -l`.strip.split("\n")
-          devices.select do | device |
-            white_list.include?(device.udid) && white_list.count(device.udid) == 1
-          end
-        else
-          devices
+      devices = xcode_tools.instruments(:devices)
+      if self.idevice_id_available?
+        white_list = `#{idevice_id_bin_path} -l`.strip.split("\n")
+        devices.select do | device |
+          white_list.include?(device.udid) && white_list.count(device.udid) == 1
         end
-      }.call
+      else
+        devices
+      end
     end
 
     private

data/lib/luffa/version.rb

@@ -1,5 +1,5 @@
 module Luffa
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 
   # 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.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Jonas Maturana Larsen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print