fastlane 2.69.0.beta.20171212010004 → 2.69.0

data/fastlane/lib/fastlane/actions/get_version_number.rb

@@ -115,10 +115,10 @@ module Fastlane
                              end),
           FastlaneCore::ConfigItem.new(key: :scheme,
                              env_name: "FL_VERSION_NUMBER_SCHEME",
-                             description: "Specify a specific scheme if you have multiple per project, optional.
-                                          This parameter is deprecated and will be removed in a future release.
-                                          Please use the 'target' parameter instead. The behavior of this parameter
-                                          is currently undefined if your scheme name doesn't match your target name",
+                             description: "Specify a specific scheme if you have multiple per project, optional. " \
+                                          "This parameter is deprecated and will be removed in a future release. " \
+                                          "Please use the 'target' parameter instead. The behavior of this parameter " \
+                                          "is currently undefined if your scheme name doesn't match your target name",
                              optional: true,
                              deprecated: true),
           FastlaneCore::ConfigItem.new(key: :target,

data/fastlane/lib/fastlane/actions/increment_build_number.rb

@@ -89,6 +89,10 @@ module Fastlane
         "The new build number"
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.author
         "KrauseFx"
       end

data/fastlane/lib/fastlane/actions/increment_version_number.rb

@@ -116,6 +116,10 @@ module Fastlane
         ]
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.return_value
         "The new version number"
       end

data/fastlane/lib/fastlane/actions/is_ci.rb

@@ -24,6 +24,10 @@ module Fastlane
         []
       end
 
+      def self.return_type
+        :bool
+      end
+
       def self.authors
         ["KrauseFx"]
       end

data/fastlane/lib/fastlane/actions/last_git_commit.rb

@@ -17,6 +17,10 @@ module Fastlane
         "Returns the following dict: {commit_hash: \"commit hash\", abbreviated_commit_hash: \"abbreviated commit hash\" author: \"Author\", message: \"commit message\"}"
       end
 
+      def self.return_type
+        :hash_of_strings
+      end
+
       def self.author
         "ngutman"
       end

data/fastlane/lib/fastlane/actions/last_git_tag.rb

@@ -21,6 +21,10 @@ module Fastlane
         []
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.authors
         ["KrauseFx"]
       end

data/fastlane/lib/fastlane/actions/latest_testflight_build_number.rb

@@ -100,6 +100,10 @@ module Fastlane
         "Integer representation of the latest build number uploaded to TestFlight"
       end
 
+      def self.return_type
+        :int
+      end
+
       def self.authors
         ["daveanderson"]
       end

data/fastlane/lib/fastlane/actions/modify_services.rb

@@ -99,6 +99,7 @@ module Fastlane
                                        env_name: "PRODUCE_ENABLE_SERVICES",
                                        description: "Array with Spaceship App Services (e.g. #{allowed_services_description})",
                                        is_string: false,
+                                       type: Hash,
                                        default_value: {},
                                        verify_block: proc do |value|
                                          allowed_keys = Produce::DeveloperCenter::ALLOWED_SERVICES.keys

data/fastlane/lib/fastlane/actions/number_of_commits.rb

@@ -33,6 +33,10 @@ module Fastlane
         "The total number of all commits in current git branch"
       end
 
+      def self.return_type
+        :int
+      end
+
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :all,

data/fastlane/lib/fastlane/actions/podio_item.rb

@@ -80,6 +80,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :other_fields,
                                        description: 'Dictionary of your app fields. Podio supports several field types, see https://developers.podio.com/doc/items',
                                        is_string: false,
+                                       type: Hash,
                                        optional: true)
         ]
       end

data/fastlane/lib/fastlane/actions/prompt.rb

@@ -87,6 +87,10 @@ module Fastlane
         "User Content\nWithNewline"
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.category
         :misc
       end

data/fastlane/lib/fastlane/actions/read_podspec.rb

@@ -79,6 +79,10 @@ module Fastlane
         }
       end
 
+      def self.return_type
+        :hash_of_strings
+      end
+
       def self.category
         :misc
       end

data/fastlane/lib/fastlane/actions/register_device.rb

@@ -91,6 +91,10 @@ module Fastlane
         ]
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.category
         :code_signing
       end

data/fastlane/lib/fastlane/actions/register_devices.rb

@@ -62,6 +62,7 @@ module Fastlane
                                        env_name: "FL_REGISTER_DEVICES_DEVICES",
                                        description: "A hash of devices, with the name as key and the UDID as value",
                                        is_string: false,
+                                       type: Hash,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :devices_file,
                                        env_name: "FL_REGISTER_DEVICES_FILE",

data/fastlane/lib/fastlane/actions/rocket.rb

@@ -71,6 +71,10 @@ module Fastlane
         ]
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.category
         :misc
       end

data/fastlane/lib/fastlane/actions/set_github_release.rb

@@ -236,6 +236,10 @@ module Fastlane
         ].join("\n")
       end
 
+      def self.return_type
+        :hash_of_strings
+      end
+
       def self.authors
         ["czechboy0", "tommeier"]
       end

data/fastlane/lib/fastlane/actions/sh.rb

@@ -35,6 +35,7 @@ module Fastlane
                                          description: 'A callback invoked with the command output if there is a non-zero exit status',
                                          optional: true,
                                          is_string: false,
+                                         type: :string_callback,
                                          default_value: nil)
         ]
       end
@@ -43,6 +44,10 @@ module Fastlane
         'Outputs the string and executes it. When running in tests, it returns the actual command instead of executing it'
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.authors
         ["KrauseFx"]
       end

data/fastlane/lib/fastlane/actions/slather.rb

@@ -148,61 +148,73 @@ Slather is available at https://github.com/SlatherOrg/slather
                                        env_name: "FL_SLATHER_BUILDKITE_ENABLED", # The name of the environment variable
                                        description: "Tell slather that it is running on Buildkite",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :teamcity,
                                        env_name: "FL_SLATHER_TEAMCITY_ENABLED", # The name of the environment variable
                                        description: "Tell slather that it is running on TeamCity",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :jenkins,
                                        env_name: "FL_SLATHER_JENKINS_ENABLED", # The name of the environment variable
                                        description: "Tell slather that it is running on Jenkins",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :travis,
                                        env_name: "FL_SLATHER_TRAVIS_ENABLED", # The name of the environment variable
                                        description: "Tell slather that it is running on TravisCI",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :travis_pro,
                                        env_name: "FL_SLATHER_TRAVIS_PRO_ENABLED", # The name of the environment variable
                                        description: "Tell slather that it is running on TravisCI Pro",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :circleci,
                                        env_name: "FL_SLATHER_CIRCLECI_ENABLED",
                                        description: "Tell slather that it is running on CircleCI",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :coveralls,
                                        env_name: "FL_SLATHER_COVERALLS_ENABLED",
                                        description: "Tell slather that it should post data to Coveralls",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :simple_output,
                                        env_name: "FL_SLATHER_SIMPLE_OUTPUT_ENABLED",
                                        description: "Tell slather that it should output results to the terminal",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :gutter_json,
                                        env_name: "FL_SLATHER_GUTTER_JSON_ENABLED",
                                        description: "Tell slather that it should output results as Gutter JSON format",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :cobertura_xml,
                                        env_name: "FL_SLATHER_COBERTURA_XML_ENABLED",
                                        description: "Tell slather that it should output results as Cobertura XML format",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :html,
                                        env_name: "FL_SLATHER_HTML_ENABLED",
                                        description: "Tell slather that it should output results as static HTML pages",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :show,
                                        env_name: "FL_SLATHER_SHOW_ENABLED",
                                        description: "Tell slather that it should open static html pages automatically",
                                        is_string: false,
+                                       type: Boolean,
                                        default_value: false),
           FastlaneCore::ConfigItem.new(key: :source_directory,
                                        env_name: "FL_SLATHER_SOURCE_DIRECTORY",
@@ -221,11 +233,13 @@ Slather is available at https://github.com/SlatherOrg/slather
                                        env_name: "FL_SLATHER_VERBOSE",
                                        description: "Tell slather to enable verbose mode",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :use_bundle_exec,
                                       env_name: "FL_SLATHER_USE_BUNDLE_EXEC",
                                       description: "Use bundle exec to execute slather. Make sure it is in the Gemfile",
                                       is_string: false,
+                                      type: Boolean,
                                       default_value: false),
           FastlaneCore::ConfigItem.new(key: :binary_basename,
                                        env_name: "FL_SLATHER_BINARY_BASENAME",

data/fastlane/lib/fastlane/actions/update_urban_airship_configuration.rb

@@ -59,6 +59,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :detect_provisioning_mode,
                                        env_name: "URBAN_AIRSHIP_DETECT_PROVISIONING_MODE",
                                        is_string: false,
+                                       type: Boolean,
                                        optional: true,
                                        description: "Automatically detect provisioning mode")
         ]

