simctl 1.5.8 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23e929d60bc574b9e16e479b4754d40fa393cda0
-  data.tar.gz: 06d72f6aca738f535b9517bdaacb3606ab17548b
+  metadata.gz: befe14fafe0f39d0393b7780baa319a46c6bf13a
+  data.tar.gz: 88c089c6d7da469fbca2024f8892861181bb09a6
 SHA512:
-  metadata.gz: 37521cf964d7b1cc61c591beb0a77d2b0f0a54973d5a89ab10694aa9b7cb45329704d89064451ce22e36871bfb4296ca33c92b6894cb588c6cbf67fad43048d5
-  data.tar.gz: 83480c3189051338b6d75fd8601847111a4bf61b1e9d94d9421ab27e6e47d44aece6ea47ff8713a3c81a7ab8ef4a81d807bcc1f78a068c576c77a5a9bdbf24c3
+  metadata.gz: e077e932fa6bb00962c6533a3d3656ecfe7e5917266d86c3cb8800b24fb4e81cfcf6311969e66a3cc6906685285cb0e121d52fc605e05a1e287420ff4f25a013
+  data.tar.gz: d489f60b57eea0d3b3b106e607c5231e1f4cf527e4b4edbd65081df9da559adeacdf4c92b836394cf279ef5ce2f51a7b9cbb5f85a4d4fc5770ffbadfcf29d871

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.6.0
+
+* Breaking change: All `!` have been removed from method names
+* Support spawning processes
+* Add `device.ready?` method
+
 # 1.5.8
 
 * Support taking screenshots

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simctl (1.5.8)
+    simctl (1.6.0)
       CFPropertyList
       naturally
 

data/README.md

@@ -19,20 +19,20 @@ devicetype = SimCtl.devicetype(name: 'iPhone 5')
 device = SimCtl.create_device 'Unit Tests @ iPhone 5 9.3', devicetype, runtime
 
 # Launch a new Simulator.app instance
-device.launch!
+device.launch
 
 # Wait for the device to be booted
-device.wait! {|d| d.state == :booted}
+device.wait {|d| d.state == :booted}
 
 # Kill the Simulator.app instance again
-device.shutdown!
-device.kill!
+device.shutdown
+device.kill
 
 # Wait until it did shutdown
-device.wait! {|d| d.state == :shutdown}
+device.wait {|d| d.state == :shutdown}
 
 # Delete the device
