pindo 4.6.9 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78cbf0c3494294a495f70d4d68732ab4d7fcb111efb47c13832bcc5570fdda49
-  data.tar.gz: 9b6072f6a35def3e42a09f36796bbe4a4999e2157d76225864ba3325a55d6d1c
+  metadata.gz: 4c7daab6ca92e2942ae682695e06ea741b5cb2ae45804dd9af94bdacc59a49cf
+  data.tar.gz: d237736dfdf676455395a85590142ac30ab8604cd8dd2636577582b48d1da389
 SHA512:
-  metadata.gz: cb6837bd54cd72e830010a5d263437913af930b6c3e9ce1c15ee9450a0699fa58e74b3cc14de69f6979efd147b051536d4698e36eebecfa47c6b6d6c97f5f731
-  data.tar.gz: 44b8eefc1b54857a60f20a72026f790bf134110976b97415dee6419086336cd7f30472cccdc37b7dda501a878609a279d55dbd5f8c9ca21eb99cf47dc773eb8e
+  metadata.gz: d5dc55d34adbd57fd5fa0d0d5268418f88b5fe019e2f1f33c9f5dd19016e15ff3ce00272966c76d6a90b8b68af2eb0d40f49f700990010557abbad69e3338bdf
+  data.tar.gz: f6d9f58c141d0a0b2702f84f34745315b821d59d04f59f8a61c963c6cfc8497b3532455d344e65f73cdfbccd7282cb84166ee5dd46517e5f47c7463a003f36d3

data/lib/pindo/base/aeshelper.rb

@@ -1,11 +1,11 @@
+require 'openssl'
+
 module Pindo
  
 
   module AESHelper
 
 
-
-
     def self.aes_128_ecb_encrypt(key, encrypted_string)
       cipher = OpenSSL::Cipher::Cipher.new('AES-128-ECB')
       cipher.encrypt
@@ -24,6 +24,52 @@ module Pindo
     end
 
 
+    def self.encrypt_specific_file(src_file: nil, password: nil, output_dir: nil)
+      UI.user_error!("No password supplied") if password.to_s.strip.length == 0
+
+      data_to_encrypt = File.binread(path)
+      salt = SecureRandom.random_bytes(8)
+
+      # The :: is important, as there is a name clash
+      cipher = ::OpenSSL::Cipher.new('AES-256-CBC')
+      cipher.encrypt
+      cipher.pkcs5_keyivgen(password, salt, 1, "MD5")
+      encrypted_data = "Salted__" + salt + cipher.update(data_to_encrypt) + cipher.final
+
+      destfile = File.join(output_dir, File.basename(src_file))
+      File.write(destfile, Base64.encode64(encrypted_data))
+      return destfile
+    rescue error
+      puts path
+      raise Informative, error
+    end
+
+    # The encryption parameters in this implementations reflect the old behavior which depended on the users' local OpenSSL version
+    # 1.0.x OpenSSL and earlier versions use MD5, 1.1.0c and newer uses SHA256, we try both before giving an error
+    def self.decrypt_specific_file(src_file: nil, password: nil, output_dir: nil, hash_algorithm: "MD5")
+      
+      begin
+        stored_data = Base64.decode64(File.read(src_file))
+        salt = stored_data[8..15]
+        data_to_decrypt = stored_data[16..-1]
+
+        decipher = ::OpenSSL::Cipher.new('AES-256-CBC')
+        decipher.decrypt
+        decipher.pkcs5_keyivgen(password, salt, 1, hash_algorithm)
+
+        decrypted_data = decipher.update(data_to_decrypt) + decipher.final
+        destfile = File.join(output_dir, File.basename(src_file))
+        File.binwrite(destfile, decrypted_data)
+        return destfile
+      rescue => error
+        fallback_hash_algorithm = "SHA256"
+        if hash_algorithm != fallback_hash_algorithm
+          decrypt_specific_file(src_file: src_file, password: password, hash_algorithm: fallback_hash_algorithm)
+        else
+          raise Informative, "Couldn't decrypt the repo, please make sure you enter the right password!"
+        end
+      end
+    end
 
   end
 

