simctl 1.6.2 → 1.6.3

data/lib/simctl/command/warmup.rb

@@ -7,13 +7,13 @@ module SimCtl
       # @param runtime [String] runtime string
       # @param timeout [Integer] timeout in seconds to wait until device is ready
       # @return [SimCtl::Device]
-      def warmup(devicetype, runtime, timeout=120)
+      def warmup(devicetype, runtime, timeout = 120)
         devicetype = devicetype(name: devicetype) unless devicetype.is_a?(DeviceType)
         runtime = runtime(name: runtime) unless runtime.is_a?(Runtime)
         device = device(devicetype: devicetype, runtime: runtime)
-        raise DeviceNotFound.new("Could not find device with type '#{devicetype.name}' and runtime '#{runtime.name}'") if device.nil?
+        raise DeviceNotFound, "Could not find device with type '#{devicetype.name}' and runtime '#{runtime.name}'" if device.nil?
         device.launch
-        device.wait(timeout) {|d| d.state == :booted && d.ready?}
+        device.wait(timeout) { |d| d.state == :booted && d.ready? }
         device
       end
     end

data/lib/simctl/device.rb

@@ -71,7 +71,7 @@ module SimCtl
     # Launches the Simulator
     #
     # @return [void]
-    def launch(scale=1.0, opts={})
+    def launch(scale = 1.0, opts = {})
       SimCtl.launch_device(self, scale, opts)
     end
 
@@ -88,7 +88,7 @@ module SimCtl
     # @param identifier [String] the app identifier
     # @param args [Array] optional launch arguments
     # @return [void]
-    def launch_app(identifier, args=[], opts={})
+    def launch_app(identifier, args = [], opts = {})
       SimCtl.launch_app(self, identifier, args, opts)
     end
 
@@ -97,7 +97,7 @@ module SimCtl
     # @param identifier [String] the app identifier
     # @param args [Array] optional terminate arguments
     # @return [void]
-    def terminate_app(identifier, args=[])
+    def terminate_app(identifier, args = [])
       SimCtl.terminate_app(self, identifier, args)
     end
 
@@ -121,7 +121,7 @@ module SimCtl
     #
     # @return [Bool]
     def ready?
-      running_services = launchctl.list.reject {|service| service.pid.to_i == 0 }.map {|service| service.name}
+      running_services = launchctl.list.reject { |service| service.pid.to_i == 0 }.map(&:name)
       (required_services_for_ready - running_services).empty?
     end
 
@@ -164,7 +164,7 @@ module SimCtl
     # * type: Can be png, tiff, bmp, gif, jpeg (default is png)
     # * display: Can be main or tv for iOS, tv for tvOS and main for watchOS
     # @return [void]
-    def screenshot(file, opts={})
+    def screenshot(file, opts = {})
       SimCtl.screenshot(self, file, opts)
     end
 
@@ -187,7 +187,7 @@ module SimCtl
     # @param path [String] path to executable
     # @param args [Array] arguments for the executable
     # @return [void]
-    def spawn(path, args=[], opts={})
+    def spawn(path, args = [], opts = {})
       SimCtl.spawn(self, path, args, opts)
     end
 
@@ -201,8 +201,8 @@ module SimCtl
     # Reloads the device until the given block returns true
     #
     # @return [void]
-    def wait(timeout=SimCtl.default_timeout)
-      Timeout::timeout(timeout) do
+    def wait(timeout = SimCtl.default_timeout)
+      Timeout.timeout(timeout) do
         loop do
           break if yield SimCtl.device(udid: udid)
         end
@@ -212,7 +212,7 @@ module SimCtl
 
     def ==(other)
       return false if other.nil?
-      return false unless other.kind_of? Device
+      return false unless other.is_a? Device
       other.udid == udid
     end
 
@@ -239,12 +239,12 @@ module SimCtl
         if Xcode::Version.gte? '8.0'
           [
             'com.apple.mobileassetd',
-            'com.apple.nsurlsessiond',
+            'com.apple.nsurlsessiond'
           ]
         else
           [
             'com.apple.mobileassetd',
-            'com.apple.networkd',
+            'com.apple.networkd'
           ]
         end
       when :ios
