fastlane_core 0.36.8 → 0.36.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df20c29b3701692f89ad3418ab3f9933735b81a
-  data.tar.gz: bdbe065e873eaade6db30af2d0654c0b5278a204
+  metadata.gz: eb03c52b6d68f1d13b5470c5921b9dbe50b88053
+  data.tar.gz: 85e09706d35029e07617b279fb6bc8b724fd98c9
 SHA512:
-  metadata.gz: f689d3b9a0dc4fcf942cfc12da2ba686f4625da8a4126f8b51908ffd6532cb649db0860def61aea1ccb5e2892a3e2ca4df30f91bf1b79e5d5ad12f079f3a3490
-  data.tar.gz: d1119e07d5bc52350311171a015c02e2df4ca36ff261f32dca289e951336029800a6f1452bec3893c0ceb4d68aa6f3925a78f827b5e647964a7c6984e6b7253e
+  metadata.gz: 93150dbe3b09b674fc298418aed928a461e1ed5b3328d3e1c5a1d9b41396970399419961c4adebfebc13ff579c813f651a3de616e43d0fb8140ce2daea096bb7
+  data.tar.gz: 78dfc200e172ba6ade3ce3eed598e503aac40ec6eaeafebbb23b158224e1bf30fa3f10595e00e8b6147a1d77782b0fd1185dd8fcf997d551d8140a873a45dea4

data/lib/fastlane_core/configuration/config_item.rb

@@ -91,7 +91,7 @@ module FastlaneCore
         return value.to_f
       else
         # Special treatment if the user specififed true, false or YES, NO
-        # There is no boolean typoe, so we just do it here
+        # There is no boolean type, so we just do it here
         if %w(YES yes true TRUE).include?(value)
           return true
         elsif %w(NO no false FALSE).include?(value)

data/lib/fastlane_core/configuration/configuration.rb

@@ -182,6 +182,9 @@ module FastlaneCore
       return value unless value.nil? # we already have a value
       return value if option.optional # as this value is not required, just return what we have
 
+      return value unless ask
+
+      # fallback to asking
       if Helper.is_test? or Helper.is_ci?
         # Since we don't want to be asked on tests, we'll just call the verify block with no value
         # to raise the exception that is shown when the user passes an invalid value
@@ -190,7 +193,7 @@ module FastlaneCore
         UI.user_error!("No value found for '#{key}'")
       end
 
-      while ask && value.nil?
+      while value.nil?
         Helper.log.info "To not be asked about this value, you can specify it using '#{option.key}'".yellow
         value = ask("#{option.description}: ")
         # Also store this value to use it from now on
@@ -221,10 +224,11 @@ module FastlaneCore
       true
     end
 
-    def values
+    # see fetch
+    def values(ask: true)
       # As the user accesses all values, we need to iterate through them to receive all the values
       @available_options.each do |option|
-        @values[option.key] = fetch(option.key) unless @values[option.key]
+        @values[option.key] = fetch(option.key, ask: ask) unless @values[option.key]
       end
       @values
     end

data/lib/fastlane_core/configuration/configuration_file.rb

@@ -32,10 +32,13 @@ module FastlaneCore
     def method_missing(method_sym, *arguments, &block)
       # First, check if the key is actually available
       if self.config.all_keys.include? method_sym
-        value = arguments.first || (block.call if block_given?) # this is either a block or a value
-        if value
-          self.config[method_sym] = value if self.config._values[method_sym].to_s.length == 0
-        end
+        # This silently prevents a value from having its value set more than once.
+        return unless self.config._values[method_sym].to_s.empty?
+
+        value = arguments.first
+        value = block.call if value.nil? && block_given?
+
+        self.config[method_sym] = value unless value.nil?
       else
         # We can't set this value, maybe the tool using this configuration system has its own
         # way of handling this block, as this might be a special block (e.g. ipa block) that's only

data/lib/fastlane_core/print_table.rb

@@ -2,22 +2,16 @@ module FastlaneCore
   class PrintTable
     class << self
       # This method prints out all the user inputs in a nice table. Useful to summarize the run
-      # You can pass an array to `hide_key` if you don't want certain elements to show up (symbols)
-      def print_values(config: nil, title: nil, hide_keys: [])
+      # You can pass an array to `hide_keys` if you don't want certain elements to show up (symbols or strings)
+      # You can pass an array to `mask_keys` if you want to mask certain elements (symbols or strings)
+      def print_values(config: nil, title: nil, hide_keys: [], mask_keys: [])
         require 'terminal-table'
-        rows = []
 
-        config.available_options.each do |config_item|
-          value = config.fetch(config_item.key, ask: false) # Don't ask the user for missing values at this point
-          next if value.nil?
-          next if value.to_s == ""
-          next if hide_keys.include?(config_item.key)
-
-          rows << [config_item.key, value]
-        end
+        options = config.nil? ? {} : config.values(ask: false)
+        rows = self.collect_rows(options: options, hide_keys: hide_keys.map(&:to_s), mask_keys: mask_keys.map(&:to_s), prefix: '')
 
         params = {}
-        params[:rows] = rows
+        params[:rows] = limit_row_size(rows)
         params[:title] = title.green if title
 
         puts ""
@@ -26,6 +20,37 @@ module FastlaneCore
 
         return params
       end
+
+      def limit_row_size(rows, max_length = 100)
+        require 'fastlane_core/string_filters'
+
+        max_key_length = rows.map { |e| e[0].length }.max || 0
+        max_allowed_value_length = max_length - max_key_length - 7
+        rows.map do |e|
+          value = e[1]
+          value = value.truncate(max_allowed_value_length) if value.kind_of? String
+          [e[0], value]
+        end
+      end
+
+      def collect_rows(options: nil, hide_keys: [], mask_keys: [], prefix: '', mask: '********')
+        rows = []
+
+        options.each do |key, value|
+          prefixed_key = "#{prefix}#{key}"
+          next if value.nil?
+          next if value.to_s == ""
+          next if hide_keys.include?(prefixed_key)
+          value = mask if mask_keys.include?(prefixed_key)
+
+          if value.respond_to? :key
+            rows.concat self.collect_rows(options: value, hide_keys: hide_keys, mask_keys: mask_keys, prefix: "#{prefix}#{key}.", mask: mask)
+          else
+            rows << [prefixed_key, value]
+          end
+        end
+        rows
+      end
     end
   end
 end

data/lib/fastlane_core/project.rb

@@ -80,6 +80,14 @@ module FastlaneCore
       self.is_workspace
     end
 
+    def project_name
+      if is_workspace
+        return File.basename(options[:workspace], ".xcworkspace")
+      else
+        return File.basename(options[:project], ".xcodeproj")
+      end
+    end
+
     # Get all available schemes in an array
     def schemes
       parsed_info.schemes
@@ -109,15 +117,16 @@ module FastlaneCore
 
         if preferred_to_include and preferred.count == 1
           options[:scheme] = preferred.last
+        elsif automated_scheme_selection? && schemes.include?(project_name)
+          Helper.log.info "Using scheme matching project name (#{project_name}).".yellow
+          options[:scheme] = project_name
+        elsif Helper.is_ci?
+          Helper.log.error "Multiple schemes found but you haven't specified one.".red
+          Helper.log.error "Since this is a CI, please pass one using the `scheme` option".red
+          raise "Multiple schemes found".red
         else
-          if Helper.is_ci?
-            Helper.log.error "Multiple schemes found but you haven't specified one.".red
-            Helper.log.error "Since this is a CI, please pass one using the `scheme` option".red
-            raise "Multiple schemes found".red
-          else
-            puts "Select Scheme: "
-            options[:scheme] = choose(*(schemes))
-          end
+          puts "Select Scheme: "
+          options[:scheme] = choose(*(schemes))
         end
       else
         Helper.log.error "Couldn't find any schemes in this project, make sure that the scheme is shared if you are using a workspace".red
@@ -290,5 +299,11 @@ module FastlaneCore
       end
       @parsed_info
     end
+
+    # If scheme not specified, do we want the scheme
+    # matching project name?
+    def automated_scheme_selection?
+      !!ENV["AUTOMATED_SCHEME_SELECTION"]
+    end
   end
 end

data/lib/fastlane_core/simulator.rb

@@ -30,9 +30,9 @@ module FastlaneCore
           else
             # iPad 2 (0EDE6AFC-3767-425A-9658-AAA30A60F212) (Shutdown)
             # iPad Air 2 (4F3B8059-03FD-4D72-99C0-6E9BBEE2A9CE) (Shutdown) (unavailable, device type profile not found)