data/lib/pindo/base/funlog.rb

@@ -0,0 +1,89 @@
+require "tty-spinner"
+
+module Pindo
+ 
+  class Funlog
+
+
+      def create_spinner(info_key:nil)
+        # spinner = TTY::Spinner.new("[:spinner] :#{info_key}", format: :dots_2, error_mark: "❌", success_mark: "✅")
+        spinner = TTY::Spinner.new("[:spinner] :#{info_key}", format: :dots_2, error_mark: "❌")
+        spinner
+      end
+
+      def spinner_log_handle
+        if @spinner_log.nil?
+          @spinner_log = create_spinner(info_key:"title")
+        end
+        @spinner_log
+      end
+
+
+
+      def fancyinfo_start(*args)
+        message = args.join(" ")
+        spinner_log_handle.update(title:message)
+        spinner_log_handle.auto_spin
+        @spinner_log
+      end
+
+
+      def fancyinfo_update(*args)
+         message = args.join(" ")
+         spinner_log_handle.update(title:message)
+         spinner_log_handle.spin
+         @spinner_log
+      end
+
+      def fancyinfo_success(*args)
+         message = args.join(" ")
+         spinner_log_handle.update(title:message)
+         spinner_log_handle.success
+         @spinner_log =nil
+      end
+
+      def fancyinfo_error(*args)
+         message = args.join(" ")
+         spinner_log_handle.update(title:message)
+         spinner_log_handle.error
+         @spinner_log =nil
+      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_log_instance
+        Funlog.instance
+      end
+    end
+
+  end
+
+
+end

data/lib/pindo/base/githelper.rb

@@ -199,6 +199,11 @@ module Pindo
       def git_latest_commit_id(local_repo_dir:nil)
 
         current=Dir.pwd
+
+        unless File.exist?(File::join(local_repo_dir, ".git"))
+          return nil
+        end
+        
         commit_id = nil
 
         if File.exist?(local_repo_dir)
@@ -218,13 +223,14 @@ module Pindo
 
       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
+        current=Dir.pwd
+        local_repo_dir = File::join(path, reponame)
+
+        Funlog.instance.fancyinfo_start("开始更新仓库:#{local_repo_dir}...")
+
+        begin
+          
 
-          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)
@@ -279,9 +285,17 @@ module Pindo
               end
 
           end
+          
+          Funlog.instance.fancyinfo_success("仓库#{local_repo_dir}更新完成!")
+        rescue StandardError => e
 
-          Dir.chdir(current)
-          return local_repo_dir
+          Funlog.instance.fancyinfo_error("仓库#{local_repo_dir}更新失败!")
+          
+          raise Informative, e.to_s
+        end
+
+        Dir.chdir(current)
+        return local_repo_dir
       end
 
       def get_repo_base_name(repo_url:nil)  
@@ -294,6 +308,7 @@ module Pindo
 
       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) 
@@ -310,6 +325,9 @@ module Pindo
         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
 
@@ -390,12 +408,12 @@ module Pindo
                 git! ['commit', '-m ' + "#{message}"]  
                 git! ['push']
               else
-                puts "\n#{path}\n!!!仓库中文件未发生变化，无需提交!!!\n"
+                # puts "\n#{path}\n!!!仓库中文件未发生变化，无需提交!!!\n"
               end
             else
               files_list = git! ['ls-files', '--other', '--modified', '--exclude-standard'] || []
-              puts "提交如下内容："
-              puts files_list
+              # puts "提交如下内容："
+              # puts files_list
               if !files_list.nil? && files_list.size > 0
                   git! ['add', '-A']
                   git! ['commit', '-m ' + "#{message}"]
@@ -406,7 +424,7 @@ module Pindo
             end
 
         rescue => error
-            puts(error.to_s)
+            # puts(error.to_s)
             raise Informative, "\n#{path}\n 仓库失败 ！！！"
         end
 

data/lib/pindo/base/plaininformative.rb

