fourflusher 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a35973aab1aa95c3d8aafd5faa10aea43d14891d
-  data.tar.gz: 297b32aca985dca711baabb12d243396fcdb13e4
+  metadata.gz: 51d11f36e15ae2cef0aec386296a4ff9888ece0e
+  data.tar.gz: a363748b2fd402115f6ca433f802f22160ead987
 SHA512:
-  metadata.gz: 8cedb38cb098754a409cc3cfd37d117cb464c63eabb3f397f98a586d2c272668dd9e9f8b262307c61cae044e32b3c7a0bf0a5c3a13a0c15f29bf3df86a66c4a6
-  data.tar.gz: 0bdca3894776bb5b01518beb78a9f33a7b671390a4a94f811126864b1a8e4e583a0cde49fd34d21fdf8d35cd79dca089a78a1c08080737d8935f521766dc218d
+  metadata.gz: eea706a0d6b0bb7bb538557a729b398714e4b45c354168ff2544f3e5fd0d8aad46b33bd6e21812bedb3838b9c6261b370c844baa5cc0a35c23e836d3f4773d12
+  data.tar.gz: e327d66420dcf7c0178bcf7a52ad8cdda85ae06599980b78c3be2e8a4eee97f5c414cb4492efb89753d43ea8f0e7701f3213697b61775c1292455a2b4bb42193

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -1,9 +1,12 @@
 language: ruby
 os: osx
-osx_image: xcode7.2
-rvm: 2.0.0-p598
+osx_image: xcode8
+rvm: 2.0.0-p648
 cache: bundler
 before_install: gem install bundler
+before_script:
+    # Useful for reference while reviewing travis failures
+    - xcrun simctl list -j devices
 script:
   - bundle exec rake spec
   - bundle exec rake rubocop

data/CHANGELOG.md

