fastlane_core 0.35.1 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaceeb34f89395634665eca09896c384e21802c7
-  data.tar.gz: ef02fb14918ce867d9f326e50e626afdacd674f7
+  metadata.gz: 62180ad56d4720bae4f2d9abad31ff128076f028
+  data.tar.gz: 41fc0d18208d64f7259e3c23e0495fc0075514b6
 SHA512:
-  metadata.gz: 01d65cf15b15403797671a3001e39377bfbdffb46187aa12226c10dcbe1f93b892aaefe3d1e2b89614aa4dc8f83f7509378665dc2e91246e8c706c0eff53ea63
-  data.tar.gz: 8d8588d6c0186c239645e7d24c43aba913d4e390faf1981dd9ee558d9b76e14084c538983b56ce6a6d8e7823205628e2ac245875d527ce5f1a00580fcf396485
+  metadata.gz: 9b8e60d5f10e816fa27706a3f93f3565974ccd7cd1f9182e2a330d2d07ec2e68cea8f1767656b2aa7057feedabd19d8db43d20b61263067ee32ab6cd7ef953de
+  data.tar.gz: 12aff2f4ecddbcd5e0f7963434f9e365c2b82629b14b285b3c9183724a4482f03ae144b818279a6f869af5967320d705dc2793a020160700d7138585a4dd255f

data/README.md

@@ -46,6 +46,9 @@ This gem contains all shared classes and code:
 
 You can hide the inline changelog by setting the `FASTLANE_HIDE_CHANGELOG` environment variable
 
