simctl 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da76a9f1cad014fffee2818138f5e11fbd0cc97e
-  data.tar.gz: 3932e4c59a417d56f38a69af7f0dd5c16bc12e15
+  metadata.gz: f923baf8dbf6166ce07d1890414262712aa65756
+  data.tar.gz: ce8194686b27910c708edd304b0ce55366c0c577
 SHA512:
-  metadata.gz: ee307c69171853a9d164756c7d842169e33df54a017264bbbc2c9a17fb7c4a5a372d86d9922b989e4333c30224906dbc9050edcce11a04f9a3aad83e5c713a7b
-  data.tar.gz: 5abd74d5dd1214848a0c0023774c3fa434897d3c3b80660a60876848b39644749ca7b00052f3ad29558af8b7d2bda12bbf1b405c2427deb5f82a95a2ebaa821b
+  metadata.gz: 7b20bc6edfabde97837da052ae1d2b951724039111e1493b71eec2f17664155747a854a7053e8a49f4dfef9cce4d49a1ad46e206abfb47c21f95ac0270d64582
+  data.tar.gz: 947909872a6e4b6bb082f43699362c19021ca1d072fc5abb7fa85db1f5f1097e90420426bdb26706e33a7a60e84150e6cc5ca04cc18a25fee804c68b0c37674b

data/.travis.yml

@@ -3,5 +3,8 @@ osx_image: xcode7.3
 before_script:
   - export LANG=en_US.UTF-8
 install: bundle
+env:
+  - CUSTOM_DEVICE_SET_PATH=true
+  - CUSTOM_DEVICE_SET_PATH=false
 script:
   - bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.5.2
+
+* Support custom device set path
+
 # 1.5.1
 
 * Let `SimCtl#create_device` wait for the device to be created

data/Gemfile.lock

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

data/lib/simctl/command.rb

@@ -13,6 +13,8 @@ require 'simctl/executor'
 
 module SimCtl
   class Command
+    attr_accessor :device_set_path
+
     include SimCtl::Command::Boot
     include SimCtl::Command::Create
     include SimCtl::Command::Delete
@@ -24,5 +26,12 @@ module SimCtl
     include SimCtl::Command::Rename
     include SimCtl::Command::Reset
     include SimCtl::Command::Shutdown
+
+    def command_for(*arguments)
+      command = %w[xcrun simctl]
+      command += ['--set', device_set_path] unless device_set_path.nil?
+      command += arguments
+      command
+    end
   end
 end

data/lib/simctl/command/boot.rb

@@ -1,14 +1,12 @@
 module SimCtl
   class Command
     module Boot
-      COMMAND = %w[xcrun simctl boot]
-
       # Boots a device
       #
       # @param device [SimCtl::Device] the device to boot
       # @return [void]
       def boot_device(device)
-        Executor.execute([COMMAND, device.udid])
+        Executor.execute(command_for('boot', device.udid))
       end
     end
   end

data/lib/simctl/command/create.rb

@@ -3,8 +3,6 @@ require 'shellwords'
 module SimCtl
   class Command
     module Create
-      COMMAND = %w[xcrun simctl create]
-
       # Creates a device
       #
       # @param name [String] name of the new device
@@ -16,7 +14,7 @@ module SimCtl
         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)
-        device = Executor.execute([COMMAND, Shellwords.shellescape(name), devicetype.identifier, runtime.identifier]) do |identifier|
+        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)}

data/lib/simctl/command/delete.rb

@@ -1,14 +1,12 @@
 module SimCtl
   class Command
     module Delete
-      COMMAND = %w[xcrun simctl delete]
-
       # Delete a device
       #
       # @param device [SimCtl::Device] the device to delete
       # @return [void]
       def delete_device(device)
-        Executor.execute([COMMAND, device.udid])
+        Executor.execute(command_for('delete', device.udid))
       end
 
       # Delete all devices

data/lib/simctl/command/erase.rb

@@ -1,14 +1,12 @@
 module SimCtl
   class Command
     module Erase
