fastlane_core 0.41.3 → 0.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3501dde8a99eaa2d37c5f5052a5835ff93a09384
-  data.tar.gz: 9802e017e03259a343f54976ff928b936bdb482c
+  metadata.gz: 8756fcc16ab3e05e3429c167bfeec9f527ac2b7f
+  data.tar.gz: 363bab72d387aaf4555fdc69a518df68e0507e94
 SHA512:
-  metadata.gz: 3da7e12d5a745ad709035348a8b2dd1d5b9d1b8e2b1bb76634283f891bd1f12a042a28ec0d75aaa6ec8126eca4e4a565b93a370fb2ee01bf9d98c72f46c42159
-  data.tar.gz: b7b51581a819640271b43f15599ebb7121c7b10de4d1f8ffd13b8bffb2f5e2207d5eb7adaa365a2a69be72dc9d1497e60c523b41fbcaa287e37e3aa956b07412
+  metadata.gz: 7a0179679220b305704d16ad21169c4a7a974f078dc300b86e33fb1ea789caf66945116afb96603f19cefce864f484a4213195d8587228f1df1f8cd740a7afd2
+  data.tar.gz: 071d8d281c09e36ff9ba9135189485589b50357bae94125270d12a342c3106114ea53007b8c02a5314dec7e12e81fcdceba784ed50c9f0c56fce1968a0d7ad88

data/lib/fastlane_core.rb

@@ -16,7 +16,7 @@ require 'fastlane_core/command_executor'
 require 'fastlane_core/ipa_upload_package_builder'
 require 'fastlane_core/print_table'
 require 'fastlane_core/project'
-require 'fastlane_core/simulator'
+require 'fastlane_core/device_manager'
 require 'fastlane_core/crash_reporting/crash_reporting'
 require 'fastlane_core/ui/ui'
 

data/lib/fastlane_core/configuration/commander_generator.rb

@@ -14,7 +14,8 @@ module FastlaneCore
         next if option.description.to_s.empty? # "private" options
 
         short_switch = option.short_option
-        validate_short_switch(used_switches, short_switch)
+        key = option.key
+        validate_short_switch(used_switches, short_switch, key)
 
         type = option.data_type
 
@@ -55,7 +56,7 @@ module FastlaneCore
         # Passing a nil value to global_option has been shown to create problems with
         # option parsing!
         #
-        # See: https://github.com/fastlane/fastlane/tree/master/fastlane_core
+        # See: https://github.com/fastlane/fastlane_core/pull/89
         #
         # If we don't have a data type for this option, we tell it to act like a String.
         # This allows us to get a reasonable value for boolean options that can be
@@ -67,13 +68,13 @@ module FastlaneCore
       end
     end
 
-    def validate_short_switch(used_switches, short_switch)
+    def validate_short_switch(used_switches, short_switch, key)
       return if short_switch.nil?
 
-      UI.user_error!("Short option #{short_switch} already taken for key #{option.key}") if used_switches.include?(short_switch)
-      UI.user_error!("-v is already used for the version (key #{option.key})") if short_switch == "-v"
-      UI.user_error!("-h is already used for the help screen (key #{option.key})") if short_switch == "-h"
-      UI.user_error!("-t is already used for the trace screen (key #{option.key})") if short_switch == "-t"
+      UI.user_error!("Short option #{short_switch} already taken for key #{key}") if used_switches.include?(short_switch)
+      UI.user_error!("-v is already used for the version (key #{key})") if short_switch == "-v"
+      UI.user_error!("-h is already used for the help screen (key #{key})") if short_switch == "-h"
+      UI.user_error!("-t is already used for the trace screen (key #{key})") if short_switch == "-t"
 
       used_switches << short_switch
     end

data/lib/fastlane_core/configuration/config_item.rb

@@ -28,10 +28,6 @@ module FastlaneCore
         UI.user_error!("Do not let descriptions end with a '.', since it's used for user inputs as well") if description[-1] == '.'
       end
 
-      if type.to_s.length > 0 and short_option.to_s.length == 0
-        UI.user_error!("Type '#{type}' for key '#{key}' requires a short option")
-      end
-
       if conflicting_options
         conflicting_options.each do |conflicting_option_key|
           UI.user_error!("Conflicting option key must be a symbol") unless conflicting_option_key.kind_of? Symbol

data/lib/fastlane_core/{simulator.rb → device_manager.rb}

@@ -1,14 +1,15 @@
 require 'open3'
+require 'plist'
 
 module FastlaneCore
-  class Simulator
+  class DeviceManager
     class << self
-      def requested_os_type
-        'iOS'
+      def all(requested_os_type = "")
+        return connected_devices(requested_os_type) + simulators(requested_os_type)
       end
 
-      def all
-        UI.message("Fetching available devices") if $verbose
+      def simulators(requested_os_type = "")
+        UI.message("Fetching available simulator devices") if $verbose
 
         @devices = []
         os_type = 'unknown'