@@ -1,3 +1,6 @@
+require 'pindo/base/standarderror'
+
+
 module Pindo
   
     require 'claide'

data/lib/pindo/base/standarderror.rb

@@ -1,3 +1,4 @@
+
 module Pindo
   
   require 'pindo/version'

data/lib/pindo/base/xcodeconst.rb

@@ -0,0 +1,251 @@
+require 'openssl'
+
+module Pindo
+ 
+
+  module XcodoeConst
+
+    def self.xcode_ios_icon_json 
+          model_data = {
+                "images" => [
+                  {
+                    "size" => "20x20",
+                    "idiom" => "iphone",
+                    "filename" => "icon20@2x.png",
+                    "scale" => "2x"
+                  },
+                  {
+                    "size" => "20x20",
+                    "idiom" => "iphone",
+                    "filename" => "icon20@3x.png",
+                    "scale" => "3x"
+                  },
+                  {
+                    "size" => "29x29",
+                    "idiom" => "iphone",
+                    "filename" => "icon29@2x.png",
+                    "scale" => "2x"
+                  },
+                  {
+                    "size" => "29x29",
+                    "idiom" => "iphone",
+                    "filename" => "icon29@3x.png",
+                    "scale" => "3x"
+                  },
+                  {
+                    "size" => "40x40",
+                    "idiom" => "iphone",
+                    "filename" => "icon40@2x.png",
+                    "scale" => "2x"
+                  },
+                  {
+                    "size" => "40x40",
+                    "idiom" => "iphone",
+                    "filename" => "icon40@3x.png",
+                    "scale" => "3x"
+                  },
+                  {
+                    "size" => "60x60",
+                    "idiom" => "iphone",
+                    "filename" => "icon60@2x.png",
+                    "scale" => "2x"
+                  },
+                  {
+                    "size" => "60x60",
+                    "idiom" => "iphone",
+                    "filename" => "icon60@3x.png",
+                    "scale" => "3x"
+                  },
+                  {
+                    "size" => "20x20",
+                    "idiom" => "ipad",
+                    "filename" => "icon20@1x.png",
+                    "scale" => "1x"
+                  },
+                  {
+                    "size" => "20x20",
+                    "idiom" => "ipad",
+                    "filename" => "icon20@2x.png",
+                    "scale" => "2x"
+                  },
+                  {
+                    "size" => "29x29",
+                    "idiom" => "ipad",
+                    "filename" => "icon29@1x.png",
+                    "scale" => "1x"
+                  },
+                  {
+                    "size" => "29x29",
+                    "idiom" => "ipad",
+                    "filename" => "icon29@2x.png",
+                    "scale" => "2x"
+                  },
+                  {
+                    "size" => "40x40",
+                    "idiom" => "ipad",
+                    "filename" => "icon40@1x.png",
+                    "scale" => "1x"
+                  },
+                  {
+                    "size" => "40x40",
+                    "idiom" => "ipad",
+                    "filename" => "icon40@2x.png",
+                    "scale" => "2x"
+                  },
+                  {
+                    "size" => "76x76",
+                    "idiom" => "ipad",
+                    "filename" => "icon76@1x.png",
+                    "scale" => "1x"
+                  },
+                  {
+                    "size" => "76x76",
+                    "idiom" => "ipad",
+                    "filename" => "icon76@2x.png",
+                    "scale" => "2x"
+                  },
+                  {
+                    "size" => "83.5x83.5",
+                    "idiom" => "ipad",
+                    "filename" => "icon83_5@2x.png",
+                    "scale" => "2x"
+                  },
+                  {
+                    "size" => "1024x1024",
+                    "idiom" => "ios-marketing",
+                    "filename" => "icon1024@1x.png",
+                    "scale" => "1x"
+                  }
+                ],
+                "info" => {
+                "version" => 1,
+                "author" => "xcode"
+                }
+              }
+        return model_data
+    end
+
+    def self.xcode_ios_imessage_icon_json
+          model_data = {
+              "images" => [
+                {
+                  "size" => "29x29",
+                  "idiom" => "iphone",
+                  "filename" => "icon29@2x.png",
+                  "scale" => "2x"
+                },
+                {
+                  "size" => "29x29",
+                  "idiom" => "iphone",
+                  "filename" => "icon29@3x.png",
+                  "scale" => "3x"
+                },
+                {
+                  "size" => "60x45",
+                  "idiom" => "iphone",
+                  "filename" => "icon60_45@2x.png",
+                  "scale" => "2x"
+                },
+                {
+                  "size" => "60x45",
+                  "idiom" => "iphone",
+                  "filename" => "icon60_45@3x.png",
+                  "scale" => "3x"
+                },
+                {
+                  "size" => "29x29",
+                  "idiom" => "ipad",
+                  "filename" => "icon29@2x.png",
+                  "scale" => "2x"
+                },
+                {
+                  "size" => "67x50",
+                  "idiom" => "ipad",
+                  "filename" => "icon67_50@2x.png",
+                  "scale" => "2x"
+                },
+                {
+                  "size" => "74x55",
+                  "idiom" => "ipad",
+                  "filename" => "icon74_55@2x.png",
+                  "scale" => "2x"
+                },
+                {
+                  "size" => "1024x1024",
+                  "idiom" => "ios-marketing",
+                  "filename" => "icon1024@1x.png",
+                  "scale" => "1x"
+                },
+                {
+                  "size" => "27x20",
+                  "idiom" => "universal",
+                  "filename" => "icon27_20@2x.png",
+                  "scale" => "2x",
+                  "platform" => "ios"
+                },
+                {
+                  "size" => "27x20",
+                  "idiom" => "universal",
+                  "filename" => "icon27_20@3x.png",
+                  "scale" => "3x",
+                  "platform" => "ios"
+                },
+                {
+                  "size" => "32x24",
+                  "idiom" => "universal",
+                  "filename" => "icon32_24@2x.png",
+                  "scale" => "2x",
+                  "platform" => "ios"
+                },
+                {
+                  "size" => "32x24",
+                  "idiom" => "universal",
+                  "filename" => "icon32_24@3x.png",
+                  "scale" => "3x",
+                  "platform" => "ios"
+                },
+                {
+                  "size" => "1024x768",
+                  "idiom" => "ios-marketing",
+                  "filename" => "icon1024_768@1x.png",
+                  "scale" => "1x",
+                  "platform" => "ios"
+                }
+              ],
+              "info" => {
+                "version" => 1,
+                "author" => "xcode"
+              }
+            }
+        return model_data
+    end
+
+
+      
+      XCODE_IOS_LAUNCHIMG_JSON = { 
+        "images" => [
+                {
+                  "idiom" => "universal",
+                  "scale" => "1x"
+                },
+                {
+                  "idiom" => "universal",
+                  "filename" => "w768_h1024@2x.png",
+                  "scale" => "2x"
+                },
+                {
+                  "idiom" => "universal",
+                  "scale" => "3x"
+                }
+            ],
+            "info" => {
+            "version" => 1,
+            "author" => "xcode"
+            }
+        }
+
+
+  end
+
+
+end

data/lib/pindo/client/applovinclient.rb

@@ -113,8 +113,11 @@ module Pindo
 	              result_data = JSON.parse(res.body)   
 
 	          end
-	          puts JSON.pretty_generate(result_data)
+	          # puts JSON.pretty_generate(result_data)
+
+	          # return result_data
 
+	          return nil
 		end
 
 
@@ -144,9 +147,9 @@ module Pindo
           if !res.body.nil?
               result_data = JSON.parse(res.body)    
           end
-          puts JSON.pretty_generate(result_data)
+          # puts JSON.pretty_generate(result_data)
           
-          return result_data
+          return nil
 			
 		end
 

data/lib/pindo/client/aws3sclient.rb

@@ -2,9 +2,9 @@
 require 'uri'
 require 'json'
 require 'faraday'
-require 'pindo/base/aeshelper'
 require "aws-sdk-s3"
 require 'securerandom'
+require 'pindo/base/aeshelper'
 
 module Pindo
  
@@ -115,64 +115,51 @@ module Pindo
         object_key = upload_path + file_uuid + extension
 
         puts "上传路径: #{object_key}"
-
+        puts
+        
         upload_result = nil
+
+
+        Funlog.instance.fancyinfo_start("开始上传...")
+
         begin
-          
-          
-          obj = Aws::S3::Object.new(@bucket_name, object_key)
 