data/fastlane/lib/fastlane/actions/xcode_install.rb

@@ -76,6 +76,10 @@ module Fastlane
         "The path to the newly installed Xcode version"
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.authors
         ["Krausefx"]
       end

data/fastlane/lib/fastlane/actions/xcode_server_get_assets.rb

@@ -283,6 +283,10 @@ module Fastlane
         ]
       end
 
+      def self.return_type
+        :array_of_strings
+      end
+
       def self.authors
         ["czechboy0"]
       end

data/fastlane/lib/fastlane/actions/zip.rb

@@ -84,6 +84,10 @@ module Fastlane
         "The path to the output zip file"
       end
 
+      def self.return_type
+        :string
+      end
+
       def self.authors
         ["KrauseFx"]
       end

data/fastlane/lib/fastlane/boolean.rb

@@ -0,0 +1,5 @@
+module Fastlane
+  class Boolean
+    # Used in config item generation
+  end
+end

data/fastlane/lib/fastlane/command_line_handler.rb

@@ -27,7 +27,12 @@ module Fastlane
       end
 
       dot_env = Helper.is_test? ? nil : options.env
-      Fastlane::LaneManager.cruise_lane(platform, lane, lane_parameters, dot_env)
+
+      if FastlaneCore::FastlaneFolder.swift?
+        Fastlane::SwiftLaneManager.cruise_lane(lane, lane_parameters, dot_env)
+      else
+        Fastlane::LaneManager.cruise_lane(platform, lane, lane_parameters, dot_env)
+      end
     end
 
     # Helper to convert into the right data type

data/fastlane/lib/fastlane/commands_generator.rb

@@ -119,11 +119,22 @@ module Fastlane
             beta_info = CrashlyticsBetaCommandLineHandler.info_from_options(options)
             Fastlane::CrashlyticsBeta.new(beta_info, Fastlane::CrashlyticsBetaUi.new).run
           else
-            Fastlane::Setup.new.run(user: options.user)
+            is_swift_fastfile = args.include?("swift")
+            Fastlane::Setup.new.run(user: options.user, is_swift_fastfile: is_swift_fastfile)
           end
         end
       end
 
+      command :init_swift do |c|
+        c.syntax = 'fastlane init_swift'
+        c.description = 'Helps you with your initial fastlane setup for Swift'
+        c.option '-u STRING', '--user STRING', String, 'iOS projects only: Your Apple ID'
+
+        c.action do |args, options|
+          Fastlane::Setup.new.run(user: options.user, is_swift_fastfile: true)
+        end
+      end
+
       command :new_action do |c|
         c.syntax = 'fastlane new_action'
         c.description = 'Create a new custom action for fastlane.'
@@ -135,6 +146,34 @@ module Fastlane
         end
       end
 
+      command :socket_server do |c|
+        c.syntax = 'fastlane start_server'
+        c.description = 'Starts local socket server and enables only a single local connection'
+        c.option '-s', '--stay_alive', 'Keeps socket server up even after error or disconnects, requires CTRL-C to kill.'
+        c.option '-c seconds', '--connection_timeout', 'Sets connection established timeout'
+        c.action do |args, options|
+          default_connection_timeout = 5
+          stay_alive = options.stay_alive || false
+          connection_timeout = options.connection_timeout || default_connection_timeout
+
+          if stay_alive && options.connection_timeout.nil?
+            UI.important("stay_alive is set, but the connection timeout is not, this will give you #{default_connection_timeout} seconds to (re)connect")
+          end
+
+          require 'fastlane/server/socket_server'
+          require 'fastlane/server/socket_server_action_command_executor'
+
+          command_executor = SocketServerActionCommandExecutor.new
+          server = Fastlane::SocketServer.new(
+            command_executor: command_executor,
+            connection_timeout: connection_timeout,
+            stay_alive: stay_alive
+          )
+          result = server.start
+          UI.success "Result: #{result}" if result
+        end
+      end
+
       command :lanes do |c|
         c.syntax = 'fastlane lanes'
         c.description = 'Lists all available lanes and shows their description'

