pindo 4.6.9 → 4.7.0

data/lib/pindo/client/pgyerclient.rb

@@ -42,14 +42,15 @@ module Pindo
       
       def do_login(force_login:false)
 
-          login_success = false
+          
 
+          login_success = false
           @token = load_token()    
           if !@token.nil? && !@token["token"].nil? && !force_login
               login_success = true
 
-              puts "用户#{@token["username"]}登录pgyer成功!!!"
-              puts
+              # puts "用户#{@token["username"]}登录pgyer成功!!!"
+              # puts
 
           else
               username = nil
@@ -66,11 +67,11 @@ module Pindo
                   login_success = true
               end 
           end    
+
           return login_success
       end
 
       def do_login_req(username:nil, checksum_password:nil)
-          puts "do logn pgyer --- "
           
           
           login_name = username
@@ -78,7 +79,7 @@ module Pindo
               login_name = ask('请输入pgger网站的usernmae:') || nil
           end
 
-          puts "usernmae: #{login_name} "
+          puts "用户: #{login_name} "
 
           result_data = do_send_code(username:login_name)
 
@@ -93,6 +94,8 @@ module Pindo
 
           # puts "passwork: #{checksum_pass}"
 
+          Funlog.instance.fancyinfo_start("正在登录pgyer...")
+
           boss_url = @baseurl + @request_config["do_login"]
           body_params = {
               username:login_name,
@@ -115,10 +118,12 @@ module Pindo
 
             
             if !res.body.nil?
+                
                 login_response_data = JSON.parse(res.body)    
             end
 
           rescue => error
+              Funlog.instance.fancyinfo_error("pgyer登录失败!")
               puts "登录失败，请重试!!!"
           end 
 
@@ -127,18 +132,20 @@ module Pindo
           # puts JSON.pretty_generate(login_response_data)
 
           if !login_response_data.nil? && !login_response_data["code"].nil? && login_response_data["code"].to_s.eql?("200")
-              puts "登录成功!!!"
 
               token = {}
               token= login_response_data["data"]
               token["password"] = checksum_pass
               # puts JSON.pretty_generate(token)
               store_token(token:token)
+
+              Funlog.instance.fancyinfo_success("用户:#{@token["username"]}登录pgyer成功!")
+
           else
               if File.exist?(@pgyer_token_file)
                 FileUtils.rm_rf(@pgyer_token_file)  
               end
-              puts "登录失败，请重试!!!"
+              Funlog.instance.fancyinfo_error("pgyer登录失败!")
           end
 
           return token
@@ -148,6 +155,7 @@ module Pindo
       def load_token()
 
           @token = nil
+          Funlog.instance.fancyinfo_success("正在读取pgyer token...")
           if File.exist?(@pgyer_token_file)
               begin
                 data = File.read(@pgyer_token_file) 
@@ -157,7 +165,7 @@ module Pindo
                 temp_token = JSON.parse(data_string)
                 if !temp_token.nil? && !temp_token["token"].nil? && !temp_token["username"].nil?
                     @token = temp_token
-                    # puts "加载pgyer token 成功!!! "
+                    Funlog.instance.fancyinfo_success("读取pgyer token成功!")
                 end 
               rescue => error
                   puts error
@@ -165,10 +173,11 @@ module Pindo
                   if File.exist?(@pgyer_token_file)
                     FileUtils.rm_rf(@pgyer_token_file)  
                   end
+                  Funlog.instance.fancyinfo_error("pgyer token文件不存在!")
                   @token  = nil
               end 
           else
-              # puts "load pgyer token ---- fail !!! "
+              Funlog.instance.fancyinfo_error("pgyer token文件不存在!")
           end    
 
           return @token    
@@ -183,11 +192,10 @@ module Pindo
             File.open(@pgyer_token_file, "w") do |f|
               f.write(data_string)
             end
-            puts "store pgyer token---- sucess !!!"
-          rescue => error
-            puts 
-            puts "store pgyer token---- sucess !!!"
-            puts error
+            Funlog.instance.fancyinfo_success("token 存储成功!")
+            # puts "store pgyer token---- sucess !!!"
+          rescue => error            
+            Funlog.instance.fancyinfo_error("token存储失败!")
           end 
       end
 
@@ -428,6 +436,62 @@ module Pindo
           end
           
           
+          # puts JSON.pretty_generate(result_date)
+          
+          return result_date
+
+      end
+
+      def get_cert_list( )
+
+          params = {} if params.nil?
+          boss_url = @baseurl + @request_config["get_cert_list"]
+
+          con = HttpClient.create_instance_with_proxy  
+          res = con.get do |req|
+              req.url boss_url
+              req.headers['Content-Type'] = 'application/json'
+              req.headers['token'] = @token["token"]
+          end
+
+          result_date = nil
+          if !res.body.nil?
+              result_date = JSON.parse(res.body)    
+          end
+          
+          
+          # puts JSON.pretty_generate(result_date)
+          
+          return  result_date
+
+      end
+
+      def post_resign(appVersionId:nil, certId:nil)
+
+          boss_url = @baseurl + @request_config["post_resign"]
+
+          body_params = {
+                appVersionId:appVersionId,
+                certId:certId
+            }
+
+
+          con = HttpClient.create_instance_with_proxy 
+
+          res = con.post do |req|
+              req.url boss_url
+              req.headers['Content-Type'] = 'application/json'
+              req.headers['token'] = @token["token"]
+              req.body = body_params.to_json
+          end
+
+
+          result_date = nil
+          if !res.body.nil?
+              result_date = JSON.parse(res.body)    
+          end
+          
+          
           # puts JSON.pretty_generate(result_date)
           
           return result_date

data/lib/pindo/command/appstore/iap.rb

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Iap < Appstore
+
+
+                self.summary = 'Appstore中iap相关操作'
+
+                self.description = <<-DESC
+                    Appstore中iap相关操作，配置目录下执行：pindo appstore iap, 默认创建iap购买项
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo ipa output --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    @args_download_name = argv.option('download')
+                    
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/appstore/itcapp.rb

@@ -0,0 +1,41 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Itcapp < Appstore
+
+
+                self.summary = 'Appstore中创建app'
+
+                self.description = <<-DESC
+                    Appstore中创建app，配置目录下执行：pindo appstore itcapp
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/appstore/metadata.rb

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Metadata < Appstore
+
+
+                self.summary = 'Appstore中metadata相关操作'
+
+                self.description = <<-DESC
+                    Appstore中metadata相关操作, 用法:pindo appstre metadata
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo appstore metadata --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                        @args_download_name = argv.option('download')
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/appstore/screenshots.rb

@@ -0,0 +1,43 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Screenshots < Appstore
+
+
+                self.summary = 'Appstore中screenshots相关操作'
+
+                self.description = <<-DESC
+                    Appstore中screenshots相关操作, 用法:pindo appstre screenshots
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+                        ['--download', '下载app的所有购买项,用法:pindo appstore screenshots --download'],
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                        @args_download_name = argv.option('download')
+
+                    super
+                end
+
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/appstore/upload.rb

@@ -0,0 +1,40 @@
+require 'highline/import'
+require 'xcodeproj'
+require 'find'
+require 'fileutils'
+
+module Pindo
+    class Command
+        class Appstore < Command
+            class Upload < Appstore
+
+                self.summary = '上传ipa到appstore'
+
+                self.description = <<-DESC
+                    上传ipa到appstore：pindo appstore upload
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', false),
+                ]
+
+                def self.options
+                    [
+
+
+                    ].concat(super)
+                end
+
+                def initialize(argv)
+
+                    super
+                end
+
+                def run
+
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/appstore.rb

