simctl 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd28b66b86819a39b9b4c3255d8a43da5a396aa4
-  data.tar.gz: 6701555feb0245c7829b3d19164cf6104aca4091
+  metadata.gz: dd8b47a97cfc1f00603d9a4a34f24b8660803cc2
+  data.tar.gz: 40bb8ad6343667c9f5fe2f871d3c42ff299b467f
 SHA512:
-  metadata.gz: c97dd6ebdc1afef17375c02f98aab4c139767607295a1423ae725e0c461e815020002afe7c5cbfc9f7219457db71acf8d684920451b6f4d04a51b915eea335a6
-  data.tar.gz: 92c109f84dbcae8beb6af57a1561d56f2c239458d80d42581ae906b13e2aaa497c9e37e04c34b1c76376c8ea0981e5851eab3bd5d0743fc3f8a50951730a7f25
+  metadata.gz: 034237cf350ae1f5b691683cfaa113f4c0dcb8ab45f0c8e2b6fb3c5f3b3db0354d1e598374865be0f4d2d3d491597bc63e4e6434114b4614fea8010942cce857
+  data.tar.gz: b8b1f15f50397012431b030134d5b1d0699c9a0ad4bc19f01f93cbfd75039a4ccfde0dea66703bb3816b8b870ac2a022ba9b529255239f1a89c6ea5df9ffb5a5

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    simctl (1.1.0)
+    simctl (1.2.0)
+      CFPropertyList
 
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.2)
     coveralls (0.8.10)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)

data/lib/simctl/command/create.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module SimCtl
   class Command
     module Create
@@ -6,11 +8,13 @@ module SimCtl
       # Creates a device
       #
       # @param name [String] name of the new device
-      # @param device_type [SimCtl::DeviceType] device type of the new device
+      # @param devicetype [SimCtl::DeviceType] device type of the new device
       # @param runtime [SimCtl::Runtime] runtime of the new device
       # @return [SimCtl::Device] the device that was created
-      def create_device(name, device_type, runtime)
-        Executor.execute([COMMAND, "'#{name}'", device_type.identifier, runtime.identifier]) do |identifier|
+      def create_device(name, devicetype, runtime)
+        runtime = runtime(name: runtime) unless runtime.is_a?(Runtime)
+        devicetype = devicetype(name: devicetype) unless devicetype.is_a?(DeviceType)
+        Executor.execute([COMMAND, Shellwords.shellescape(name), devicetype.identifier, runtime.identifier]) do |identifier|
           device(udid: identifier)
         end
       end

data/lib/simctl/command/launch.rb

@@ -2,16 +2,18 @@ module SimCtl
   class Command
     module Launch
       XCODE_HOME = `xcode-select -p`.chomp
+      SUPPORTED_SCALE = [1.0, 0.75, 0.5, 0.25]
 
       # Launches a Simulator instance with the given device
       #
       # @param device [SimCtl::Device] the device to launch
       # @return [void]
-      def launch_device(device)
+      def launch_device(device, scale=1.0)
+        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}"
+        command = "open -n #{XCODE_HOME}/Applications/Simulator.app --args -ConnectHardwareKeyboard 0 -CurrentDeviceUDID #{device.udid} -SimulatorWindowLastScale-#{device.devicetype.identifier} #{scale}"
         system command
       end
     end

data/lib/simctl/command/rename.rb

@@ -0,0 +1,18 @@
+require 'shellwords'
+
+module SimCtl
+  class Command
+    module Rename
+      COMMAND = %w[xcrun simctl rename]
+
+      # Boots a device
+      #
+      # @param device [SimCtl::Device] the device to boot
+      # @param name [String] the new device name
+      # @return [void]
+      def rename_device(device, name)
+        Executor.execute([COMMAND, device.udid, Shellwords.shellescape(name)])
+      end
+    end
+  end
+end

data/lib/simctl/command.rb

@@ -5,6 +5,7 @@ require 'simctl/command/erase'
 require 'simctl/command/kill'
 require 'simctl/command/launch'
 require 'simctl/command/list'
+require 'simctl/command/rename'
 require 'simctl/command/reset'
 require 'simctl/command/shutdown'
 require 'simctl/executor'
@@ -18,6 +19,7 @@ module SimCtl
     include SimCtl::Command::Kill
     include SimCtl::Command::Launch
     include SimCtl::Command::List
+    include SimCtl::Command::Rename
     include SimCtl::Command::Reset
     include SimCtl::Command::Shutdown
   end

data/lib/simctl/device.rb

@@ -1,3 +1,5 @@
+require 'cfpropertylist'
+require 'ostruct'
 require 'simctl/object'
 require 'timeout'
 
