fastlane 1.59.0 → 1.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7acb651b99d94230e6795a8cc1464c058d76723f
-  data.tar.gz: a84369d44f2ad07524e83e67b333886603c81cba
+  metadata.gz: a1338c5055a5be98c13f9ac2339fc8af01cc4618
+  data.tar.gz: 27953fcef98fff5cb1f1f8cf2eee2661869a5668
 SHA512:
-  metadata.gz: bda64f711bed402357ff4077adb348d9ef7fb66a864578fbc76730151841a351cf6cda1906d116eae11ae10bb338187a6dbe47b9be3b5a26872f25b35f8fe28c
-  data.tar.gz: 3dde5ef54740b221f7498cb1e55d8590560df96b2a86a25daff0ee17e6b2ca91a131a7cfb047838248124b65e414a645c954236b0bef93681cac69dbdd11e57b
+  metadata.gz: 325bf47a78344790a47d9bb191c771f0d4d01682f9383529862cf4272878bca0f77a81679619a04e96f4be0deaa7ca322cbc2f2b52b963e46b9c82972b5608b0
+  data.tar.gz: 94d735495e67d72454fef23fb03a09a01146f19927673531075c1d8513cf37ccf8e0d1a8de18735f8e1f5daef059564ac35cfce2dd0b9829cce92bb89172dc64

data/lib/fastlane/actions/adb.rb

@@ -0,0 +1,65 @@
+module Fastlane
+  module Actions
+    module SharedValues
+    end
+
+    class AdbAction < Action
+      def self.run(params)
+        adb = Helper::AdbHelper.new(adb_path: params[:adb_path])
+        result = adb.trigger(command: params[:command], serial: params[:serial])
+        return result
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Run ADB Actions"
+      end
+
+      def self.details
+        [
+          "see adb --help for more details"
+        ].join("\n")
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :serial,
+                                       env_name: "FL_ANDROID_SERIAL",
+                                       description: "Android serial, which device should be used for this command",
+                                       is_string: true,
+                                       default_value: ""),
+          FastlaneCore::ConfigItem.new(key: :command,
+                                       env_name: "FL_ADB_COMMAND",
+                                       description: "All commands you want to pass to the adb command, e.g. `kill-server`",
+                                       optional: true,
+                                       is_string: true),
+          FastlaneCore::ConfigItem.new(key: :adb_path,
+                                       env_name: "FL_ADB_PATH",
+                                       optional: true,
+                                       description: "The path to your `adb` binary",
+                                       is_string: true,
+                                       default_value: "adb"
+                                      )
+        ]
+      end
+
+      def self.output
+      end
+
+      def self.return_value
+        "The output of the adb command"
+      end
+
+      def self.authors
+        ["hjanuschka"]
+      end
+
+      def self.is_supported?(platform)
+        platform == :android
+      end
+    end
+  end
+end

data/lib/fastlane/actions/adb_devices.rb

@@ -0,0 +1,55 @@
+module Fastlane
+  module Actions
+    module SharedValues
+    end
+
+    class AdbDevicesAction < Action
+      def self.run(params)
+        adb = Helper::AdbHelper.new(adb_path: params[:adb_path])
+        result = adb.load_all_devices
+        return result
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Get an Array of Connected android device serials"
+      end
+
+      def self.details
+        [
+          "fetches device list via adb"
+        ].join("\n")
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :adb_path,
+                                       env_name: "FL_ADB_PATH",
+                                       description: "The path to your `adb` binary",
+                                       is_string: true,
+                                       optional: true,
+                                       default_value: "adb"
+                                      )
+        ]
+      end
+
+      def self.output
+      end
+
+      def self.return_value
+        "Array of devices"
+      end
+
+      def self.authors
+        ["hjanuschka"]
+      end
+
+      def self.is_supported?(platform)
+        platform == :android
+      end
+    end
+  end
+end

data/lib/fastlane/actions/badge.rb

@@ -9,7 +9,9 @@ module Fastlane
           custom: params[:custom],
           no_badge: params[:no_badge],
           shield: params[:shield],
