fourflusher 0.3.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 360c1493bcc1fcc20d80a9af59bbb5b60200ad53
-  data.tar.gz: a2a4429a7f76c9706d87bc28c707a816e1d18cdc
+  metadata.gz: 9e241d7369f92a28c82655eabe7a195a046367ff
+  data.tar.gz: bf4abf44b2c2727b442d7420eba20539c0764e3e
 SHA512:
-  metadata.gz: 22134cb079e8cfbbbeb70330d778a95a0f42ff1f36d70f345b8addc4265e152361df525b89a4847731132af13821930a4c7f754ff6d7864f548da468e95e3068
-  data.tar.gz: 4c04fca2b89f1685286ac28cdd71f65aac289c0ca76c4451f2c6ceb9aeb216d215fef07b70acf5ac911913a54bd5fed3630a41689d517e04d5bcb445717b55e6
+  metadata.gz: f96dc7dd394a1918b4ad6f8f71ae30e2d0144a1d03a9dbb1b779ecf97ddd7dd23153b54e65ac2d6d76b0ce20d611eae15fe01b0ece69ac2b3243ce3b4ba3dfce
+  data.tar.gz: 010b434ef1d31a6c82e0a5bf1d57a9b5c2159dc34ff918f6c7df6b794717275e2cdac8e84501dde514832192dec2131388d900389a01e6a77b738ce5207c7356

data/.rubocop.yml

@@ -1,5 +1,5 @@
 Metrics/AbcSize:
-  Max: 25
+  Max: 35
 
 Metrics/CyclomaticComplexity:
   Max: 10

data/README.md

@@ -2,10 +2,6 @@
 
 A library for interacting with Xcode simulators.
 
-## Usage
-
-TODO: Write usage instructions here
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/fourflusher/find.rb

@@ -6,7 +6,6 @@ module Fourflusher
   class Simulator
     attr_reader :id
     attr_reader :name
-    attr_reader :os_name
     attr_reader :os_version
 
     def self.match(line, os_name, os_version)
@@ -15,6 +14,10 @@ module Fourflusher
       sims
     end
 
+    def os_name
+      @os_name.downcase.to_sym
+    end
+
     def compatible?(other_version)
       other_version <= os_version
     end
@@ -60,11 +63,11 @@ module Fourflusher
       @os_regex = /^-- (?<os_name>.*?) (?<os_version>[0-9][0-9]?\.[0-9]) --$/
     end
 
-    def simulator(filter, minimum_version = '1.0')
-      usable_simulators(filter, minimum_version).first
+    def simulator(filter, os_name = :ios, minimum_version = '1.0')
+      usable_simulators(filter, os_name, minimum_version).first
     end
 
-    def usable_simulators(filter = nil, minimum_version = '1.0')
+    def usable_simulators(filter = nil, os = :ios, minimum_version = '1.0')
       os_name = ''
       os_version = ''
       sims = []
@@ -77,9 +80,19 @@ module Fourflusher
         sims += Simulator.match(line, os_name, os_version)
       end
 
+      oses = sims.map(&:os_name).uniq
+      os = os.downcase.to_sym
+      fail "Invalid OS `#{os}`, valid values are #{oses.join(', ')}" unless oses.include?(os)
+
       return sims if filter.nil?
       minimum_version = Gem::Version.new(minimum_version)
-      sims.select { |sim| sim.name == filter && sim.compatible?(minimum_version) }
+      sims = sims.select { |sim| sim.os_name == os && sim.compatible?(minimum_version) }
+
+      return [sims.first] if filter == :oldest
+
+      found_sims = sims.select { |sim| sim.name == filter }
+      return found_sims if found_sims.count > 0
+      sims.select { |sim| sim.name.start_with?(filter) }
     end
   end
 end

data/lib/fourflusher/version.rb

@@ -1,3 +1,3 @@
 module Fourflusher
-  VERSION = '0.3.2'
+  VERSION = '1.0.0'
 end

data/lib/fourflusher/xcodebuild.rb

@@ -3,8 +3,8 @@ require 'fourflusher/find'
 module Fourflusher
   # Executes `simctl` commands
   class SimControl
-    def destination(filter, minimum_version = '1.0')
-      sim = simulator(filter, minimum_version)
+    def destination(filter, os = :ios, minimum_version = '1.0')
+      sim = simulator(filter, os, minimum_version)
       fail "Simulator #{filter} is not available." if sim.nil?
       ['-destination', "id=#{sim.id}"]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fourflusher
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler