fastlane 2.115.0.beta.20190126200102 → 2.115.0.beta.20190127200030

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe399ab7696b77ad5a78e90c0e7497ebeb09c020
-  data.tar.gz: 07b38da9f234328d1ca3fda27b2ca685ac46982d
+  metadata.gz: a2f690dd41314c5c114efcfe3d8bcef7645e54a8
+  data.tar.gz: 5835afcaad7a7aee734131ada28166971d6da86b
 SHA512:
-  metadata.gz: 03ee001ffd244fd4a6a37b37abc1d266e951d97cc36ed3a25242dcf5b700c22cd19713f2613c6fa86ba1995a2d00b07ab67fbdec2387a831edb407e5cd20a2cd
-  data.tar.gz: 73cf0d2a9c66e36ac023b2c13fd83412077623348670caec6bff3ecec39d017dc7ed16f2d7a5aaa1587bf69630b6de62725f6b82a29d10be0679bdce11da02f2
+  metadata.gz: aec640eec8630de7a4755af11b2afbd16763b6c6d8c79246965da54c3a3a5f3d175f4352b6eafa6820bf8a3578eea1782b999819d361b7c50c8d033ac8820d93
+  data.tar.gz: b2390dea0e1655717f6ec83972f86e0824495c9123966c024cbe12b7300a1aa0cf43b3309eca3b9109430f6d637c8b4e2088d49d9b172f2a6a87fd8be57577db

data/deliver/lib/deliver/options.rb

@@ -257,6 +257,13 @@ module Deliver
                                      default_value: :warn),
 
         # App Metadata
