certstepper 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e609908e4ef8c3cbd7acfa980f0a717c1630011
-  data.tar.gz: 1fa74cf6a1e1c67ee7a682498cefe8e5d9f453d8
+  metadata.gz: a10e16af831fd8f23aad6b7823bca78111800ec8
+  data.tar.gz: 262bdc266edd1b8b1e762b9256040b5486742a7e
 SHA512:
-  metadata.gz: 832ba2694ec8f7f3bdfb0ce27596b276a6b10f8b37d2b77f7d247cd3c6d2965cfa5384af9bb33fbcef0f9c5bb97b172470b90f5322aa4e979905822eb3d656e0
-  data.tar.gz: cac9a78a60b85d25efc2e4e36d03331f7301f2724c324896e5805bb67a9f06aafb96620f40d0d67e59715f459152483aa61c2ae577153ca2e3a9fb655af8f509
+  metadata.gz: 938e94de0269b821dd132e4cbb6ddaac0b26d9c57886aa1b6d65784f7a8dea1e1f6aa59f89d3004e09fb5b0731afc8669b6d58842023b464c8f25fb82cb29b97
+  data.tar.gz: 4956383be018681aef60f91f0d5e2dde3179c043d9ee9be1470dccb40f47a402403166594c724816c7e3d291a91443c498d3e4884838eef507f33fc12a2ba5fd

data/lib/certstepper.rb

@@ -79,8 +79,8 @@ module CertStepper
 
                opts.on('-t cert_type','--type cert_type','生成证书和配置文件的类型 development adhoc distribution') do |value|
                  if value.start_with? 'ad' 
-                   @options[:cert_type] = ""
-                   @options[:profile_type] = "--adhoc" 
+                   @options[:cert_type] = "--adhoc"
+                   @options[:profile_type] = "" 
                  elsif value.start_with? 'dev' 
                    @options[:cert_type] = "--development"
                    @options[:profile_type] = "--development" 
@@ -143,17 +143,20 @@ module CertStepper
     
                createKeychain cert_path
                system "cert -u #{cert.email} -o #{cert_path}  #{@options[:cert_type]}"
-               dealCert cert_path
+               dealCert cert , cert_path
                 
 
                system "produce -u #{cert.email} -a #{cert.profile_id} --app_name #{cert.profile_name} --skip_itc"
                system "sigh -a #{cert.profile_id} -u #{cert.email} -o #{cert_path} #{@options[:profile_type]}"
                #system "sigh -a #{cert.profile_id} -u #{cert.email} -o #{cert_path} --adhoc"
                
+               
                if !generateCertSuccessfully? cert
                  failed_cert_array << cert.email
                end
 
+               deleteUnusefulFile cert_path
+
             end 
 
             
@@ -166,23 +169,38 @@ module CertStepper
 
           end 
 
+    end
+
+    def self.deleteUnusefulFile(de_path)
+      console_de_path = de_path.gsub /[\s]/ , "\\ "
+      Dir.entries(de_path).each do |file_name|
+        if file_name.end_with? '.cer' 
+          file_path = "#{de_path}/#{file_name}"
+          system "rm #{console_de_path}/#{file_name}" 
+          system "rm #{console_de_path}/#{File.basename(file_path,'.*')}.p12" 
+          system "rm #{console_de_path}/#{File.basename(file_path,'.*')}.certSigningRequest" 
+        end 
+      end
 
     end
 
     def self.generateCertSuccessfully?(cert)
       cert_path = @@root_path + "/#{cert.profile_name}"
+      puts cert_path
       is_p12_exist = false 
       is_cer_exist = false
       is_provision_exist = false 
-      Dir.entries(de_path).each do |file_name| 
-        if file_name.end_with? ".p12"
-          is_p12_exist = true
-        elsif file_name.end_with? ".cer"
-          is_cer_exist = true
-        elsif file_name.end_with? ".mobileprovision"
-          is_provision_exist = true
+      if File.exists? cert_path 
+        Dir.entries(cert_path).each do |file_name| 
+          if file_name.end_with? ".p12"
+            is_p12_exist = true
+          elsif file_name.end_with? ".cer"
+            is_cer_exist = true
+          elsif file_name.end_with? ".mobileprovision"
+            is_provision_exist = true
+          end
         end
-      end
+      end 
 
       return is_p12_exist && is_cer_exist && is_provision_exist
     end 
@@ -211,7 +229,7 @@ module CertStepper
             	new_cert.password = line_content.strip
             when 2
             	new_cert.profile_id = line_content.strip
-              new_cert.profile_name = line_content.strip.scan(/\b\w?\d+\b/).join ""
+              new_cert.profile_name = line_content
             end
             index+=1
          end 
@@ -246,18 +264,20 @@ module CertStepper
       system "security create-keychain -p 123456 #{@keychain_path}"
     end
 
-    def self.dealCert(de_path)
+    def self.dealCert(cert,de_path)
       console_de_path = de_path.gsub /[\s]/ , "\\ "
       Dir.entries(de_path).each do |file_name|
         if file_name.end_with? '.cer' 
           #system "security add-trusted-cert -r unspecified -k 123456 #{File.expand_path('~')}/Downloads/ios_development.cer"
-          system "security import #{de_path}/#{file_name} -k #{@keychain_path}"
-          system "security export -k #{@keychain_path} -t certs -f pkcs12 -P 123 -o #{console_de_path}/cert.p12"
+          system "security import #{console_de_path}/#{file_name} -k #{@keychain_path}"
+          system "security export -k #{@keychain_path} -t certs -f pkcs12 -P 123 -o #{console_de_path}/#{cert.profile_name}.p12"
           system "security delete-keychain #{@keychain_path}"
+
         end 
       end
     end
 
+
     def self.dealCertByChrome(root_path , profile_name)
       system "security create-keychain -P 123456"
       system "security add-trusted-cert -r unspecified -k 123456 #{File.expand_path('~')}/Downloads/ios_development.cer"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certstepper
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - chengkai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cert