-      COMMAND = %w[xcrun simctl erase]
-
       # Erase a device
       #
       # @param device [SimCtl::Device] the device to erase
       # @return [void]
       def erase_device(device)
-        Executor.execute([COMMAND, device.udid])
+        Executor.execute(command_for('erase', device.udid))
       end
     end
   end

data/lib/simctl/command/install.rb

@@ -11,7 +11,7 @@ module SimCtl
       # @param path Absolute path to the app that should be installed
       # @return [void]
       def install_app(device, path)
-        Executor.execute([COMMAND, device.udid, Shellwords.shellescape(path)])
+        Executor.execute(command_for('install', device.udid, Shellwords.shellescape(path)))
       end
     end
   end

data/lib/simctl/command/launch.rb

@@ -20,7 +20,9 @@ module SimCtl
           '-ConnectHardwareKeyboard' => 1,
           '-CurrentDeviceUDID' => device.udid,
           "-SimulatorWindowLastScale-#{device.devicetype.identifier}" => scale,
-        }.merge(opts).zip.flatten.join(' ')
+        }
+        args.merge!({ '-DeviceSetPath' => 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}"
         system command
       end
@@ -35,7 +37,7 @@ module SimCtl
       def launch_app(device, identifier, args=[], opts={})
         launch_args = args.map {|arg| Shellwords.shellescape arg}
         launch_opts = opts[:wait_for_debugger] ? '-w' : ''
-        Executor.execute([LAUNCH_APP_COMMAND, launch_opts, device.udid, identifier, launch_args])
+        Executor.execute(command_for('launch', launch_opts, device.udid, identifier, launch_args))
       end
     end
   end

data/lib/simctl/command/list.rb

@@ -3,8 +3,6 @@ module SimCtl
   class RuntimeNotFound < StandardError; end
   class Command
     module List
-      COMMAND = %w[xcrun simctl list -j]
-
       # Find a device
       #
       # @param filter [Hash] the filter
@@ -26,7 +24,7 @@ module SimCtl
       #
       # @return [SimCtl::List] a list of SimCtl::Device objects
       def list_devices
-        Executor.execute([COMMAND, 'devices']) do |json|
+        Executor.execute(command_for('list', '-j', 'devices')) do |json|
           SimCtl::List.new(json['devices'].map {|os, devices| devices.map {|device| Device.new(device.merge(os: os))}}.flatten)
         end
       end
@@ -35,7 +33,7 @@ module SimCtl
       #
       # @return [SimCtl::List] a list of SimCtl::DeviceType objects
       def list_devicetypes
-        Executor.execute([COMMAND, 'devicetypes']) do |json|
+        Executor.execute(command_for('list', '-j', 'devicetypes')) do |json|
           SimCtl::List.new(json['devicetypes'].map {|devicetype| DeviceType.new(devicetype)})
         end
       end
@@ -44,7 +42,7 @@ module SimCtl
       #
       # @return [SimCtl::List] a list of SimCtl::Runtime objects
       def list_runtimes
-        Executor.execute([COMMAND, 'runtimes']) do |json|
+        Executor.execute(command_for('list', '-j', 'runtimes')) do |json|
           SimCtl::List.new(json['runtimes'].map {|runtime| Runtime.new(runtime)})
         end
       end

data/lib/simctl/command/rename.rb

@@ -3,15 +3,13 @@ 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)])
+        Executor.execute(command_for('rename', device.udid, Shellwords.shellescape(name)))
       end
     end
   end

data/lib/simctl/command/shutdown.rb

@@ -1,14 +1,12 @@
 module SimCtl
   class Command
     module Shutdown
-      COMMAND = %w[xcrun simctl shutdown]
-
       # Shutdown a device
       #
       # @param device [SimCtl::Device] the device to shutdown
       # @return [void]
       def shutdown_device(device)
-        Executor.execute([COMMAND, device.udid])
+        Executor.execute(command_for('shutdown', device.udid))
       end
     end
   end

data/lib/simctl/device_path.rb