@@ -253,20 +253,20 @@ module SimCtl
             'com.apple.backboardd',
             'com.apple.mobile.installd',
             'com.apple.CoreSimulator.bridge',
-            'com.apple.SpringBoard',
+            'com.apple.SpringBoard'
           ]
         elsif Xcode::Version.gte? '8.0'
           [
             'com.apple.SimulatorBridge',
             'com.apple.SpringBoard',
             'com.apple.backboardd',
-            'com.apple.mobile.installd',
+            'com.apple.mobile.installd'
           ]
         else
           [
             'com.apple.SimulatorBridge',
             'com.apple.SpringBoard',
-            'com.apple.mobile.installd',
+            'com.apple.mobile.installd'
           ]
         end
       else

data/lib/simctl/device_launchctl.rb

@@ -7,13 +7,13 @@ module SimCtl
     end
 
     def list
-      fields = [:pid, :status, :name]
+      fields = %i[pid status name]
       device
         .spawn(device.path.launchctl, ['list'])
         .split("\n")
         .drop(1)
-        .map {|item| Hash[fields.zip(item.split("\t"))] }
-        .map {|item| OpenStruct.new(item) }
+        .map { |item| Hash[fields.zip(item.split("\t"))] }
+        .map { |item| OpenStruct.new(item) }
     end
 
     private

data/lib/simctl/device_path.rb

@@ -1,3 +1,5 @@
+require 'cfpropertylist'
+
 module SimCtl
   class DevicePath
     def initialize(device)
@@ -17,11 +19,7 @@ module SimCtl
     end
 
     def launchctl
-      @launchctl ||= if Xcode::Version.gte? '9.0'
-                       "#{Xcode::Path.home}//Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime/Contents/Resources/RuntimeRoot/bin/launchctl"
-                     else
-                        File.join(runtime_root, 'bin/launchctl')
-                     end
+      @launchctl ||= File.join(runtime_root, 'bin/launchctl')
     end
 
     def preferences_plist
@@ -38,9 +36,22 @@ module SimCtl
     end
 
     def locate_runtime_root
-      "/Library/Developer/CoreSimulator/Profiles/Runtimes/#{device.runtime.name}.simruntime/Contents/Resources/RuntimeRoot".tap do |path|
-        return path if File.exists?(path)
+      runtime_identifier = device.runtime.identifier
+
+      [
+        Xcode::Path.runtime_profiles,
+        '/Library/Developer/CoreSimulator/Profiles/Runtimes/'
+      ].each do |parent_dir|
+        Dir.glob(File.join(File.expand_path(parent_dir), '*')).each do |dir|
+          plist_path = File.join(dir, 'Contents/Info.plist')
+          next unless File.exist?(plist_path)
+          info = CFPropertyList.native_types(CFPropertyList::List.new(file: plist_path).value)
+          next unless info.is_a?(Hash) && (info['CFBundleIdentifier'] == runtime_identifier)
+          root_path = File.join(dir, 'Contents/Resources/RuntimeRoot')
+          return root_path if File.exist?(root_path)
+        end
       end
+
       Xcode::Path.sdk_root
     end
 

data/lib/simctl/device_settings.rb

@@ -13,7 +13,7 @@ module SimCtl
     # @return [void]
     def disable_keyboard_helpers
       edit_plist(path.preferences_plist) do |plist|
-        %w(
+        %w[
           KeyboardAllowPaddle
           KeyboardAssistant
           KeyboardAutocapitalization
@@ -23,7 +23,7 @@ module SimCtl
           KeyboardPeriodShortcut
           KeyboardPrediction
           KeyboardShowPredictionBar
-        ).each do |key|
+        ].each do |key|
           plist[key] = false
         end
       end
@@ -39,8 +39,8 @@ module SimCtl
       end
     end
 
-    def edit_plist(path, &block)
-      plist = File.exists?(path) ? CFPropertyList::List.new(file: path) : CFPropertyList::List.new
+    def edit_plist(path)
+      plist = File.exist?(path) ? CFPropertyList::List.new(file: path) : CFPropertyList::List.new
       content = CFPropertyList.native_types(plist.value) || {}
       yield content
       plist.value = CFPropertyList.guess(content)