-device.delete!
+device.delete
 ```
 
 ## License (MIT)

data/lib/simctl/command/create.rb

@@ -17,7 +17,7 @@ module SimCtl
         device = Executor.execute(command_for('create', Shellwords.shellescape(name), devicetype.identifier, runtime.identifier)) do |identifier|
           device(udid: identifier)
         end
-        device.wait! {|d| d.state == :shutdown && File.exists?(d.path.device_plist)}
+        device.wait {|d| d.state == :shutdown && File.exists?(d.path.device_plist)}
         device
       end
     end

data/lib/simctl/command/delete.rb

@@ -14,10 +14,10 @@ module SimCtl
       # @return [SimCtl::List] a list of all deleted SimCtl::Device objects
       def delete_all_devices
         list_devices.each do |device|
-          device.kill!
-          device.shutdown! if device.state != :shutdown
-          device.wait! {|d| d.state == :shutdown}
-          device.delete!
+          device.kill
+          device.shutdown if device.state != :shutdown
+          device.wait {|d| d.state == :shutdown}
+          device.delete
         end
       end
     end

data/lib/simctl/command/io.rb

@@ -12,7 +12,7 @@ module SimCtl
       # * display: Can be main or tv for iOS, tv for tvOS and main for watchOS
       # @return [void]
       def screenshot(device, file, opts={})
-        unless XcodeVersion.gte? '8.2'
+        unless Xcode::Version.gte? '8.2'
           raise UnsupportedCommandError.new('Needs at least Xcode 8.2')
         end
         optional_args = opts.map {|k,v| "--#{k}=#{Shellwords.shellescape(v)}"}

data/lib/simctl/command/launch.rb

@@ -3,9 +3,7 @@ require 'shellwords'
 module SimCtl
   class Command
     module Launch
-      LAUNCH_APP_COMMAND = 'xcrun simctl launch'
       SUPPORTED_SCALE = [1.0, 0.75, 0.5, 0.25]
-      XCODE_HOME = `xcode-select -p`.chomp
 
       # Launches a Simulator instance with the given device
       #
@@ -23,7 +21,7 @@ module SimCtl
         }
         args.merge!({ '-DeviceSetPath' => Shellwords.shellescape(SimCtl.device_set_path) }) unless SimCtl.device_set_path.nil?
         args = args.merge(opts).zip.flatten.join(' ')
-        command = "open -Fgn #{XCODE_HOME}/Applications/Simulator.app --args #{args}"
+        command = "open -Fgn #{Xcode::Path.home}/Applications/Simulator.app --args #{args}"
         system command
       end
 

data/lib/simctl/command/reset.rb

@@ -11,16 +11,16 @@ module SimCtl
       def reset_device(name, device_type, runtime)
         begin
           list_devices.where(name: name, os: runtime.name).each do |device|
-            device.kill!
-            device.shutdown! if device.state != :shutdown
-            device.wait! {|d| d.state == :shutdown}
-            device.delete!
+            device.kill
+            device.shutdown if device.state != :shutdown
+            device.wait {|d| d.state == :shutdown}
+            device.delete
           end
         rescue Exception => exception
           yield exception if block_given?
         end
         device = create_device name, device_type, runtime
-        device.wait! {|d| d.state == :shutdown}
+        device.wait {|d| d.state == :shutdown}
         device
       end
     end

data/lib/simctl/command/spawn.rb

@@ -0,0 +1,19 @@
+require 'shellwords'
+
+module SimCtl
+  class Command
+    module Spawn
+      # Spawn a process on a device
+      #
+      # @param device [SimCtl::Device] the device to spawn a process on
+      # @param path [String] path to executable
+      # @param args [Array] arguments for the executable
+      # @return [String] standard output the spawned process generated
+      def spawn(device, path, args=[], opts={})
+        Executor.execute(command_for('spawn', device.udid, Shellwords.shellescape(path), *args.map{|a| Shellwords.shellwords(a)})) do |output|
+          output
+        end
+      end
+    end
+  end
+end

data/lib/simctl/command.rb

@@ -11,6 +11,7 @@ require 'simctl/command/openurl'
 require 'simctl/command/rename'
 require 'simctl/command/reset'
 require 'simctl/command/shutdown'
+require 'simctl/command/spawn'
 require 'simctl/command/uninstall'
 require 'simctl/executor'
 require 'shellwords'
@@ -32,6 +33,7 @@ module SimCtl
     include SimCtl::Command::Rename
     include SimCtl::Command::Reset
     include SimCtl::Command::Shutdown
+    include SimCtl::Command::Spawn
     include SimCtl::Command::Uninstall
 
     def device_set_path=(device_set_path)

data/lib/simctl/device.rb

@@ -1,5 +1,6 @@
 require 'cfpropertylist'
 require 'ostruct'
+require 'simctl/device_launchctl'
 require 'simctl/device_path'
 require 'simctl/device_settings'
 require 'simctl/object'
@@ -9,17 +10,24 @@ module SimCtl
   class Device < Object
     attr_reader :availability, :name, :os, :state, :udid
 
+    # Returns true/false if the device is available
+    #
+    # @return [Bool]
+    def available?
+      availability !~ /unavailable/i
+    end
+
     # Boots the device
     #
     # @return [void]
-    def boot!
+    def boot
       SimCtl.boot_device(self)
     end
 
     # Deletes the device
     #
     # @return [void]
-    def delete!
+    def delete
       SimCtl.delete_device(self)
     end
 
@@ -33,7 +41,7 @@ module SimCtl
     # Erases the device
     #
     # @return [void]
-    def erase!
+    def erase
       SimCtl.erase_device(self)
     end
 
@@ -41,7 +49,7 @@ module SimCtl
     #
     # @param path Absolute path to the app that should be installed
     # @return [void]
-    def install!(path)
+    def install(path)
       SimCtl.install_app(self, path)
     end
 
@@ -49,31 +57,38 @@ module SimCtl
     #
     # @param app_id App identifier of the app that should be uninstalled
     # @return [void]
-    def uninstall!(app_id)
+    def uninstall(app_id)
       SimCtl.uninstall_app(self, app_id)
     end
 
     # Kills the device
     #
     # @return [void]
-    def kill!
+    def kill
       SimCtl.kill_device(self)
     end
 
     # Launches the Simulator
     #
     # @return [void]
-    def launch!(scale=1.0, opts={})
+    def launch(scale=1.0, opts={})
       SimCtl.launch_device(self, scale, opts)
     end
 
+    # Returns the launchctl object
+    #
+    # @ return [SimCtl::DeviceLaunchctl]
+    def launchctl
+      @launchctl ||= DeviceLaunchctl.new(self)
+    end
+
     # Launches an app in the given device
     #
     # @param opts [Hash] options hash - `{ wait_for_debugger: true/false }`
     # @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
 
@@ -81,18 +96,31 @@ module SimCtl
     #
     # @param url [String] The url to be opened on the device
     # @return [void]
-    def open_url!(url)
+    def open_url(url)
       SimCtl.open_url(self, url)
     end
 
     def path
-      @path ||= DevicePath.new(udid)
+      @path ||= DevicePath.new(self)
+    end
+
+		# Returns true/false if the device is ready
+    # Uses [SimCtl::DeviceLaunchctl] to look for certain services being running.
+    #
+    # Unfortunately the 'booted' state does not mean the Simulator is ready for
+    # installing or launching applications.
+		#
+    # @return [Bool]
+    def ready?
+      # TODO: Should look for different services depending on device type (iphone/ipad, tv, watch)
+      running_services = launchctl.list.reject {|service| service.pid.to_i == 0 }.map {|service| service.name}
+      (required_services_for_ready - running_services).empty?
     end
 
     # Reloads the device information
     #
     # @return [void]
-    def reload!
+    def reload
       device = SimCtl.device(udid: udid)
       device.instance_variables.each do |ivar|
         instance_variable_set(ivar, device.instance_variable_get(ivar))
@@ -102,7 +130,7 @@ module SimCtl
     # Renames the device
     #
     # @return [void]
-    def rename!(name)
+    def rename(name)
       SimCtl.rename_device(self, name)
       @name = name
     end
@@ -110,7 +138,7 @@ module SimCtl
     # Resets the device
     #
     # @return [void]
-    def reset!
+    def reset
       SimCtl.reset_device name, devicetype, runtime
     end
 
@@ -128,7 +156,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
 
@@ -142,10 +170,19 @@ module SimCtl
     # Shuts down the runtime
     #
     # @return [void]
-    def shutdown!
+    def shutdown
       SimCtl.shutdown_device(self)
     end
 
+    # Spawn a process on a device
+    #
+    # @param path [String] path to executable
+    # @param args [Array] arguments for the executable
+    # @return [void]
+    def spawn(path, args=[], opts={})
+      SimCtl.spawn(self, path, args, opts)
+    end
+
     # Returns the state of the device
     #
     # @return [sym]
@@ -156,13 +193,13 @@ module SimCtl
     # Reloads the device until the given block returns true
     #
     # @return [void]
-    def wait!(timeout=SimCtl.default_timeout)
+    def wait(timeout=SimCtl.default_timeout)
       Timeout::timeout(timeout) do
         loop do
           break if yield SimCtl.device(udid: udid)
         end
       end
-      reload!
+      reload
     end
 
     def ==(other)
@@ -171,11 +208,56 @@ module SimCtl
       other.udid == udid
     end
 
+    def method_missing(method_name, *args, &block)
+      if method_name[-1] == '!'
+        new_method_name = method_name.to_s.chop.to_sym
+        if respond_to?(new_method_name)
+          warn "[#{Kernel.caller.first}] `#{method_name}` is deprecated. Please use `#{new_method_name}` instead."
+          return send(new_method_name, &block)
+        end
+      end
+      super
+    end
+
     private
 
     def plist
       @plist ||= OpenStruct.new(CFPropertyList.native_types(CFPropertyList::List.new(file: path.device_plist).value))
     end
 