@@ -13,6 +15,10 @@ module SimCtl
       SimCtl.delete_device(self)
     end
 
+    def devicetype
+      @devicetype ||= SimCtl.devicetype(identifier: plist.deviceType)
+    end
+
     def erase!
       SimCtl.erase_device(self)
     end
@@ -21,8 +27,16 @@ module SimCtl
       SimCtl.kill_device(self)
     end
 
-    def launch!
-      SimCtl.launch_device(self)
+    def launch!(scale=1.0)
+      SimCtl.launch_device(self, scale)
+    end
+
+    def rename!(name)
+      SimCtl.rename_device(self, name)
+    end
+
+    def runtime
+      @runtime ||= SimCtl.runtime(identifier: plist.runtime)
     end
 
     def shutdown!
@@ -40,5 +54,16 @@ module SimCtl
         end
       end
     end
+
+    def ==(other)
+      other.udid == udid
+    end
+
+    private
+
+    def plist
+      @plist ||= OpenStruct.new(CFPropertyList.native_types(CFPropertyList::List.new(file: File.join(ENV['HOME'], 'Library/Developer/CoreSimulator/Devices', udid, 'device.plist')).value))
+    end
+
   end
 end

data/lib/simctl/device_type.rb

@@ -3,5 +3,9 @@ require 'simctl/object'
 module SimCtl
   class DeviceType < Object
     attr_reader :identifier, :name
+
+    def ==(other)
+      other.identifier == identifier
+    end
   end
 end

data/lib/simctl/runtime.rb

@@ -3,5 +3,9 @@ require 'simctl/object'
 module SimCtl
   class Runtime < Object
     attr_reader :availability, :buildversion, :identifier, :name, :version
+
+    def ==(other)
+      other.identifier == identifier
+    end
   end
 end

data/lib/simctl/version.rb

@@ -1,3 +1,3 @@
 module SimCtl
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/simctl.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'maxitest'
   s.add_development_dependency 'shoulda-context'
   s.add_development_dependency 'coveralls'
+
+  s.add_dependency 'CFPropertyList'
 end

data/test/simctl/command/crud_test.rb

@@ -6,7 +6,7 @@ class SimCtl::Command::CRUDTest < Minitest::Test
     @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! {|device| device.state != :creating}
+    @device.wait! {|d| d.state != :creating}
   end
 
   def teardown
@@ -14,6 +14,20 @@ class SimCtl::Command::CRUDTest < Minitest::Test
     return unless device
     device.kill!
     device.shutdown! if device.state != :shutdown
+    device.wait! {|d| d.state == :shutdown}
+    device.delete!
+  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 'lookup devicetype and runtime strings' do
+    device = SimCtl.create_device SecureRandom.hex, @devicetype.name, @runtime.name
+    device.wait! {|d| d.state != :creating}
     device.delete!
   end
 
@@ -30,21 +44,22 @@ class SimCtl::Command::CRUDTest < Minitest::Test
   should 'launch and kill the device created in setup' do
     device = SimCtl.device(udid: @device.udid)
     assert device.launch!
-    device.wait!{|device| device.state == :booted}
+    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)
-    SimCtl.erase_device device
+    device.erase!
   end
 
   should 'boot/shutdown the device created in setup' do
     device = SimCtl.device(udid: @device.udid)
-    SimCtl.boot_device device
-    device.wait! {|device| device.state == :booted}
-    SimCtl.shutdown_device device
-    device.wait! {|device| device.state == :shutdown}
+    device.boot!
+    device.wait! {|d| d.state == :booted}
+    device.shutdown!
+    device.wait! {|d| d.state == :shutdown}
   end
 
   should 'delete the device created in setup' do
@@ -53,11 +68,17 @@ class SimCtl::Command::CRUDTest < Minitest::Test
     assert_nil SimCtl.device(udid: @device.udid)
   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'
+  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! {|device| device.state != :creating}
+    device.wait! {|d| d.state != :creating}
   end
 end

data/test/simctl/command/list_test.rb

@@ -57,4 +57,10 @@ class SimCtl::Command::ListTest < Minitest::Test
     end
   end
 
+  context 'unknown method' do
+    should 'raise an exception' do
+      assert_raises { SimCtl.foo }
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simctl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Johannes Plunien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: CFPropertyList
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby interface to xcrun simctl
 email:
 - plu@pqpq.de
@@ -90,6 +104,7 @@ files:
 - lib/simctl/command/kill.rb
 - lib/simctl/command/launch.rb
 - lib/simctl/command/list.rb
+- lib/simctl/command/rename.rb
 - lib/simctl/command/reset.rb
 - lib/simctl/command/shutdown.rb
 - lib/simctl/device.rb