@@ -53,7 +53,7 @@ module SimCtl
     def set_language(language)
       edit_plist(path.global_preferences_plist) do |plist|
         key = 'AppleLanguages'
-        plist[key] = [] unless plist.has_key?(key)
+        plist[key] = [] unless plist.key?(key)
         plist[key].unshift(language).uniq!
       end
     end

data/lib/simctl/device_type.rb

@@ -6,7 +6,7 @@ module SimCtl
 
     def ==(other)
       return false if other.nil?
-      return false unless other.kind_of? DeviceType
+      return false unless other.is_a? DeviceType
       other.identifier == identifier
     end
   end

data/lib/simctl/executor.rb

@@ -7,11 +7,11 @@ module SimCtl
       def execute(command)
         command = command.flatten.join(' ')
         $stderr.puts command if ENV['SIMCTL_DEBUG']
-        Open3.popen3(command) do |stdin, stdout, stderr, result|
+        Open3.popen3(command) do |_stdin, stdout, stderr, result|
           output = stdout.read
           if result.value.to_i > 0
             output = stderr.read if output.empty?
-            raise RuntimeError.new(output)
+            raise output
           end
           return unless block_given?
           if looks_like_json?(output)
@@ -25,7 +25,7 @@ module SimCtl
       private
 
       def looks_like_json?(output)
-        output.start_with?('[') || output.start_with?('{')
+        output.start_with?('[', '{')
       end
     end
   end

data/lib/simctl/list.rb

@@ -12,12 +12,12 @@ module SimCtl
       select do |item|
         matches = true
         filter.each do |key, value|
-          case value
-          when Regexp
-            matches &= item.send(key) =~ value
-          else
-            matches &= item.send(key) == value
-          end
+          matches &= case value
+                     when Regexp
+                       item.send(key) =~ value
+                     else
+                       item.send(key) == value
+                     end
         end
         matches
       end

data/lib/simctl/object.rb

@@ -1,7 +1,7 @@
 module SimCtl
   class Object
     def initialize(args)
-      args.each do |k,v|
+      args.each do |k, v|
         instance_variable_set("@#{k}", v) unless v.nil?
       end
     end

data/lib/simctl/runtime.rb

@@ -11,7 +11,7 @@ module SimCtl
 
     def ==(other)
       return false if other.nil?
-      return false unless other.kind_of? Runtime
+      return false unless other.is_a? Runtime
       other.identifier == identifier
     end
 
@@ -20,7 +20,7 @@ module SimCtl
     # @param name [String] type (ios, watchos, tvos)
     # @return [SimCtl::Runtime] the latest available runtime
     def self.latest(type)