+    def required_services_for_ready
+      case runtime.type
+      when :tvos, :watchos
+        if Xcode::Version.gte? '8.0'
+          [
+            'com.apple.mobileassetd',
+            'com.apple.nsurlsessiond',
+          ]
+        else
+          [
+            'com.apple.mobileassetd',
+            'com.apple.networkd',
+          ]
+        end
+      when :ios
+        if Xcode::Version.gte? '8.0'
+          [
+            'com.apple.SimulatorBridge',
+            'com.apple.SpringBoard',
+            'com.apple.backboardd',
+            'com.apple.medialibraryd',
+            'com.apple.mobile.installd',
+          ]
+        else
+          [
+            'com.apple.SimulatorBridge',
+            'com.apple.SpringBoard',
+            'com.apple.mobile.installd',
+          ]
+        end
+      else
+        []
+      end
+    end
   end
 end

data/lib/simctl/device_launchctl.rb

@@ -0,0 +1,23 @@
+require 'ostruct'
+
+module SimCtl
+  class DeviceLaunchctl
+    def initialize(device)
+      @device = device
+    end
+
+    def list
+      fields = [: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) }
+    end
+
+    private
+
+    attr_reader :device
+  end
+end

data/lib/simctl/device_path.rb

@@ -1,19 +1,47 @@
 module SimCtl
   class DevicePath