-          progress = Proc.new do |bytes, totals|
-            set_progress(bytes.sum, totals.sum)
+            obj = Aws::S3::Object.new(@bucket_name, object_key)
+            progress = Proc.new do |bytes, totals|
+              set_progress(bytes.sum, totals.sum)
+            end
+
+            if isAttach
+              obj.upload_file(binary_file, progress_callback: progress, content_disposition:content_disposition)
+            else
+              obj.upload_file(binary_file, progress_callback: progress)
+            end
+            
+            upload_result = object_key
+
+            Funlog.instance.fancyinfo_success(@upload_message)
+            Funlog.instance.fancyinfo_success("#{binary_file} 上传成功!")
+          rescue => ex
+            Funlog.instance.fancyinfo_error("#{binary_file} 上传失败!")
           end
-          
-          
-          if isAttach
-            puts 
-            puts "正在上传附件..."
-            obj.upload_file(binary_file, progress_callback: progress, content_disposition:content_disposition)
-          else
-            puts 
-            puts "正在上传安装包..."
-            obj.upload_file(binary_file, progress_callback: progress)
-          end
-          
-          upload_result = object_key
-
-        #   bucket = find_bucket!()
-        #   details = {
-        #     # acl: 'private'
-        #     key: object_key,
-        #     body: bytes
-        #   }
-        #   obj = bucket.put_object(details)
-        #   # When you enable versioning on a S3 bucket,
-        #   # writing to an object will create an object version
-        #   # instead of replacing the existing object.
-        #   # http://docs.aws.amazon.com/AWSRubySDK/latest/AWS/S3/ObjectVersion.html
-        #   if obj.kind_of?(Aws::S3::ObjectVersion)
-        #     obj = obj.object
-        #   end
-
-        #   # Return public url
-        #   puts obj.public_url.to_s
-        #   upload_result = object_key
-        rescue => ex
-          puts ex.to_s
-          puts "Upload S3 failed !!!"
-        end
 
         return upload_result
       end
 
 
-      def set_progress(index_num, total_num,  char = '=')
+      def set_progress(index_num, total_num,  char ='>' )
           progress_str = sprintf("%.2f", 100.0 * index_num / total_num )
           total_size = sprintf("%.2f", 1.00 * total_num / 1024 /1024 ) 
           index = 100.0 * index_num / total_num
 
-          $stdout.print "    已上传: #{progress_str} \% ", (char * (index/1).floor).ljust(100, ' '), " Total: #{total_size} M \r"
-          $stdout.flush
+          # (char * (index/1).floor).ljust(100, ' ')
+
+          upload_message = "已下载:#{progress_str}\%【" + (char * (index/1).floor).ljust(100, '_') +  "】Total: #{total_size} M"
+          @upload_message = upload_message
+          Funlog.instance.fancyinfo_update(upload_message)
+          # @spinner.reset
+          # $stdout.print "    已上传: #{progress_str} \% ", (char * (index/1).floor).ljust(100, ' '), " Total: #{total_size} M \r"
+          # $stdout.flush
           # print "    已上传: #{progress_str} \% ", (char * (index/1).floor).ljust(100, ' '), " Total: #{total_size} M \r"
           # $stdout.flush
       end

data/lib/pindo/client/bossclient.rb

@@ -24,7 +24,7 @@ module Pindo
     attr_accessor :base_url
 
 
-    def initialize(app_type:"FancyApp", is_dev:true, base_url:nil)
+    def initialize(app_type:"FunnyApp", is_dev:true, base_url:nil)
 
 #   
         @app_type = app_type