pindo 4.6.9

data/lib/pindo/base/githelper.rb

@@ -0,0 +1,489 @@
+
+require 'fileutils'
+require 'pindo/base/executable'
+require 'etc'
+
+module Pindo    
+    module Githelper
+
+      extend Executable
+      executable :git
+    
+      def prepare_gitenv()
+
+          usrname = Etc.getlogin
+          command = "git config --global user.email #{usrname}@example.com"
+          system command
+          command = "git config --global user.name #{usrname}"
+          system command
+
+      end
+
+      def add_branch(local_repo_dir: nil, branch: nil)
+
+          current=Dir.pwd
+          result = false
+
+          puts local_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
+          if !local_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
+            git!(%W(-C #{local_repo_dir} checkout -b #{branch}))
+            result = true
+          end
+
+          git!(%W(-C #{local_repo_dir} push origin #{branch}:#{branch}))
+
+          Dir.chdir(current)
+          return result
+      end
+
+      def remove_branch(local_repo_dir: nil, branch: nil)
+          current=Dir.pwd
+
+          result = false
+          if File.exist?(local_repo_dir)
+            current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
+            if local_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
+                git!(%W(-C #{local_repo_dir} branch -D #{branch})) 
+                result = true
+            end
+            
+            if remote_branch_exists?(local_repo_dir: local_repo_dir, branch: branch)
+                git!(%W(-C #{local_repo_dir} push origin :#{branch})) 
+                result = true
+            end
+
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+      end
+
+
+      def local_branch_exists?(local_repo_dir: nil, branch: nil)
+          current=Dir.pwd
+          result = false
+
+          if File.exist?(local_repo_dir)
+            Dir.chdir(local_repo_dir)
+
+            res_data = Executable.capture_command('git', %W(rev-parse --verify #{branch}), :capture => :out)
+            # puts "=====1"
+            # puts res_data
+            # res_data = git!(%W(-C #{local_repo_dir} --no-pager branch --list origin/#{branch} --no-color -r))
+            result = !res_data.nil? && !res_data.empty?
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+      end
+
+      def remote_branch_exists?(local_repo_dir: nil, branch: nil)
+          current=Dir.pwd
+          result = false
+          if File.exist?(local_repo_dir)
+            Dir.chdir(local_repo_dir)
+            res_data = git!(%W(-C #{local_repo_dir} ls-remote --heads origin refs/heads/#{branch}))
+            result = !res_data.nil? && !res_data.empty?
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+      end
+
+
+      def add_tag(local_repo_dir: nil, tag_name: nil)
+
+          current=Dir.pwd
+          result = false
+          if File.exist?(local_repo_dir)
+            Dir.chdir(local_repo_dir)
+            if !local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+                git!(%W(-C #{local_repo_dir} tag #{tag_name}))
+                result = true
+            end
+            git!(%W(-C #{local_repo_dir} push origin #{tag_name})) 
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+      end
+
+      def add_tag_with_check(local_repo_dir:nil, tag_name:nil)
+
+          if remote_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+              puts
+              puts "路径: #{local_repo_dir}"
+              puts "Tag: #{tag_name}"
+              puts 
+              puts "仓库已经存在同样tag:#{tag_name} !!!"
+              
+              answer = agree("确定删除远程仓库的tag, 重新添加tag:#{tag_name}吗(Y/n)?:")
+              unless answer
+                  raise Informative, "添加tag异常！！！"
+              end
+              if local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+                  git!(%W(-C #{local_repo_dir} tag -d #{tag_name}))
+              end
+              git!(%W(-C #{local_repo_dir} push origin :#{tag_name}))
+              add_tag(local_repo_dir:local_repo_dir, tag_name:tag_name)
+          else
+              if local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+                  git!(%W(-C #{local_repo_dir} tag -d #{tag_name}))
+              end
+              add_tag(local_repo_dir:local_repo_dir, tag_name:tag_name)
+          end
+      end
+
+      def remove_tag(local_repo_dir: nil, tag_name: nil)
+
+          result = false
+          current=Dir.pwd
+          if File.exist?(local_repo_dir)
+            Dir.chdir(local_repo_dir)
+            if local_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+                git!(%W(-C #{local_repo_dir} tag -d #{tag_name})) 
+                result = true
+            end
+            if remote_tag_exists?(local_repo_dir: local_repo_dir, tag_name: tag_name)
+                git!(%W(-C #{local_repo_dir} push origin :#{tag_name})) 
+                result = true
+            end
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+
+      end
+
+      
+      def remote_tag_exists?(local_repo_dir: nil, tag_name: nil)
+
+          result = false
+          current=Dir.pwd
+
+          if File.exist?(local_repo_dir)
+            Dir.chdir(local_repo_dir)
+            tag_ref = "refs/tags/#{tag_name}"            
+            res_data = git!(%W(-C #{local_repo_dir} ls-remote --tags origin #{tag_ref})) 
+            result =  !res_data.nil? && !res_data.empty?
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+
+
+      end
+
+      def local_tag_exists?(local_repo_dir: nil, tag_name: nil)
+          # tag_ref = "refs/tags/#{tag_name}"
+          result = false
+          current=Dir.pwd
+
+          if File.exist? (local_repo_dir)
+            Dir.chdir(local_repo_dir)
+            res_data = git!(%W(-C #{local_repo_dir} tag --list #{tag_name}))
+            result = !res_data.nil? && !res_data.empty?
+          else
+            result = false
+          end
+          Dir.chdir(current)
+          return result
+      end
+
+      def git_latest_commit_id(local_repo_dir:nil)
+
+        current=Dir.pwd
+        commit_id = nil
+
+        if File.exist?(local_repo_dir)
+          Dir.chdir(local_repo_dir)
+          current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
+          # puts "current_branch: #{current_branch}"
+
+          # git log -n 1 --pretty=format:"commit %H"
+          # format_str = "commit %H"
+          # latest_log_info = git!(%W(-C #{current} log -n 1 --pretty=#{format_str} #{current_branch})).strip
+          commit_id = git!(%W(-C #{local_repo_dir} rev-parse #{current_branch})).strip
+        end
+        Dir.chdir(current)
+
+        return commit_id
+      end
+
+      def getcode_to_dir(reponame:nil, remote_url:nil, path: nil, new_branch:"master", new_tag: nil)
+
+          current=Dir.pwd
+          # puts reponame
+          # puts remote_url
+          # puts path
+
+          local_repo_dir = File::join(path, reponame)
+          puts "正在更新仓库: #{local_repo_dir}"
+          if !reponame.empty? && !remote_url.empty? && !path.empty?
+      
+              if File.exist?(local_repo_dir)
+                Dir.chdir(local_repo_dir)
+
+                remote_info = git!(%W(remote -v))
+                if remote_info.include?("git.coding.net")
+                  current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
+                  git!(%W(remote remove origin))
+                  git!(%W(remote add origin #{remote_url}))
+                  args = %W(-C #{local_repo_dir} fetch origin)
+                  args.push('--progress')
+                  git!(args)
+                  git!(%W(-C #{local_repo_dir} branch --set-upstream-to=origin/#{current_branch}  #{current_branch}))  
+                end
+
+                git!(%W(-C #{local_repo_dir} fetch origin --progress))
+              else
+                puts "Cloning `#{remote_url}` into `#{local_repo_dir}`."
+                git! ['clone', remote_url, local_repo_dir]
+              end
+
+              Dir.chdir(local_repo_dir)
+              if !remote_branch_exists?(local_repo_dir:local_repo_dir, branch:new_branch)
+                  raise Informative, "仓库中的#{new_branch}分支不存在 !!!"
+              end
+
+              current_branch = git!(%W(-C #{local_repo_dir} rev-parse --abbrev-ref HEAD)).strip
+              if current_branch.eql?(new_branch)
+                  git!(%W(-C #{local_repo_dir} reset --hard origin/#{new_branch}))      
+                  git!(%W(-C #{local_repo_dir} branch --set-upstream-to=origin/#{new_branch} #{new_branch}))       
+                  git!(%W(-C #{local_repo_dir} pull))
+                  
+              else
+                git!(%W(-C #{local_repo_dir} clean -fd))
+                if local_branch_exists?(local_repo_dir:local_repo_dir, branch:new_branch)
+                  git!(%W(-C #{local_repo_dir} checkout #{new_branch})) 
+                else
+                  git!(%W(-C #{local_repo_dir} checkout -b #{new_branch})) 
+                end
+                git!(%W(-C #{local_repo_dir} branch --set-upstream-to=origin/#{new_branch} #{new_branch})) 
+                git!(%W(-C #{local_repo_dir} pull))
+              end
+
+              if !new_tag.nil? && new_tag != "" 
+                if !new_tag.nil? && new_tag != "" && local_tag_exists?(local_repo_dir:local_repo_dir, tag_name:new_tag)
+                  puts "tag : #{new_tag} is exist !!!"
+                  git!(%W(-C #{local_repo_dir} checkout #{new_tag}))
+                else
+                  raise Informative, "tag #{new_tag} is not exist !!!"
+                end
+              end
+
+          end
+
+          Dir.chdir(current)
+          return local_repo_dir
+      end
+
+      def get_repo_base_name(repo_url:nil)  
+        temp_url = String.new(repo_url)
+        index = temp_url.rindex('/') 
+        temp_url = temp_url.slice(index + 1, temp_url.length) 
+        base_name = temp_url.gsub!(/\.git/, "")
+        return base_name 
+      end
+
+      def clong_buildconfig_repo(repo_name:nil)      
+        
+        pindo_dir = File::expand_path(Pindoconfig.instance.pindo_dir)
+        if !File.exist?(pindo_dir)
+          FileUtils.mkdir(pindo_dir) 
+        end
+
+        repo_org_name = Pindoconfig.instance.build_deploy_org
+        
+        git_repo_file = File.join(Pindoconfig.instance.pindo_env_configdir,  "git_base_url.json")
+        git_repo_json = JSON.parse(File.read(git_repo_file))
+        if repo_name && git_repo_json && git_repo_json[repo_name]
+          repo_org_name = git_repo_json[repo_name]
+        end
+
+        url = File.join("https://gitee.com", repo_org_name, repo_name + ".git")
+        getcode_to_dir(reponame:repo_name, remote_url: url, path:pindo_dir)
+        config_repo_dir = File.join(pindo_dir, repo_name)
+        return config_repo_dir
+      end
+
+      def clone_pindo_common_config_repo(force_delete:false)
+        pindo_dir = File::expand_path(Pindoconfig.instance.pindo_dir)
+        if !File.exist?(pindo_dir)
+          FileUtils.mkdir(pindo_dir) 
+        end
+
+        common_config_dir_basename = get_repo_base_name(repo_url:Pindoconfig.instance.pindo_common_config_giturl)
+        config_repo_dir = File.join(pindo_dir, common_config_dir_basename)
+        if force_delete
+          if File.exist?(config_repo_dir)
+            FileUtils.rm_rf(config_repo_dir)
+          end
+        end
+        getcode_to_dir(reponame:common_config_dir_basename, remote_url:Pindoconfig.instance.pindo_common_config_giturl, path:pindo_dir)
+        
+        return config_repo_dir
+      end
+
+      def clone_pindo_env_config_repo(force_delete:false)          
+        pindo_dir = File::expand_path(Pindoconfig.instance.pindo_dir)
+        if !File.exist?(pindo_dir)
+          FileUtils.mkdir(pindo_dir) 
+        end
+
+        env_config_dir_basename = get_repo_base_name(repo_url:Pindoconfig.instance.pindo_env_config_giturl)
+        config_repo_dir = File.join(pindo_dir, env_config_dir_basename)
+        if force_delete
+          if File.exist?(config_repo_dir)
+            FileUtils.rm_rf(config_repo_dir)
+          end
+        end
+        getcode_to_dir(reponame:env_config_dir_basename, remote_url:Pindoconfig.instance.pindo_env_config_giturl, path:pindo_dir)
+        return config_repo_dir
+      end
+
+      def clone_devclang_repo           
+        pindo_dir = File::expand_path(Pindoconfig.instance.pindo_dir)
+        if !File.exist?(pindo_dir)
+          FileUtils.mkdir(pindo_dir) 
+        end
+
+        getcode_to_dir(reponame:"confuseclang", remote_url:Pindoconfig.instance.dev_clang_giturl, path:pindo_dir)
+
+        config_repo_dir = File.join(pindo_dir, "confuseclang")
+        return config_repo_dir
+      end
+
+      def clone_clang_repo           
+        pindo_dir = File::expand_path(Pindoconfig.instance.pindo_dir)
+        if !File.exist?(pindo_dir)
+          FileUtils.mkdir(pindo_dir) 
+        end
+
+        getcode_to_dir(reponame:"deployclang", remote_url:Pindoconfig.instance.deploy_clang_giturl, path:pindo_dir)
+
+        config_repo_dir = File.join(pindo_dir, "deployclang")
+        return config_repo_dir
+      end
+
+      def git_addpush_repo(path:nil, message:"res", commit_file_params:nil)           
+        current=Dir.pwd
+        Dir.chdir(path)
+        begin
+            if !commit_file_params.nil? && !commit_file_params.empty?
+              files_list = git! ['ls-files', '--other', '--modified', '--exclude-standard'] || []
+
+              need_commit = false
+              commit_file_params.each do |file_name|
+                if !files_list.nil? && files_list.size > 0 && files_list.include?(file_name)
+                    need_commit = true
+                    git! ['add', file_name]  
+                end
+              end
+              if need_commit
+                git! ['commit', '-m ' + "#{message}"]  
+                git! ['push']
+              else
+                puts "\n#{path}\n!!!仓库中文件未发生变化，无需提交!!!\n"
+              end
+            else
+              files_list = git! ['ls-files', '--other', '--modified', '--exclude-standard'] || []
+              puts "提交如下内容："
+              puts files_list
+              if !files_list.nil? && files_list.size > 0
+                  git! ['add', '-A']
+                  git! ['commit', '-m ' + "#{message}"]
+                  git! ['push']
+              else
+                puts "\n#{path}\n!!!仓库中文件未发生变化，无需提交!!!\n"
+              end
+            end
+
+        rescue => error
+            puts(error.to_s)
+            raise Informative, "\n#{path}\n 仓库失败 ！！！"
+        end
+
+
+        Dir.chdir(current)
+      end
+
+
+
+        def process_need_add_files(project_dir:nil)
+
+                  current_project_dir = project_dir
+                  origin_path=Dir.pwd
+                  Dir.chdir(current_project_dir)
+                  coding_branch = git!(%W(-C #{current_project_dir} rev-parse --abbrev-ref HEAD)).strip
+                  git!(%W(-C #{current_project_dir} restore --staged #{current_project_dir}))
+
+                  files_list = git!(%W(-C #{current_project_dir} ls-files --other --modified --exclude-standard)) || []
+                  if !files_list.nil? && files_list.size > 0
+
+                      process_types = ["全部提交", "全部删除", "退出"]
+                      puts 
+                      puts "当前所在分支:#{coding_branch}有下面这些文件没有提交："
+                      puts 
+                      puts files_list
+                      puts 
+
+
+                      cli = HighLine.new
+                      menu_choice="None"
+                      cli.choose do |menu|                                  # you can also use constants like :blue
+                          menu.header = "对以上未提交的文件, 有下列处理方式"
+                          menu.prompt = "请选择如何处理(1/2/3...):"
+                          if !process_types.nil? && process_types.length > 0
+                            for index_item in process_types do
+                              menu.choice(index_item) do |details|
+                                # puts index_item
+                                menu_choice="#{details}"
+                              end
+                            end
+                          end
+                      end
+
+                      puts "选择的处理方式为: #{menu_choice}"
+                      if menu_choice.eql?("全部提交")
+                          message = ask('请输入提交的备注信息: ') || "release code"
+                          git! ['add', '-A']
+                          git! ['commit', '-m ' + "#{message}"]
+                          git!(%W(-C #{current_project_dir} fetch origin))
+                          if remote_branch_exists?(local_repo_dir: current_project_dir, branch:coding_branch)
+                            git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{coding_branch} #{coding_branch}))   
+                            git! ['pull']
+                            git! ['push']
+                          else
+                            git!(%W(-C #{current_project_dir} push --set-upstream origin #{coding_branch}))   
+                          end
+                      elsif menu_choice.eql?("全部删除")  
+
+                          answer = agree("有未提交的文件，确认删除？(Y/n）:")
+                          unless answer
+                            raise Informative, "请手动处理未提交的文件！！！"
+                          end 
+                          git!(%W(-C #{current_project_dir} reset --hard))
+                          git!(%W(-C #{current_project_dir} clean -dfx))
+                          git!(%W(-C #{current_project_dir} branch --set-upstream-to=origin/#{coding_branch} #{coding_branch})) 
+                          git!(%W(-C #{current_project_dir} pull))
+                      else
+                          raise Informative, "请手动处理未提交的文件！！！"
+                      end
+                  else
+                      puts "当前所在分支没有需要提交的文件！！"
+                      puts
+                  end
+
+                  Dir.chdir(origin_path)
+          end
+
+
+    end
+end

data/lib/pindo/base/hashhelper.rb

@@ -0,0 +1,134 @@
+
+require 'fileutils'
+require 'json'
+require 'pindo/base/executable'
+
+
+module Pindo    
+    module Hashhelper
+
+      def deepcopy_hash(des_hash:nil, src_hash:nil)
+
+        des_hash = des_hash || {}
+        if !src_hash.nil? && (src_hash.kind_of? Hash)
+            src_hash.each do |key, value|
+                if !value.nil? && (value.kind_of? Hash)
+                    des_hash[key] = {}
+                    deepcopy_hash(des_hash:des_hash[key], src_hash:value)
+                elsif !value.nil? && (value.kind_of? Array)
+                    des_hash[key] = des_hash[key] || []
+                    des_hash[key] = des_hash[key] + value
+                else
+                    des_hash[key] = value
+                end
+            end
+        end
+        return des_hash
+      end
+
+      def deepcopy_hash_struct(src_hash:nil, key_value:"")
+        des_hash = des_hash || {}
+        if !src_hash.nil? && (src_hash.kind_of? Hash)
+            src_hash.each do |key, value|
+                if !value.nil? && (value.kind_of? Hash)
+                    
+                    des_hash[key] = deepcopy_hash_struct(src_hash:value, key_value:key_value)
+                elsif !value.nil? && (value.kind_of? Array)
+                      des_hash[key] = []
+                else
+                    new_value = key_value + key + "__________"
+                    des_hash[key] = new_value
+                    if key == 'module_git_url' || key == 'module_git_branch' || key == 'module_git_tag'
+                      des_hash[key] = ""
+                    end
+                end
+            end
+        end
+        return des_hash
+      end
+
+
+      def minus_hash(hash1:nil, hash2:nil)
+        minus_hash = {}
+        hash2 = hash2 || {}
+        if !hash1.nil? && (hash1.kind_of? Hash)
+          hash1.each do |key, value1|
+              value2 = hash2[key]
+              if !value1.nil? && (value1.kind_of? Hash) 
+                  if !value2.nil? && (value2.kind_of? Hash) 
+
+                    valut_temp = minus_hash(hash1:value1, hash2:value2)
+                    if valut_temp.size > 0
+                      minus_hash[key] = valut_temp
+                    end
+                  end
+              elsif !value1.nil? && (value1.kind_of? Array)
+                  value1 = value1 || []
+                  value2 = value2 || []
+                  minus_hash[key] = value1 - value2
+              else
+
+                unless hash2.has_key?(key)
+                  minus_hash[key] = hash1[key]
+                end
+
+              end
+          end
+        end
+        return minus_hash
+      end
+
+      def init_hash_value_wihtout_add_key(hash1:nil, hash2:nil)
+        hash2 = hash2 || {}
+        
+        if !hash1.nil? && (hash1.kind_of? Hash)
+          hash1.each do |key, value1|
+              value2 = hash2[key]
+              if !value1.nil? && (value1.kind_of? Hash) 
+                  if hash2.has_key?(key) && (value2.kind_of? Hash) 
+                    hash1[key] = init_hash_value_wihtout_add_key(hash1:value1, hash2:value2)
+                  end
+              elsif !value1.nil? && (value1.kind_of? Array)
+                  value1 = value1 || []
+                  value2 = value2 || []
+                  hash1[key] = value1 | value2
+              else
+                if hash2.has_key?(key)
+                  hash1[key] = hash2[key]
+                end
+              end
+          end
+        end
+        return hash1
+      end
+
+      def init_hash_value_wihtout_exludekeys(hash1:nil, hash2:nil, exlude_keys:nil)
+        exlude_keys = exlude_keys || []
+        hash2 = hash2 || {}
+        
+        if !hash1.nil? && (hash1.kind_of? Hash)
+          hash1.each do |key, value1|
+              value2 = hash2[key]              
+
+              if exlude_keys.include?(key)
+
+              elsif (value1.kind_of? Hash) 
+                  if hash2.has_key?(key) && (value2.kind_of? Hash) 
+                    hash1[key] = init_hash_value_wihtout_exludekeys(hash1:value1, hash2:value2, exlude_keys:exlude_keys)
+                  end
+              elsif (value1.kind_of? Array)
+                  value1 = value1 || []
+                  value2 = value2 || []
+                  hash1[key] = value1 | value2
+              else
+                if hash2.has_key?(key)
+                  hash1[key] = hash2[key]
+                end
+              end
+          end
+        end
+        return hash1
+      end
+
+    end
+end

data/lib/pindo/base/plaininformative.rb

@@ -0,0 +1,15 @@
+module Pindo
+  
+    require 'claide'
+    require 'pindo/base/standarderror'
+  
+    # Indicates a runtime error **not** caused by a bug.
+    #
+    class PlainInformative < StandardError; 
+        include CLAide::InformativeError
+    end
+    
+    # Indicates a user error.
+  
+  end
+