-    attr_reader :device_plist, :global_preferences_plist, :home, :preferences_plist
+    def initialize(device)
+      @device = device
+    end
+
+    def device_plist
+      @device_plist ||= File.join(home, 'device.plist')
+    end
+
+    def global_preferences_plist
+      @global_preferences_plist ||= File.join(home, 'data/Library/Preferences/.GlobalPreferences.plist')
+    end
+
+    def home
+      @home ||= File.join(device_set_path, device.udid)
+    end
 
-    def initialize(udid)
-      @home = File.join(device_set_path, udid)
-      @device_plist = File.join(@home, 'device.plist')
-      @global_preferences_plist = File.join(@home, 'data/Library/Preferences/.GlobalPreferences.plist')
-      @preferences_plist = File.join(@home, 'data/Library/Preferences/com.apple.Preferences.plist')
+    def launchctl
+      @launchctl ||= File.join(runtime_root, 'bin/launchctl')
+    end
+
+    def preferences_plist
+      @preferences_plist ||= File.join(home, 'data/Library/Preferences/com.apple.Preferences.plist')
     end
 
     private
 
+    attr_reader :device
+
     def device_set_path
       return SimCtl.device_set_path unless SimCtl.device_set_path.nil?
       File.join(ENV['HOME'], 'Library/Developer/CoreSimulator/Devices')
     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)
+      end
+      Xcode::Path.sdk_root
+    end
+
+    def runtime_root
+      @runtime_root ||= locate_runtime_root
+    end
   end
 end

data/lib/simctl/device_settings.rb

@@ -11,7 +11,7 @@ module SimCtl
     # Disables the keyboard helpers
     #
     # @return [void]