data/fastlane/lib/fastlane/fast_file.rb

@@ -175,6 +175,10 @@ module Fastlane
 
     # Execute shell command
     def sh(*command, log: true, error_callback: nil, &b)
+      FastFile.sh(*command, log: log, error_callback: error_callback, &b)
+    end
+
+    def self.sh(*command, log: true, error_callback: nil, &b)
       command_header = log ? Actions.shell_command_from_args(*command) : "shell command"
       Actions.execute_action(command_header) do
         Actions.sh_no_action(*command, log: log, error_callback: error_callback, &b)
@@ -392,7 +396,7 @@ module Fastlane
     end
 
     def action_launched(action_name)
-      action_launch_context = FastlaneCore::ActionLaunchContext.context_for_action_name(action_name, args: ARGV)
+      action_launch_context = FastlaneCore::ActionLaunchContext.context_for_action_name(action_name, configuration_language: "ruby", args: ARGV)
       FastlaneCore.session.action_launched(launch_context: action_launch_context)
     end
 

data/fastlane/lib/fastlane/lane_list.rb

@@ -1,27 +1,90 @@
 module Fastlane
   class LaneList
     # Print out the result of `generate`
+    SWIFT_FUNCTION_REGEX = /\s*func\s*(\w*)\s*\(\s*\)\s*/
+    SWIFT_DESC_REGEX = /\s*desc\s*\(\s*"(.*)"\s*\)\s*/
     def self.output(path)
       puts generate(path)
 
       puts "Execute using `fastlane [lane_name]`".yellow
     end
 
+    def self.generate_swift_lanes(path)
+      return unless (path || '').length > 0
+      UI.user_error!("Could not find Fastfile.swift at path '#{path}'") unless File.exist?(path)
+      path = File.expand_path(path)
+      lane_content = File.read(path)
+
+      current_lane_name = nil
+      lanes_by_name = {}
+
+      lane_content.split("\n").reject(&:empty?).each do |line|
+        line.strip!
+        if line.start_with?("func")
+          current_lane_name = self.lane_name_from_swift_line(potential_lane_line: line)
+        elsif line.start_with?("desc")
+          lane_description = self.desc_entry_for_swift_lane(named: current_lane_name, potential_desc_line: line)
+          unless lane_description
+            next
+          end
+
+          lanes_by_name[current_lane_name] = Fastlane::Lane.new(platform: nil, name: current_lane_name.to_sym, description: [lane_description])
+          current_lane_name = nil
+        end
+      end
+      # "" because that will be interpreted as general platform
+      # (we don't detect platform right now)
+      return { "" => lanes_by_name }
+    end
+
+    def self.desc_entry_for_swift_lane(named: nil, potential_desc_line: nil)
+      unless named
+        return nil
+      end
+
+      desc_match = SWIFT_DESC_REGEX.match(potential_desc_line)
+      unless desc_match
+        return nil
+      end
+
+      return desc_match[1]
+    end
+
+    def self.lane_name_from_swift_line(potential_lane_line: nil)
+      function_name_match = SWIFT_FUNCTION_REGEX.match(potential_lane_line)
+      unless function_name_match
+        return nil
+      end
+
+      unless function_name_match[1].downcase.end_with?("lane")
+        return nil
+      end
+
+      return function_name_match[1]
+    end
+
     def self.generate(path)
-      ff = Fastlane::FastFile.new(path)
+      lanes = {}
+      if FastlaneCore::FastlaneFolder.swift?
+        lanes = generate_swift_lanes(path)
+      else
+        ff = Fastlane::FastFile.new(path)
+        lanes = ff.runner.lanes
+      end
+
       output = ""
 
-      all_keys = ff.runner.lanes.keys.reject(&:nil?)
+      all_keys = lanes.keys.reject(&:nil?)
       all_keys.unshift(nil) # because we want root elements on top. always! They have key nil
 
       all_keys.each do |platform|
-        next if (ff.runner.lanes[platform] || []).count == 0
+        next if (lanes[platform] || []).count == 0
 
         plat_text = platform
         plat_text = "general" if platform.to_s.empty?
         output += "\n--------- #{plat_text}---------\n".yellow
 
-        value = ff.runner.lanes[platform]
+        value = lanes[platform]
         next unless value
 
         value.each do |lane_name, lane|