+        FastlaneCore::ConfigItem.new(key: :individual_metadata_items,
+                                     env_name: "DELIVER_INDIVUDAL_METADATA_ITEMS",
+                                     description: "An array of localized metadata items to upload individually by language so that errors can be identified. E.g. ['name', 'keywords', 'description']. Note: slow",
+                                     is_string: false,
+                                     type: Array,
+                                     default_value: []),
+
         # Non Localised
         FastlaneCore::ConfigItem.new(key: :app_icon,
                                      description: "Metadata: The path to the app icon",

data/deliver/lib/deliver/upload_metadata.rb

@@ -94,6 +94,7 @@ module Deliver
         non_localised_options = (NON_LOCALISED_VERSION_VALUES + NON_LOCALISED_APP_VALUES)
       end
 
+      individual = options[:individual_metadata_items] || []
       localised_options.each do |key|
         current = options[key]
         next unless current
@@ -106,8 +107,12 @@ module Deliver
         current.each do |language, value|
           next unless value.to_s.length > 0
           strip_value = value.to_s.strip
-          v.send(key)[language] = strip_value if LOCALISED_VERSION_VALUES.include?(key)
-          details.send(key)[language] = strip_value if LOCALISED_APP_VALUES.include?(key)
+          if individual.include?(key.to_s)
+            upload_individual_item(app, v, language, key, strip_value)
+          else
+            v.send(key)[language] = strip_value if LOCALISED_VERSION_VALUES.include?(key)
+            details.send(key)[language] = strip_value if LOCALISED_APP_VALUES.include?(key)
+          end
         end
       end
 
@@ -137,6 +142,7 @@ module Deliver
         # If another string needs to be checked here we should
         # figure out a more generic way to handle these cases.
         if e.message.include?('App Name cannot be longer than 50 characters') || e.message.include?('The app name you entered is already being used')
+          UI.error("Error in app name.  Try using 'individual_metadata_items' to identify the problem language.")
           UI.user_error!(e.message)
         else
           raise e
@@ -144,6 +150,23 @@ module Deliver
       end
     end
 
+    # Uploads metadata individually by language to help identify exactly which items have issues
+    def upload_individual_item(app, version, language, key, value)
+      details = app.details
+      version.send(key)[language] = value if LOCALISED_VERSION_VALUES.include?(key)
+      details.send(key)[language] = value if LOCALISED_APP_VALUES.include?(key)
+      Helper.show_loading_indicator("Uploading #{language} #{key} to App Store Connect")
+      version.save!
+      Helper.hide_loading_indicator
+      begin
+        details.save!
+        UI.success("Successfully uploaded #{language} #{key} to App Store Connect")
+      rescue Spaceship::TunesClient::ITunesConnectError => e
+        UI.error("Error in #{language} #{key}: \n#{value}")
+        UI.error(e.message) # Don't use user_error to allow all values to get checked
+      end
+    end
+
     # rubocop:enable Metrics/PerceivedComplexity
 
     # If the user is using the 'default' language, then assign values where they are needed

data/fastlane/lib/fastlane/actions/create_keychain.rb

@@ -22,7 +22,15 @@ module Fastlane
         end
 
         commands = []
-        commands << Fastlane::Actions.sh("security create-keychain -p #{escaped_password} #{keychain_path}", log: false)
+
+        if !exists?(keychain_path)
+          commands << Fastlane::Actions.sh("security create-keychain -p #{escaped_password} #{keychain_path}", log: false)
+        elsif params[:require_create]
+          UI.abort_with_message!("`require_create` option passed, but found keychain '#{keychain_path}', failing create_keychain action")
+        else
+          UI.important("Found keychain '#{keychain_path}', creation skipped")
+          UI.important("If creating a new Keychain DB is required please set the `require_create` option true to cause the action to fail")
+        end
 
         if params[:default_keychain]
           # if there is no default keychain - setting the original will fail - silent this error
@@ -52,6 +60,14 @@ module Fastlane
         commands
       end
 
+      def self.exists?(keychain_path)
+        keychain_path = File.expand_path(keychain_path)
+
+        # Creating Keychains using the security
+        # CLI appends `-db` to the file name.
+        File.exist?("#{keychain_path}-db") || File.exist?(keychain_path)
+      end
+
       def self.description
         "Create a new Keychain"
       end
@@ -98,7 +114,11 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :add_to_search_list,
                                        description: 'Add keychain to search list',
                                        is_string: false,
-                                       default_value: true)
+                                       default_value: true),
+          FastlaneCore::ConfigItem.new(key: :require_create,
+                                       description: 'Fail the action if the Keychain already exists',
+                                       is_string: false,
+                                       default_value: false)
         ]
       end
 

data/fastlane/lib/fastlane/actions/docs/sync_code_signing.md

@@ -201,13 +201,36 @@ fastlane match migrate
 
 After a successful migration you can safely delete your git repo.
 
-#### Google Cloud `gc_keys.json`
+#### Google Cloud access control
 
 *Google Cloud Storage only*
 
-When running `fastlane match init` the first time, the setup process will help you create your `gc_keys.json` file. This file contains the auth credentials needed to access your Google Cloud storage bucket. Make sure to keep that file secret and never add it to version control.
+There are two cases for reading and writing certificates stored in a Google Cloud storage bucket:
 
-We recommend adding `gc_keys.json` to your `.gitignore` and manually add the file to all your work machines. Every developer should create their own `gc_keys.json` file, which will give the admin full control over who has read/write access to the given Storage bucket. At the same time it allows your team to revoke a single key if a file gets compromised.
+1. Continuous integration jobs. These will authenticate to your Google Cloud project via a service account, and use a `gc_keys.json` file as credentials.
+1. Developers on a local workstation. In this case, you should choose whether everyone on your team will create their own `gc_keys.json` file, or whether you want to manage access to the bucket directly using your developers' Google accounts.
+
+When running `fastlane match init` the first time, the setup process will give you the option to create your `gc_keys.json` file. This file contains the auth credentials needed to access your Google Cloud storage bucket. Make sure to keep that file secret and never add it to version control. We recommend adding `gc_keys.json` to your `.gitignore`
+
+##### Managing developer access via keys
+If you want to manage developer access to your certificates via authentication keys, every developer should create their own `gc_keys.json` and add the file to all their work machines. This will give the admin full control over who has read/write access to the given Storage bucket. At the same time it allows your team to revoke a single key if a file gets compromised.
+
+##### Managing developer acess via Google accounts
+If your developers already have Google accounts and access to your Google Cloud project, you can also manage access to the storage bucket via [Cloud Identity and Access Management (IAM)](https://cloud.google.com/storage/docs/access-control/iam). Just [set up](https://cloud.google.com/storage/docs/access-control/lists) individual developer accounts or an entire Google Group containing your team as readers and writers on your storage bucket.
+
+You can then specify the Google Cloud project id containing your storage bucket in your `Matchfile`:
+
+```ruby-skip-tests
+storage_mode("google_cloud")
+google_cloud_bucket_name("my-app-certificates")
+google_cloud_project_id("my-app-project")
+```
+
+This lets developers on your team use [Application Default Credentials](https://cloud.google.com/docs/authentication/production) when accessing your storage bucket. After installing the [Google Cloud SDK](https://cloud.google.com/sdk/), they only need to run the following command once:
+```no-highlight
+gcloud auth application-default login
+```
+... and log in with their Google account. Then, when they run `fastlane match`, _match_ will use these credentials to read from and write to the storage bucket.
 
 #### New machine
 

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.115.0.beta.20190126200102'.freeze
+  VERSION = '2.115.0.beta.20190127200030'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
   RUBOCOP_REQUIREMENT = '0.49.1'.freeze

data/fastlane/swift/Fastlane.swift

@@ -2146,6 +2146,7 @@ func match(type: String = matchfile.type,
            cloneBranchDirectly: Bool = matchfile.cloneBranchDirectly,
            googleCloudBucketName: String? = matchfile.googleCloudBucketName,
            googleCloudKeysFile: String? = matchfile.googleCloudKeysFile,
+           googleCloudProjectId: String? = matchfile.googleCloudProjectId,
            keychainName: String = matchfile.keychainName,
            keychainPassword: String? = matchfile.keychainPassword,
            force: Bool = matchfile.force,
@@ -2170,6 +2171,7 @@ func match(type: String = matchfile.type,
                                                                                        RubyCommand.Argument(name: "clone_branch_directly", value: cloneBranchDirectly),
                                                                                        RubyCommand.Argument(name: "google_cloud_bucket_name", value: googleCloudBucketName),
                                                                                        RubyCommand.Argument(name: "google_cloud_keys_file", value: googleCloudKeysFile),
+                                                                                       RubyCommand.Argument(name: "google_cloud_project_id", value: googleCloudProjectId),
                                                                                        RubyCommand.Argument(name: "keychain_name", value: keychainName),
                                                                                        RubyCommand.Argument(name: "keychain_password", value: keychainPassword),
                                                                                        RubyCommand.Argument(name: "force", value: force),

data/frameit/lib/frameit/editor.rb

@@ -12,20 +12,23 @@ module Frameit
   # Currently the class is 2 lines too long. Reevaluate refactoring when it's length changes significantly
   class Editor # rubocop:disable Metrics/ClassLength
     attr_accessor :screenshot # reference to the screenshot object to fetch the path, title, etc.
+    attr_accessor :debug_mode
+    attr_accessor :frame_path
     attr_accessor :frame # the frame of the device
     attr_accessor :image # the current image used for editing
     attr_accessor :space_to_device
 
-    def initialize(screenshot)
+    def initialize(screenshot, debug_mode = false)
       @screenshot = screenshot
+      self.debug_mode = debug_mode
     end
 
     def frame!
       prepare_image
 
-      frame = load_frame
-      if frame # Mac doesn't need a frame
-        self.frame = MiniMagick::Image.open(frame)
+      @frame_path = load_frame
+      if @frame_path # Mac doesn't need a frame
+        self.frame = MiniMagick::Image.open(@frame_path)
         # Rotate the frame according to the device orientation
         self.frame.rotate(self.rotation_for_device_orientation)
       elsif self.class == Editor
@@ -85,6 +88,26 @@ module Frameit
       frame.rotate(-rotation)
       @image.rotate(-rotation)
 
+      # Debug Mode: Add filename to frame
+      if self.debug_mode
+        filename = File.basename(@frame_path, ".*")
+        filename.sub!('Apple', '') # remove 'Apple'
+
+        width = screenshot.size[0]
+        font_size = width / 20 # magic number that works well
+
+        offset_top = offset['offset'].split("+")[2].to_f
+        annotate_offset = "+0+#{offset_top}" # magic number that works semi well
+
+        frame.combine_options do |c|
+          c.gravity('North')
+          c.undercolor('#00000080')
+          c.fill('white')
+          c.pointsize(font_size)
+          c.annotate(annotate_offset.to_s, filename.to_s)
+        end
+      end
+
       @image = frame.composite(image, "png") do |c|
         c.compose("DstOver")
         c.geometry(offset['offset'])

data/frameit/lib/frameit/options.rb

@@ -65,7 +65,12 @@ module Frameit
                                          :landscape_right
                                        end
                                      end,
-                                     default_value_dynamic: true)
+                                     default_value_dynamic: true),
+        FastlaneCore::ConfigItem.new(key: :debug_mode,
+                                     env_name: "FRAMEIT_DEBUG_MODE",
+                                     description: "Output debug information in framed screenshots",
+                                     default_value: false,
+                                     type: Boolean)
       ]
     end
   end

data/frameit/lib/frameit/runner.rb

@@ -40,7 +40,7 @@ module Frameit
             if screenshot.mac?
               editor = MacEditor.new(screenshot)
             else
-              editor = Editor.new(screenshot)
+              editor = Editor.new(screenshot, Frameit.config[:debug_mode])
             end
             if editor.should_skip?
               UI.message("Skipping framing of screenshot #{screenshot.path}.  No title provided in your Framefile.json or title.strings.")

data/match/lib/match/migrate.rb

@@ -17,7 +17,8 @@ module Match
       # to ask for all the missing inputs *before* cloning the git repo
       google_cloud_storage = Storage.for_mode("google_cloud", {
         google_cloud_bucket_name: params[:google_cloud_bucket_name],
-        google_cloud_keys_file: params[:google_cloud_keys_file]
+        google_cloud_keys_file: params[:google_cloud_keys_file],
+        google_cloud_project_id: params[:google_cloud_project_id]
       })
 
       git_storage = Storage.for_mode("git", {

data/match/lib/match/nuke.rb

@@ -36,7 +36,8 @@ module Match
         git_user_email: params[:git_user_email],
         clone_branch_directly: params[:clone_branch_directly],
         google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
-        google_cloud_keys_file: params[:google_cloud_keys_file].to_s
+        google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
+        google_cloud_project_id: params[:google_cloud_project_id].to_s
       })
       self.storage.download
 

data/match/lib/match/options.rb

@@ -123,6 +123,10 @@ module Match
                                      verify_block: proc do |value|
                                        UI.user_error!("Could not find keys file at path '#{File.expand_path(value)}'") unless File.exist?(value)
                                      end),
+        FastlaneCore::ConfigItem.new(key: :google_cloud_project_id,
+                                     env_name: "MATCH_GOOGLE_CLOUD_PROJECT_ID",
+                                     description: "ID of the Google Cloud project to use for authentication",
+                                     optional: true),
 
         # Keychain
         FastlaneCore::ConfigItem.new(key: :keychain_name,

data/match/lib/match/runner.rb

@@ -46,7 +46,8 @@ module Match
         type: params[:type].to_s,
         platform: params[:platform].to_s,
         google_cloud_bucket_name: params[:google_cloud_bucket_name].to_s,
-        google_cloud_keys_file: params[:google_cloud_keys_file].to_s
+        google_cloud_keys_file: params[:google_cloud_keys_file].to_s,
+        google_cloud_project_id: params[:google_cloud_project_id].to_s
       })
       storage.download
 

data/match/lib/match/storage/google_cloud_storage.rb

@@ -17,7 +17,7 @@ module Match
       attr_reader :platform
       attr_reader :bucket_name
       attr_reader :google_cloud_keys_file
-      attr_reader :project_id
+      attr_reader :google_cloud_project_id
 
       # Managed values
       attr_accessor :gc_storage
@@ -34,26 +34,34 @@ module Match
           type: params[:type].to_s,
           platform: params[:platform].to_s,
           google_cloud_bucket_name: params[:google_cloud_bucket_name],
-          google_cloud_keys_file: params[:google_cloud_keys_file]
+          google_cloud_keys_file: params[:google_cloud_keys_file],
+          google_cloud_project_id: params[:google_cloud_project_id]
         )
       end
 
       def initialize(type: nil,
                      platform: nil,
                      google_cloud_bucket_name: nil,
-                     google_cloud_keys_file: nil)
+                     google_cloud_keys_file: nil,
+                     google_cloud_project_id: nil)
         @type = type if type
         @platform = platform if platform
+        @google_cloud_project_id = google_cloud_project_id if google_cloud_project_id
         @bucket_name = google_cloud_bucket_name
 
-        @google_cloud_keys_file = ensure_keys_file_exists(google_cloud_keys_file)
+        @google_cloud_keys_file = ensure_keys_file_exists(google_cloud_keys_file, google_cloud_project_id)
 
-        # Extract the Project ID from the `JSON` file
-        # so the user doesn't have to provide it manually
-        keys_file_content = JSON.parse(File.read(self.google_cloud_keys_file))
-        @project_id = keys_file_content["project_id"]
-        if self.project_id.to_s.length == 0
-          UI.user_error!("Provided keys file on path #{File.expand_path(self.google_cloud_keys_file)} doesn't include required value for `project_id`")
+        if self.google_cloud_keys_file.to_s.length > 0
+          # Extract the Project ID from the `JSON` file
+          # so the user doesn't have to provide it manually
+          keys_file_content = JSON.parse(File.read(self.google_cloud_keys_file))
+          if google_cloud_project_id.to_s.length > 0 && google_cloud_project_id != keys_file_content["project_id"]
+            UI.important("The google_cloud_keys_file's project ID ('#{keys_file_content['project_id']}') doesn't match the google_cloud_project_id ('#{google_cloud_project_id}'). This may be the wrong keys file.")
+          end
+          @google_cloud_project_id = keys_file_content["project_id"]
+          if self.google_cloud_project_id.to_s.length == 0
+            UI.user_error!("Provided keys file on path #{File.expand_path(self.google_cloud_keys_file)} doesn't include required value for `project_id`")
+          end
         end
 
         # Create the Google Cloud Storage client
@@ -62,7 +70,7 @@ module Match
         begin
           self.gc_storage = Google::Cloud::Storage.new(
             credentials: self.google_cloud_keys_file,
-            project_id: self.project_id
+            project_id: self.google_cloud_project_id
           )
         rescue => ex
           UI.error(ex)
@@ -101,7 +109,7 @@ module Match
       end
 
       def human_readable_description
-        "Google Cloud Bucket [#{self.project_id}/#{self.bucket_name}]"
+        "Google Cloud Bucket [#{self.google_cloud_project_id}/#{self.bucket_name}]"
       end
 
       def upload_files(files_to_upload: [], custom_message: nil)
@@ -149,7 +157,7 @@ module Match
 
       # This method will make sure the keys file exists
       # If it's missing, it will help the user set things up
-      def ensure_keys_file_exists(google_cloud_keys_file)
+      def ensure_keys_file_exists(google_cloud_keys_file, google_cloud_project_id)
         if google_cloud_keys_file && File.exist?(google_cloud_keys_file)
           return google_cloud_keys_file
         end
@@ -159,8 +167,31 @@ module Match
         fastlane_folder_gc_keys_path = File.join(FastlaneCore::FastlaneFolder.path, DEFAULT_KEYS_FILE_NAME)
         return fastlane_folder_gc_keys_path if File.exist?(fastlane_folder_gc_keys_path)
 
-        # User doesn't seem to have provided a keys file
-        UI.message("Looks like you don't have a Google Cloud #{DEFAULT_KEYS_FILE_NAME.cyan} file yet")
+        if google_cloud_project_id.to_s.length > 0
+          # Check to see if this system has application default keys installed.
+          # These are the default keys that the Google Cloud APIs use when no other keys are specified.
+          # Users with the Google Cloud SDK installed can generate them by running...
+          # `gcloud auth application-default login`
+          # ...and then they'll be automatically available.
+          # The nice thing about these keys is they can be associated with the user's login in GCP
+          # (e.g. my_account@gmail.com), so teams can control access to the certificate bucket
+          # using a mailing list of developer logins instead of generating service accounts
+          # and keys.
+          application_default_keys = nil
+          begin
+            application_default_keys = Google::Auth.get_application_default
+          rescue
+            # This means no application default keys have been installed. That's perfectly OK,
+            # we can continue and ask the user if they want to use a keys file.
+          end
+
+          if application_default_keys && UI.confirm("Do you want to use this system's Google Cloud application default keys?")
+            return nil
+          end
+        end
+
+        # User doesn't seem to have provided a keys file.
+        UI.message("Looks like you don't have a Google Cloud #{DEFAULT_KEYS_FILE_NAME.cyan} file")
         UI.message("If you have one, make sure to put it into the '#{Dir.pwd}' directory and call it '#{DEFAULT_KEYS_FILE_NAME.cyan}'")
         unless UI.confirm("Do you want fastlane to help you to create a #{DEFAULT_KEYS_FILE_NAME} file?")
           UI.user_error!("Process stopped, run fastlane again to start things up again")
@@ -217,7 +248,7 @@ module Match
           if available_bucket_identifiers.count > 0
             @bucket_name = UI.select("What Google Cloud Storage bucket do you want to use? (you can define it using the `google_cloud_bucket_name` key)", available_bucket_identifiers)
           else
-            UI.error("Looks like your Google Cloud account for the project ID '#{self.project_id}' doesn't")
+            UI.error("Looks like your Google Cloud account for the project ID '#{self.google_cloud_project_id}' doesn't")
             UI.error("have any available storage buckets yet. Please visit the following URL")
             UI.message("")
             UI.message("\t\thttps://console.cloud.google.com/storage/browser".cyan)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.115.0.beta.20190126200102
+  version: 2.115.0.beta.20190127200030
 platform: ruby
 authors:
 - Danielle Tomlinson
@@ -27,7 +27,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-26 00:00:00.000000000 Z
+date: 2019-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -1687,24 +1687,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
+- fastlane/lib
+- snapshot/lib
 - cert/lib
-- supply/lib
-- precheck/lib
-- credentials_manager/lib
+- gym/lib
 - sigh/lib
-- pilot/lib
+- credentials_manager/lib
 - scan/lib
-- snapshot/lib
-- produce/lib
+- precheck/lib
+- supply/lib
+- screengrab/lib
 - deliver/lib
-- gym/lib
-- frameit/lib
-- fastlane_core/lib
-- pem/lib
 - spaceship/lib
-- fastlane/lib
+- pilot/lib
 - match/lib
-- screengrab/lib
+- produce/lib
+- pem/lib
+- frameit/lib
+- fastlane_core/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="