@@ -0,0 +1,17 @@
+
+require 'pindo/command/appstore/iap'
+require 'pindo/command/appstore/itcapp'
+require 'pindo/command/appstore/metadata'
+require 'pindo/command/appstore/screenshots'
+require 'pindo/command/appstore/upload'
+
+module Pindo
+  class Command
+    
+    class Appstore < Command
+      self.abstract_command = true
+      self.summary = 'appstore的相关命令'
+    end
+
+  end
+end

data/lib/pindo/command/deploy/build.rb

@@ -0,0 +1,109 @@
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'xcodeproj'
+require 'gym'
+
+module Pindo
+    class Command
+        class Deploy < Command
+            class Build < Deploy
+
+
+                self.summary = '编译工程'
+
+                self.description = <<-DESC
+                    编译工程. 用法：在工程目录下执行 pindo deploy build
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('path/to/config.json', true),
+                ]
+
+                def initialize(argv)
+                  super
+                  @additional_args = argv.remainder!
+                end
+
+                def run
+
+                    new_project_dir = Dir.pwd
+                    project_fullname = Dir.glob(File.join(new_project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
+
+                    if File.exist?(File.join(new_project_dir, "build"))
+                        FileUtils.rm_rf(File.join(new_project_dir, "build"))
+                    end
+
+
+                    gym_options = get_gym_build_values(project_fullname:project_fullname)
+
+                    config = FastlaneCore::Configuration.create(Gym::Options.available_options, gym_options)
+                    Gym::Manager.new.work(config)
+
+
+                end
+
+
+                def get_gym_build_values(project_fullname:nil)
+
+                    if project_fullname.nil?
+                       raise "请指定要编译的工程"
+                    end
+                    project_path = File.dirname(project_fullname)
+                    proj_name = File.basename(project_fullname, ".xcodeproj")
+                    project_obj = Xcodeproj::Project.open(project_fullname)
+                    main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+                    provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase.split(" ")
+
+                    build_type = "app-store"
+                    icloud_env = "Production"
+                    if provisioning_profile_name.include?("adhoc")
+                        build_type = "ad-hoc"
+                        icloud_env = "Development"
+                    elsif provisioning_profile_name.include?("development")
+                        build_type = "development"
+                        icloud_env = "Development"
+                    else
+                        build_type = "app-store"
+                        icloud_env = "Production"
+                    end
+
+
+                    app_ipaname_temp = main_target.build_configurations.first.build_settings['INFOPLIST_KEY_CFBundleDisplayName'] || main_target.display_name
+                    app_ipaname_temp = app_ipaname_temp.gsub(/ /, '');
+                    app_ipaname_temp = app_ipaname_temp.gsub(/\'/, '');
+
+                    values = {
+                        project: "#{proj_name}.xcodeproj",
+                        scheme:"#{proj_name}",
+                        configuration: "Release",
+                        clean: true,
+                        export_method: build_type,
+                        output_directory:"./build/",
+                        output_name: "#{app_ipaname_temp}.ipa"
+                      }
+
+
+                    if File.exist?(File.join(project_path, "Podfile"))
+                        values[:workspace] = "#{proj_name}.xcworkspace"
+                        values[:project] = nil
+                    end
+
+                    values[:export_options] ||={}
+                    values[:export_options][:compileBitcode] = false
+                    values[:export_options][:stripSwiftSymbols] = true
+                    values[:export_options][:uploadSymbols] = false
+
+                    if !@deploy_icloud_id.nil?
+                        values[:export_options][:iCloudContainerEnvironment] = icloud_env
+                    end
+
+                    return values
+
+                end
+
+
+            end
+        end
+    end
+end

data/lib/pindo/{deploy → command/deploy}/bundleid.rb

@@ -25,7 +25,7 @@ module Pindo
             [
                 ['--sign', 'sign flags'],
             ].concat(super)
-        end
+          end
 
           def initialize(argv)
             @args_sign_flag = argv.flag?('sign', false)