fastlane 1.7.3 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3719594f0dc113b73b07509a43f5daa459c69879
-  data.tar.gz: f5fede279421253290b123cae0e275e8f73adcfa
+  metadata.gz: c339ea21edfc2acca2f46b9a751d03795647c3f6
+  data.tar.gz: 9c35a144521c7f03f7a9c7fe5441026ed9882d59
 SHA512:
-  metadata.gz: 2c0d4bf339f2ea29298e934611cb7be5a9cfda72c27a6b238dea39479889170f11f6fb332a5b5a0ddd67650ffcc3c321bb498c3190a20b2d1890aec7409d8044
-  data.tar.gz: 2fa46225e0200c809dcfba03662958eb085a4c614a21b21ce0a48cf6c3d64360ccf211be4a84885ba2c59ca261058c8be074d1b180b4ce269e3490078903d27a
+  metadata.gz: cc15fe2094ff6748d3c9f9ba7fc029b60eb7faafe91b9f7c407a749232fed51ab25a852f6b69b746ae4b0b3cd296cc260aa9b4e291385a09c530369978a05beb
+  data.tar.gz: 4849594603cd554346c5ddc54d97a1365903df26f1a14507719ecd2434ae780c79515a7c8c88c5d0392f5bfffac7da8694bc63487d3abb972bbdd965499fcd06

data/README.md