-            match = line.match(/\s+([^\(]+) \(([-0-9A-F]+)\) \((?:[^\(]+)\)(.*unavailable.*)?/)
-            if match && !match[3] && os_type == requested_os_type
-              @devices << Device.new(name: match[1], ios_version: os_version, udid: match[2])
+            match = line.match(/\s+([^\(]+) \(([-0-9A-F]+)\) \(([^\(]+)\)(.*unavailable.*)?/)
+            if match && !match[4] && os_type == requested_os_type
+              @devices << Device.new(name: match[1], os_version: os_version, udid: match[2], state: match[3])
             end
           end
         end
@@ -44,6 +44,18 @@ module FastlaneCore
         @devices = nil
       end
 
+      # Reset all simulators of this type
+      def reset_all
+        all.each(&:reset)
+      end
+
+      # Reset simulator by UDID or name and OS version
+      # Latter is useful when combined with -destination option of xcodebuild
+      def reset(udid: nil, name: nil, os_version: nil)
+        match = all.detect { |device| device.udid == udid || device.name == name && device.os_version == os_version }
+        match.reset if match
+      end
+
       # The code below works from Xcode 7 on
       # def all
       #   Helper.log.info "Fetching available devices" if $verbose
@@ -68,7 +80,7 @@ module FastlaneCore
       #       next unless os_version.include?(requested_os_type)
 
       #       os = os_version.gsub(requested_os_type + " ", "").strip
-      #       @devices << Device.new(name: device['name'], ios_version: os, udid: device['udid'])
+      #       @devices << Device.new(name: device['name'], os_version: os, udid: device['udid'])
       #     end
       #   end
 
@@ -88,20 +100,29 @@ module FastlaneCore
 
     class Device
       attr_accessor :name
-
       attr_accessor :udid
+      attr_accessor :os_version
+      attr_accessor :ios_version # Preserved for backwards compatibility
+      attr_accessor :state
 
-      attr_accessor :ios_version
-
-      def initialize(name: nil, udid: nil, ios_version: nil)
+      def initialize(name: nil, udid: nil, os_version: nil, state: nil)
         self.name = name
         self.udid = udid
-        self.ios_version = ios_version
+        self.os_version = os_version
+        self.ios_version = os_version
+        self.state = state
       end
 
       def to_s
         self.name
       end
+
+      def reset
+        Helper.log.info "Resetting #{self}"
+        `xcrun simctl shutdown #{self.udid}` if self.state == "Booted"
+        `xcrun simctl erase #{self.udid}`
+        return
+      end
     end
   end
 
@@ -112,4 +133,12 @@ module FastlaneCore
       end
     end
   end
+
+  class SimulatorWatch < Simulator
+    class << self
+      def requested_os_type
+        'watchOS'
+      end
+    end
+  end
 end

data/lib/fastlane_core/string_filters.rb

@@ -0,0 +1,34 @@
+class String
+  # Truncates a given +text+ after a given <tt>length</tt> if +text+ is longer than <tt>length</tt>:
+  #
+  #   'Once upon a time in a world far far away'.truncate(27)
+  #   # => "Once upon a time in a wo..."
+  #
+  # Pass a string or regexp <tt>:separator</tt> to truncate +text+ at a natural break:
+  #
+  #   'Once upon a time in a world far far away'.truncate(27, separator: ' ')
+  #   # => "Once upon a time in a..."
+  #
+  #   'Once upon a time in a world far far away'.truncate(27, separator: /\s/)
+  #   # => "Once upon a time in a..."
+  #
+  # The last characters will be replaced with the <tt>:omission</tt> string (defaults to "...")
+  # for a total length not exceeding <tt>length</tt>:
+  #
+  #   'And they found that many people were sleeping better.'.truncate(25, omission: '... (continued)')
+  #   # => "And they f... (continued)"
+  def truncate(truncate_at, options = {})
+    return dup unless length > truncate_at
+
+    omission = options[:omission] || '...'
+    length_with_room_for_omission = truncate_at - omission.length
+    stop = \
+      if options[:separator]
+        rindex(options[:separator], length_with_room_for_omission) || length_with_room_for_omission
+      else
+        length_with_room_for_omission
+      end
+
+    "#{self[0, stop]}#{omission}"
+  end
+end

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.36.8".freeze
+  VERSION = "0.36.9".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.36.8
+  version: 0.36.9
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -355,6 +355,7 @@ files:
 - lib/fastlane_core/project.rb
 - lib/fastlane_core/provisioning_profile.rb
 - lib/fastlane_core/simulator.rb
+- lib/fastlane_core/string_filters.rb
 - lib/fastlane_core/ui/disable_colors.rb
 - lib/fastlane_core/ui/fastlane_runner.rb
 - lib/fastlane_core/ui/implementations/shell.rb
@@ -384,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Contains all shared code/dependencies of the fastlane.tools