scan 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a36b291dfc7c2e8139d915b07464b7b43fa0ccbc
-  data.tar.gz: 58139086e5d430f38bb7c0f185f51930db66c384
+  metadata.gz: 533ce99c41f14c934f7bb3d544575cf113462fd3
+  data.tar.gz: bbe83676310a88b0e61a1b69cc152ce13e975aee
 SHA512:
-  metadata.gz: 52fd21eca38e9ff6be57beec023170973fb143d92b3db59d72692bde7b20587d19ceaf44d5a009805cef78262ea5042c017e9a381abc357f9a929a0eee4479e0
-  data.tar.gz: 222476d927b6e004c5b3a2367b33680c848293b6712b6e356b22174564ad7ce3042c2a495b71576bc79ab380d7c3b20fb64c074a52e75c6c7321a9f672129d06
+  metadata.gz: af7be52af7e0d12dc253e7ed1ca1234be0001ac825d86a1d6380f2fc9a4a3a5df5553e87fa1c0731c127f8ea8df13ead94b8f05ece0f5da0471edd3167ce1e77
+  data.tar.gz: 37ebc33597cadedd3ff96b52481f979022e48759ffbc4f3a79cc2f843d34e819c04ea7f9f587326a6f6442acf47b8f2724bd4453035d603b257da5938a7df0b1

data/README.md

@@ -29,14 +29,14 @@
 scan
 ============
 
-[![Twitter: @KauseFx](https://img.shields.io/badge/contact-@KrauseFx-blue.svg?style=flat)](https://twitter.com/KrauseFx)
+[![Twitter: @FastlaneTools](https://img.shields.io/badge/contact-@FastlaneTools-blue.svg?style=flat)](https://twitter.com/FastlaneTools)
 [![License](https://img.shields.io/badge/license-MIT-green.svg?style=flat)](https://github.com/fastlane/scan/blob/master/LICENSE)
 [![Gem](https://img.shields.io/gem/v/scan.svg?style=flat)](http://rubygems.org/gems/scan)
 [![Build Status](https://img.shields.io/travis/fastlane/scan/master.svg?style=flat)](https://travis-ci.org/fastlane/scan)
 
 ###### The easiest way to run tests of your iOS and Mac app
 
-Get in contact with the developer on Twitter: [@KrauseFx](https://twitter.com/KrauseFx)
+Get in contact with the developer on Twitter: [@FastlaneTools](https://twitter.com/FastlaneTools)
 
 -------
 <p align="center">

data/lib/scan/detect_values.rb

@@ -6,29 +6,36 @@ module Scan
     def self.set_additional_default_values
       config = Scan.config
 
+      # First, try loading the Scanfile from the current directory
+      config.load_configuration_file(Scan.scanfile_name)
+
+      # Detect the project
       FastlaneCore::Project.detect_projects(config)
       Scan.project = FastlaneCore::Project.new(config)
 
-      # Go into the project's folder
+      # Go into the project's folder, as there might be a Snapfile there
       Dir.chdir(File.expand_path("..", Scan.project.path)) do
         config.load_configuration_file(Scan.scanfile_name)
       end
 
       Scan.project.select_scheme
 
-      default_device if Scan.project.ios?
+      default_device_ios if Scan.project.ios?
+      default_device_tvos if Scan.project.tvos?
       detect_destination
 
       return config
     end
 
-    def self.default_device
+    def self.default_device_ios
       config = Scan.config
 
       if config[:device] # make sure it actually exists
         device = config[:device].to_s.strip.tr('()', '') # Remove parenthesis
 
-        found = FastlaneCore::Simulator.all.find { |d| (d.name + " " + d.ios_version).include? device }
+        found = FastlaneCore::Simulator.all.find do |d|
+          (d.name + " " + d.ios_version).include? device
+        end
 
         if found
           Scan.device = found
@@ -56,6 +63,42 @@ module Scan
       raise "No simulators found".red unless Scan.device
     end
 
+    def self.default_device_tvos
+      config = Scan.config
+
+      if config[:device] # make sure it actually exists
+        device = config[:device].to_s.strip.tr('()', '') # Remove parenthesis
+
+        found = FastlaneCore::SimulatorTV.all.find do |d|
+          (d.name + " " + d.tvos_version).include? device
+        end
+
+        if found
+          Scan.device = found
+          return
+        else
+          Helper.log.error "Couldn't find simulator '#{config[:device]}' - falling back to default simulator".red
+        end
+      end
+
+      sims = FastlaneCore::SimulatorTV.all
+      xcode_target = Scan.project.build_settings(key: "TVOS_DEPLOYMENT_TARGET")
+
+      # Filter out any simulators that are not the same major version of our deployment target
+      if xcode_target.to_s.length > 0
+        min_target = xcode_target.split(".").first.to_i
+        sims = sims.select { |s| s.ios_version.to_i >= min_target }
+      end
+
+      # Apple TV 1080p is useful for tests
+      found = sims.find { |d| d.name == "Apple TV 1080p" }
+      found ||= sims.first # anything is better than nothing
+
+      Scan.device = found
+
+      raise "No simulators found".red unless Scan.device
+    end
+
     # Is it an iOS device or a Mac?
     def self.detect_destination
       if Scan.config[:destination]
@@ -69,6 +112,8 @@ module Scan
       # building up the destination now
       if Scan.project.ios?
         Scan.config[:destination] = "platform=iOS Simulator,id=#{Scan.device.udid}"
+      elsif Scan.project.tvos?
+        Scan.config[:destination] = "platform=tvOS Simulator,id=#{Scan.device.udid}"
       else
         Scan.config[:destination] = "platform=OS X"
       end

data/lib/scan/options.rb

@@ -108,6 +108,7 @@ module Scan
                                        raise "File not found at path '#{File.expand_path(value)}'".red unless File.exist?(value)
                                      end),
         FastlaneCore::ConfigItem.new(key: :slack_url,
+                                     short_option: "-i",
                                      env_name: "SLACK_URL",
                                      description: "Create an Incoming WebHook for your Slack group to post results there",
                                      optional: true,
@@ -115,6 +116,7 @@ module Scan
                                        raise "Invalid URL, must start with https://" unless value.start_with? "https://"
                                      end),
         FastlaneCore::ConfigItem.new(key: :slack_channel,
+                                     short_option: "-e",
                                      env_name: "SCAN_SLACK_CHANNEL",
                                      description: "#channel or @username",
                                      optional: true),

data/lib/scan/test_command_generator.rb

@@ -66,6 +66,10 @@ module Scan
           Helper.log.info "Automatically switched to Travis formatter".green
         end
 
+        if Helper.colors_disabled?
+          formatter << "--no-color"
+        end
+
         if Scan.config[:output_style] == 'basic'
           formatter << "--no-utf"
         end

data/lib/scan/version.rb

@@ -1,4 +1,4 @@
 module Scan
-  VERSION = "0.3.3"
+  VERSION = "0.4.1"
   DESCRIPTION = "Making sure no bad code gets on board"
 end

data/lib/scan.rb

@@ -34,4 +34,5 @@ module Scan
   end
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+  UI = FastlaneCore::UI
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scan
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.6
+        version: 0.32.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.6
+        version: 0.32.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0