+# Code of Conduct
+Help us keep `fastlane` open and inclusive. Please read and follow our [Code of Conduct](https://github.com/fastlane/code-of-conduct).
+
 # License
 This project is licensed under the terms of the MIT license. See the LICENSE file.
 

data/lib/fastlane_core.rb

@@ -24,5 +24,8 @@ require 'fastlane_core/ui/ui'
 require 'colored'
 require 'commander'
 
+# after commander import
+require 'fastlane_core/ui/fastlane_runner' # monkey patch
+
 module FastlaneCore
 end

data/lib/fastlane_core/configuration/config_item.rb

@@ -52,7 +52,7 @@ module FastlaneCore
 
     # This will raise an exception if the value is not valid
     def verify!(value)
-      raise "Invalid value '#{value}' for option '#{self}'".red unless valid? value
+      UI.user_error!("Invalid value '#{value}' for option '#{self}'") unless valid? value
       true
     end
 
@@ -63,15 +63,15 @@ module FastlaneCore
       if value
         # Verify that value is the type that we're expecting, if we are expecting a type
         if data_type && !value.kind_of?(data_type)
-          raise "'#{self.key}' value must be a #{data_type}! Found #{value.class} instead.".red
+          UI.user_error!("'#{self.key}' value must be a #{data_type}! Found #{value.class} instead.")
         end
 
         if @verify_block
           begin
             @verify_block.call(value)
           rescue => ex
-            Helper.log.fatal "Error setting value '#{value}' for option '#{@key}'".red
-            raise ex
+            UI.error "Error setting value '#{value}' for option '#{@key}'"
+            raise Interface::FastlaneError.new, ex.to_s
           end
         end
       end
@@ -82,7 +82,6 @@ module FastlaneCore
     # Returns an updated value type (if necessary)
     def auto_convert_value(value)
       # Weird because of https://stackoverflow.com/questions/9537895/using-a-class-object-in-case-statement
-
       case
       when data_type == Array
         return value.split(',') if value.kind_of?(String)

data/lib/fastlane_core/configuration/configuration.rb

@@ -43,11 +43,11 @@ module FastlaneCore
     end
 
     def verify_input_types
-      raise "available_options parameter must be an array of ConfigItems but is #{@available_options.class}".red unless @available_options.kind_of? Array
+      UI.user_error!("available_options parameter must be an array of ConfigItems but is #{@available_options.class}") unless @available_options.kind_of? Array
       @available_options.each do |item|
-        raise "available_options parameter must be an array of ConfigItems. Found #{item.class}.".red unless item.kind_of? ConfigItem
+        UI.user_error!("available_options parameter must be an array of ConfigItems. Found #{item.class}.") unless item.kind_of? ConfigItem
       end
-      raise "values parameter must be a hash".red unless @values.kind_of? Hash
+      UI.user_error!("values parameter must be a hash") unless @values.kind_of? Hash
     end
 
     def verify_value_exists
@@ -59,7 +59,7 @@ module FastlaneCore
         if option
           option.verify!(value) # Call the verify block for it too
         else
-          raise "Could not find option '#{key}' in the list of available options: #{@available_options.collect(&:key).join(', ')}".red
+          UI.user_error!("Could not find option '#{key}' in the list of available options: #{@available_options.collect(&:key).join(', ')}")
         end
       end
     end
@@ -68,11 +68,11 @@ module FastlaneCore
       # Make sure a key was not used multiple times
       @available_options.each do |current|
         count = @available_options.count { |option| option.key == current.key }
-        raise "Multiple entries for configuration key '#{current.key}' found!".red if count > 1
+        UI.user_error!("Multiple entries for configuration key '#{current.key}' found!") if count > 1
 
         unless current.short_option.to_s.empty?
           count = @available_options.count { |option| option.short_option == current.short_option }
-          raise "Multiple entries for short_option '#{current.short_option}' found!".red if count > 1
+          UI.user_error!("Multiple entries for short_option '#{current.short_option}' found!") if count > 1
         end
       end
     end
@@ -101,7 +101,7 @@ module FastlaneCore
               raise ex
             end
           else
-            raise "Unresolved conflict between options: '#{current.key}' and '#{conflicting_option.key}'".red
+            UI.user_error!("Unresolved conflict between options: '#{current.key}' and '#{conflicting_option.key}'")
           end
         end
       end
@@ -118,7 +118,7 @@ module FastlaneCore
           end
         rescue => ex
           Helper.log.fatal ex
-          raise "Invalid default value for #{item.key}, doesn't match verify_block".red
+          UI.user_error!("Invalid default value for #{item.key}, doesn't match verify_block")
         end
       end
     end
@@ -155,10 +155,10 @@ module FastlaneCore
     # Returns the value for a certain key. fastlane_core tries to fetch the value from different sources
     # if 'ask' is true and the value is not present, the user will be prompted to provide a value
     def fetch(key, ask: true)
-      raise "Key '#{key}' must be a symbol. Example :app_id.".red unless key.kind_of?(Symbol)
+      UI.user_error!("Key '#{key}' must be a symbol. Example :app_id.") unless key.kind_of?(Symbol)
 
       option = option_for_key(key)
-      raise "Could not find option for key :#{key}. Available keys: #{@available_options.collect(&:key).join(', ')}".red unless option
+      UI.user_error!("Could not find option for key :#{key}. Available keys: #{@available_options.collect(&:key).join(', ')}") unless option
 
       value = @values[key]
 
@@ -181,7 +181,7 @@ module FastlaneCore
         # to raise the exception that is shown when the user passes an invalid value
         set(key, '')
         # If this didn't raise an exception, just raise a default one
-        raise "No value found for '#{key}'"
+        UI.user_error!("No value found for '#{key}'")
       end
 
       while ask && value.nil?
@@ -202,11 +202,11 @@ module FastlaneCore
     # Overwrites or sets a new value for a given key
     # @param key [Symbol] Must be a symbol
     def set(key, value)
-      raise "Key '#{key}' must be a symbol. Example :#{key}.".red unless key.kind_of? Symbol
+      UI.user_error!("Key '#{key}' must be a symbol. Example :#{key}.") unless key.kind_of? Symbol
       option = option_for_key(key)
 
       unless option
-        raise "Could not find option '#{key}' in the list of available options: #{@available_options.collect(&:key).join(', ')}".red
+        UI.user_error!("Could not find option '#{key}' in the list of available options: #{@available_options.collect(&:key).join(', ')}")
       end
 
       option.verify!(value)

data/lib/fastlane_core/crash_reporting/crash_reporting.rb

@@ -27,7 +27,6 @@ module FastlaneCore
         puts "😨  An error occured. Please enable crash reports using `fastlane enable_crash_reporting`.".yellow
         puts "👍  This makes resolving issues much easier and helps improve fastlane.".yellow
         puts "🔒  The reports will be stored securely on getsentry.com.".yellow
-        puts "✨  Once crash reporting is enabled, you get a clean output when something goes wrong.".yellow
         puts "🙊  More information about privacy: https://github.com/fastlane/fastlane/releases/tag/1.33.3".yellow
         puts "-------------------------------------------------------------------------------------------".yellow
       end
@@ -40,7 +39,6 @@ module FastlaneCore
         puts "😃  Enable crash reporting when fastlane experiences a problem?".yellow
         puts "👍  This makes resolving issues much easier and helps improve fastlane.".yellow
         puts "🔒  The reports will be stored securely on getsentry.com".yellow
-        puts "✨  Once crash reporting is enabled, you get a clean output when something goes wrong".yellow
         puts "🙊  More information about privacy: https://github.com/fastlane/fastlane/releases/tag/1.33.3".yellow
         puts "🌴  You can always disable crash reports at anytime `fastlane disable_crash_reporting`".yellow
         puts "-------------------------------------------------------------------------------------------".yellow
@@ -52,13 +50,10 @@ module FastlaneCore
       def handle_crash(ex)
         unless enabled?
           show_message
-          raise ex
         end
 
         raise ex if Helper.test?
-
         send_crash(ex)
-        Kernel.abort # => return status 1, we could pass a message here too, but this would end up with duplicates
       end
 
       def send_crash(ex)

data/lib/fastlane_core/helper.rb

@@ -63,7 +63,7 @@ module FastlaneCore
     # @return [boolean] true if building in a known CI environment
     def self.ci?
       # Check for Jenkins, Travis CI, ... environment variables
-      ['JENKINS_URL', 'TRAVIS', 'CIRCLECI', 'CI', 'TEAMCITY_VERSION', 'GO_PIPELINE_NAME', 'bamboo_buildKey'].each do |current|
+      ['JENKINS_URL', 'TRAVIS', 'CIRCLECI', 'CI', 'TEAMCITY_VERSION', 'GO_PIPELINE_NAME', 'bamboo_buildKey', 'GITLAB_CI'].each do |current|
         return true if ENV.key?(current)
       end
       return false

data/lib/fastlane_core/ipa_file_analyser.rb

@@ -19,25 +19,23 @@ module FastlaneCore
 
     def self.fetch_info_plist_file(path)
       Zip::File.open(path) do |zipfile|
-        zipfile.each do |file|
-          next if file.name.match(%r{\.app/.+\.app/Info.plist$})
-          next unless file.name.include? '.plist' and !['.bundle', '.framework'].any? { |a| file.name.include? a }
+        file = zipfile.glob('**/Payload/*.app/Info.plist').first
+        return nil unless file
 
-          # We can not be completely sure, that's the correct plist file, so we have to try
-          begin
-            # The XML file has to be properly unpacked first
-            tmp_path = "/tmp/deploytmp.plist"
-            File.write(tmp_path, zipfile.read(file))
-            system("plutil -convert xml1 #{tmp_path}")
-            result = Plist.parse_xml(tmp_path)
-            File.delete(tmp_path)
+        # We can not be completely sure, that's the correct plist file, so we have to try
+        begin
+          # The XML file has to be properly unpacked first
+          tmp_path = "/tmp/deploytmp.plist"
+          File.write(tmp_path, zipfile.read(file))
+          system("plutil -convert xml1 #{tmp_path}")
+          result = Plist.parse_xml(tmp_path)
+          File.delete(tmp_path)
 
-            if result['CFBundleIdentifier'] or result['CFBundleVersion']
-              return result
-            end
-          rescue
-            # We don't really care, look for another XML file
+          if result['CFBundleIdentifier'] or result['CFBundleVersion']
+            return result
           end
+        rescue
+          # We don't really care, look for another XML file
         end
       end
 

data/lib/fastlane_core/itunes_transporter.rb

@@ -56,12 +56,7 @@ module FastlaneCore
       if result and File.directory? itmsp_path
         Helper.log.info "Successfully downloaded the latest package from iTunesConnect.".green
       else
-        # rubocop:disable Style/CaseEquality
-        unless /^[0-9a-zA-Z\.\$\_]*$/ === @password
-          Helper.log.error "Password contains special characters, which may not be handled properly by iTMSTransporter. If you experience problems uploading to iTunes Connect, please consider changing your password to something with only alphanumeric characters."
-        end
-        # rubocop:enable Style/CaseEquality
-        Helper.log.fatal "Could not download metadata from iTunes Connect! It's probably related to your password or your internet connection."
+        handle_error(@password)
       end
 
       result
@@ -90,6 +85,8 @@ module FastlaneCore
         Helper.log.info(("-" * 102).green)
 
         FileUtils.rm_rf(dir) unless Helper.is_test? # we don't need the package any more, since the upload was successful
+      else
+        handle_error(@password)
       end
 
       result
@@ -97,6 +94,15 @@ module FastlaneCore
 
     private
 
+    def handle_error(password)
+      # rubocop:disable Style/CaseEquality
+      unless /^[0-9a-zA-Z\.\$\_]*$/ === password
+        Helper.log.error "Password contains special characters, which may not be handled properly by iTMSTransporter. If you experience problems uploading to iTunes Connect, please consider changing your password to something with only alphanumeric characters."
+      end
+      # rubocop:enable Style/CaseEquality
+      Helper.log.fatal "Could not download/upload from iTunes Connect! It's probably related to your password or your internet connection."
+    end
+
     def execute_transporter(command)
       @errors = []
       @warnings = []

data/lib/fastlane_core/ui/fastlane_runner.rb

@@ -0,0 +1,53 @@
+module Commander
+  # This class override the run method with our custom stack trace handling
+  # In particular we want to distinguish between user_error! and crash! (one with, one without stack trace)
+  class Runner
+    # Code taken from https://github.com/commander-rb/commander/blob/master/lib/commander/runner.rb#L50
+    def run!
+      require_program :version, :description
+      trap('INT') { abort program(:int_message) } if program(:int_message)
+      trap('INT') { program(:int_block).call } if program(:int_block)
+      global_option('-h', '--help', 'Display help documentation') do
+        args = @args - %w(-h --help)
+        command(:help).run(*args)
+        return
+      end
+      global_option('-v', '--version', 'Display version information') do
+        say version
+        return
+      end
+      parse_global_options
+      remove_global_options options, @args
+
+      begin
+        run_active_command
+      rescue InvalidCommandError => e
+        abort "#{e}. Use --help for more information"
+      rescue Interrupt => ex
+        # We catch it so that the stack trace is hidden by default when using ctrl + c
+        if $verbose
+          raise ex
+        else
+          puts "\nCancelled... use --verbose to show the stack trace"
+        end
+      rescue \
+        OptionParser::InvalidOption,
+        OptionParser::InvalidArgument,
+        OptionParser::MissingArgument => e
+        abort e.to_s
+      rescue FastlaneCore::Interface::FastlaneError => e # user_error!
+        error_message = "\n[!] #{e}".red
+        if $verbose # with stack trace
+          raise e, "[!] #{e.message}".red, e.backtrace
+        else
+          abort error_message # without stack trace
+        end
+      rescue => e # high chance this is actually FastlaneCore::Interface::FastlaneCrash, but can be anything else
+        FastlaneCore::CrashReporting.handle_crash(ex)
+        # From https://stackoverflow.com/a/4789702/445598
+        # We do this to make the actual error message red and therefore more visible
+        raise e, "[!] #{e.message}".red, e.backtrace
+      end
+    end
+  end
+end

data/lib/fastlane_core/ui/implementations/shell.rb

@@ -102,36 +102,6 @@ module FastlaneCore
       ask(message.yellow) { |q| q.echo = "*" }
     end
 
-    #####################################################
-    # @!group Errors: Different kinds of exceptions
-    #####################################################
-
-    def crash!(exception)
-      if exception.kind_of?(String)
-        raise exception.red
-      elsif exception.kind_of?(Exception)
-        # From https://stackoverflow.com/a/4789702/445598
-        # We do this to make the actual error message red and therefore more visible
-        begin
-          raise exception
-        rescue => ex
-          raise $!, "[!] #{ex.message}".red, $!.backtrace
-        end
-      else
-        raise exception # we're just raising whatever we have here #yolo
-      end
-    end
-
-    def user_error!(error_message)
-      error_message = "\n[!] #{error_message}".red
-      if $verbose
-        # On verbose we want to see the full stack trace
-        raise error_message
-      else
-        abort(error_message)
-      end
-    end
-
     private
 
     def verify_interactive!(message)

data/lib/fastlane_core/ui/interface.rb

@@ -104,23 +104,32 @@ module FastlaneCore
     # @!group Errors: Different kinds of exceptions
     #####################################################
 
+    # raised from crash!
+    class FastlaneCrash < StandardError
+    end
+
+    # raised from user_error!
+    class FastlaneError < StandardError
+    end
+
     # Pass an exception to this method to exit the program
     #   using the given exception
     # Use this method instead of user_error! if this error is
     # unexpected, e.g. an invalid server response that shouldn't happen
-    def crash!(_exception)
-      not_implemented(__method__)
+    def crash!(exception)
+      raise FastlaneCrash.new, exception.to_s
     end
 
     # Use this method to exit the program because of an user error
     #   e.g. app doesn't exist on the given Developer Account
     #        or invalid user credentials
+    #        or scan tests fail
     # This will show the error message, but doesn't show the full
     #   stack trace
     # Basically this should be used when you actively catch the error
     # and want to show a nice error message to the user
-    def user_error!(_error_message)
-      not_implemented(__method__)
+    def user_error!(error_message)
+      raise FastlaneError.new, error_message.to_s
     end
 
     #####################################################

data/lib/fastlane_core/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCore
-  VERSION = "0.35.1"
+  VERSION = "0.36.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane_core
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.36.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -70,14 +70,14 @@ dependencies:
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 4.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 4.3.5
 - !ruby/object:Gem::Dependency
@@ -356,6 +356,7 @@ files:
 - lib/fastlane_core/provisioning_profile.rb
 - lib/fastlane_core/simulator.rb
 - lib/fastlane_core/ui/disable_colors.rb
+- lib/fastlane_core/ui/fastlane_runner.rb
 - lib/fastlane_core/ui/implementations/shell.rb
 - lib/fastlane_core/ui/interface.rb
 - lib/fastlane_core/ui/ui.rb