match 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4abe678f917b35157991a1fd570fa49b2c9bb949
-  data.tar.gz: a70c2b38bea8f4031c134fa8c54ed16d89635e56
+  metadata.gz: d2a8fdcf766e8137661f1f80021efcbfe0d0b732
+  data.tar.gz: 4e7de3efa9546a4b011ab42c4309115233a06998
 SHA512:
-  metadata.gz: a4d3d5dc5457e53ddf636e6b14a728c06ce2e8e353a04b5528de13b1d3f37ab0e0aeb9faaed12a7c8d958bb0c6bb2a91404f606f248758506f3800a8d148e5d5
-  data.tar.gz: 74bfb495c09c40a8ea81fd173493a68dc9664f7fecf700d5bf4cd81511a73626e4329660f96bae2cc23d41d9e120c1b36ec935d39e7febf9cfe949d5d9b6f0f3
+  metadata.gz: d1d23e83c8e0a137e33a54417a3354c34e58d8a8dc542b5a506911baec5457d45b965e827e105f7d1746ead73210428ed322217fa069fcc06a3d82cb400682b2
+  data.tar.gz: b4eab30e467fe8fc5574f754cf5816b5aeedfe59ef1f433864ea274e6f2b976fa75c4393a38cb99fa826b325e2a240da7dd5f838a900753b2a79f0f73d529caa

data/README.md

@@ -256,7 +256,7 @@ gym
 
 ##### Registering new devices
 
-By using `match`, you'll save a lot of time every time you add new device to your Ad Hoc or Development profiles. Use `match` in combination with the [`register_devices`](https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Actions.md#register_devices) action.
+By using `match`, you'll save a lot of time every time you add new device to your Ad Hoc or Development profiles. Use `match` in combination with the [`register_devices`](https://docs.fastlane.tools/actions#register_devices) action.
 
 ```ruby
 lane :beta do

data/lib/match.rb

@@ -28,7 +28,13 @@ module Match
 
   # @return [Boolean] returns true if the unsupported enterprise mode should be enabled
   def self.enterprise?
-    ENV["MATCH_FORCE_ENTERPRISE"]
+    force_enterprise = ENV["MATCH_FORCE_ENTERPRISE"]
+
+    return false if (force_enterprise.kind_of?(String) || force_enterprise.kind_of?(Numeric)) &&
+                    (force_enterprise.to_s == "0")
+    return false if force_enterprise.kind_of?(String) &&
+                    (force_enterprise == "" || force_enterprise.casecmp("false") == 0 || force_enterprise.casecmp("no") == 0)
+    return !!force_enterprise
   end
 
   # @return [Boolean] returns true if match should interpret the given [certificate|profile] type as an enterprise one

data/lib/match/generator.rb

@@ -10,7 +10,8 @@ module Match
         output_path: output_path,
         force: true, # we don't need a certificate without its private key, we only care about a new certificate
         username: params[:username],
-        team_id: params[:team_id]
+        team_id: params[:team_id],
+        keychain_path: FastlaneCore::Helper.keychain_path(params[:keychain_name])
       })
 
       Cert.config = arguments

data/lib/match/options.rb

@@ -47,6 +47,7 @@ module Match
         FastlaneCore::ConfigItem.new(key: :keychain_password,
                                      short_option: "-p",
                                      env_name: "MATCH_KEYCHAIN_PASSWORD",
+                                     sensitive: true,
                                      description: "This might be required the first time you access certificates on a new mac. For the login/default keychain this is your account password",
                                      optional: true),
         FastlaneCore::ConfigItem.new(key: :readonly,

data/lib/match/runner.rb

@@ -85,6 +85,10 @@ module Match
         # Import the private key
         # there seems to be no good way to check if it's already installed - so just install it
         Utils.import(keys.last, params[:keychain_name], password: params[:keychain_password])
+
+        # Get and print info of certificate
+        info = Utils.get_cert_info(cert_path)
+        TablePrinter.print_certificate_info(cert_info: info)
       end
 
       return File.basename(cert_path).gsub(".cer", "") # Certificate ID

data/lib/match/table_printer.rb

@@ -1,5 +1,19 @@
 module Match
   class TablePrinter
+    # logs public key's  name, user, organisation, country, availability dates
+    def self.print_certificate_info(cert_info: nil)
+      params = {
+        rows: cert_info,
+        title: "Installed Certificate".green
+      }
+
+      puts ""
+      puts Terminal::Table.new(params)
+      puts ""
+    rescue => ex
+      UI.error(ex)
+    end
+
     def self.print_summary(app_identifier: nil, type: nil)
       rows = []
 

data/lib/match/utils.rb

@@ -1,29 +1,7 @@
 module Match
   class Utils
     def self.import(item_path, keychain, password: "")
-      # Existing code expects that a keychain name will be expanded into a default path to Libary/Keychains
-      # in the user's home directory. However, this will not allow the user to pass an absolute path
-      # for the keychain value
-      #
-      # So, if the passed value can't be resolved as a file in Library/Keychains, just use it as-is
-      # as the keychain path.
-      #
-      # We need to expand each path because File.exist? won't handle directories including ~ properly
-      #
-      # We also try to append `-db` at the end of the file path, as with Sierra the default Keychain name
-      # has changed for some users: https://github.com/fastlane/fastlane/issues/5649
-      #
-      keychain_paths = [
-        File.join(Dir.home, 'Library', 'Keychains', keychain),
-        File.join(Dir.home, 'Library', 'Keychains', "#{keychain}-db"),
-        keychain,
-        "#{keychain}-db"
-      ].map { |path| File.expand_path(path) }
-
-      keychain_path = keychain_paths.find { |path| File.exist?(path) }
-
-      UI.user_error!("Could not locate the provided keychain. Tried:\n\t#{keychain_paths.join("\n\t")}") unless keychain_path
-
+      keychain_path = FastlaneCore::Helper.keychain_path(keychain)
       FastlaneCore::KeychainImporter.import_file(item_path, keychain_path, keychain_password: password, output: $verbose)
     end
 
@@ -45,6 +23,35 @@ module Match
       (base_environment_variable_name(app_identifier: app_identifier, type: type) + ["profile-name"]).join("_")
     end
 
+    def self.get_cert_info(cer_certificate_path)
+      command = "openssl x509 -inform der -in #{cer_certificate_path.shellescape} -subject -dates -noout"
+      command << " &" # start in separate process
+      output = Helper.backticks(command, print: $verbose)
+
+      # openssl output:
+      # subject= /UID={User ID}/CN={Certificate Name}/OU={Certificate User}/O={Organisation}/C={Country}\n
+      # notBefore={Start datetime}\n
+      # notAfter={End datetime}
+      cert_info = output.gsub(/\s*subject=\s*/, "").tr("/", "\n")
+      out_array = cert_info.split("\n")
+      openssl_keys_to_readable_keys = {
+           'UID' => 'User ID',
+           'CN' => 'Common Name',
+           'OU' => 'Organisation Unit',
+           'O' => 'Organisation',
+           'C' => 'Country',
+           'notBefore' => 'Start Datetime',
+           'notAfter' => 'End Datetime'
+       }
+
+      return out_array.map { |x| x.split(/=+/) if x.include? "=" }
+                      .compact
+                      .map { |k, v| [openssl_keys_to_readable_keys.fetch(k, k), v] }
+    rescue => ex
+      UI.error(ex)
+      return {}
+    end
+
     def self.base_environment_variable_name(app_identifier: nil, type: nil)
       ["sigh", app_identifier, type]
     end

data/lib/match/version.rb

@@ -1,4 +1,4 @@
 module Match
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
   DESCRIPTION = "Easily sync your certificates and profiles across your team using git"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: match
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: security
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 0.58.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 0.58.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.38.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.37.0
+        version: 0.38.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.12.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -100,7 +100,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.12.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -110,7 +110,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.4
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -120,7 +120,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.4
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -311,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Easily sync your certificates and profiles across your team using git