simctl 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac630b987ba9c0f46f26ced5fd5ec0d6487394bd
-  data.tar.gz: 07d80b1f7451dcc2dc21aae2e255ace702c4768f
+  metadata.gz: 5dfe7554bf2998c41f884105ec70bc6a4dee155a
+  data.tar.gz: b96a52ae6049709614ded55bc6038afc9ed23ed5
 SHA512:
-  metadata.gz: d170e8e970ee62839dd7c082907cca67cd0c98f794bc2606cbeb22675fbaf412d5fa56bd5e787fc68e5e68ba5d1377c540d447dbd5c6c695bb538bf1912f186b
-  data.tar.gz: 79e93352a0b4aa486a5456c2896b32f5b894ce7dd1078daecc34eec184d095910b31386b9cb8fa747409d377448126ba83b4dca32b1f4e41a1a29744e6d99653
+  metadata.gz: 8864a6e8fc2d0d5106bd9c1baad25225a8f6ce3bd9141ab2226d0b809d2ba5648c155da99681d4de21fcfa01c851710d72118715534198125d861a635fa810cb
+  data.tar.gz: b4541558026993c78934f76ae571648a21f210c7537595070fb5bec80f3961e99d68095e37c7b66ff49e131868e5e5505d3e601e46759b49a08f60cb47bc12f4

data/.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 before_script:
   - export LANG=en_US.UTF-8
 install: bundle

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simctl (1.2.3)
+    simctl (1.3.0)
       CFPropertyList
 
 GEM

data/lib/simctl/command/create.rb

@@ -14,6 +14,8 @@ module SimCtl
       def create_device(name, devicetype, runtime)
         runtime = runtime(name: runtime) unless runtime.is_a?(Runtime)
         devicetype = devicetype(name: devicetype) unless devicetype.is_a?(DeviceType)
+        raise "Invalid runtime: #{runtime}" unless runtime.is_a?(Runtime)
+        raise "Invalid devicetype: #{devicetype}" unless devicetype.is_a?(DeviceType)
         Executor.execute([COMMAND, Shellwords.shellescape(name), devicetype.identifier, runtime.identifier]) do |identifier|
           device(udid: identifier)
         end

data/lib/simctl/command/delete.rb

@@ -10,6 +10,18 @@ module SimCtl
       def delete_device(device)
         Executor.execute([COMMAND, device.udid])
       end
+
+      # Delete all devices
+      #
+      # @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!
+        end
+      end
     end
   end
 end

data/lib/simctl/command/launch.rb

@@ -8,12 +8,17 @@ module SimCtl
       #
       # @param device [SimCtl::Device] the device to launch
       # @return [void]
-      def launch_device(device, scale=1.0)
+      def launch_device(device, scale=1.0, opts={})
         raise "unsupported scale '#{scale}' (supported: #{SUPPORTED_SCALE.join(', ')})" unless SUPPORTED_SCALE.include?(scale)
         # Launching the same device twice does not work.
         # Simulator.app would just hang. Solution: Kill first.
         kill_device(device)
-        command = "open -n #{XCODE_HOME}/Applications/Simulator.app --args -ConnectHardwareKeyboard 0 -CurrentDeviceUDID #{device.udid} -SimulatorWindowLastScale-#{device.devicetype.identifier} #{scale}"
+        args = {
+          '-ConnectHardwareKeyboard' => 1,
+          '-CurrentDeviceUDID' => device.udid,
+          "-SimulatorWindowLastScale-#{device.devicetype.identifier}" => scale,
+        }.merge(opts).zip.flatten.join(' ')
+        command = "open -Fgn #{XCODE_HOME}/Applications/Simulator.app --args #{args}"
         system command
       end
     end

data/lib/simctl/device.rb

@@ -1,5 +1,6 @@
 require 'cfpropertylist'
 require 'ostruct'
+require 'simctl/device_path'
 require 'simctl/object'
 require 'timeout'
 
@@ -19,6 +20,24 @@ module SimCtl
       @devicetype ||= SimCtl.devicetype(identifier: plist.deviceType)
     end
 
+    def disable_keyboard_helpers!
+      path.edit path.preferences_plist do |plist|
+        %w(
+          KeyboardPeriodShortcut
+          KeyboardAutocapitalization
+          KeyboardCheckSpelling
+          KeyboardAssistant
+          KeyboardAutocorrection
+          KeyboardPrediction
+          KeyboardShowPredictionBar
+          KeyboardCapsLock
+        ).each do |key|
+          plist[key] = false
+        end
+        plist
+      end
+    end
+
     def erase!
       SimCtl.erase_device(self)
     end
@@ -27,14 +46,22 @@ module SimCtl
       SimCtl.kill_device(self)
     end
 
-    def launch!(scale=1.0)
-      SimCtl.launch_device(self, scale)
+    def launch!(scale=1.0, opts={})
+      SimCtl.launch_device(self, scale, opts)
+    end
+
+    def path
+      @path ||= DevicePath.new(udid)
     end
 
     def rename!(name)
       SimCtl.rename_device(self, name)
     end
 
+    def reset!
+      SimCtl.reset_device name, devicetype, runtime
+    end
+
     def runtime
       @runtime ||= SimCtl.runtime(identifier: plist.runtime)
     end
@@ -56,17 +83,15 @@ module SimCtl
     end
 
     def ==(other)
+      return false if other.nil?
+      return false unless other.kind_of? Device
       other.udid == udid
     end
 
     private
 
     def plist
-      @plist ||= OpenStruct.new(CFPropertyList.native_types(CFPropertyList::List.new(file: plist_path).value))
-    end
-
-    def plist_path
-      File.join(ENV['HOME'], 'Library/Developer/CoreSimulator/Devices', udid, 'device.plist')
+      @plist ||= OpenStruct.new(CFPropertyList.native_types(CFPropertyList::List.new(file: path.device_plist).value))
     end
 
   end

data/lib/simctl/device_path.rb

@@ -0,0 +1,21 @@
+require 'simctl/object'
+
+module SimCtl
+  class DevicePath
+    attr_reader :device_plist, :home, :preferences_plist
+
+    def initialize(udid)
+      @home = File.join(ENV['HOME'], 'Library/Developer/CoreSimulator/Devices', udid)
+      @device_plist = File.join(@home, 'device.plist')
+      @preferences_plist = File.join(@home, 'data/Library/Preferences/com.apple.Preferences.plist')
+    end
+
+    def edit(path, &block)
+      plist = File.exists?(path) ? CFPropertyList::List.new(file: path) : CFPropertyList::List.new
+      content = CFPropertyList.native_types(plist.value) || {}
+      plist.value = CFPropertyList.guess(yield content)
+      plist.save(path, CFPropertyList::List::FORMAT_BINARY)
+    end
+
+  end
+end

data/lib/simctl/device_type.rb

@@ -5,6 +5,8 @@ module SimCtl
     attr_reader :identifier, :name
 
     def ==(other)
+      return false if other.nil?
+      return false unless other.kind_of? DeviceType
       other.identifier == identifier
     end
   end

data/lib/simctl/executor.rb

@@ -10,14 +10,10 @@ module SimCtl
           output = stdout.read
           raise StandardError.new(output) if result.value.to_i > 0
           return unless block_given?
-          begin
-            if looks_like_json?(output)
-              yield JSON.parse(output)
-            else
-              yield output.chomp
-            end
-          rescue StandardError => e
-            raise StandardError.new("Failed to execute '#{command}' (output: '#{output.chomp}'): #{e}")
+          if looks_like_json?(output)
+            yield JSON.parse(output)
+          else
+            yield output.chomp
           end
         end
       end

data/lib/simctl/runtime.rb

@@ -5,6 +5,8 @@ module SimCtl
     attr_reader :availability, :buildversion, :identifier, :name, :version
 
     def ==(other)
+      return false if other.nil?
+      return false unless other.kind_of? Runtime
       other.identifier == identifier
     end
 

data/lib/simctl/version.rb

@@ -1,3 +1,3 @@
 module SimCtl
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

data/test/simctl/command/crud_test.rb

@@ -2,83 +2,95 @@ require 'securerandom'
 require 'test_helper'
 
 class SimCtl::Command::CRUDTest < Minitest::Test
-  def setup
-    @devicetype = SimCtl.list_devicetypes.select {|devicetype| devicetype.name =~ %r[iPhone]}.first
-    @runtime = SimCtl.list_runtimes.select {|runtime| runtime.name =~ %r[iOS.*9]}.first
-    @device = SimCtl.create_device SecureRandom.hex, @devicetype, @runtime
-    @device.wait! {|d| d.state != :creating}
-  end
+  order_dependent!
 
-  def teardown
-    device = SimCtl.device(udid: @device.udid)
-    return unless device
-    device.kill!
-    device.shutdown! if device.state != :shutdown
-    device.wait! {|d| d.state == :shutdown}
-    device.delete!
+  udid = nil
+  name = SecureRandom.hex
+  devicetype = 'iPhone 5'
+
+  should 'raise exception if devicetype lookup failed' do
+    assert_raises { SimCtl.create_device SecureRandom.hex, 'invalid devicetype', SimCtl::Runtime.latest(:ios) }
   end
 
-  #should 'have devicetype and runtime property' do
-  #  device = SimCtl.device(udid: @device.udid)
-  #  assert device == @device
-  #  assert device.devicetype == @devicetype
-  #  assert device.runtime == @runtime
-  #end
+  should 'raise exception if runtime lookup failed' do
+    assert_raises { SimCtl.create_device name, SimCtl::DeviceType.find(name: devicetype), 'invalid runtime' }
+  end
 
-  should 'lookup devicetype and runtime strings' do
-    device = SimCtl.create_device SecureRandom.hex, @devicetype.name, @runtime.name
-    device.wait! {|d| d.state != :creating}
-    device.delete!
+  should '01. create a new device' do
+    device = SimCtl.create_device name, devicetype, SimCtl::Runtime.latest(:ios)
+    device.wait! {|d| d.state == :shutdown}
+    udid = device.udid
   end
 