-    def disable_keyboard_helpers!
+    def disable_keyboard_helpers
       edit_plist(path.preferences_plist) do |plist|
         %w(
           KeyboardAllowPaddle
@@ -33,7 +33,7 @@ module SimCtl
     #
     # @param enabled value to replace
     # @return [vod]
-    def update_hardware_keyboard!(enabled)
+    def update_hardware_keyboard(enabled)
       edit_plist(path.preferences_plist) do |plist|
         plist['AutomaticMinimizationEnabled'] = enabled
       end

data/lib/simctl/runtime.rb

@@ -3,7 +3,11 @@ require 'simctl/object'
 
 module SimCtl
   class Runtime < Object
-    attr_reader :availability, :buildversion, :identifier, :name, :version
+    attr_reader :availability, :buildversion, :identifier, :name, :type, :version
+
+    def type
+      @type ||= name.split("\s").first.downcase.to_sym
+    end
 
     def ==(other)
       return false if other.nil?

data/lib/simctl/version.rb

@@ -1,3 +1,3 @@
 module SimCtl
-  VERSION = '1.5.8'
+  VERSION = '1.6.0'
 end

data/lib/simctl/xcode/path.rb

@@ -0,0 +1,17 @@
+module SimCtl
+  module Xcode
+    class Path
+      HOME=`xcode-select -p`.chomp
+
+      class << self
+        def home
+          HOME
+        end
+
+        def sdk_root
+          File.join(HOME, 'Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk')
+        end
+      end
+    end
+  end
+end

data/lib/simctl/xcode/version.rb

@@ -0,0 +1,13 @@
+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)
+        end
+      end
+    end
+  end
+end

data/lib/simctl.rb

@@ -3,7 +3,8 @@ require 'simctl/device'
 require 'simctl/device_type'
 require 'simctl/list'
 require 'simctl/runtime'
-require 'simctl/xcode_version'
+require 'simctl/xcode/path'
+require 'simctl/xcode/version'
 
 module SimCtl
   class UnsupportedCommandError < StandardError; end

data/spec/simctl/device_interaction_spec.rb

@@ -7,13 +7,13 @@ RSpec.describe SimCtl, order: :defined do
     @devicetype = SimCtl.devicetype(name: 'iPhone 5')
     @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.delete! }
+    with_rescue { @device.kill }
+    with_rescue { @device.wait {|d| d.state == :shutdown} }
+    with_rescue { @device.delete }
   end
 
   describe 'creating a device' do
@@ -54,13 +54,31 @@ RSpec.describe SimCtl, order: :defined do
     it 'state is shutdown' do
       expect(@device.state).to be == :shutdown
     end
+
+    describe '#path' do
+      it 'has a device plist' do
+        expect(File).to exist(@device.path.device_plist)
+      end
+
+      it 'has a global preferences plist' do
+        expect(File).to exist(@device.path.global_preferences_plist)
+      end
+
+      it 'has a home' do
+        expect(File).to exist(@device.path.home)
+      end
+
+      it 'has a launchctl' do
+        expect(File).to exist(@device.path.launchctl)
+      end
+    end
   end
 
   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)
-        @device.settings.update_hardware_keyboard!(false)
+        @device.settings.update_hardware_keyboard(false)
         expect(File).to exist(@device.path.preferences_plist)
       end
     end
@@ -68,7 +86,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)
-        @device.settings.disable_keyboard_helpers!
+        @device.settings.disable_keyboard_helpers
         expect(File).to exist(@device.path.preferences_plist)
       end
     end
@@ -106,7 +124,7 @@ RSpec.describe SimCtl, order: :defined do
 
   describe 'renaming the device' do
     it 'renames the device' do
-      @device.rename!('new name')
+      @device.rename('new name')
       expect(@device.name).to be == 'new name'
       expect(SimCtl.device(udid: @device.udid).name).to be == 'new name'
     end
@@ -114,63 +132,75 @@ RSpec.describe SimCtl, order: :defined do
 
   describe 'erasing the device' do
     it 'erases the device' do
