fastlane 1.20.0 → 1.21.0

data/lib/fastlane/actions/update_info_plist.rb

@@ -6,36 +6,34 @@ module Fastlane
     class UpdateInfoPlistAction < Action
       def self.run(params)
         require 'plist'
-                
+
         # Check if parameters are set
         if params[:app_identifier] or params[:display_name]
-          
+
           # Assign folder from parameter or search for xcodeproj file
           folder = params[:xcodeproj] || Dir["*.xcodeproj"].first
-        
-          # Read existing plist file 
+
+          # Read existing plist file
           info_plist_path = File.join(folder, "..", params[:plist_path])
-          raise "Couldn't find info plist file at path '#{params[:plist_path]}'".red unless File.exists?(info_plist_path)
-          plist = Plist::parse_xml(info_plist_path)
-          
+          raise "Couldn't find info plist file at path '#{params[:plist_path]}'".red unless File.exist?(info_plist_path)
+          plist = Plist.parse_xml(info_plist_path)
+
           # Update plist values
           plist['CFBundleIdentifier'] = params[:app_identifier] if params[:app_identifier]
           plist['CFBundleDisplayName'] = params[:display_name] if params[:display_name]
-          
+
           # Write changes to file
           plist_string = Plist::Emit.dump(plist)
           File.write(info_plist_path, plist_string)
-          
+
           Helper.log.info "Updated #{params[:plist_path]} 💾.".green
           plist_string
         else
           Helper.log.warn("You haven't specified any parameters to update your plist.")
           false
         end
-        
       end
 
-
       #####################################################
       # @!group Documentation
       #####################################################
@@ -50,19 +48,19 @@ module Fastlane
 
       def self.available_options
         [
-          
+
           FastlaneCore::ConfigItem.new(key: :xcodeproj,
                                        env_name: "FL_UPDATE_PLIST_PROJECT_PATH",
                                        description: "Path to your Xcode project",
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                        raise "Please pass the path to the project, not the workspace".red if value.include?"workspace"
-                                        raise "Could not find Xcode project".red unless File.exists?(value)
+                                       verify_block: proc do |value|
+                                         raise "Please pass the path to the project, not the workspace".red if value.include? "workspace"
+                                         raise "Could not find Xcode project".red unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :plist_path,
                                        env_name: "FL_UPDATE_PLIST_PATH",
                                        description: "Path to info plist",
-                                       verify_block: Proc.new do |value|
+                                       verify_block: proc do |value|
                                          raise "Invalid plist file".red unless value[-6..-1].downcase == ".plist"
                                        end),
           FastlaneCore::ConfigItem.new(key: :app_identifier,

data/lib/fastlane/actions/update_project_code_signing.rb

@@ -7,7 +7,7 @@ module Fastlane
       def self.run(params)
         path = params[:path]
         path = File.join(path, "project.pbxproj")
-        raise "Could not find path to project config '#{path}'. Pass the path to your project (not workspace)!".red unless File.exists?(path)
+        raise "Could not find path to project config '#{path}'. Pass the path to your project (not workspace)!".red unless File.exist?(path)
 
         Helper.log.info("Updating provisioning profile UDID (#{params[:udid]}) for the given project '#{path}'")
 
@@ -30,8 +30,8 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :path,
                                        env_name: "FL_PROJECT_SIGNING_PROJECT_PATH",
                                        description: "Path to your Xcode project",
-                                       verify_block: Proc.new do |value|
-                                        raise "Path is invalid".red unless File.exists?(value)
+                                       verify_block: proc do |value|
+                                         raise "Path is invalid".red unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :udid,
                                        env_name: "FL_PROJECT_SIGNING_UDID",

data/lib/fastlane/actions/update_project_provisioning.rb

@@ -1,22 +1,21 @@
+# rubocop:disable Metrics/AbcSize
 module Fastlane
   module Actions
     module SharedValues
-      
     end
 
     class UpdateProjectProvisioningAction < Action
       ROOT_CERTIFICATE_URL = "http://www.apple.com/appleca/AppleIncRootCertificate.cer"
       def self.run(params)
-        
         # assign folder from parameter or search for xcodeproj file
         folder = params[:xcodeproj] || Dir["*.xcodeproj"].first
-        
+
         # validate folder
-        folder = File.join(folder, "project.pbxproj")
-        raise "Could not find path to project config '#{folder}'. Pass the path to your project (not workspace)!".red unless File.exists?(folder)
+        project_file_path = File.join(folder, "project.pbxproj")
+        raise "Could not find path to project config '#{project_file_path}'. Pass the path to your project (not workspace)!".red unless File.exist?(project_file_path)
 
         # download certificate
-        if not File.exists?(params[:certificate])
+        unless File.exist?(params[:certificate])
           Helper.log.info("Downloading root certificate from (#{ROOT_CERTIFICATE_URL}) to path '#{params[:certificate]}'")
           require 'open-uri'
           File.open(params[:certificate], "w") do |file|
@@ -29,38 +28,42 @@ module Fastlane
         profile = File.read(params[:profile])
         p7 = OpenSSL::PKCS7.new(profile)
         store = OpenSSL::X509::Store.new
-        raise "Could not find valid certificate at '#{params[:certificate]}'" unless (File.size(params[:certificate]) > 0)
+        raise "Could not find valid certificate at '#{params[:certificate]}'" unless File.size(params[:certificate]) > 0
         cert = OpenSSL::X509::Certificate.new(File.read(params[:certificate]))
         store.add_cert(cert)
-        verification = p7.verify([cert], store)
-        data = Plist::parse_xml(p7.data)
-        
-        filter = params[:build_configuration_filter]
+        p7.verify([cert], store)
+        data = Plist.parse_xml(p7.data)
+
+        target_filter = params[:target_filter] || params[:build_configuration_filter]
+        configuration = params[:build_configuration]
 
         # manipulate project file
         Helper.log.info("Going to update project '#{folder}' with UUID".green)
-        require 'pbxplorer'
+        require 'xcodeproj'
 
-        project_file = XCProjectFile.new(folder)
-        project_file.project.targets.each do |target|
-          if filter
-            if target['productName'].match(filter) or target['productType'].match(filter)
-              Helper.log.info "Updating target #{target['productName']}...".green
-            else
-              Helper.log.info "Skipping target #{target['productName']} as it doesn't match the filter '#{filter}'".yellow
-              next
-            end
+        project = Xcodeproj::Project.open(folder)
+        project.targets.each do |target|
+          if !target_filter || target.product_name.match(target_filter) || target.product_type.match(target_filter)
+            Helper.log.info "Updating target #{target.product_name}...".green
           else
-            Helper.log.info "Updating target #{target['productName']}...".green
+            Helper.log.info "Skipping target #{target.product_name} as it doesn't match the filter '#{target_filter}'".yellow
+            next
           end
 
           target.build_configuration_list.build_configurations.each do |build_configuration|
-            build_configuration["buildSettings"]["PROVISIONING_PROFILE"] = data["UUID"]
-            build_configuration["buildSettings"]["CODE_SIGN_RESOURCE_RULES_PATH[sdk=*]"] = "$(SDKROOT)/ResourceRules.plist"
+            config_name = build_configuration.name
+            if !configuration || config_name.match(configuration)
+              Helper.log.info "Updating configuration #{config_name}...".green
+            else
+              Helper.log.info "Skipping configuration #{config_name} as it doesn't match the filter '#{configuration}'".yellow
+              next
+            end
+
+            build_configuration.build_settings["PROVISIONING_PROFILE"] = data["UUID"]
           end
         end
 
-        project_file.save
+        project.save
 
         # complete
         Helper.log.info("Successfully updated project settings in'#{params[:xcodeproj]}'".green)
@@ -74,10 +77,10 @@ module Fastlane
         [
           "This action retrieves a provisioning profile UUID from a provisioning profile (.mobileprovision) to set",
           "up the xcode projects' code signing settings in *.xcodeproj/project.pbxproj",
-          "",
-          "The `build_configuration_filter` value can be used to only update code signing for one target",
+          "The `target_filter` value can be used to only update code signing for specified targets",
+          "The `build_configuration` value can be used to only update code signing for specified build configurations of the targets passing through the `target_filter`",
           "Example Usage is the WatchKit Extension or WatchKit App, where you need separate provisioning profiles",
-          "Example: `update_project_provisioning(xcodeproj: \"..\", build_configuration_filter: \".*WatchKit App.*\")"
+          "Example: `update_project_provisioning(xcodeproj: \"..\", target_filter: \".*WatchKit App.*\")"
         ].join("\n")
       end
 
@@ -87,19 +90,27 @@ module Fastlane
                                        env_name: "FL_PROJECT_PROVISIONING_PROJECT_PATH",
                                        description: "Path to your Xcode project",
                                        optional: true,
-                                       verify_block: Proc.new do |value|
-                                        raise "Path to xcode project is invalid".red unless File.exists?(value)
+                                       verify_block: proc do |value|
+                                         raise "Path to xcode project is invalid".red unless File.exist?(value)
                                        end),
           FastlaneCore::ConfigItem.new(key: :profile,
                                        env_name: "FL_PROJECT_PROVISIONING_PROFILE_FILE",
                                        description: "Path to provisioning profile (.mobileprovision)",
                                        default_value: Actions.lane_context[SharedValues::SIGH_PROFILE_PATH],
-                                       verify_block: Proc.new do |value|
-                                        raise "Path to provisioning profile is invalid".red unless File.exists?(value)
+                                       verify_block: proc do |value|
+                                         raise "Path to provisioning profile is invalid".red unless File.exist?(value)
                                        end),
+          FastlaneCore::ConfigItem.new(key: :target_filter,
+                                       env_name: "FL_PROJECT_PROVISIONING_PROFILE_TARGET_FILTER",
+                                       description: "A filter for the target name. Use a standard regex",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :build_configuration_filter,
                                        env_name: "FL_PROJECT_PROVISIONING_PROFILE_FILTER",
-                                       description: "A filter for the target name. Use a standard regex",
+                                       description: "Legacy option, use 'target_filter' instead",
+                                       optional: true),
+          FastlaneCore::ConfigItem.new(key: :build_configuration,
+                                       env_name: "FL_PROJECT_PROVISIONING_PROFILE_BUILD_CONFIGURATION",
+                                       description: "A filter for the build configuration name. Use a standard regex. Applied to all configurations if not specified",
                                        optional: true),
           FastlaneCore::ConfigItem.new(key: :certificate,
                                        env_name: "FL_PROJECT_PROVISIONING_CERTIFICATE_PATH",
@@ -108,13 +119,14 @@ module Fastlane
         ]
       end
 
-      def self.author
-        "tobiasstrebitzer"
+      def self.authors
+        ["tobiasstrebitzer", "czechboy0"]
       end
 
       def self.is_supported?(platform)
-        platform == :ios
+        [:ios, :mac].include? platform
       end
     end
   end
 end
+# rubocop:enable Metrics/AbcSize

data/lib/fastlane/actions/xcode_select.rb

@@ -19,13 +19,14 @@ module Fastlane
     #
     class XcodeSelectAction < Action
       def self.run(params)
-        xcode_path = (params.first rescue nil)
+        params = nil unless params.kind_of? Array
+        xcode_path = (params || []).first
 
         # Verify that a param was passed in
         raise "Path to Xcode application required (e.x. \"/Applications/Xcode.app\")".red unless xcode_path.to_s.length > 0
 
         # Verify that a path to a directory was passed in
-        raise "Path '#{xcode_path}' doesn't exist".red unless Dir.exists?(xcode_path)
+        raise "Path '#{xcode_path}' doesn't exist".red unless Dir.exist?(xcode_path)
 
         Helper.log.info "Setting Xcode version to #{xcode_path} for all build steps"
 
@@ -41,7 +42,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
     end
   end

data/lib/fastlane/actions/xcode_server_get_assets.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/AbcSize
 module Fastlane
   module Actions
     module SharedValues
@@ -12,7 +13,6 @@ module Fastlane
       require 'fileutils'
 
       def self.run(params)
-
         host = params[:host]
         bot_name = params[:bot_name]
         integration_number_override = params[:integration_number]
@@ -46,10 +46,10 @@ module Fastlane
         # we have our bot, get finished integrations, sorted from newest to oldest
         integrations = xcs.fetch_integrations(bot['_id']).select { |i| i['currentStep'] == 'completed' }
         raise "Failed to find any completed integration for Bot \"#{bot_name}\"".red if (integrations || []).count == 0
-        
+
         # if no integration number is specified, pick the newest one (this is sorted from newest to oldest)
         if integration_number_override
-          integration = integrations.select { |i| i['number'] == integration_number_override }.first
+          integration = integrations.find { |i| i['number'] == integration_number_override }
           raise "Specified integration number #{integration_number_override} does not exist.".red unless integration
         else
           integration = integrations.first
@@ -68,7 +68,7 @@ module Fastlane
         Helper.log.info "Successfully downloaded #{asset_entries.count} assets to file #{assets_path}!".green
 
         # now find the archive and unzip it
-        zipped_archive_path = asset_entries.select { |i| i.end_with?('xcarchive.zip') }.first
+        zipped_archive_path = asset_entries.find { |i| i.end_with?('xcarchive.zip') }
 
         if zipped_archive_path
 
@@ -77,7 +77,7 @@ module Fastlane
           archive_file_path = File.basename(zipped_archive_path, File.extname(zipped_archive_path))
           archive_dir_path = File.dirname(zipped_archive_path)
           archive_path = File.join(archive_dir_path, archive_file_path)
-          if File.exists?(archive_path)
+          if File.exist?(archive_path)
             # we already have the archive, skip
             Helper.log.info "Archive #{archive_path} already exists, not unzipping again...".yellow
           else
@@ -89,8 +89,8 @@ module Fastlane
           asset_entries = Dir.entries(assets_path).map { |i| File.join(assets_path, i) }
 
           # optionally delete everything except for the archive
-          if !keep_all_assets
-            files_to_delete = asset_entries.select do |i| 
+          unless keep_all_assets
+            files_to_delete = asset_entries.select do |i|
               File.extname(i) != '.xcarchive' && ![".", ".."].include?(File.basename(i))
             end
 
@@ -101,7 +101,7 @@ module Fastlane
 
           Actions.lane_context[SharedValues::XCODE_SERVER_GET_ASSETS_ARCHIVE_PATH] = archive_path
         end
-        
+
         Actions.lane_context[SharedValues::XCODE_SERVER_GET_ASSETS_PATH] = assets_path
 
         return assets_path
@@ -117,22 +117,20 @@ module Fastlane
 
         def fetch_all_bots
           response = get_endpoint('/bots')
-          raise "You are unauthorized to access data on #{@host}, please check that you're passing in a correct username and password.".red if response.status == 401 
+          raise "You are unauthorized to access data on #{@host}, please check that you're passing in a correct username and password.".red if response.status == 401
           raise "Failed to fetch Bots from Xcode Server at #{@host}, response: #{response.status}: #{response.body}.".red if response.status != 200
-          bots = JSON.parse(response.body)['results']
+          JSON.parse(response.body)['results']
         end
 
         def fetch_integrations(bot_id)
           response = get_endpoint("/bots/#{bot_id}/integrations?limit=10")
           raise "Failed to fetch Integrations for Bot #{bot_id} from Xcode Server at #{@host}, response: #{response.status}: #{response.body}".red if response.status != 200
-          integrations = JSON.parse(response.body)['results']
+          JSON.parse(response.body)['results']
         end
 
         def fetch_assets(integration_id, target_folder, action)
-          
           # create a temp folder and a file, stream the download into it
           Dir.mktmpdir do |dir|
-
             temp_file = File.join(dir, "tmp_download.#{rand(1000000)}")
             f = open(temp_file, 'w')
             streamer = lambda do |chunk, remaining_bytes, total_bytes|
@@ -145,7 +143,7 @@ module Fastlane
             end
 
             response = self.get_endpoint("/integrations/#{integration_id}/assets", streamer)
-            f.close()
+            f.close
 
             raise "Integration doesn't have any assets (it probably never ran).".red if response.status == 500
             raise "Failed to fetch Assets zip for Integration #{integration_id} from Xcode Server at #{@host}, response: #{response.status}: #{response.body}".red if response.status != 200
@@ -157,7 +155,7 @@ module Fastlane
             action.sh "cd \"#{out_folder}\"; cat \"#{temp_file}\" | gzip -d | tar -x"
 
             # then pull the real name from headers
-            asset_filename = response.headers['Content-Disposition'].split(';')[1].split('=')[1].gsub('"', '')
+            asset_filename = response.headers['Content-Disposition'].split(';')[1].split('=')[1].delete('"')
             asset_foldername = asset_filename.split('.')[0]
 
             # rename the folder in out_folder to asset_foldername
@@ -186,33 +184,33 @@ module Fastlane
 
         def headers
           require 'base64'
-          headers = { 
+          headers = {
             'User-Agent' => 'fastlane-xcode_server_get_assets', # XCS wants user agent. for some API calls. not for others. sigh.
             'X-XCSAPIVersion' => 1 # XCS API version with this API, Xcode needs this otherwise it explodes in a 500 error fire. Currently Xcode 7 Beta 5 is on Version 5.
           }
 
-          if @username && @password 
+          if @username and @password
             userpass = "#{@username}:#{@password}"
             headers['Authorization'] = "Basic #{Base64.strict_encode64(userpass)}"
           end
-          
+
           return headers
         end
 
-        def get_endpoint(endpoint, response_block=nil)
+        def get_endpoint(endpoint, response_block = nil)
           url = url_for_endpoint(endpoint)
           headers = self.headers || {}
 
           if response_block
-            response = Excon.get(url, :response_block => response_block, :headers => headers)
+            response = Excon.get(url, response_block: response_block, headers: headers)
           else
-            response = Excon.get(url, :headers => headers)
+            response = Excon.get(url, headers: headers)
           end
 
           return response
         end
 
-        private 
+        private
 
         def url_for_endpoint(endpoint)
           "#{@host}:20343/api#{endpoint}"
@@ -235,7 +233,7 @@ module Fastlane
           assets folder and puts into shared values the paths to the asset folder and to the `.xcarchive` inside it"
       end
 
-      def self.available_options        
+      def self.available_options
         [
           FastlaneCore::ConfigItem.new(key: :host,
                                        env_name: "FL_XCODE_SERVER_GET_ASSETS_HOST",
@@ -296,4 +294,5 @@ module Fastlane
       end
     end
   end
-end
+end
+# rubocop:enable Metrics/AbcSize

data/lib/fastlane/actions/xcodebuild.rb

@@ -1,3 +1,4 @@
+# rubocop:disable all
 module Fastlane
   module Actions
     module SharedValues
@@ -43,7 +44,7 @@ module Fastlane
       }
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
 
       def self.run(params)
@@ -65,7 +66,6 @@ module Fastlane
           build_path += "/"
         end
 
-
         if params
           # Operation bools
           archiving = params.key? :archive
@@ -80,7 +80,7 @@ module Fastlane
             params[:export_format] ||= "ipa"
 
             # If not passed, construct export path from env vars
-            if params[:export_path] == nil
+            if params[:export_path].nil?
               ipa_filename = scheme ? scheme : File.basename(params[:archive_path], ".*")
               params[:export_path] = "#{build_path}#{ipa_filename}"
             end
@@ -139,7 +139,6 @@ module Fastlane
           if params[:reports]
             # New report options format
             reports = params[:reports].reduce("") do |arguments, report|
-
               report_string = "--report #{report[:report]}"
 
               if report[:output]
@@ -169,7 +168,7 @@ module Fastlane
             # Test report file format
             report_formats = params[:report_formats].map do |format|
               "--report #{format}"
-            end.sort().join(" ")
+            end.sort.join(" ")
 
             xcpretty_args.push report_formats
 
@@ -213,7 +212,7 @@ module Fastlane
               raise_error = false
 
               Helper.log.warn "First attempt failed with iPhone Simulator error: #{iphone_simulator_time_out_error.source}"
-              Helper.log.warn  "Retrying once more..."
+              Helper.log.warn "Retrying once more..."
               Actions.sh "set -o pipefail && xcodebuild #{xcodebuild_args} | xcpretty #{xcpretty_args}"
             end
           end
@@ -233,7 +232,7 @@ module Fastlane
             value = (v != true && v.to_s.length > 0 ? "\"#{v}\"" : "")
             "#{arg} #{value}".strip
           elsif k == :build_settings
-            v.map{|setting,value| "#{setting}=\"#{value}\""}.join(' ')
+            v.map {|setting, val| "#{setting}=\"#{val}\""}.join(' ')
           elsif k == :destination
             [*v].collect { |dst| "-destination \"#{dst}\"" }.join(' ')
           elsif k == :keychain && v.to_s.length > 0
@@ -251,7 +250,7 @@ module Fastlane
           Helper.log.warn "Multiple workspaces detected."
         end
 
-        if !workspaces.empty?
+        unless workspaces.empty?
           workspace = workspaces.first
           Helper.log.warn "Using workspace \"#{workspace}\""
         end
@@ -299,7 +298,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
 
       def self.available_options
@@ -329,7 +328,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
 
       def self.available_options
@@ -360,7 +359,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
 
       def self.available_options
@@ -402,7 +401,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
     end
 
@@ -431,7 +430,7 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        [:ios, :mac].include?platform
+        [:ios, :mac].include? platform
       end
 
       def self.author
@@ -440,3 +439,4 @@ module Fastlane
     end
   end
 end
+# rubocop:enable all