-  should 'find the device created in setup' do
-    device = SimCtl.device(udid: @device.udid)
+  should '02. find the device by udid' do
+    device = SimCtl.device(udid: udid)
     assert_kind_of SimCtl::Device, device
     assert device.availability != nil
-    assert device.name != nil
+    assert device.name == name
     assert device.os != nil
     assert device.state != nil
     assert device.udid != nil
   end
 
-  should 'launch and kill the device created in setup' do
-    device = SimCtl.device(udid: @device.udid)
-    assert SimCtl.launch_device(device)
+  should '03. find the device by name' do
+    assert SimCtl.device(name: name).udid == udid
+  end
+
+  should '04. have devicetype property' do
+    assert SimCtl.device(udid: udid).devicetype == SimCtl.devicetype(name: devicetype)
+  end
+
+  should '05. have runtime property' do
+    assert SimCtl.device(udid: udid).runtime == SimCtl::Runtime.latest(:ios)
+  end
+
+  should '06. rename the device' do
+    SimCtl.device(udid: udid).rename!('new name')
+    assert SimCtl.device(udid: udid).name == 'new name'
+  end
+
+  should '07. erase the device' do
+    SimCtl.device(udid: udid).erase!
+  end
+
+  should '08. launch the device' do
+    device = SimCtl.device(udid: udid)
+    device.launch!
     device.wait!{|d| d.state == :booted}
-    assert device.kill!
-    device.wait!{|d| d.state == :shutdown}
   end
 
-  should 'erase the device created in setup' do
-    device = SimCtl.device(udid: @device.udid)
-    device.erase!
+  should '09. kill the device' do
+    device = SimCtl.device(udid: udid)
+    assert device.kill!
+    device.wait!{|d| d.state == :shutdown}
   end
 
-  should 'boot/shutdown the device created in setup' do
-    device = SimCtl.device(udid: @device.udid)
+  should '10. boot the device' do
+    device = SimCtl.device(udid: udid)
     device.boot!
-    device.wait! {|d| d.state == :booted}
-    device.shutdown!
-    device.wait! {|d| d.state == :shutdown}
+    device.wait!{|d| d.state == :booted}
   end
 
-  should 'delete the device created in setup' do
-    device = SimCtl.device(udid: @device.udid)
-    SimCtl.delete_device device
-    assert_nil SimCtl.device(udid: @device.udid)
+  should '11. shutdown the device' do
+    device = SimCtl.device(udid: udid)
+    device.shutdown!
+    device.wait!{|d| d.state == :shutdown}
   end
 
-  should 'rename the device created in setup' do
-    device = SimCtl.device(udid: @device.udid)
-    device.rename!('new name')
-    assert SimCtl.device(udid: @device.udid).name == 'new name'
+  should '12. reset the device' do
+    old_device = SimCtl.device(udid: udid)
+    new_device = SimCtl.reset_device old_device.name, old_device.devicetype, old_device.runtime
+    new_device.wait!{|d| d.state != :creating}
+    assert old_device.name == new_device.name
+    assert old_device.devicetype == new_device.devicetype
+    assert old_device.runtime == new_device.runtime
+    assert old_device.udid != new_device.udid
+    udid = new_device.udid
   end
 
-  should 'reset the device created in setup' do
-    device = SimCtl.reset_device @device.name, @devicetype, @runtime
-    assert_kind_of SimCtl::Device, device
-    assert_nil SimCtl.device(udid: @device.udid)
-    @device = device # teardown cleanup
-    device.wait! {|d| d.state != :creating}
+  should '13. delete the device' do
+    device = SimCtl.device(udid: udid)
+    device.delete!
+    assert_nil SimCtl.device(udid: udid)
   end
 end

data/test/simctl/command/list_test.rb

@@ -49,6 +49,18 @@ class SimCtl::Command::ListTest < Minitest::Test
     should 'parse name property' do
       assert SimCtl.list_runtimes.first.name != nil
     end
+
+    should 'return latest ios runtime' do
+      assert_kind_of SimCtl::Runtime, SimCtl::Runtime.latest(:ios)
+    end
+
+    should 'return latest tvos runtime' do
+      assert_kind_of SimCtl::Runtime, SimCtl::Runtime.latest(:tvos)
+    end
+
+    should 'return latest watchos runtime' do
+      assert_kind_of SimCtl::Runtime, SimCtl::Runtime.latest(:watchos)
+    end
   end
 
   context 'runtime' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simctl
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Johannes Plunien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,6 +108,7 @@ files:
 - lib/simctl/command/reset.rb
 - lib/simctl/command/shutdown.rb
 - lib/simctl/device.rb
+- lib/simctl/device_path.rb
 - lib/simctl/device_type.rb
 - lib/simctl/executor.rb
 - lib/simctl/list.rb