@@ -0,0 +1,89 @@
+
+## 2.0.0 (2016-10-02)
+
+##### Enhancements
+
+* None
+
+##### Bug Fixes
+
+* None
+
+## v2.0.0 (2016-10-02)
+
+##### Breaking
+
+* Use JSON output from `xcrun simctl list`. Drop support for Xcode 6 (doesn't support JSON output)  
+  [Ben Asher](https://github.com/benasher44)
+  [#6](https://github.com/CocoaPods/fourflusher/pull/6)
+
+##### Enhancements
+
+* Update simulator count for Travis  
+  [Boris Bügling](https://github.com/neonichu)
+  [#5](https://github.com/CocoaPods/fourflusher/pull/5)
+
+* A more helpful error message for missing simulators  
+  [Radek Pietruszewski](https://github.com/radex)
+  [#4](https://github.com/CocoaPods/fourflusher/pull/4)
+
+##### Bug Fixes
+
+* None
+
+## v1.0.1 (2016-06-25)
+
+##### Enhancements
+
+* Show better error for `:oldest` simulator search  
+  [Boris Bügling](https://github.com/neonichu)
+
+## v1.0.0 (2016-06-24)
+
+##### Enhancements
+
+* Improve finding simulators  
+  [Boris Bügling](https://github.com/neonichu)
+
+## v0.3.2 (2016-06-16)
+
+##### Enhancements
+
+* Support for parsing iOS 10.0 and tvOS 10.0  
+  [Boris Bügling](https://github.com/neonichu)
+
+##### Bug Fixes
+
+* Rubocop fixes  
+  [Boris Bügling](https://github.com/neonichu)
+
+## v0.3.1 (2016-05-30)
+
+##### Enhancements
+
+* Travis CI improvements  
+  [Boris Bügling](https://github.com/neonichu)
+  [#1](https://github.com/CocoaPods/fourflusher/pull/1)
+
+* Handle missing Xcode more gracefully  
+  [Boris Bügling](https://github.com/neonichu)
+
+## v0.3.0 (2015-12-29)
+
+##### Enhancements
+
+* Allow specifying constraints for `destination()`  
+  [Boris Bügling](https://github.com/neonichu)
+
+## v0.2.0 (2015-12-29)
+
+##### Enhancements
+
+* Allow constraining simulators by OS version  
+  [Boris Bügling](https://github.com/neonichu)
+
+## v0.1.0 (2015-12-18)
+
+* List usable simulators. Find simulators by name. Get the destination setting for the simulator to pass to Xcodebuild  
+  [Boris Bügling](https://github.com/neonichu)
+

data/Gemfile.lock

@@ -0,0 +1,47 @@
+PATH
+  remote: .
+  specs:
+    fourflusher (2.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.3.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
+    diff-lcs (1.2.5)
+    parser (2.3.1.4)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.1.0)
+    rake (10.5.0)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.4)
+    rubocop (0.35.1)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.3.0, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      tins (<= 1.6.0)
+    ruby-progressbar (1.8.1)
+    tins (1.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.11)
+  fourflusher!
+  rake (~> 10.0)
+  rspec (~> 2)
+  rubocop (~> 0.35.0)
+
+BUNDLED WITH
+   1.13.1

data/lib/fourflusher/find.rb

@@ -1,4 +1,5 @@
 require 'fourflusher/simctl'
+require 'json'
 require 'rubygems/version'
 
 module Fourflusher
@@ -8,12 +9,6 @@ module Fourflusher
     attr_reader :name
     attr_reader :os_version
 
-    def self.match(line, os_name, os_version)
-      sims = []
-      @@sim_regex.match(line) { |m| sims << Simulator.new(m, os_name, Gem::Version.new(os_version)) }
-      sims
-    end
-
     def os_name
       @os_name.downcase.to_sym
     end
@@ -26,73 +21,115 @@ module Fourflusher
       "#{@name} (#{@id}) - #{@os_name} #{@os_version}"
     end
 
-    private
+    # Compare function for sorting simulators in order by
+    # - OS Name: ascending
+    # - OS Version: descending
+    # - Device type: iPhone first, then ascending
+    # - Model: ascending
+    def sim_list_compare(other)
+      return os_name.to_s <=> other.os_name.to_s unless os_name == other.os_name
+      return other.os_version <=> os_version unless os_version == other.os_version
+      device1, model1 = device_and_model
+      device2, model2 = other.device_and_model
+      unless device1 == device2
+        return -1 if device1 == 'iPhone'
+        return 1 if device2 == 'iPhone'
+        return device1 <=> device2
+      end
+      model1 <=> model2
+    end
+
+    # Returns the [device, model] for use during sorting
+    # Examples: [iPhone, 5s], [iPhone, 6s Plus], [Apple Watch Series 2, 38mm]
+    def device_and_model
+      if os_name == :watchos
+        # Sample string: Apple Watch Series 2 - 38mm
+        name.split ' - '
+      else
+        # Sample string: "iPhone 5s" or "iPhone 6 Plus" or "iPad Air 2"
+        if name.start_with? 'Apple TV'
+          # The last part is the model, and the rest is the device
+          parts = name.rpartition(' ').reject { |str| str.strip.empty? }
+          [parts[0...-1].join(' '), parts.drop(parts.count - 1).join(' ')].map(&:strip)
+        else
+          # The first part is device, and the rest is the model
+          name.split ' ', 2
+        end
+      end
+    end
 
-    @@sim_regex = /^\s*(?<sim_name>[^\)]*?) \((?<sim_id>[^\)]*?)\) \((?<sim_state>[^\)]*?)\)$/
+    private
 
-    def initialize(match_data, os_name, os_version)
-      @id = match_data['sim_id']
-      @name = match_data['sim_name']
+    def initialize(device_json, os_name, os_version)
+      @id = device_json['udid']
+      @name = device_json['name']
       @os_name = os_name
-      @os_version = os_version
+      @os_version = Gem::Version.new os_version
     end
   end
 
-  # -- iOS 9.2 --
-  #     iPhone 4s (C0404A23-2D2D-4208-8CEC-774194D06759) (Shutdown)
-  #     iPhone 5 (7A0F62DD-8330-44F0-9828-AC8B1BC9BF05) (Shutdown)
-  #     iPhone 5s (51C1CB50-FBCB-47ED-B8FF-68C816BF0932) (Shutdown)
-  #     iPhone 6 (6F4E143A-6914-476E-90BF-51B680B8E2EF) (Shutdown)
-  #     iPhone 6 Plus (BEB9BFE9-AF1A-4FEA-9FA5-CAFD5243CA42) (Shutdown)
-  #     iPhone 6s (98DB904B-DF98-4F3C-AB21-A4D133604BA4) (Shutdown)
-  #     iPhone 6s Plus (65838307-4C03-4DD3-84E4-A6477CFD3490) (Shutdown)
-  #     iPad 2 (349C1313-6C9C-48C6-8849-DAB18BE2F15C) (Shutdown)
-  #     iPad Retina (30909168-4C90-48CD-B142-86DCF7B1372A) (Shutdown)
-  #     iPad Air (A8B5F651-C215-459C-95C6-663194F2277B) (Shutdown)
-  #     iPad Air 2 (BFDB363E-D514-490C-A1D6-AC86402089BA) (Shutdown)
-  #     iPad Pro (AE5DA548-66F6-4FCE-AA6D-5E6E17CD721E) (Shutdown)
-  # -- tvOS 9.1 --
-  #     Apple TV 1080p (C5A44868-685C-4D72-BEBD-102246C870F7) (Shutdown)
-  # -- watchOS 2.1 --
-  #     Apple Watch - 38mm (FE557B65-A044-44C3-96AC-2EAC395A6090) (Shutdown)
-  #     Apple Watch - 42mm (C9138FAE-6812-4BB5-A463-76520C116AF4) (Shutdown)
+  # {
+  #   "devices" : {
+  #     "iOS 10.0" : [
+  #       {
+  #         "state" : "Shutdown",
+  #         "availability" : "(available)",
+  #         "name" : "iPhone 5",
+  #         "udid" : "B7D21008-CC16-47D6-A9A9-885FE1FC47A8"
+  #       },
+  #       {
+  #         "state" : "Shutdown",
+  #         "availability" : "(available)",
+  #         "name" : "iPhone 5s",
+  #         "udid" : "38EAE7BD-90C3-4C3D-A672-3AF683EEC5A2"
+  #       },
+  #     ]
+  #   }
+  # }
 
   # Executes `simctl` commands
   class SimControl
-    def initialize
-      @os_regex = /^-- (?<os_name>.*?) (?<os_version>[0-9][0-9]?\.[0-9]) --$/
-    end
-
     def simulator(filter, os_name = :ios, minimum_version = '1.0')
       usable_simulators(filter, os_name, minimum_version).first
     end
 
     def usable_simulators(filter = nil, os = :ios, minimum_version = '1.0')
-      os_name = ''
-      os_version = ''
-      sims = []
-
-      list(['devices']).lines.each do |line|
-        @os_regex.match(line) do |m|
-          os_name = m['os_name']
-          os_version = m['os_version']
-        end
-        sims += Simulator.match(line, os_name, os_version)
-      end
-
+      sims = fetch_sims
       oses = sims.map(&:os_name).uniq
       os = os.downcase.to_sym
-      fail "Invalid OS `#{os}`, valid values are #{oses.join(', ')}" unless oses.include?(os)
+
+      unless oses.include?(os)
+        fail "Could not find a `#{os}` simulator (valid values: #{oses.join(', ')}). Ensure that "\
+          "Xcode -> Window -> Devices has at least one `#{os}` simulator listed or otherwise add one."
+      end
 
       return sims if filter.nil?
       minimum_version = Gem::Version.new(minimum_version)
       sims = sims.select { |sim| sim.os_name == os && sim.compatible?(minimum_version) }
 
-      return [sims.first] if filter == :oldest
+      return [sims.min_by(&:os_version)] 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
+
+    private
+
+    # Gets the simulators and transforms the simctl json into Simulator objects
+    def fetch_sims
+      device_list = JSON.parse(list(['-j', 'devices']))['devices']
+      unless device_list.is_a?(Hash)
+        msg = "Expected devices to be of type Hash but instated found #{device_list.class}"
+        fail Fourflusher::Informative, msg
+      end
+      device_list.flat_map do |runtime_str, devices|
+        # Sample string: iOS 9.3
+        os_name, os_version = runtime_str.split ' '
+        devices.map do |device|
+          Simulator.new(device, os_name, os_version) if device['availability'] == '(available)'
+        end
+      end.compact.sort(&:sim_list_compare)
+    end
   end
 end

data/lib/fourflusher/version.rb

@@ -1,3 +1,3 @@
 module Fourflusher
-  VERSION = '1.0.1'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fourflusher
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Boris Bügling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-25 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,7 +76,9 @@ files:
 - .gitignore
 - .rubocop.yml
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -115,4 +117,3 @@ signing_key:
 specification_version: 4
 summary: A library for interacting with Xcode simulators.
 test_files: []
-has_rdoc: