import_certificate.rb in fastlane-2.118.0.beta.20190303200015

- old
+ new

@@ -13,10 +13,18 @@
         "Import certificate from inputfile into a keychain"
       end
 
       def self.available_options
         [
+          FastlaneCore::ConfigItem.new(key: :certificate_path,
+                                       description: "Path to certificate",
+                                       optional: false),
+          FastlaneCore::ConfigItem.new(key: :certificate_password,
+                                       description: "Certificate password",
+                                       sensitive: true,
+                                       default_value: "",
+                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :keychain_name,
                                        env_name: "KEYCHAIN_NAME",
                                        description: "Keychain the items should be imported to",
                                        optional: false),
           FastlaneCore::ConfigItem.new(key: :keychain_path,
@@ -26,18 +34,10 @@
           FastlaneCore::ConfigItem.new(key: :keychain_password,
                                        env_name: "FL_IMPORT_CERT_KEYCHAIN_PASSWORD",
                                        description: "The password for the keychain. Note that for the login keychain this is your user's password",
                                        sensitive: true,
                                        optional: true),
-          FastlaneCore::ConfigItem.new(key: :certificate_path,
-                                       description: "Path to certificate",
-                                       optional: false),
-          FastlaneCore::ConfigItem.new(key: :certificate_password,
-                                       description: "Certificate password",
-                                       sensitive: true,
-                                       default_value: "",
-                                       optional: true),
           FastlaneCore::ConfigItem.new(key: :log_output,
                                        description: "If output should be logged to the console",
                                        type: Boolean,
                                        default_value: false,
                                        optional: true)
@@ -51,18 +51,21 @@
       def self.is_supported?(platform)
         true
       end
 
       def self.details
-        "Import certificates into the current default keychain. Use `create_keychain` to create a new keychain."
+        "Import certificates (and private keys) into the current default keychain. Use the `create_keychain` action to create a new keychain."
       end
 
       def self.example_code
         [
           'import_certificate(certificate_path: "certs/AppleWWDRCA.cer")',
           'import_certificate(
             certificate_path: "certs/dist.p12",
             certificate_password: ENV["CERTIFICATE_PASSWORD"] || "default"
+          )',
+          'import_certificate(
+            certificate_path: "certs/development.cer"
           )'
         ]
       end
 
       def self.category