pindo 4.6.9

data/lib/pindo/client/tgateclient.rb

@@ -0,0 +1,103 @@
+
+require 'uri'
+require 'json'
+require 'faraday'
+require 'pindo/base/deviceinfo'
+
+
+module Pindo
+ 
+
+  class TgateClient 
+
+
+      attr_accessor :requests_config
+      attr_accessor :base_url
+
+      def initialize(base_usrl:nil, req_config:nil)
+        @base_url = base_usrl
+        @req_config = req_config
+
+      end
+
+
+      def get_gate_status(device_info:nil)
+
+          querry_params = device_info
+          querry_params = {
+              market:"iOS",
+              device_id:device_info.device_id,
+              idfa:device_info.idfa,
+              sbsid:device_info.sbsid,
+              sutid:device_info.sutid,
+              tzlid:device_info.tzlid
+              # idfv:device_info.idfv
+          }
+
+          req_url = URI.join(@base_url, @req_config["get_gate_status"])  
+          
+          con = Faraday.new 
+          res = con.get do |req|
+              req.url req_url
+              req.headers['Content-Type'] = 'application/json'
+              req.params = querry_params
+          end
+
+          result_status = nil
+          if !res.body.nil?
+              result_status = JSON.parse(res.body)    
+          end
+
+          return  result_status
+      end
+
+      def post_update_gate_status(env_mode:nil, type:nil, to_status:nil, device_info:nil)
+
+          req_url = URI.join(@base_url, @req_config["update_gate_status"])  
+
+          body_params = {
+              env:env_mode,
+              type:type,
+              to_status:to_status,
+              market:"iOS",
+              device_id:device_info.device_id,
+              idfa:device_info.idfa,
+              sbsid:device_info.sbsid,
+              sutid:device_info.sutid,
+              tzlid:device_info.tzlid
+          }
+          
+          puts    
+          puts "#{env_mode}环境更新#{type}为#{to_status}状态..."
+          # puts "env: #{env_mode}".bold.blue
+          # puts "type: #{type}".bold.blue
+          # puts "to_status: #{to_status}".bold.blue
+          # puts
+
+          con = Faraday.new 
+          res = con.post do |req|
+              req.url req_url
+              req.headers['Content-Type'] = 'application/json'
+              req.body = body_params.to_json
+          end
+
+          result_status = nil
+          if !res.body.nil?
+              result_status = JSON.parse(res.body)    
+          end
+          
+
+          if !result_status.nil? && !result_status["meta"].nil? && result_status["meta"]["code"].to_s.eql?("200") && !result_status["data"].nil? && result_status["data"]["is_success"]
+              puts "更新成功!!" 
+              puts    
+          end
+          # puts 
+          
+          return  result_status
+
+          
+      end
+
+  end
+end
+

data/lib/pindo/command.rb

@@ -0,0 +1,101 @@
+
+
+require 'claide'
+require 'json'
+require 'pindo/version'
+require 'pindo/config/pindoconfig'
+require 'pindo/base/plaininformative'
+require 'pindo/base/githelper'
+require 'pindo/client/giteeclient'
+require 'pindo/base/hashhelper'
+
+module Pindo
+    class Informative < PlainInformative
+        def message
+          "[!] #{super}".red
+        end
+    end
+
+    class Command < CLAide::Command
+
+        include Pindo::Githelper
+        include Pindoconfig::Mixin
+
+        require 'pindo/options/deployoptions'
+
+
+        require 'pindo/module/appselect'
+        require 'pindo/module/buildconfighelper'
+        require 'pindo/module/buildhelper'
+        require 'pindo/module/pemcreate'
+        require 'pindo/module/commonconfuseproj'
+        require 'pindo/module/xcodebuildpre'
+        require 'pindo/module/xcodehelper'
+        require 'pindo/module/configprojhelper'
+        require 'pindo/module/appstore_in_app_purchase'
+        require 'pindo/module/appstore_metadata_fastlane_helper'
+        require 'pindo/module/appstore_metadata_connect_api_helper'
+
+
+        require 'pindo/deploy'
+        require 'pindo/dev'
+        require 'pindo/env'
+        require 'pindo/lib'
+        require 'pindo/utils'
+        require 'pindo/pgyer'
+        require 'pindo/setup'
+        require 'pindo/repo'
+        require 'pindo/upgrade'
+        require 'pindo/ipa'
+
+
+        attr_accessor :args_help_flag
+        alias_method :args_help_flag?, :args_help_flag
+
+        self.abstract_command = true
+        self.command = 'pindo'
+        self.version = VERSION
+        self.description = 'pindo, make it easy!'
+
+
+        DEFAULT_ROOT_OPTIONS = [
+          ['--version', '查看pindo版本'],
+        ]
+
+        DEFAULT_OPTIONS = [
+          ['--help',    '查看命令行用法'],
+        ]
+
+
+        # def self.options
+        #     [
+
+        #     ].concat(super)
+        # end
+
+        def self.options
+          if root_command?
+            DEFAULT_ROOT_OPTIONS + DEFAULT_OPTIONS
+          else
+            DEFAULT_OPTIONS
+          end
+        end
+
+        def validate!
+            super
+            help! if args_help_flag?
+        end
+
+        def self.run(argv)
+
+            super(argv)
+        end
+
+        def initialize(argv)
+            super
+            @args_help_flag = argv.flag?('help', false)
+        end
+
+    end
+
+end