-      @device.erase!
+      @device.erase
     end
   end
 
   describe 'launching the device' do
     it 'launches the device' do
-      @device.launch!
-      @device.wait!{|d| d.state == :booted}
+      @device.launch
+      @device.wait {|d| d.state == :booted}
       expect(@device.state).to be == :booted
     end
+
+    it 'is ready' do
+      @device.wait {|d| d.ready?}
+      expect(@device).to be_ready
+    end
   end
 
   describe 'launching a system app' do
     it 'launches Safari' do
-      @device.launch_app!('com.apple.mobilesafari')
+      @device.launch_app('com.apple.mobilesafari')
     end
   end
 
   describe 'taking a screenshot' do
-    if SimCtl::XcodeVersion.gte? '8.2'
+    if SimCtl::Xcode::Version.gte? '8.2'
       it 'takes a screenshot' do
         file = File.join(Dir.mktmpdir, 'screenshot.png')
-        @device.screenshot!(file)
+        @device.screenshot(file)
         expect(File).to exist(file)
       end
     else
       it 'raises exception' do
-        expect { @device.screenshot!('/tmp/foo.png') }.to raise_error SimCtl::UnsupportedCommandError
+        expect { @device.screenshot('/tmp/foo.png') }.to raise_error SimCtl::UnsupportedCommandError
       end
     end
   end
 
+  describe 'spawning a process' do
+    it 'spawns launchctl list' do
+      output = @device.spawn(@device.path.launchctl, ['list'])
+      expect(output.length).to be > 0
+    end
+  end
+
   describe 'installing an app' do
     before(:all) do
       system 'cd spec/SampleApp && xcodebuild -sdk iphonesimulator >/dev/null 2>&1'
     end
 
     it 'installs SampleApp' do
-      @device.install!('spec/SampleApp/build/Release-iphonesimulator/SampleApp.app')
+      @device.install('spec/SampleApp/build/Release-iphonesimulator/SampleApp.app')
     end
   end
 
   describe 'launching an app' do
     it 'launches SampleApp' do
-      @device.launch_app!('com.github.plu.simctl.SampleApp')
+      @device.launch_app('com.github.plu.simctl.SampleApp')
     end
   end
 
   describe 'uninstall an app' do
     it 'uninstalls SampleApp' do
-      @device.uninstall!('com.github.plu.simctl.SampleApp')
+      @device.uninstall('com.github.plu.simctl.SampleApp')
     end
   end
 
   describe 'opening a url' do
     it 'opens some url' do
-      @device.open_url!('https://www.github.com')
+      @device.open_url('https://www.github.com')
     end
   end
 
@@ -180,8 +210,8 @@ RSpec.describe SimCtl, order: :defined do
     end
 
     it 'kills the device' do
-      @device.kill!
-      @device.wait!{|d| d.state == :shutdown}
+      @device.kill
+      @device.wait {|d| d.state == :shutdown}
     end
 
     it 'state is shutdown' do
@@ -195,14 +225,19 @@ RSpec.describe SimCtl, order: :defined do
     end
 
     it 'boots the device' do
-      @device.boot!
-      @device.wait! {|d| d.state == :booted}
+      @device.boot
+      @device.wait {|d| d.state == :booted}
       expect(@device.state).to be == :booted
     end
 
     it 'state is booted' do
       expect(@device.state).to be == :booted
     end
+
+    it 'is ready' do
+      @device.wait {|d| d.ready?}
+      expect(@device).to be_ready
+    end
   end
 
   describe 'shutting down the device' do
@@ -211,8 +246,8 @@ RSpec.describe SimCtl, order: :defined do
     end
 
     it 'shuts down the device' do
-      @device.shutdown!
-      @device.wait!{|d| d.state == :shutdown}
+      @device.shutdown
+      @device.wait {|d| d.state == :shutdown}
     end
 
     it 'state is shutdown' do