-          alpha: params[:alpha]
+          alpha: params[:alpha],
+          shield_io_timeout: params[:shield_io_timeout],
+          glob: params[:glob]
         }
         Badge::Runner.new.run(params[:path], options)
       end
@@ -76,7 +78,20 @@ module Fastlane
                                        default_value: '.',
                                        verify_block: proc do |value|
                                          raise "path needs to be a valid directory".red if Dir[value].empty?
-                                       end)
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :shield_io_timeout,
+                                       env_name: "FL_BADGE_SHIELD_IO_TIMEOUT",
+                                       description: "Set custom duration for the timeout of the shield.io request in seconds",
+                                       optional: true,
+                                       is_string: false,
+                                       verify_block: proc do |value|
+                                         raise "shield_io_timeout needs to be an integer > 0".red if value.to_i < 1
+                                       end),
+          FastlaneCore::ConfigItem.new(key: :glob,
+                                       env_name: "FL_BADGE_GLOB",
+                                       description: "Glob pattern for finding image files",
+                                       optional: true,
+                                       is_string: true)
         ]
       end
 
@@ -85,7 +100,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        platform == :ios
+        [:ios, :mac, :android].include?(platform)
       end
     end
   end

data/lib/fastlane/actions/erb.rb

@@ -34,16 +34,15 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :destination,
                                        short_option: "-D",
                                        env_name: "FL_ERB_DST",
-                                       description: "destination file",
+                                       description: "Destination file",
                                        optional: true,
                                        is_string: true
                                       ),
           FastlaneCore::ConfigItem.new(key: :placeholders,
                                        short_option: "-p",
-                                       env_name: "FL_ERB_LOG",
-                                       description: "Log Commands",
-                                       optional: true,
-                                       default_value: true,
+                                       env_name: "FL_ERB_PLACEHOLDERS",
+                                       description: "Placeholders given as a hash",
+                                       default_value: {},
                                        is_string: false,
                                        type: Hash
                                       )

data/lib/fastlane/actions/gradle.rb

@@ -11,7 +11,7 @@ module Fastlane
 
         gradle = Helper::GradleHelper.new(gradle_path: params[:gradle_path])
 
-        result = gradle.trigger(task: task, flags: params[:flags])
+        result = gradle.trigger(task: task, flags: params[:flags], serial: params[:serial])
 
         return result unless task.start_with?("assemble")
 
@@ -51,6 +51,11 @@ module Fastlane
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(key: :serial,
+                                       env_name: "FL_ANDROID_SERIAL",
+                                       description: "Android serial, wich device should be used for this command",
+                                       is_string: true,
+                                       default_value: ""),
           FastlaneCore::ConfigItem.new(key: :task,
                                        env_name: "FL_GRADLE_TASK",
                                        description: "The gradle task you want to execute",

data/lib/fastlane/actions/nexus_upload.rb

@@ -10,11 +10,11 @@ module Fastlane
         command += upload_options(params)
         command << upload_url(params)
 
-        Fastlane::Actions.sh(command.join(' '), log: false)
+        Fastlane::Actions.sh(command.join(' '), log: params[:verbose])
       end
 
       def self.upload_url(params)
-        "#{params[:endpoint].shellescape}/nexus/service/local/artifact/maven/content"
+        "#{params[:endpoint]}#{params[:mount_path]}/service/local/artifact/maven/content".shellescape
       end
 
       def self.verbose(params)
@@ -96,6 +96,11 @@ module Fastlane
                                        env_name: "FL_NEXUS_ENDPOINT",
                                        description: "Nexus endpoint e.g. http://nexus:8081",
                                        optional: false),
+          FastlaneCore::ConfigItem.new(key: :mount_path,
+                                       env_name: "FL_NEXUS_MOUNT_PATH",
+                                       description: "Nexus mount path. Defaults to /nexus",
+                                       default_value: "/nexus",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :username,
                                        env_name: "FL_NEXUS_USERNAME",
                                        description: "Nexus username",

data/lib/fastlane/actions/register_devices.rb

@@ -74,6 +74,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :team_id,
                                        env_name: "FASTLANE_TEAM_ID",
                                        description: "optional: Your team ID",
+                                       default_value: CredentialsManager::AppfileConfig.try_fetch_value(:team_id),
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :username,
                                        env_name: "DELIVER_USER",

data/lib/fastlane/actions/setup_jenkins.rb

@@ -0,0 +1,172 @@
+module Fastlane
+  module Actions
+    class SetupJenkinsAction < Action
+      USED_ENV_NAMES = [
+        "BACKUP_XCARCHIVE_DESTINATION",
+        "DERIVED_DATA_PATH",
+        "GYM_BUILD_PATH",
+        "GYM_CODE_SIGNING_IDENTITY",
+        "GYM_DERIVED_DATA_PATH",
+        "GYM_OUTPUT_DIRECTORY",
+        "GYM_RESULT_BUNDLE",
+        "SCAN_DERIVED_DATA_PATH",
+        "SCAN_OUTPUT_DIRECTORY",
+        "SCAN_RESULT_BUNDLE",
+        "XCODE_DERIVED_DATA_PATH"
+      ].freeze
+
+      def self.run(params)
+        # Stop if not executed by CI
+        if !Helper.is_ci? && !params[:force]
+          UI.important "Not executed by Continuous Integration system."
+          return
+        end
+
+        # Print table
+        FastlaneCore::PrintTable.print_values(
+          config: params,
+          title: "Summary for Setup Jenkins Action"
+        )
+
+        # Keychain
+        if params[:unlock_keychain] && params[:keychain_path]
+          keychain_path = File.expand_path(params[:keychain_path])
+          UI.message "Unlocking keychain: \"#{keychain_path}\"."
+          Actions::UnlockKeychainAction.run(
+            path: keychain_path,
+            password: params[:keychain_password],
+            add_to_search_list: params[:add_keychain_to_search_list],
+            set_default: params[:set_default_keychain]
+          )
+        end
+
+        # Code signing identity
+        if params[:set_code_signing_identity] && params[:code_signing_identity]
+          code_signing_identity = params[:code_signing_identity]
+          UI.message "Set code signing identity: \"#{code_signing_identity}\"."
+          ENV['GYM_CODE_SIGNING_IDENTITY'] = code_signing_identity
+        end
+
+        # Set output directory
+        if params[:output_directory]
+          output_directory_path = File.expand_path(params[:output_directory])
+          UI.message "Set output directory path to: \"#{output_directory_path}\"."
+          ENV['GYM_BUILD_PATH'] = output_directory_path
+          ENV['GYM_OUTPUT_DIRECTORY'] = output_directory_path
+          ENV['SCAN_OUTPUT_DIRECTORY'] = output_directory_path
+          ENV['BACKUP_XCARCHIVE_DESTINATION'] = output_directory_path
+        end
+
+        # Set derived data
+        if params[:derived_data_path]
+          derived_data_path = File.expand_path(params[:derived_data_path])
+          UI.message "Set derived data path to: \"#{derived_data_path}\"."
+          ENV['DERIVED_DATA_PATH'] = derived_data_path # Used by clear_derived_data.
+          ENV['XCODE_DERIVED_DATA_PATH'] = derived_data_path
+          ENV['GYM_DERIVED_DATA_PATH'] = derived_data_path
+          ENV['SCAN_DERIVED_DATA_PATH'] = derived_data_path
+        end
+
+        # Set result bundle
+        if params[:result_bundle]
+          UI.message "Set result bundle."
+          ENV['GYM_RESULT_BUNDLE'] = "YES"
+          ENV['SCAN_RESULT_BUNDLE'] = "YES"
+        end
+      end
+
+      #####################################################
+      # @!group Documentation
+      #####################################################
+
+      def self.description
+        "Setup xcodebuild, gym and scan for easier Jenkins integration"
+      end
+
+      def self.details
+        [
+          "- Adds and unlocks keychains from Jenkins 'Keychains and Provisioning Profiles Plugin'",
+          "- Sets code signing identity from Jenkins 'Keychains and Provisioning Profiles Plugin'",
+          "- Sets output directory to './output' (gym, scan and backup_xcarchive).",
+          "- Sets derived data path to './derivedData' (xcodebuild, gym, scan and clear_derived_data).",
+          "- Produce result bundle (gym and scan)."
+        ].join("\n")
+      end
+
+      def self.available_options
+        [
+          # General
+          FastlaneCore::ConfigItem.new(key: :force,
+                                       env_name: "FL_SETUP_JENKINS_FORCE",
+                                       description: "Force setup, even if not executed by Jenkins",
+                                       is_string: false,
+                                       default_value: false),
+
+          # Keychain
+          FastlaneCore::ConfigItem.new(key: :unlock_keychain,
+                                       env_name: "FL_SETUP_JENKINS_UNLOCK_KEYCHAIN",
+                                       description: "Unlocks keychain",
+                                       is_string: false,
+                                       default_value: true),
+          FastlaneCore::ConfigItem.new(key: :add_keychain_to_search_list,
+                                       env_name: "FL_SETUP_JENKINS_ADD_KEYCHAIN_TO_SEARCH_LIST",
+                                       description: "Add to keychain search list",
+                                       is_string: false,
+                                       default_value: :replace),
+          FastlaneCore::ConfigItem.new(key: :set_default_keychain,
+                                       env_name: "FL_SETUP_JENKINS_SET_DEFAULT_KEYCHAIN",
+                                       description: "Set keychain as default",
+                                       is_string: false,
+                                       default_value: true),
+          FastlaneCore::ConfigItem.new(key: :keychain_path,
+                                       env_name: "KEYCHAIN_PATH",
+                                       description: "Path to keychain",
+                                       is_string: true,
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :keychain_password,
+                                       env_name: "KEYCHAIN_PASSWORD",
+                                       description: "Keychain password",
+                                       is_string: true,
+                                       default_value: ""),
+
+          # Code signing identity
+          FastlaneCore::ConfigItem.new(key: :set_code_signing_identity,
+                                       env_name: "FL_SETUP_JENKINS_SET_CODE_SIGNING_IDENTITY",
+                                       description: "Set code signing identity from CODE_SIGNING_IDENTITY environment",
+                                       is_string: false,
+                                       default_value: true),
+          FastlaneCore::ConfigItem.new(key: :code_signing_identity,
+                                       env_name: "CODE_SIGNING_IDENTITY",
+                                       description: "Code signing identity",
+                                       is_string: true,
+                                       optional: true),
+
+          # Xcode parameters
+          FastlaneCore::ConfigItem.new(key: :output_directory,
+                                       env_name: "FL_SETUP_JENKINS_OUTPUT_DIRECTORY",
+                                       description: "The directory in which the ipa file should be stored in",
+                                       is_string: true,
+                                       default_value: "./output"),
+          FastlaneCore::ConfigItem.new(key: :derived_data_path,
+                                       env_name: "FL_SETUP_JENKINS_DERIVED_DATA_PATH",
+                                       description: "The directory where build products and other derived data will go",
+                                       is_string: true,
+                                       default_value: "./derivedData"),
+          FastlaneCore::ConfigItem.new(key: :result_bundle,
+                                       env_name: "FL_SETUP_JENKINS_RESULT_BUNDLE",
+                                       description: "Produce the result bundle describing what occurred will be placed",
+                                       is_string: false,
+                                       default_value: true)
+        ]
+      end
+
+      def self.authors
+        ["bartoszj"]
+      end
+
+      def self.is_supported?(platform)
+        [:ios, :mac].include?(platform)
+      end
+    end
+  end
+end

data/lib/fastlane/actions/update_fastlane.rb

@@ -23,7 +23,9 @@ module Fastlane
         "spaceship",
         "pilot",
         "supply",
-        "scan"
+        "scan",
+        "screengrab",
+        "match"
       ]
 
       def self.run(options)