-      Naturally.sort_by(SimCtl.list_runtimes.where(name: %r|#{type}|i), :version).last
+      Naturally.sort_by(SimCtl.list_runtimes.where(name: /#{type}/i), :version).last
     end
   end
 end

data/lib/simctl/version.rb

@@ -1,3 +1,3 @@
 module SimCtl
-  VERSION = '1.6.2'
+  VERSION = '1.6.3'.freeze
 end

data/lib/simctl/xcode/path.rb

@@ -1,15 +1,21 @@
 module SimCtl
   module Xcode
     class Path
-      HOME=`xcode-select -p`.chomp
-
       class << self
         def home
-          HOME
+          @home ||= `xcode-select -p`.chomp
         end
 
         def sdk_root
-          File.join(HOME, 'Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk')
+          File.join(home, 'Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk')
+        end
+
+        def runtime_profiles
+          if Xcode::Version.gte? '9.0'
+            File.join(home, 'Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/')
+          else
+            File.join(home, 'Platforms/iPhoneSimulator.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/')
+          end
         end
       end
     end

data/lib/simctl/xcode/version.rb

@@ -1,11 +1,11 @@
 module SimCtl
   module Xcode
     class Version
-      VERSION = Gem::Version.new(`xcodebuild -version`.scan(/Xcode (\S+)/).flatten.first)
-
       class << self
         def gte?(version)
-          VERSION >= Gem::Version.new(version)
+          @version ||= Gem::Version.new(`xcodebuild -version`.scan(/Xcode (\S+)/).flatten.first)
+
+          @version >= Gem::Version.new(version)
         end
       end
     end

data/simctl.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 $LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 require 'simctl/version'
 
@@ -9,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'Ruby interface to xcrun simctl'
 
   s.authors = ['Johannes Plunien']
-  s.email = %w(plu@pqpq.de)
+  s.email = %w[plu@pqpq.de]
   s.homepage = 'https://github.com/plu/simctl'
   s.licenses = ['MIT']
 
@@ -21,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'coveralls'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rubocop'
 
   s.add_dependency 'CFPropertyList'
   s.add_dependency 'naturally'

data/spec/simctl/device_interaction_spec.rb

@@ -4,15 +4,15 @@ require 'spec_helper'
 RSpec.describe SimCtl, order: :defined do
   before(:all) do
     @name = SecureRandom.hex
-    @devicetype = SimCtl.devicetype(name: 'iPhone 5')
+    @devicetype = SimCtl.devicetype(name: 'iPhone 6')
     @runtime = SimCtl::Runtime.latest(:ios)
     @device = SimCtl.create_device @name, @devicetype, @runtime
-    @device.wait {|d| d.state == :shutdown}
+    @device.wait { |d| d.state == :shutdown }
   end
 
   after(:all) do
     with_rescue { @device.kill }
-    with_rescue { @device.wait {|d| d.state == :shutdown} }
+    with_rescue { @device.wait { |d| d.state == :shutdown } }
     with_rescue { @device.delete }
   end
 
@@ -77,7 +77,7 @@ RSpec.describe SimCtl, order: :defined do
   describe 'device settings' do
     describe 'update hardware keyboard' do
       it 'creates the preferences plist' do
-        File.delete(@device.path.preferences_plist) if File.exists?(@device.path.preferences_plist)
+        File.delete(@device.path.preferences_plist) if File.exist?(@device.path.preferences_plist)
         @device.settings.update_hardware_keyboard(false)
         expect(File).to exist(@device.path.preferences_plist)
       end
@@ -85,7 +85,7 @@ RSpec.describe SimCtl, order: :defined do
 
     describe 'disable keyboard helpers' do
       it 'creates the preferences plist' do
-        File.delete(@device.path.preferences_plist) if File.exists?(@device.path.preferences_plist)
+        File.delete(@device.path.preferences_plist) if File.exist?(@device.path.preferences_plist)
         @device.settings.disable_keyboard_helpers
         expect(File).to exist(@device.path.preferences_plist)
       end
@@ -139,12 +139,12 @@ RSpec.describe SimCtl, order: :defined do
   describe 'launching the device' do
     it 'launches the device' do
       @device.launch
-      @device.wait {|d| d.state == :booted}
+      @device.wait { |d| d.state == :booted }
       expect(@device.state).to be == :booted
     end
 
     it 'is ready' do
-      @device.wait {|d| d.ready?}
+      @device.wait(&:ready?)
       expect(@device).to be_ready
     end
   end
@@ -223,7 +223,7 @@ RSpec.describe SimCtl, order: :defined do
 
     it 'kills the device' do
       @device.kill
-      @device.wait {|d| d.state == :shutdown}
+      @device.wait { |d| d.state == :shutdown }
     end
 
     it 'state is shutdown' do
@@ -238,7 +238,7 @@ RSpec.describe SimCtl, order: :defined do
 
     it 'boots the device' do
       @device.boot
-      @device.wait {|d| d.state == :booted}
+      @device.wait { |d| d.state == :booted }
       expect(@device.state).to be == :booted
     end
 
@@ -247,7 +247,7 @@ RSpec.describe SimCtl, order: :defined do
     end
 
     it 'is ready' do
-      @device.wait {|d| d.ready?}
+      @device.wait(&:ready?)
       expect(@device).to be_ready
     end
   end
@@ -259,7 +259,7 @@ RSpec.describe SimCtl, order: :defined do
 
     it 'shuts down the device' do
       @device.shutdown
-      @device.wait {|d| d.state == :shutdown}
+      @device.wait { |d| d.state == :shutdown }
     end
 
     it 'state is shutdown' do