@@ -116,7 +116,7 @@ The setup assistant will create all the necessary files for you, using the exist
 
 For more details, please follow the [fastlane guide](https://github.com/KrauseFx/fastlane/blob/master/docs/Guide.md) or [documentation](https://github.com/KrauseFx/fastlane/blob/master/docs).
 
-There is also a [Japanese fastlane guide](http://qiita.com/gin0606/items/162d756dfda7b84e97d4) available.
+There are also 2 Japanese fastlane guides available: [qiita](http://qiita.com/gin0606/items/162d756dfda7b84e97d4) and [mercari](http://tech.mercari.com/entry/2015/07/13/143000)
 
 ## Available commands
 
@@ -156,11 +156,13 @@ See how [Wikipedia](https://github.com/fastlane/examples#wikipedia-by-wikimedia-
 
 You can easily opt-out by adding `opt_out_usage` to your `Fastfile` or by setting the environment variable `FASTLANE_OPT_OUT_USAGE`.
 
+To also disable update checks, set the `FASTLANE_SKIP_UPDATE_CHECK` variable.
+
 ## Credentials
-A detailed description about how ```fastlane``` stores your credentials is available on a [separate repo](https://github.com/KrauseFx/CredentialsManager).
+A detailed description about how `fastlane` stores your credentials is available on a [separate repo](https://github.com/KrauseFx/CredentialsManager).
 
 ## Need help?
-- If there is a technical problem with ```fastlane```, [open an issue](https://github.com/KrauseFx/fastlane/issues/new).
+- If there is a technical problem with `fastlane`, [open an issue](https://github.com/KrauseFx/fastlane/issues/new).
 - I'm available for contract work - drop me an email: fastlane@krausefx.com
 
 ## Special Thanks

data/bin/fastlane

@@ -13,7 +13,10 @@ class FastlaneApplication
 
   def run
     program :version, Fastlane::VERSION
-    program :description, "CLI for 'fastlane' - Connect all iOS deployment tools into one streamlined workflow.\n\nRun using fastlane [lane_name]"
+    program :description, [
+      "CLI for 'fastlane' - Connect all iOS deployment tools into one streamlined workflow.\n",
+      "\tRun using `fastlane [platform] [lane_name]`",
+      "\tTo pass values to the lanes use `fastlane [platform] [lane_name] key:value key2:value2`"].join("\n")
     program :help, 'Author', 'Felix Krause <fastlane@krausefx.com>'
     program :help, 'Website', 'https://fastlane.tools'
     program :help, 'GitHub', 'https://github.com/krausefx/fastlane'
@@ -28,15 +31,8 @@ class FastlaneApplication
 
       c.action do |args, _options|
         if Fastlane::FastlaneFolder.path
-          platform = nil
-          lane = args[1]
-          if lane
-            platform = args[0]
-          else
-            lane = args[0]
-          end
-
-          Fastlane::LaneManager.cruise_lane(platform, lane, _options.env)
+
+          Fastlane::CommandLineHandler.handle(args, _options)
         else
           create = agree('Could not find fastlane in current directory. Would you like to set it up? (y/n)'.yellow, true)
           Fastlane::Setup.new.run if create

data/lib/fastlane.rb

@@ -12,6 +12,7 @@ require 'fastlane/action'
 require 'fastlane/action_collector'
 require 'fastlane/supported_platforms'
 require 'fastlane/configuration_helper'
+require 'fastlane/command_line_handler'
 
 require 'fastlane_core'
 

data/lib/fastlane/action_collector.rb

@@ -3,14 +3,14 @@ module Fastlane
     HOST_URL = "https://fastlane-enhancer.herokuapp.com/"
 
     def did_launch_action(name)
-      if is_official(name)
+      if is_official?(name)
         launches[name] ||= 0
         launches[name] += 1
       end
     end
 
     def did_raise_error(name)
-      if is_official(name)
+      if is_official?(name)
         @error = name
       end
     end
@@ -18,31 +18,35 @@ module Fastlane
     # Sends the used actions
     # Example data => [:xcode_select, :deliver, :notify, :slack]
     def did_finish
-      Thread.new do
-        unless ENV["FASTLANE_OPT_OUT_USAGE"]
-          begin
-            unless did_show_message?
-              Helper.log.debug("Sending Crash/Success information. More information on: https://github.com/fastlane/enhancer")
-              Helper.log.debug("No personal/sensitive data is sent. Only sharing the following:")
-              Helper.log.debug(launches)
-              Helper.log.debug(@error) if @error
-              Helper.log.debug("This information is used to fix failing actions and improve integrations that are often used.")
-              Helper.log.debug("You can disable this by adding `opt_out_usage` to your Fastfile")
-            end
+      unless ENV["FASTLANE_OPT_OUT_USAGE"]
+        begin
+          unless did_show_message?
+            Helper.log.debug("Sending Crash/Success information. More information on: https://github.com/fastlane/enhancer")
+            Helper.log.debug("No personal/sensitive data is sent. Only sharing the following:")
+            Helper.log.debug(launches)
+            Helper.log.debug(@error) if @error
+            Helper.log.debug("This information is used to fix failing actions and improve integrations that are often used.")
+            Helper.log.debug("You can disable this by adding `opt_out_usage` to your Fastfile")
+          end
 
-            require 'excon'
-            url = HOST_URL + '/did_launch?'
-            url += URI.encode_www_form(
-                    steps: launches.to_json,
-                    error: @error
-                  )
+          require 'excon'
+          url = HOST_URL + '/did_launch?'
+          url += URI.encode_www_form(
+                  steps: launches.to_json,
+                  error: @error
+                )
 
-            unless Helper.is_test? # don't send test data
-              Excon.post(url)
+          unless Helper.is_test? # don't send test data
+            fork do
+              begin
+                Excon.post(url)
+              rescue
+                # we don't want to show a stack trace if something goes wrong
+              end
             end
-          rescue
-            # We don't care about connection errors
           end
+        rescue
+          # We don't care about connection errors
         end
       end
     end
@@ -51,7 +55,8 @@ module Fastlane
       @launches ||= {}
     end
 
-    def is_official(name)
+    def is_official?(name)
+      return true if name == :lane_switch
       Actions.get_all_official_actions.include?name
     end
 

data/lib/fastlane/actions/hockey.rb

@@ -77,6 +77,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :dsym,
                                        env_name: "FL_HOCKEY_DSYM",
                                        description: "Path to your DSYM file",
+                                       default_value: Actions.lane_context[SharedValues::DSYM_OUTPUT_PATH],
                                        optional: true,
                                        verify_block: Proc.new do |value|
                                         # validation is done in the action

data/lib/fastlane/actions/import_certificate.rb

@@ -7,6 +7,7 @@ module Fastlane
         command = "security import #{params[:certificate_path].shellescape} -k ~/Library/Keychains/#{params[:keychain_name].shellescape}"
         command << " -P #{params[:certificate_password].shellescape}" if params[:certificate_password]
         command << " -T /usr/bin/codesign"
+        command << " -T /usr/bin/security"
 
         Fastlane::Actions.sh command, log: false
       end

data/lib/fastlane/command_line_handler.rb

@@ -0,0 +1,44 @@
+module Fastlane
+  class CommandLineHandler
+    # This method handles command line inputs and properly transforms them to a usable format
+    # @param [Array] args An array of all arguments (not options)
+    # @param [Array] args A hash of all options (e.g. --env NAME)
+    def self.handle(args, options)
+      lane_parameters = {} # the parameters we'll pass to the lane
+      platform_lane_info = [] # the part that's responsible for the lane/platform definition
+      args.each do |current|
+        if current.include?":" # that's a key/value which we want to pass to the lane
+          key, value = current.split(":")          
+          raise "Please pass values like this: key:value" unless (key.length > 0 and value.length > 0)
+          value = convert_value(value)
+          Helper.log.debug "Using #{key}: #{value}".green
+          lane_parameters[key.to_sym] = value
+        else
+          platform_lane_info << current
+        end
+      end
+
+      platform = nil
+      lane = platform_lane_info[1]
+      if lane
+        platform = platform_lane_info[0]
+      else
+        lane = platform_lane_info[0]
+      end
+
+      dot_env = options.env rescue nil # we don't really care about this option in tests
+
+      Fastlane::LaneManager.cruise_lane(platform, lane, lane_parameters, dot_env)
+    end
+
+    private
+      # Conert into the right data type
+      def self.convert_value(value)
+        return true if (value == 'true' or value == 'yes')
+        return false if (value == 'false' || value == 'no')
+        
+        # Default case:
+        return value
+      end
+  end
+end

data/lib/fastlane/fast_file.rb

@@ -68,62 +68,81 @@ module Fastlane
       @runner.set_error(@current_platform, block)
     end
 
+    def try_switch_to_lane(new_lane, parameters)
+      current_platform = Actions.lane_context[Actions::SharedValues::PLATFORM_NAME]
+      block = @runner.blocks.fetch(current_platform, {}).fetch(new_lane, nil)
+      platform_nil = (block == nil) # used for the output
+      block ||= @runner.blocks.fetch(nil, {}).fetch(new_lane, nil) # fallback to general lane for multiple platforms
+      if block
+        pretty = [new_lane]
+        pretty = [current_platform, new_lane] unless platform_nil
+        Helper.log.info "Cruising over to lane '#{pretty.join(' ')}' 🚖".green
+        collector.did_launch_action(:lane_switch)
+        result = block.call(parameters.first || {}) # to always pass a hash
+        original_lane = Actions.lane_context[Actions::SharedValues::LANE_NAME]
+        Helper.log.info "Cruising back to lane '#{original_lane}' 🚘".green
+        return result
+      else
+        # No action and no lane, raising an exception now
+        raise "Could not find action or lane '#{new_lane}'. Check out the README for more details: https://github.com/KrauseFx/fastlane".red
+      end
+    end
+
+    def execute_action(method_sym, class_ref, arguments)
+      collector.did_launch_action(method_sym)
+
+      step_name = class_ref.step_text rescue nil
+      step_name = method_sym.to_s unless step_name
+
+      verify_supported_os(method_sym, class_ref)
+
+      Helper.log_alert("Step: " + step_name)
+
+      begin
+        Dir.chdir('..') do # go up from the fastlane folder, to the project folder
+          Actions.execute_action(method_sym) do
+            # arguments is an array by default, containing an hash with the actual parameters
+            # Since we usually just need the passed hash, we'll just use the first object if there is only one
+            if arguments.count == 0 
+              arguments = ConfigurationHelper.parse(class_ref, {}) # no parameters => empty hash
+            elsif arguments.count == 1 and arguments.first.kind_of?Hash
+              arguments = ConfigurationHelper.parse(class_ref, arguments.first) # Correct configuration passed
+            elsif not class_ref.available_options
+              # This action does not use the new action format
+              # Just passing the arguments to this method
+            else
+              raise "You have to pass the options for '#{method_sym}' in a different way. Please check out the current documentation on GitHub!".red
+            end
+
+            class_ref.run(arguments)
+          end
+        end
+      rescue => ex
+        collector.did_raise_error(method_sym)
+        raise ex
+      end
+    end
+
     # Is used to look if the method is implemented as an action
     def method_missing(method_sym, *arguments, &_block)
       # First, check if there is a predefined method in the actions folder
-
       class_name = method_sym.to_s.fastlane_class + 'Action'
       class_ref = nil
       begin
         class_ref = Fastlane::Actions.const_get(class_name)
+        if class_ref && class_ref.respond_to?(:run)
+          # Action is available, now execute it
+          return execute_action(method_sym, class_ref, arguments)
+        else
+          raise "Action '#{method_sym}' of class '#{class_name}' was found, but has no `run` method.".red
+        end
       rescue NameError => ex
         # Action not found
-        raise "Could not find method '#{method_sym}'. Check out the README for more details: https://github.com/KrauseFx/fastlane".red
-      end
-
-      if class_ref && class_ref.respond_to?(:run)
-        collector.did_launch_action(method_sym)
-
-        step_name = class_ref.step_text rescue nil
-        step_name = method_sym.to_s unless step_name
-
-        verify_supported_os(method_sym, class_ref)
-
-        Helper.log_alert("Step: " + step_name)
-
-        begin
-          Dir.chdir('..') do # go up from the fastlane folder, to the project folder
-            Actions.execute_action(method_sym) do
-              # arguments is an array by default, containing an hash with the actual parameters
-              # Since we usually just need the passed hash, we'll just use the first object if there is only one
-              if arguments.count == 0 
-                arguments = ConfigurationHelper.parse(class_ref, {}) # no parameters => empty hsh
-              elsif arguments.count == 1 and arguments.first.kind_of?Hash
-                arguments = ConfigurationHelper.parse(class_ref, arguments.first) # Correct configuration passed
-              elsif not class_ref.available_options
-                # This action does not use the new action format
-                # Just passing the arguments to this method
-              else
-                Helper.log.fatal "------------------------------------------------------------------------------------".red
-                Helper.log.fatal "If you've been an existing fastlane user, please check out the MigrationGuide to 1.0".yellow
-                Helper.log.fatal "https://github.com/KrauseFx/fastlane/blob/master/docs/MigrationGuide.md".yellow
-                Helper.log.fatal "------------------------------------------------------------------------------------".red
-                raise "You have to pass the options for '#{method_sym}' in a different way. Please check out the current documentation on GitHub!".red
-              end
-
-              class_ref.run(arguments)
-            end
-          end
-        rescue => ex
-          collector.did_raise_error(method_sym)
-          raise ex
-        end
-      else
-        raise "Action '#{method_sym}' of class '#{class_name}' was found, but has no `run` method.".red
+        # Is there a lane under this name?
+        return try_switch_to_lane(method_sym, arguments)
       end
     end
 
-
     #####################################################
     # @!group Other things
     #####################################################

data/lib/fastlane/lane_manager.rb

@@ -2,9 +2,12 @@ module Fastlane
   class LaneManager
     # @param platform The name of the platform to execute
     # @param lane_name The name of the lane to execute
-    def self.cruise_lane(platform, lane, env = nil)
+    # @param parameters [Hash] The parameters passed from the command line to the lane
+    # @param env Dot Env Information
+    def self.cruise_lane(platform, lane, parameters = nil, env = nil)
       raise 'lane must be a string' unless (lane.is_a?(String) or lane.nil?)
       raise 'platform must be a string' unless (platform.is_a?(String) or platform.nil?)
+      raise 'parameters must be a hash' unless (parameters.is_a?(Hash) or parameters.nil?)
 
       ff = Fastlane::FastFile.new(File.join(Fastlane::FastlaneFolder.path, 'Fastfile'))
 
@@ -30,7 +33,7 @@ module Fastlane
       started = Time.now
       e = nil
       begin
-        ff.runner.execute(lane, platform)
+        ff.runner.execute(lane, platform, parameters)
       rescue => ex
         Helper.log.info 'Variable Dump:'.yellow
         Helper.log.info Actions.lane_context
@@ -47,15 +50,12 @@ module Fastlane
 
     # All the finishing up that needs to be done
     def self.finish_fastlane(ff, duration, error)
-      thread = ff.did_finish
+      ff.did_finish
 
       # Finished with all the lanes
       Fastlane::JUnitGenerator.generate(Fastlane::Actions.executed_actions)
 
-      thread.join(5) # https://github.com/KrauseFx/fastlane/issues/240
-
       unless error
-
         if duration > 5
           Helper.log.info "fastlane.tools just saved you #{duration} minutes! 🎉".green
         else

data/lib/fastlane/runner.rb

@@ -4,7 +4,8 @@ module Fastlane
     # This will take care of executing **one** lane. 
     # @param lane_name The name of the lane to execute
     # @param platform The name of the platform to execute
-    def execute(lane, platform = nil)
+    # @param parameters [Hash] The parameters passed from the command line to the lane
+    def execute(lane, platform = nil, parameters = nil)
       raise "No lane given" unless lane
 
       ENV["FASTLANE_LANE_NAME"] = lane.to_s
@@ -20,7 +21,7 @@ module Fastlane
       Actions.lane_context[Actions::SharedValues::PLATFORM_NAME] = platform # set this in any case: important
 
       full_lane_name = [platform, lane].reject(&:nil?).join(' ')
-      Helper.log.info "Driving the lane '#{full_lane_name}'".green
+      Helper.log.info "Driving the lane '#{full_lane_name}' 🚀".green
       Actions.lane_context[Actions::SharedValues::LANE_NAME] = full_lane_name
 
       return_val = nil
@@ -36,8 +37,7 @@ module Fastlane
         before_all_blocks[platform].call(lane) if (before_all_blocks[platform] and platform != nil)
         before_all_blocks[nil].call(lane) if before_all_blocks[nil]
         
-        return_val = blocks[platform][lane].call
-        
+        return_val = blocks[platform][lane].call(parameters || {}) # by default no parameters
         
         # `after_all` is only called if no exception was raised before
         # Call the platform specific before_all block and then the general one

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '1.7.3'
+  VERSION = '1.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.8.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -474,6 +474,7 @@ files:
 - lib/fastlane/actions/xcodebuild.rb
 - lib/fastlane/actions/xctool.rb
 - lib/fastlane/actions_list.rb
+- lib/fastlane/command_line_handler.rb
 - lib/fastlane/configuration_helper.rb
 - lib/fastlane/core_ext/string.rb
 - lib/fastlane/dependency_checker.rb