data/lib/pindo/config/pindoconfig.rb

@@ -0,0 +1,439 @@
+
+require 'fileutils'
+require 'json'
+
+
+module Pindo
+
+  class Pindoconfig
+
+    attr_accessor :pindo_common_config_json
+    attr_accessor :pindo_env_config_json
+    attr_accessor :pindo_user_config_json
+
+    def initialize(enable_ustom_config = true)
+      
+      # puts "initialize Pindoconfig"
+      if !File.exist?(pindo_dir) 
+        FileUtils.mkdir(pindo_dir)
+      end
+
+
+
+      @pindo_user_config_json = {}
+      @pindo_user_config_json["pindo_common_config"] = "https://gitee.com/goodbuildtest/pindo_common_config.git"
+
+      if File.exist?(pindo_common_configfile_fullname) 
+        
+        @pindo_common_config_json = {}
+        begin
+          @pindo_common_config_json = JSON.parse(File.read(pindo_common_configfile_fullname))  
+        rescue => exception
+          puts "Error !!! +++++++++++ load Pindo common config error ！！！"
+        end
+
+        # 必须先覆盖给 @pindo_user_config_json , 后面pindo_env_configfile_fullname会使用到 @pindo_user_config_json
+        if !@pindo_common_config_json.nil?
+          @pindo_user_config_json = deep_copy_hash(des_hash:@pindo_user_config_json, src_hash:@pindo_common_config_json)
+        end
+
+      end
+
+      env_name = pindo_user_env 
+      temp_env_config_dir = nil
+
+      if env_name == "dreamstudio_config" 
+        temp_env_config_dir = "pindo_dreamstudio_config"
+      elsif  env_name == "workhard_config" 
+        temp_env_config_dir = "pindo_workhard_config"
+      end
+
+      if !temp_env_config_dir.nil? && File.exist?(File.join(pindo_dir, temp_env_config_dir))
+
+          @pindo_env_config_json = {}
+
+          file_name = pindo_env_configfile_fullname
+          # puts "!!! +++++++++++  load Pindo env config ！！！\n #{file_name}"
+          @pindo_env_config_json = JSON.parse(File.read(file_name))  
+
+
+          if !@pindo_env_config_json.nil?
+            @pindo_user_config_json = deep_copy_hash(des_hash:@pindo_user_config_json, src_hash:@pindo_env_config_json)
+          end
+      end
+
+
+    end
+
+
+    def deep_copy_hash(des_hash:nil, src_hash:nil)
+
+      res_hash = {}
+      des_hash = des_hash || {}
+      src_hash = src_hash || {}
+
+      if !des_hash.nil? && (des_hash.kind_of? Hash)
+        des_hash.each do |key, value|
+            if !value.nil? && (value.kind_of? Hash)
+              res_hash[key] = deep_copy_hash(des_hash:nil, src_hash:value)
+            else
+              res_hash[key] = value
+            end
+          end
+      end
+
+      if !src_hash.nil? && (src_hash.kind_of? Hash)
+        src_hash.each do |key, value|
+            if !value.nil? && (value.kind_of? Hash)
+              res_hash[key] = deep_copy_hash(des_hash:nil, src_hash:value)
+            else
+              res_hash[key] = value
+            end
+          end
+      end
+
+      return res_hash
+    end
+
+    # Applies the given changes to the config for the duration of the given
+    # block.
+    #
+    # @param [Hash<#to_sym,Object>] changes
+    #        the changes to merge temporarily with the current config
+    #
+    # @yield [] is called while the changes are applied
+    #
+
+    def with_changes(changes)
+      old = {}
+      changes.keys.each do |key|
+        key = key.to_sym
+        old[key] = send(key) if respond_to?(key)
+      end
+      configure_with(changes)
+      yield if block_given?
+    ensure
+      configure_with(old)
+    end
+
+    # Sets the values of the attributes with the given hash.
+    #
+    # @param  [Hash{String,Symbol => Object}] values_by_key
+    #         The values of the attributes grouped by key.
+    #
+    # @return [void]
+    #
+    def configure_with(values_by_key)
+
+      return unless values_by_key
+      values_by_key.each do |key, value|
+        instance_variable_set("@#{key}", value)
+      end
+
+    end
+
+    #-------------------------------------------------------------------------#
+    #-------------------------------------------------------------------------#
+
+    def update_pindo_env(env_name:nil)
+      if !env_name.nil? then
+        @pindo_user_env = env_name
+        pindo_env_file = File.join(pindo_dir, '.pindo_env')
+        pindo_env_json = {}
+        pindo_env_json['pindo_env'] = @pindo_user_env
+
+        if !File.exist?(pindo_dir)
+            FileUtils.mkdir(pindo_dir)
+        end
+
+        File.open(pindo_env_file, "w") do |f|
+          f.write(JSON.pretty_generate(pindo_env_json))
+        end
+      end
+      return @pindo_user_env
+    end
+
+    def pindo_user_env
+
+      pindo_env_file = File.join(pindo_dir, '.pindo_env')
+      if File.exist?(pindo_env_file)
+        pindo_env_file_json = JSON.parse(File.read(pindo_env_file))
+        if pindo_env_file_json && pindo_env_file_json['pindo_env'] && pindo_env_file_json['pindo_env'] != "" then
+          @pindo_user_env = pindo_env_file_json['pindo_env']
+        end
+      end
+      return @pindo_user_env
+    end
+
+    def pindo_env_config_dirname
+        env_config_dirname = nil
+
+        begin
+          url = pindo_env_config_giturl
+          temp_url = String.new(url)
+          index = temp_url.rindex('/') 
+          temp_url = temp_url.slice(index + 1, temp_url.length) 
+          env_config_dirname = temp_url.gsub!(/\.git/, "")
+
+        rescue => err
+            puts err
+            raise Informative, "pindo配置错误 ！！！\n \n 请运行pindo setup 更新pindo配置 \n"
+        end
+
+      return env_config_dirname
+
+    end
+
+
+    def pindo_dir
+      return @pindo_dir ||= File.expand_path(ENV['PINDO_DIR'] || '~/.pindo')
+    end
+
+    def config_file_name
+      return "pindo_config.json"
+    end
+
+    def pindo_common_configdir
+      return @pindo_common_configdir ||= File.join(pindo_dir, "pindo_common_config")
+    end
+
+    def pindo_common_configfile_fullname
+      return @pindo_common_configfile_fullname ||= File.join(pindo_common_configdir, config_file_name)
+    end
+    
+    def pindo_env_configdir
+      return File.join(pindo_dir, pindo_env_config_dirname)
+    end
+
+    def pindo_env_configfile_fullname
+      return File.join(pindo_env_configdir, config_file_name)
+    end
+
+
+    #-------------------------------------------------------------------------#
+    #-------------------------------------------------------------------------#
+
+    def set_cert_info(dict:nil)
+      return @set_cert_info = dict
+    end
+
+    def get_cert_info()
+      return @set_cert_info 
+    end
+
+    def pindo_common_config_giturl
+      url = ''  
+      if !@pindo_user_config_json.nil?
+        url =  @pindo_user_config_json["pindo_common_config"]  
+      end
+      return url
+    end
+
+    def pindo_env_config_giturl
+      env = pindo_user_env();
+      url = nil
+      if !env.nil? && env != "" && !@pindo_user_config_json.nil? && !@pindo_user_config_json["pindo_config_env"].nil? then
+        url =  @pindo_user_config_json["pindo_config_env"][env]
+      end
+      return url
+    end
+
+
+    def deploy_clang_giturl
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["custome_build_system"].nil? then
+        url =  @pindo_user_config_json["custome_build_system"]["deploy_clang_giturl"]
+      end
+      return url
+
+    end
+
+    def dev_clang_giturl
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["custome_build_system"].nil?
+        url =  @pindo_user_config_json["custome_build_system"]["dev_clang_giturl"]
+      end
+      return url
+
+    end
+
+    def deploy_quark_giturl
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["custome_build_system"].nil?
+        url =  @pindo_user_config_json["custome_build_system"]["deploy_quark_giturl"]
+      end
+      return url
+    end
+
+    def deploy_swark_giturl
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["custome_build_system"].nil?
+        url =  @pindo_user_config_json["custome_build_system"]["deploy_swark_giturl"]
+      end
+      return url
+    end
+
+    def deploy_flutter_giturl
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["custome_build_system"].nil?
+        url =  @pindo_user_config_json["custome_build_system"]["deploy_flutter_giturl"]
+      end
+      return url
+    end
+
+    def deploy_cert_giturl
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["develop_accout_info"].nil?
+        url =  @pindo_user_config_json["develop_accout_info"]["deploy_cert_giturl"]
+      end
+      return url
+    end
+
+    def dev_cert_giturl
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["develop_accout_info"].nil?
+        url =  @pindo_user_config_json["develop_accout_info"]["dev_cert_giturl"]
+      end
+      return url
+    end
+
+    def demo_apple_id
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["develop_accout_info"].nil?
+        url =  @pindo_user_config_json["develop_accout_info"]["demo_apple_id"]
+      end
+      return url      
+    end
+
+    def demo_bundle_id
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["develop_accout_info"].nil?
+        url =  @pindo_user_config_json["develop_accout_info"]["demo_bundle_id"]
+      end
+      return url   
+    end
+
+    def crash_bundle_id
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["develop_accout_info"].nil?
+        url =  @pindo_user_config_json["develop_accout_info"]["crash_bundle_id"]
+      end
+      return url  
+    end
+
+
+    def build_deploy_org
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["gitee_repo_info"].nil?
+        url =  @pindo_user_config_json["gitee_repo_info"]["appconfig_appstore_org"]
+      end
+      return url  
+    end
+
+    def build_test_org
+      url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["gitee_repo_info"].nil?
+        url =  @pindo_user_config_json["gitee_repo_info"]["appconfig_test_org"]
+      end
+      return url  
+    end
+
+    def gitee_api_key
+      api_key = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["gitee_repo_info"].nil?
+        api_key =  @pindo_user_config_json["gitee_repo_info"]["gitee_api_key"]
+      end
+      return api_key  
+    end
+
+
+    def pgyer_api_key
+      api_key = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["pgyer_accout_info"].nil?
+        api_key =  @pindo_user_config_json["pgyer_accout_info"]["pgyer_api_key"]
+      end
+      return api_key  
+    end
+
+    def pgyer_user_key
+      api_key = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["pgyer_accout_info"].nil?
+        api_key =  @pindo_user_config_json["pgyer_accout_info"]["pgyer_user_key"]
+      end
+      return api_key  
+    end
+
+    def pod_repo_dict
+      repo_array = ''
+      if !@pindo_user_config_json.nil?
+        repo_array = @pindo_user_config_json["podindex_repo_dict"]
+      end
+      return repo_array  
+    end
+
+    def git_base_url_fullname
+      return @git_base_url_fullname ||= File.join(pindo_env_configdir,  "git_base_url.json")
+    end
+
+    def set_pgyerapps_info_list(app_info_list:nil)
+        @app_info_list = app_info_list
+    end
+
+    def get_pgyerapps_info_list
+        return @app_info_list
+    end
+
+
+    def tgate_base_url
+      tgate_base_url = ''
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["tgate_base_url"].nil?
+        tgate_base_url =  @pindo_user_config_json["tgate_base_url"]
+      end
+      return tgate_base_url
+    end
+
+    def tgate_req_config
+      tgate_req_config = nil
+      if !@pindo_user_config_json.nil? && !@pindo_user_config_json["tgate_req_config"].nil?
+        tgate_req_config =  @pindo_user_config_json["tgate_req_config"]
+      end
+      return tgate_req_config
+    end
+
+
+    #-------------------------------------------------------------------------#
+    #-------------------------------------------------------------------------#
+    # @!group Singleton
+
+    # @return [Config] the current config instance creating one if needed.
+    #
+    def self.reload_instance
+      @instance = new
+    end
+
+    def self.instance
+      @instance ||= new
+    end
+
+    # Sets the current config instance. If set to nil the config will be
+    # recreated when needed.
+    #
+    # @param  [Config, Nil] the instance.
+    #
+    # @return [void]
+    #
+    class << self
+      attr_writer :instance
+    end
+
+    # Provides support for accessing the configuration instance in other
+    # scopes.
+    #
+    module Mixin
+      def pindo_single_config
+        Pindoconfig.instance
+      end
+    end
+
+  end
+end