@@ -3,10 +3,17 @@ module SimCtl
     attr_reader :device_plist, :global_preferences_plist, :home, :preferences_plist
 
     def initialize(udid)
-      @home = File.join(ENV['HOME'], 'Library/Developer/CoreSimulator/Devices', 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')
     end
+
+    private
+
+    def device_set_path
+      return SimCtl.device_set_path unless SimCtl.device_set_path.nil?
+      File.join(ENV['HOME'], 'Library/Developer/CoreSimulator/Devices')
+    end
   end
 end

data/lib/simctl/version.rb

@@ -1,3 +1,3 @@
 module SimCtl
-  VERSION = '1.5.1'
+  VERSION = '1.5.2'
 end

data/test/simctl/{command/crud_test.rb → crud_test.rb}

@@ -1,7 +1,7 @@
 require 'securerandom'
 require 'test_helper'
 
-class SimCtl::Command::CRUDTest < Minitest::Test
+class SimCtl::CRUDTest < Minitest::Test
   order_dependent!
 
   udid = nil

data/test/simctl/executor_test.rb

@@ -0,0 +1,22 @@
+require 'securerandom'
+require 'test_helper'
+
+class SimCtl::ExecutorTest < Minitest::Test
+  should 'raise exception' do
+    assert_raises { SimCtl::Executor.execute(['xcrun simctl asdf']) }
+  end
+
+  should 'return json' do
+    json = SimCtl::Executor.execute(["echo '{\"foo\":\"bar\"}'"]) do |result|
+      result
+    end
+    assert json == {'foo' => 'bar'}
+  end
+
+  should 'return string' do
+    string = SimCtl::Executor.execute(["echo 'hello world'"]) do |result|
+      result
+    end
+    assert string == 'hello world'
+  end
+end

data/test/simctl/{command/list_test.rb → list_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SimCtl::Command::ListTest < Minitest::Test
+class SimCtl::ListTest < Minitest::Test
   context 'devicetype' do
     should 'find device type by name' do
       assert_kind_of SimCtl::DeviceType, SimCtl.devicetype(name: 'iPhone 5')

data/test/simctl/{command/readme_test.rb → readme_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SimCtl::Command::ReadmeTest < Minitest::Test
+class SimCtl::ReadmeTest < Minitest::Test
   should 'execute example code from readme' do
     # Select the iOS 9.2 runtime
     runtime = SimCtl.runtime(name: 'iOS 9.2')

data/test/test_helper.rb

@@ -10,3 +10,7 @@ require File.dirname(__FILE__) + '/../lib/simctl.rb'
 if ENV['TRAVIS']
   SimCtl.default_timeout = 300
 end
+
+unless ENV['CUSTOM_DEVICE_SET_PATH'] == 'false'
+  SimCtl.device_set_path = Dir.mktmpdir
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simctl
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Johannes Plunien
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,9 +126,10 @@ files:
 - test/SampleApp/SampleApp/AppDelegate.m
 - test/SampleApp/SampleApp/Info.plist
 - test/SampleApp/SampleApp/main.m
-- test/simctl/command/crud_test.rb
-- test/simctl/command/list_test.rb
-- test/simctl/command/readme_test.rb
+- test/simctl/crud_test.rb
+- test/simctl/executor_test.rb
+- test/simctl/list_test.rb
+- test/simctl/readme_test.rb
 - test/test_helper.rb
 homepage: https://github.com/plu/simctl
 licenses:
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Ruby interface to xcrun simctl
@@ -162,7 +163,8 @@ test_files:
 - test/SampleApp/SampleApp/AppDelegate.m
 - test/SampleApp/SampleApp/Info.plist
 - test/SampleApp/SampleApp/main.m
-- test/simctl/command/crud_test.rb
-- test/simctl/command/list_test.rb
-- test/simctl/command/readme_test.rb
+- test/simctl/crud_test.rb
+- test/simctl/executor_test.rb
+- test/simctl/list_test.rb
+- test/simctl/readme_test.rb
 - test/test_helper.rb