@@ -222,7 +257,7 @@ RSpec.describe SimCtl, order: :defined do
 
   describe 'resetting the device' do
     it 'deletes the old device and creates a new one' do
-      new_device = @device.reset!
+      new_device = @device.reset
       expect(new_device.name).to be == @device.name
       expect(new_device.devicetype).to be == @device.devicetype
       expect(new_device.runtime).to be == @device.runtime
@@ -235,7 +270,7 @@ RSpec.describe SimCtl, order: :defined do
   describe 'deleting the device' do
     it 'deletes the device' do
       device = SimCtl.create_device @name, @devicetype, @runtime
-      device.delete!
+      device.delete
       expect(SimCtl.device(udid: @device.udid)).to be_nil
     end
   end

data/spec/simctl/list_spec.rb

@@ -77,13 +77,13 @@ RSpec.describe SimCtl do
     end
 
     it 'finds the latest runtime' do
-      if SimCtl::XcodeVersion.gte?('8.2')
+      if SimCtl::Xcode::Version.gte?('8.2')
         expect(SimCtl::Runtime.latest(:ios).version).to be == '10.2'
-      elsif SimCtl::XcodeVersion.gte?('8.1')
+      elsif SimCtl::Xcode::Version.gte?('8.1')
         expect(SimCtl::Runtime.latest(:ios).version).to be == '10.1'
-      elsif SimCtl::XcodeVersion.gte?('8.0')
+      elsif SimCtl::Xcode::Version.gte?('8.0')
         expect(SimCtl::Runtime.latest(:ios).version).to be == '10.0'
-      elsif SimCtl::XcodeVersion.gte?('7.3')
+      elsif SimCtl::Xcode::Version.gte?('7.3')
         expect(SimCtl::Runtime.latest(:ios).version).to be == '9.3'
       end
     end

data/spec/simctl/readme_spec.rb

@@ -12,19 +12,19 @@ RSpec.describe SimCtl do
     device = SimCtl.create_device 'Unit Tests @ iPhone 5 9.3', devicetype, runtime
 
     # Launch a new Simulator.app instance
-    device.launch!
+    device.launch
 
     # Wait for the device to be booted
-    device.wait! {|d| d.state == :booted}
+    device.wait {|d| d.state == :booted}
 
     # Kill the Simulator.app instance again
-    device.shutdown!
-    device.kill!
+    device.shutdown
+    device.kill
 
     # Wait until it did shutdown
-    device.wait! {|d| d.state == :shutdown}
+    device.wait {|d| d.state == :shutdown}
 
     # Delete the device
-    device.delete!
+    device.delete
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,8 @@ require File.dirname(__FILE__) + '/../lib/simctl.rb'
 
 if ENV['TRAVIS']
   SimCtl.default_timeout = 300
+else
+  SimCtl.default_timeout = 60
 end
 
 unless ENV['CUSTOM_DEVICE_SET_PATH'] == 'false'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simctl
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.6.0
 platform: ruby
 authors:
 - Johannes Plunien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -111,8 +111,10 @@ files:
 - lib/simctl/command/rename.rb
 - lib/simctl/command/reset.rb
 - lib/simctl/command/shutdown.rb
+- lib/simctl/command/spawn.rb
 - lib/simctl/command/uninstall.rb
 - lib/simctl/device.rb
+- lib/simctl/device_launchctl.rb
 - lib/simctl/device_path.rb
 - lib/simctl/device_settings.rb
 - lib/simctl/device_type.rb
@@ -121,7 +123,8 @@ files:
 - lib/simctl/object.rb
 - lib/simctl/runtime.rb
 - lib/simctl/version.rb
-- lib/simctl/xcode_version.rb
+- lib/simctl/xcode/path.rb
+- lib/simctl/xcode/version.rb
 - simctl.gemspec
 - spec/SampleApp/.gitignore
 - spec/SampleApp/SampleApp.xcodeproj/project.pbxproj

data/lib/simctl/xcode_version.rb

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