certstepper 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d79605fedd8df288f566664fd269a516bea782ea
-  data.tar.gz: a5fea3b5b2ee819702b93befaec705b18823f7f5
+  metadata.gz: 0037ea84791c538ca76c2c6023a07ee457551bc1
+  data.tar.gz: 246f6d20f6c1a43a8fad2ace118fed87f3777ff8
 SHA512:
-  metadata.gz: 40915f36c73f9f45ccf0115d04af05916d398e31af8870f6ac95768b4522897b6a1114343f0a82153f3b1d0841a365512932ebcf891d782c7b1610da783a1c96
-  data.tar.gz: 4e3e1bc30fe3c99965cb982e4be32e5bd8ec2a248cc2ec8e0926028405bea1ef7a0d50a143c2b26e6a0ba9476ff7cdfaa9cc7761a513de95f2e12dbb0501d60e
+  metadata.gz: 212c55f435ed3b7a2f4dddb2cdfb739d9319d9acb66172968fbdd67e89f584f5b6a5dc90f1cc5f42cd2c289defab35d97add0cf3eac2f4c319441d61e3000acf
+  data.tar.gz: caf2b3ec14bb41ad8ae2b88148173dd4d527658c3c0a271b9f21bc69f43bde9d8b26f76904caa3022f255abf219c529ee1a4a14b33fca190abbabf0c53661002

data/lib/certstepper.rb

@@ -1,6 +1,9 @@
 require "pathname"
 require "fileutils"
 require "json"
+require "cert"
+require "sigh"
+require 'optparse'
 
 class String
     def strip_control_characters()
@@ -28,13 +31,13 @@ module CertStepper
 
 
     def self.startStep
-      # if ARGV.length==0 || ARGV == nil
+     #    if ARGV.length==0 || ARGV == nil
      #      puts "error: Parameter does not match,there is not any parameter"
      #      return nil
      #    end
       
+         #self.logMessage("#{ARGV}\n")
 
-         self.logMessage("#{ARGV}\n")
 
          begin
            if ARGV[0].start_with? "chrome-extension:"
@@ -59,6 +62,38 @@ module CertStepper
                end
              end
            else 
+
+            check_xcode_select = `which xcode-select`.strip
+            if !File.exists? check_xcode_select
+              `xcode-select --install`
+            end
+
+
+             @options = {}
+             option_parser = OptionParser.new do |opts|
+               opts.banner = "certstepper File_Path [Options]命令行生成证书和配置文件!\n文件的内容：三行一个循环,依次是开发者账号、密码、唯一标识"
+               @options[:cert_type] = ""
+               @options[:profile_type] = "--adhoc" 
+               @options[:force] = false
+
+               opts.on('-t cert_type','--type cert_type','生成证书和配置文件的类型') do |value|
+                 if value.start_with? 'ad' 
+                   @options[:cert_type] = ""
+                   @options[:profile_type] = "--adhoc" 
+                 elsif value.start_with? 'dev' 
+                   @options[:cert_type] = "--development"
+                   @options[:profile_type] = "--development" 
+                 elsif value.start_with? 'dis'
+                   @options[:cert_type] = ""
+                   @options[:profile_type] = "" 
+                 end
+               end
+
+              opts.on('-f', '--force', '强制重新获取证书,默认生成成功后不再重新获取') do 
+                @options[:force] = true
+              end
+             end.parse!
+
              self.parseData ARGV[0]
              self.startWork
            end
@@ -85,50 +120,67 @@ module CertStepper
     end
 
     def self.startWork
-                  
+          puts "总共要生成#{@@certs.length}个证书" 
           console_root_path = @@root_path.gsub /[\s]/ , "\\ "
           open_dir ="open #{console_root_path}"
           system("open #{console_root_path}")
           puts "Apple Cert Create Stepper\n"
+
+          failed_cert_array = []
+
           @@certs.each do |cert|
              puts "----------- begin  #{cert.profile_id} Cert ----------- \n"
-             self.createDir @@root_path + "/#{cert.profile_name}"
-             puts "1. copy email. <press enter>"
-             self.getUserInput
-             self.copyToClipboard cert.email
-             puts "email coppied : #{cert.email}\n"
-             puts "2. copy password. <press enter>"
-             self.getUserInput
-             self.copyToClipboard cert.password
-             puts "password coppied : #{cert.password}\n"
-             puts "3.import and export cert"
-             self.dealCert cert
-             puts "4. copy profile name. <press enter>"
-             self.getUserInput
-             self.copyToClipboard cert.profile_name
-             puts "name coppied : #{cert.profile_name}\n"
-             puts "\n5. copy profile id. <press enter>"
-             self.getUserInput
-             self.copyToClipboard  cert.profile_id
-             puts "id coppied : #{cert.profile_id}"
-             puts "\n6. copy profile name. <press enter>"
-             self.getUserInput
-             self.copyToClipboard cert.profile_name
-             puts "name coppied : #{cert.profile_name}\n"
-             puts "\n7. move profile to destination from download. <press enter>"
-             self.getUserInput
-             mobileprovision_name = "#{cert.profile_name}.mobileprovision"
-             source_file = "#{File.expand_path('~')}/Downloads/#{mobileprovision_name}" 
-             dest_file = "#{@@root_path}/#{cert.profile_name}/#{mobileprovision_name}"
-             if File.exist? source_file
-               FileUtils.mv source_file , dest_file 
-               puts "#{mobileprovision_name} moved\n\n"
-             else 
-               puts "#{mobileprovision_name} doesn't exist. Please download and move by yourself !\n\n"
-             end
+              
+             if !generateCertSuccessfully?(cert) || @options[:force] 
+                  
+               cert_path = console_root_path + "/#{cert.profile_name}"
+               createDir cert_path
+
+               keychain_entry = CredentialsManager::AccountManager.new(user:cert.email , password: cert.password)
+               keychain_entry.add_to_keychain
+
+    
+               createKeychain cert_path
+               system "cert -u #{cert.email} -o #{cert_path}  #{@options[:cert_type]}"
+               dealCert 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
+
+            end 
+
+            
+            failed_content = "以下账号的证书和配置文件创建失败:\n" + failed_cert_array.join("\n") + "请重新尝试执行命令，如果多次不成功，请检查账号密码的正确性!"
+            puts failed_content 
 
           end 
+
+
     end
+
+    def self.generateCertSuccessfully?(cert)
+      cert_path = @@root_path + "/#{cert.profile_name}"
+      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
+        end
+      end
+
+      return is_p12_exist && is_cer_exist && is_provision_exist
+    end 
     
     def self.parseData(start_path)
       @@certs = Array.new
@@ -154,9 +206,7 @@ module CertStepper
             	new_cert.password = line_content.strip
             when 2
             	new_cert.profile_id = line_content.strip
-            	line_content.strip.split(".").each do |comp|
-                new_cert.profile_name = comp if comp =~ /\b\w?\d+\b/ 
-              end
+              new_cert.profile_name = line_content.strip.scan(/\b\w?\d+\b/).join ""
             end
             index+=1
          end 
@@ -170,7 +220,12 @@ module CertStepper
     end
    
     def self.createDir(filePath)
-       Dir.mkdir filePath if !Dir.exist?  filePath
+       if !Dir.exist?  filePath
+         Dir.mkdir filePath 
+       else 
+         FileUtils.rm_r filePath
+         Dir.mkdir filePath 
+       end
     end
 
     def self.getUserInput 
@@ -181,11 +236,21 @@ module CertStepper
           end
     end
 
-    def self.dealCert(cert)
-      system "security create-keychain -P 123456"
-      system "security add-trusted-cert -r unspecified -k 123456 #{File.expand_path('~')}/Downloads/ios_development.cer"
-      system "security export -k 123456 -t certs -f pkcs12 -o #{@@root_path}/#{cert.profile_name}/cert.p12"
-      system "security delete-keychain 123456"
+    def self.createKeychain(de_path)
+      @keychain_path = File.expand_path "#{de_path}/CertTempleContainor"
+      system "security create-keychain -p 123456 #{@keychain_path}"
+    end
+
+    def self.dealCert(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 delete-keychain #{@keychain_path}"
+        end 
+      end
     end
 
     def self.dealCertByChrome(root_path , profile_name)
@@ -197,9 +262,10 @@ module CertStepper
 
 
     def self.logMessage(message)
-      file = File.open("#{File.expand_path('~')}/certstepper.log", "w+")
-      file.write message
-      file.close
+      puts message
+      #file = File.open("#{File.expand_path('~')}/certstepper.log", "w+")
+      #file.write message
+      #file.close
     end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: certstepper
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - chengkai
@@ -9,7 +9,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-07-20 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.8
+- !ruby/object:Gem::Dependency
+  name: sigh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: produce
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 description: create ios dev cert simple
 email: chengkai@1853.com
 executables:
@@ -28,17 +88,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: cert simplefy