apple_certs_info 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d832e03b2b9b9bc4258931131ac30b37cc98fff25e42566adcecae71b48634c0
-  data.tar.gz: ff2ca0720578dc99224e3740e75b9a4d97dff1e4d4694ade8e347f17dfa0b392
+  metadata.gz: 68d3c3b54444d29ee89642ab3cc5a4c140d4ebd8d3285109c8f58ce523dec0fc
+  data.tar.gz: affc1729365659a246ae3af13ce77883eefb74b35d51938dd750733584e75bd2
 SHA512:
-  metadata.gz: 16c615e264bc2867d2cd579dd6e80093b19677cef36747853c01286dfcf3319969d154fbb2e2a203724b6e9c8bd3582c0e609edf9a0c5231efe74130cbc9b9d6
-  data.tar.gz: a143ac10d7c70e5ebe9f8f957f83c13b204feac3bbec525c1465fc7b25d2b28f43fa5937b94a29221725597a3d86f63b6a77535ba2a1e3ef1237520463022242
+  metadata.gz: d62764bd66bf50b64c9ef1749ab36a0c187448e180b63545d25df0f5f525daf0b8054940dc6cbf32a7bcdda338bf1f639596473637bf242289561547fc8b5b00
+  data.tar.gz: 14a074228da2d5cb4f69147df2bd14c69136a9645dcce6f12cf38cffe16a682b0e8d6f9338c209b8c9722391e05f24cce0d6b0e400a00c0c3446c4ee8e29cd72

data/.idea/apple_certs_info.iml

@@ -108,28 +108,28 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="rspec-mocks (vbundled(3.10.1)) [path][gem]" type="rubylib">
+      <library name="rspec-mocks (vbundled(3.10.2)) [path][gem]" type="rubylib">
         <properties>
           <option name="version" value="4" />
         </properties>
         <CLASSES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rspec-mocks-3.10.1/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rspec-mocks-3.10.2/lib" />
         </CLASSES>
         <SOURCES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rspec-mocks-3.10.1/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rspec-mocks-3.10.2/lib" />
         </SOURCES>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="rspec-support (vbundled(3.10.1)) [path][gem]" type="rubylib">
+      <library name="rspec-support (vbundled(3.10.2)) [path][gem]" type="rubylib">
         <properties>
           <option name="version" value="4" />
         </properties>
         <CLASSES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rspec-support-3.10.1/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rspec-support-3.10.2/lib" />
         </CLASSES>
         <SOURCES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rspec-support-3.10.1/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.6.0/gems/rspec-support-3.10.2/lib" />
         </SOURCES>
       </library>
     </orderEntry>

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apple_certs_info (0.2.1)
+    apple_certs_info (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/apple_certs_info.rb

@@ -13,6 +13,17 @@ module AppleCertsInfo
     @debug_log
   end
 
+  # Remove duplicate certificate
+  # remove first data
+  def self.remove_duplicate_certificate
+    list = certificate_development_list.concat(certificate_distribution_list)
+
+    duplicate_cname = list.group_by{ |e| e[:cname] }.select { |k, v| v.size > 1 }.map(&:first)
+    duplicate_cname.each do |cname|
+      delete_first_match_keychain(name: cname)
+    end
+  end
+
   # Check Certificate file for iPhone Developer /Apple Development in the KeyChain
   # @param days: limit days
   # @return:
@@ -127,12 +138,12 @@ module AppleCertsInfo
       expire_datetime_match.each do |original_datetime|
         expire_datetime = Time.parse(original_datetime.first)
         limit_days = calc_limit_days(datetime: expire_datetime)
-        cname = cname_match[1]
+        cname = cname_match[1] # cname is same
 
         info << {
-          :expire_datetime => expire_datetime,
-          :limit_days => limit_days,
-          :cname => cname
+            :expire_datetime => expire_datetime,
+            :limit_days => limit_days,
+            :cname => cname,
         }
       end
     rescue StandardError => e
@@ -146,8 +157,20 @@ module AppleCertsInfo
 
 
   private
+  def self.delete_first_match_keychain(name:)
+    result = `security find-certificate -a -c "#{name}" -Z`
+    sha_match = result.match(/SHA-1 hash: (.*)/)
+    keychain_path = result.match(/keychain: (.*)/)
+    raise "not exits sha-1" if sha_match.nil?
+    raise "not exits keychain_path" if keychain_path.nil?
+    sha1 = sha_match[1]
+    puts "Delete #{name} / SHA-1: #{sha1}"
+
+    result = `security delete-certificate -Z #{sha1} #{keychain_path[1]}`
+  end
+
   def self.certificate_list_for(name:)
-    result = `security find-certificate -a -c "#{name}"`
+    result = `security find-certificate -a -c "#{name}" -Z`
     name_match_list = result.scan(/.*alis".*=\"(.*)\".*/)
     puts(name_match_list) if @debug_log == true
 

data/lib/apple_certs_info/version.rb

@@ -1,3 +1,3 @@
 module AppleCertsInfo
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apple_certs_info
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - tarappo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: