elpeacho 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3637b17f3531279f5834e51d40c8ab526648991af630a7d88731bcc630749abd
-  data.tar.gz: c7075d7b12ab3261f71c90600bc154e1ec33db54fe4c70ee03daeceef49f9ce2
+  metadata.gz: b78b074627d32ccde7242115fcf3dd37703754a0e23b3ae1e38bb88b9954b60e
+  data.tar.gz: 6f4943ea01ee6e383a16756d0827c13aee574bb1b50ca1d329f52ab81f5865bf
 SHA512:
-  metadata.gz: 7ba5c152d54497a28829788685523a774b9bd0b3a10fb7ff4ea9bc0eebcb7a9d799d4eedfa51f09de339eda113425bedb43482df94575f4d93d2b80ca7ca35de
-  data.tar.gz: c39dd12b14a4e9f67b5ad90d863c14c05d8a95f2ee4460b3eb882d90c7e9fef59da39cf4c5489bfdf1bf4586c8bef89e68ea629822db2896ea0d85635e5e2f45
+  metadata.gz: 1245030f1a185eca3cdf4510e2ec09bba6b3412c338832dba4c2a8e30e44deb732d06ce475baac370b6dc8f39d71350d32d4e6fdbae92652ee799161a22c3c71
+  data.tar.gz: '08b8a9133480cbb1e15c1503397f843429cced850c2d442f9b7146f35ecce56aa7a18f8af7d47ccb001eea4af22b8bd8c74bd692e7725e4691e039500a47d4a1'

data/lib/peach.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'json'
 require 'yaml'
 require 'peach/device'
@@ -12,12 +10,13 @@ class Peach
 	end
 
 	def createDevices(peachFile = 'peach.yml')
+		xc = XC.new
 		peaches = YAML.load_file(peachFile)
 		peaches.each do |properties|
 			peach_name = properties["name"]
 			peach_device = properties["device_type"]
 			peach_runtime = properties["runtime"]
-			peach = Device.new(name: peach_name, device_type: peach_device, runtime: peach_runtime)
+			peach = Device.new(name: peach_name, device_type: peach_device, runtime: peach_runtime, xc: xc)
 			peach.create() unless peach.exists?
 		end
 	end

data/lib/peach/device.rb

@@ -3,26 +3,31 @@ require 'plist'
 class Device
 	attr_reader :name, :device_type, :runtime, :udid
 
-	def initialize(name:, device_type:, runtime:, udid: nil)
+	def initialize(name:, device_type:, runtime:, udid: nil, xc: XC.new)
 		@name = name
 		@device_type = device_type
 		@runtime = runtime
 		@udid = udid
+		@xc = xc
 	end
 
 	def exists?
-		#could pass XC in? Make this a class function?
-		Device.current_devices(xc: XC.new).include?(self)
+		Device.current_devices(xc: @xc).include?(self)
 	end
 
 	def create
-		xc = XC.new
-		runtime_id = xc.runtimes.key(@runtime)
-		`xcrun simctl create \"#{@name}\" \"#{@device_type}\" \"#{runtime_id}\"`
-
-		# reload everything to get the device.
-		newDevices = Device.current_devices(xc: xc).select { |d| d == self }
-		@udid = newDevices.first.udid
+		runtime_id = @xc.runtimes.key(@runtime)
+		if @xc.runtime_invalid(@runtime)
+			puts "Unable to create #{@name}. Invalid runtime: #{@runtime}. Run \"xcrun simctl list runtimes\" to list available runtimes"
+		elsif @xc.device_type_invalid(@device_type)
+			puts "Unable to create #{@name}. Invalid device_type: #{@device_type}. Run \"xcrun simctl list devicetypes\" to list available devicetypes"
+		else
+			`xcrun simctl create \"#{@name}\" \"#{@device_type}\" \"#{runtime_id}\"`
+
+			# reload everything to get the device.
+			newDevices = Device.current_devices(xc: @xc).select { |d| d == self }
+			@udid = newDevices.first.udid
+		end
 	end
 
 	def destroy
@@ -58,7 +63,7 @@ class Device
 				device_name = d["name"]
 				device_udid = d["udid"]
 				device_type = device_type(udid: device_udid, xc: xc)
-				devices << Device.new(name: device_name, device_type: device_type, runtime: runtime, udid: device_udid)
+				devices << Device.new(name: device_name, device_type: device_type, runtime: runtime, udid: device_udid, xc: xc)
 			end
 		end
 

data/lib/peach/xc.rb

@@ -19,6 +19,14 @@ class XC
 		return @device_types[identifier]
 	end
 
+	def runtime_invalid(runtime)
+		@runtimes.select { |_, val| val == runtime }.empty?
+	end
+
+	def device_type_invalid(device_type)
+		@device_types.select { |_, val| val == device_type }.empty?
+	end
+
 	def init_runtimes
 		runtimes_json = JSON.parse(load_runtimes())
 		runtimes = runtimes_json['runtimes']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elpeacho
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kevin Barnes