data/lib/fastlane/actions/xcodebuild.rb

@@ -70,6 +70,9 @@ module Fastlane
         project       = ENV["XCODE_PROJECT"]
         buildlog_path = ENV["XCODE_BUILDLOG_PATH"]
 
+        # Set derived data path.
+        params[:derivedDataPath] ||= ENV["XCODE_DERIVED_DATA_PATH"]
+
         # Append slash to build path, if needed
         if build_path && !build_path.end_with?("/")
           build_path += "/"

data/lib/fastlane/helper/adb_helper.rb

@@ -0,0 +1,48 @@
+module Fastlane
+  module Helper
+    class AdbDevice
+      attr_accessor :serial
+
+      def initialize(serial: nil)
+        self.serial = serial
+      end
+    end
+
+    class AdbHelper
+      # Path to the adb binary
+      attr_accessor :adb_path
+
+      # All available devices
+      attr_accessor :devices
+
+      def initialize(adb_path: nil)
+        self.adb_path = adb_path
+      end
+
+      # Run a certain action
+      def trigger(command: nil, serial: nil)
+        android_serial = serial != "" ? "ANDROID_SERIAL=#{serial}" : nil
+        command = [android_serial, adb_path, command].join(" ")
+        Action.sh(command)
+      end
+
+      def device_avalaible?(serial)
+        load_all_devices
+        return devices.map(&:serial).include?(serial)
+      end
+
+      def load_all_devices
+        self.devices = []
+
+        command = [adb_path, "devices"].join(" ")
+        output = Actions.sh(command, log: false)
+        output.split("\n").each do |line|
+          if (result = line.match(/(.*)\tdevice$/))
+            self.devices << AdbDevice.new(serial: result[1])
+          end
+        end
+        self.devices
+      end
+    end
+  end
+end

data/lib/fastlane/helper/gradle_helper.rb

@@ -23,10 +23,10 @@ module Fastlane
       end
 
       # Run a certain action
-      def trigger(task: nil, flags: nil)
+      def trigger(task: nil, flags: nil, serial:nil)
         # raise "Could not find gradle task '#{task}' in the list of available tasks".red unless task_available?(task)
-
-        command = [gradle_path, task, flags].join(" ")
+        android_serial = serial != "" ? "ANDROID_SERIAL=#{serial}" : nil
+        command = [android_serial, gradle_path, task, flags].join(" ")
         Action.sh(command)
       end
 

data/lib/fastlane/version.rb

@@ -1,3 +1,3 @@
 module Fastlane
-  VERSION = '1.59.0'
+  VERSION = '1.60.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 1.59.0
+  version: 1.60.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: krausefx-shenzhen
@@ -134,7 +134,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.36.2
+        version: 0.36.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -144,7 +144,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.36.2
+        version: 0.36.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -204,7 +204,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.10.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -334,7 +334,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -344,7 +344,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -614,6 +614,8 @@ files:
 - lib/fastlane/action_collector.rb
 - lib/fastlane/actions/README.md
 - lib/fastlane/actions/actions_helper.rb
+- lib/fastlane/actions/adb.rb
+- lib/fastlane/actions/adb_devices.rb
 - lib/fastlane/actions/add_git_tag.rb
 - lib/fastlane/actions/appaloosa.rb
 - lib/fastlane/actions/appetize.rb
@@ -724,6 +726,7 @@ files:
 - lib/fastlane/actions/set_changelog.rb
 - lib/fastlane/actions/set_github_release.rb
 - lib/fastlane/actions/set_info_plist_value.rb
+- lib/fastlane/actions/setup_jenkins.rb
 - lib/fastlane/actions/sigh.rb
 - lib/fastlane/actions/skip_docs.rb
 - lib/fastlane/actions/slack.rb
@@ -770,6 +773,7 @@ files:
 - lib/fastlane/fast_file.rb
 - lib/fastlane/fastlane_folder.rb
 - lib/fastlane/helper/README.md
+- lib/fastlane/helper/adb_helper.rb
 - lib/fastlane/helper/crashlytics_helper.rb
 - lib/fastlane/helper/gem_helper.rb
 - lib/fastlane/helper/git_helper.rb
@@ -808,7 +812,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Connect all iOS deployment tools into one streamlined workflow