@@ -31,8 +32,8 @@ module FastlaneCore
             # iPad 2 (0EDE6AFC-3767-425A-9658-AAA30A60F212) (Shutdown)
             # iPad Air 2 (4F3B8059-03FD-4D72-99C0-6E9BBEE2A9CE) (Shutdown) (unavailable, device type profile not found)
             match = line.match(/\s+([^\(]+) \(([-0-9A-F]+)\) \(([^\(]+)\)(.*unavailable.*)?/)
-            if match && !match[4] && os_type == requested_os_type
-              @devices << Device.new(name: match[1], os_version: os_version, udid: match[2], state: match[3])
+            if match && !match[4] && (os_type == requested_os_type || requested_os_type == "")
+              @devices << Device.new(name: match[1], os_version: os_version, udid: match[2], state: match[3], is_simulator: true)
             end
           end
         end
@@ -40,20 +41,56 @@ module FastlaneCore
         return @devices
       end
 
-      def clear_cache
-        @devices = nil
-      end
+      def connected_devices(requested_os_type)
+        Helper.log.info "Fetching available connected devices" if $verbose
 
-      # Reset all simulators of this type
-      def reset_all
-        all.each(&:reset)
-      end
+        device_types = if requested_os_type == "tvOS"
+                         ["AppleTV"]
+                       elsif requested_os_type == "iOS"
+                         ["iPhone", "iPad", "iPod"]
+                       else
+                         []
+                       end
 
-      # Reset simulator by UDID or name and OS version
-      # Latter is useful when combined with -destination option of xcodebuild
-      def reset(udid: nil, name: nil, os_version: nil)
-        match = all.detect { |device| device.udid == udid || device.name == name && device.os_version == os_version }
-        match.reset if match
+        devices = [] # Return early if no supported devices are being searched for
+        if device_types.count == 0
+          return devices
+        end
+
+        usb_devices_output = ''
+        Open3.popen3("system_profiler SPUSBDataType -xml") do |stdin, stdout, stderr, wait_thr|
+          usb_devices_output = stdout.read
+        end
+
+        device_uuids = []
+        result = Plist.parse_xml(usb_devices_output)
+        result[0]['_items'].each do |host_controller| # loop just incase the host system has more then 1 controller
+          host_controller['_items'].each do |usb_device|
+            is_supported_device = device_types.any? { |device_type| usb_device['_name'] == device_type }
+            if is_supported_device && usb_device['serial_num'].length == 40
+              device_uuids.push(usb_device['serial_num'])
+            end
+          end
+        end
+
+        if device_uuids.count > 0 # instruments takes a little while to return so skip it if we have no devices
+          instruments_devices_output = ''
+          Open3.popen3("instruments -s devices") do |stdin, stdout, stderr, wait_thr|
+            instruments_devices_output = stdout.read
+          end
+
+          instruments_devices_output.split(/\n/).each do |instruments_device|
+            device_uuids.each do |device_uuid|
+              match = instruments_device.match(/(.+) \(([0-9.]+)\) \[([0-9a-f]+)\]?/)
+              if match && match[3] == device_uuid
+                devices << Device.new(name: match[1], udid: match[3], os_version: match[2], state: "Booted", is_simulator: false)
+                Helper.log.info "USB Device Found - \"" + match[1] + "\" (" + match[2] + ") UUID:" + match[3] if $verbose
+              end
+            end
+          end
+        end
+
+        return devices
       end
 
       # The code below works from Xcode 7 on
@@ -104,13 +141,15 @@ module FastlaneCore
       attr_accessor :os_version
       attr_accessor :ios_version # Preserved for backwards compatibility
       attr_accessor :state
+      attr_accessor :is_simulator
 
-      def initialize(name: nil, udid: nil, os_version: nil, state: nil)
+      def initialize(name: nil, udid: nil, os_version: nil, state: nil, is_simulator: nil)
         self.name = name
         self.udid = udid
         self.os_version = os_version
         self.ios_version = os_version
         self.state = state
+        self.is_simulator = is_simulator
       end
 
       def to_s
@@ -126,18 +165,42 @@ module FastlaneCore
     end
   end
 
+  class Simulator
+    class << self
+      def all
+        return DeviceManager.simulators('iOS')
+      end
+
+      # Reset all simulators of this type
+      def reset_all
+        all.each(&:reset)
+      end
+
+      # Reset simulator by UDID or name and OS version
+      # Latter is useful when combined with -destination option of xcodebuild
+      def reset(udid: nil, name: nil, os_version: nil)
+        match = all.detect { |device| device.udid == udid || device.name == name && device.os_version == os_version }
+        match.reset if match
+      end
+
+      def clear_cache
+        @devices = nil
+      end
+    end
+  end
+
   class SimulatorTV < Simulator
     class << self
-      def requested_os_type
-        'tvOS'
+      def all
+        return DeviceManager.simulators('tvOS')
       end
     end
   end
 
   class SimulatorWatch < Simulator
     class << self
-      def requested_os_type
-        'watchOS'
+      def all
+        return DeviceManager.simulators('watchOS')
       end
     end
   end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.41.3".freeze
+  VERSION = "0.42.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.41.3
+  version: 0.42.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -357,6 +357,7 @@ files:
 - lib/fastlane_core/configuration/configuration_file.rb
 - lib/fastlane_core/crash_reporting/clean_stack_trace.rb
 - lib/fastlane_core/crash_reporting/crash_reporting.rb
+- lib/fastlane_core/device_manager.rb
 - lib/fastlane_core/helper.rb
 - lib/fastlane_core/ipa_file_analyser.rb
 - lib/fastlane_core/ipa_upload_package_builder.rb
@@ -368,7 +369,6 @@ files:
 - lib/fastlane_core/print_table.rb
 - lib/fastlane_core/project.rb
 - lib/fastlane_core/provisioning_profile.rb
-- lib/fastlane_core/simulator.rb
 - lib/fastlane_core/string_filters.rb
 - lib/fastlane_core/ui/disable_colors.rb
 - lib/fastlane_core/ui/fastlane_runner.rb
@@ -399,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Contains all shared code/dependencies of the fastlane.tools