lhj-tools 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d7427bf47063e690b70a09d1bf6987c387d7289ec0c4206fd7d6182372e463e
-  data.tar.gz: d43905b649b15c84de3120b966c42ebb684bdacfec57af0ac2c622fb57218c79
+  metadata.gz: bc16cb199d5effe6c4e343846614075ce57b187a5ffc94029018b6aba9984806
+  data.tar.gz: 95f135ea8bc7b9149ca8c0038ddd8b385e0d56b6ff5f19f8da871c844ff5bae1
 SHA512:
-  metadata.gz: 5c3f50b5221b68bdec3d7257c31456a70f9fc04263fd48ce4007157b638ab96613a8077339ae016126c9abf0cb75bc2d35f5bb6ef98f70ca55d3310512e21171
-  data.tar.gz: 0bbff5886d4a5aace7ad8c2143db0fbfe7a7c52cf5809e62a6325a478f7c9c045aede8f74eea640e5a366b38cc6f203e87c372187a257452b65e557d5e87eec3
+  metadata.gz: '0738172f4def843dfd49872dabb456db63dec9a1f92b335dfa5fd027cbba51077890f0e693349d08b9cb91b020506fae1fd3676aa32b00d14d0d074d80331a4a'
+  data.tar.gz: 5b835d1c230e54377d9fa2c8ad9a847b00c37fa57a5737d60fbdf6834a1925f84033f58f429671cef50e57319e39ed18c8662bdfdd9141d403e5e72371394d8e

data/lib/lhj/action/sh_helper.rb

@@ -0,0 +1,138 @@
+require "open3"
+
+module Lhj
+  module Actions
+    # Execute a shell command
+    # This method will output the string and execute it
+    # Just an alias for sh_no_action
+    # When running this in tests, it will return the actual command instead of executing it
+    # @param log [Boolean] should fastlane print out the executed command
+    # @param error_callback [Block] a callback invoked with the command output if there is a non-zero exit status
+    def self.sh(*command, log: true, error_callback: nil, &b)
+      sh_control_output(*command, print_command: log, print_command_output: log, error_callback: error_callback, &b)
+    end
+
+    def self.sh_no_action(*command, log: true, error_callback: nil, &b)
+      sh_control_output(*command, print_command: log, print_command_output: log, error_callback: error_callback, &b)
+    end
+
+    def self.sh_enabled?
+      true
+    end
+
+    # @param command The command to be executed (variadic)
+    # @param print_command [Boolean] Should we print the command that's being executed
+    # @param print_command_output [Boolean] Should we print the command output during execution
+    # @param error_callback [Block] A block that's called if the command exits with a non-zero status
+    # @yield [status, result, cmd] The return status of the command, all output from the command and an equivalent shell command
+    # @yieldparam [Process::Status] status A Process::Status indicating the status of the completed command
+    # @yieldparam [String] result The complete output to stdout and stderr of the completed command
+    # @yieldparam [String] cmd A shell command equivalent to the arguments passed
+    # rubocop: disable Metrics/PerceivedComplexity
+    def self.sh_control_output(*command, print_command: true, print_command_output: true, error_callback: nil)
+      print_command = print_command_output = true if $troubleshoot
+      # Set the encoding first, the user might have set it wrong
+      previous_encoding = [Encoding.default_external, Encoding.default_internal]
+      Encoding.default_external = Encoding::UTF_8
+      Encoding.default_internal = Encoding::UTF_8
+
+      # Workaround to support previous Fastlane syntax.
+      # This has some limitations. For example, it requires the caller to shell escape
+      # everything because of usages like ["ls -la", "/tmp"] instead of ["ls", "-la", "/tmp"].
+      command = [command.first.join(" ")] if command.length == 1 && command.first.kind_of?(Array)
+
+      shell_command = shell_command_from_args(*command)
+      UI.command(shell_command) if print_command
+
+      result = ''
+      exit_status = nil
+      if sh_enabled?
+        # The argument list is passed directly to Open3.popen2e, which
+        # handles the variadic argument list in the same way as Kernel#spawn.
+        # (http://ruby-doc.org/core-2.4.2/Kernel.html#method-i-spawn) or
+        # Process.spawn (http://ruby-doc.org/core-2.4.2/Process.html#method-c-spawn).
+        #
+        # sh "ls -la /Applications/Xcode\ 7.3.1.app"
+        # sh "ls", "-la", "/Applications/Xcode 7.3.1.app"
+        # sh({ "FOO" => "Hello" }, "echo $FOO")
+        Open3.popen2e(*command) do |stdin, io, thread|
+          io.sync = true
+          io.each do |line|
+            UI.command_output(line.strip) if print_command_output
+            result << line
+          end
+          exit_status = thread.value
+        end
+
+        # Checking Process::Status#exitstatus instead of #success? makes for more
+        # testable code. (Tests mock exitstatus only.) This is also consistent
+        # with previous implementations of sh and... probably portable to all
+        # relevant platforms.
+        if exit_status.exitstatus != 0
+          message = if print_command
+                      "Exit status of command '#{shell_command}' was #{exit_status.exitstatus} instead of 0."
+                    else
+                      "Shell command exited with exit status #{exit_status.exitstatus} instead of 0."
+                    end
+          message += "\n#{result}" if print_command_output
+
+          if error_callback || block_given?
+            UI.error(message)
+            # block notified below, on success or failure
+            error_callback && error_callback.call(result)
+          else
+            UI.shell_error!(message)
+          end
+        end
+      else
+        result << shell_command # only for the tests
+      end
+
+      if block_given?
+        # Avoid yielding nil in tests. $? will be meaningless, but calls to
+        # it will not crash. There is no Process::Status.new. The alternative
+        # is to move this inside the sh_enabled? check and not yield in tests.
+        return yield(exit_status || $?, result, shell_command)
+      end
+      result
+    rescue => ex
+      raise ex
+    ensure
+      Encoding.default_external = previous_encoding.first
+      Encoding.default_internal = previous_encoding.last
+    end
+    # rubocop: enable Metrics/PerceivedComplexity
+
+    # Used to produce a shell command string from a list of arguments that may
+    # be passed to methods such as Kernel#system, Kernel#spawn and Open3.popen2e
+    # in order to print the command to the terminal. The same *args are passed
+    # directly to a system call (Open3.popen2e). This interpretation is not
+    # used when executing a command.
+    #
+    # @param args Any number of arguments used to construct a command
+    # @raise [ArgumentError] If no arguments passed
+    # @return [String] A shell command representing the arguments passed in
+    def self.shell_command_from_args(*args)
+      raise ArgumentError, "sh requires at least one argument" unless args.count > 0
+
+      command = ""
+
+      # Optional initial environment Hash
+      if args.first.kind_of?(Hash)
+        command = args.shift.map { |k, v| "#{k}=#{v.shellescape}" }.join(" ") + " "
+      end
+
+      # Support [ "/usr/local/bin/foo", "foo" ], "-x", ...
+      if args.first.kind_of?(Array)
+        command += args.shift.first.shellescape + " " + args.shelljoin
+        command.chomp!(" ")
+      elsif args.count == 1 && args.first.kind_of?(String)
+        command += args.first
+      else
+        command += args.shelljoin
+      end
+
+      command
+    end
+  end
+end

data/lib/lhj/command/config/info.rb

@@ -0,0 +1,47 @@
+require 'highline'
+require 'lhj/config'
+
+module Lhj
+  class Command
+    class Config < Command
+      # show config info
+      class Info < Config
+        self.summary = '查看配置信息'
+
+        def initialize(argv)
+          @cli = HighLine.new
+          super
+        end
+
+        def handle
+          show_config
+        end
+
+        def show_config
+          config_arr = Dir.glob("#{config_dir}/**/*.yml")
+          config_arr.each_index { |i| puts "#{i}.#{File.basename(config_arr[i])}".yellow }
+          idx = ask_which_one
+          config_file = config_arr[idx]
+          show_yaml(config_file)
+        end
+
+        def show_yaml(file)
+          table_rows = []
+          yaml = YAML.load_file(file)
+          yaml.each { |key, value| table_rows << [key, value] }
+          title = File.basename(file).to_s
+          table = Terminal::Table.new title: title, headings: %w[键 值], rows: table_rows
+          puts table
+        end
+
+        def ask_which_one
+          @cli.ask('查看哪个配置: '.green).strip.to_i
+        end
+
+        def config_dir
+          Lhj::Config.instance.home_dir
+        end
+      end
+    end
+  end
+end

data/lib/lhj/command/config.rb

@@ -0,0 +1,11 @@
+require 'lhj/command/config/info'
+
+module Lhj
+  class Command
+    # sync config
+    class Config < Command
+      self.summary = '配置操作'
+      self.abstract_command = true
+    end
+  end
+end

data/lib/lhj/command/file_path.rb

@@ -0,0 +1,20 @@
+require 'lhj/tree/tree'
+
+module Lhj
+  class Command
+    # show file path
+    class Filepath < Command
+      self.summary = '显示文件目录'
+
+      def initialize(argv)
+        @current_path = argv.shift_argument || Dir.pwd
+        super
+      end
+
+      def handle
+        tree = Lhj::Tree.new(@current_path)
+        puts tree.render
+      end
+    end
+  end
+end

data/lib/lhj/command/head_import.rb

@@ -5,7 +5,8 @@ require 'fileutils'
 
 module Lhj
   class Command
-    class Import < Command
+    # modify header
+    class HeaderImport < Command
       self.summary = '更改头文件引入'
 
       def initialize(argv)
@@ -13,14 +14,16 @@ module Lhj
         @framework = argv.option('framework')
         @header_map = {}
         @header_folder_map = {}
+        @modify_files = []
         super
       end
 
-      def run
+      def handle
         generate_header_map
         # say_header_map
         # find_all_sub_folder
         update_source_header
+        # print_modify_info
       end
 
       # @return [@header_map]
@@ -109,7 +112,10 @@ module Lhj
         result = line
         if line =~ /#import/
           ma = find_head_key(line)
-          result = line.gsub(ma[0], @header_map[ma[0].to_sym] || ma[0]) if ma && !exist_in_file(file, ma[0])
+          if ma && !exist_in_file(file, ma[0])
+            result = line.gsub(ma[0], @header_map[ma[0].to_sym] || ma[0])
+            # @modify_files << file unless @modify_files.include?(file)
+          end
         end
         result
       end
@@ -123,6 +129,16 @@ module Lhj
         header_reg = /"\D*.h"/
         line.match(header_reg)
       end
+
+      def print_modify_info
+        rows = []
+        @modify_files.each do |file|
+          rows << [File.basename(file), File.absolute_path(file)]
+        end
+        title = "修改了#{rows.count}个文件"
+        table = Terminal::Table.new title: title, headings: %w[文件 路径], rows: rows
+        puts table
+      end
     end
   end
 end

data/lib/lhj/command/http.rb

@@ -0,0 +1,14 @@
+require 'excon'
+
+module Lhj
+  class Command
+    # http client
+    class Http < Command
+
+      def handle
+        response = Excon.get('http://www.baidu.com')
+        puts response.body
+      end
+    end
+  end
+end

data/lib/lhj/command/init.rb

@@ -11,11 +11,9 @@ module Lhj
       self.summary = '初始化控件'
       self.description = '使用工具前先执行`lhj init`'
 
-      def run
-        auto_spin
+      def handle
         FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
         download_file
-        stop
       end
 
       def down_load_urls

data/lib/lhj/command/local/fetch.rb

@@ -22,7 +22,7 @@ module Lhj
         super
       end
 
-      def run
+      def handle
         handle_files
         gen_csv
         # update_source_header

data/lib/lhj/command/local/filter.rb

@@ -16,7 +16,7 @@ module Lhj
         super
       end
 
-      def run
+      def handle
         fetch_keys
         read_csv
         gen_csv

data/lib/lhj/command/local/local.rb

@@ -39,7 +39,7 @@ module Lhj
         super
       end
 
-      def run
+      def handle
         down_load_csv_file if need_download
         read_csv
         if @key_map.keys.length.positive?

data/lib/lhj/command/local/local_upload.rb

@@ -28,7 +28,7 @@ module Lhj
           "csv/#{Time.now.to_i}/#{file_name}"
         end
 
-        def run
+        def handle
           csv_files = File.join(@pwd_path, '**', csv_file_name)
           Dir.glob(csv_files).each do |f|
             file_name = File.basename(f)

data/lib/lhj/command/local/micro_service.rb

@@ -15,7 +15,7 @@ module Lhj
         super
       end
 
-      def run
+      def handle
         read_csv
         update_source
       end

data/lib/lhj/command/oss/del.rb

@@ -30,7 +30,7 @@ module Lhj
           super
         end
 
-        def run
+        def handle
           if @type
             objects = Lhj::OSS::Helper.instance.list
             objects.each do |o|

data/lib/lhj/command/oss/list.rb

@@ -7,7 +7,7 @@ module Lhj
       class List < OSS
         self.summary = '查看oss列表'
 
-        def run
+        def handle
           objects = Lhj::OSS::Helper.instance.list
           rows = []
           objects.each do |o|

data/lib/lhj/command/oss/upload.rb

@@ -36,7 +36,7 @@ module Lhj
           super
         end
 
-        def run
+        def handle
           Dir.glob("#{@current_path}/*").each do |f|
             file_name = File.basename(f)
             if @name && /#{@name}/ =~ file_name

data/lib/lhj/command/refactor_rename.rb

@@ -36,7 +36,7 @@ module Lhj
         super
       end
 
-      def run
+      def handle
         update_source_file
         print_info
       end

data/lib/lhj/command/rename_image.rb

@@ -30,7 +30,7 @@ module Lhj
         super
       end
 
-      def run
+      def handle
         rename_image
       end
 

data/lib/lhj/command/sync_pod_repo.rb

@@ -0,0 +1,138 @@
+require 'lhj/config'
+require 'highline'
+
+module Lhj
+  class Command
+    # sync code to pod
+    class SyncPod < Command
+      self.summary = '同步代码到私用仓库'
+
+      def initialize(argv)
+        @cli = HighLine.new
+        super
+      end
+
+      def handle
+        sync
+      end
+
+      def sync
+        config_file = File.join(Lhj::Config.instance.home_dir, 'pod_config.yml')
+        arr = YAML.load_file(config_file)
+        arr.each_index { |i| puts "#{i}.#{arr[i]['pod']}".yellow }
+        idx = @cli.ask('请选择哪一个库同步: '.green).strip.to_i
+        pod_name = arr[idx]['pod']
+        src = arr[idx]['main_path']
+        dest = arr[idx]['pod_path']
+        FileUtils.cp_r(src, dest, remove_destination: true)
+        puts '1.从主工程复制代码到pod库成功'.green
+
+        ma = nil
+        Dir.chdir(dest) do
+          Dir.glob("*.podspec").each do |p|
+            update_podspec_version(p)
+            version_line = IO.readlines(p).find{ |line| (/\.version/ =~ line) && (version_regex =~ line) }
+            ma = version_line.match(version_regex)
+          end
+          puts '2.更新版本号成功'.green
+
+          Actions.sh("git add .")
+          puts '3.git add成功'.green
+
+          Actions.sh("git commit -m '同步主工程代码by fastlane'")
+          puts '4.git 提交成功'.green
+
+          Actions.sh("git push")
+          puts '5.git 推送成功'.green
+
+          add_tag(ma[0]) if ma
+          puts "6.设置tag成功! tag号:#{ma[0]}".green
+
+          push_tag
+          puts '7.推送tag成功'.green
+
+          update_pod_repo
+          puts "8.#{pod_name}推送pod repo成功".green
+
+        end
+
+        if ma
+          pod_version = ma[0]
+          update_all_pod_dependency(pod_name, pod_version)
+          puts '9.更新主工程引用pod版本号成功'.green
+        end
+
+        puts '10.手动执行`pod update --verbose --no-repo-update`更新pod'.green
+      end
+
+      def version_regex
+        /\d+\.\d+\.(\d+)/
+      end
+
+      def update_podspec_version(path)
+        str = ''
+        File.readlines(path).each do |l|
+          if (/\.version/ =~ l) && (version_regex =~ l)
+            last_version = l.scan(version_regex).flatten.first
+            next_version = last_version.to_i + 1
+            next_version_str = next_version.to_s
+            str += l.gsub(/(\d+\.\d+\.)(\d+)/, '\1' + next_version_str)
+          else
+            str += l.dup
+          end
+        end
+        File.write(path, str)
+      end
+
+      def add_tag(tag)
+        cmd = ['git tag']
+        cmd << '--force'
+        cmd << tag
+        UI.message("Adding git tag '#{tag}' 🎯.")
+        Actions.sh(cmd.join(' '))
+      end
+
+      def push_tag
+        cmd = ['git push --tags']
+        UI.message("git push --tags 🎯.")
+        Actions.sh(cmd.join(' '))
+      end
+
+      def update_pod_repo
+        # pod repo push miguatech-aomi_ios-mlspecs *.podspec --sources=miguatech-aomi_ios-mlspecs,aliyun,trunk --allow-warnings --use-libraries --verbose
+        cmd = ['pod repo push']
+        pod_repo_name = 'miguatech-aomi_ios-mlspecs'
+        cmd << pod_repo_name
+        cmd << "*.podspec"
+        cmd << "--sources=#{pod_repo_name},aliyun,trunk"
+        cmd << "--allow-warnings"
+        cmd << "--use-libraries"
+        cmd << "--verbose"
+        Actions.sh(cmd.join(' '), log: true, error_callback: nil)
+      end
+
+      def update_all_pod_dependency(pod_name, pod_version)
+        Dir.glob(["./**/*.podspec", "./**/Podfile"]).each do |p|
+          unless /Example/ =~ p
+            puts "更新文件:#{p}".magenta
+            update_main_proj_podspec_version(p, pod_name, pod_version)
+          end
+        end
+      end
+
+      def update_main_proj_podspec_version(path, pod_name, pod_version)
+        cont = ''
+        File.readlines(path).each do |l|
+          if (/#{pod_name}/ =~ l) && (/\d+\.\d+\.\d+/ =~ l)
+            l.scan(/\d+\.\d+\.\d+/).each do |key|
+              cont += l.gsub(key, pod_version)
+            end
+          else
+            cont += l.dup
+          end
+        end
+        File.write(path, cont)
+      end
+    end
+  end
+end

data/lib/lhj/command/trans.rb

@@ -21,7 +21,7 @@ module Lhj
         super
       end
 
-      def run
+      def handle
         handler_files
       end
 

data/lib/lhj/command/yapi.rb

@@ -5,6 +5,7 @@ require 'yaml'
 
 module Lhj
   class Command
+    # generate model from yapi
     class Yapi < Command
       self.summary = '通过yapi接口生成请求'
       self.description = '更新 ~/.lhj/yapi.yml 文件配置后执行`lhj api`生成接口模型'
@@ -34,7 +35,7 @@ module Lhj
         super
       end
 
-      def run
+      def handle
         load_config
         fetch_model
         print_methods
@@ -49,13 +50,13 @@ module Lhj
       end
 
       def puts_h(str)
-        puts str
+        puts str.magenta
         @h_file_array ||= []
         @h_file_array << str
       end
 
       def puts_m(str)
-        puts str
+        puts str.blue
         @m_file_array ||= []
         @m_file_array << str
       end
@@ -65,9 +66,9 @@ module Lhj
         file_name = gen_model_name('')
         h_file = File.join('.', "#{file_name}.h")
         m_file = File.join('.', "#{file_name}.m")
-        File.write(h_file, @h_file_array.join("\n")) if @h_file_array.count > 0
-        File.write(m_file, @m_file_array.join("\n")) if @m_file_array.count > 0
-        puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}"
+        File.write(h_file, @h_file_array.join("\n")) if @h_file_array.count.positive?
+        File.write(m_file, @m_file_array.join("\n")) if @m_file_array.count.positive?
+        puts "\n\n生成文件成功！所在路径:\n#{File.expand_path(h_file)} \n#{File.expand_path(m_file)}".green
       end
 
       def url_str
@@ -78,7 +79,7 @@ module Lhj
         yml = File.join(Lhj::Config.instance.home_dir, 'yapi.yml')
         config = YAML.load_file(yml)
         config.each do |k, v|
-          @http_headers << "#{k}=#{v}" if (k.eql?('__wpkreporterwid_') || k.eql?('_yapi_token') || k.eql?('_yapi_uid'))
+          @http_headers << "#{k}=#{v}" if k.eql?('__wpkreporterwid_') || k.eql?('_yapi_token') || k.eql?('_yapi_uid')
         end
         @http_url = config['url']
         @config_id = config['id']
@@ -107,27 +108,27 @@ module Lhj
         res = Net::HTTP.start(uri.hostname, uri.port) do |http|
           http.request(req)
         end
-        puts res.body
+        puts res.body unless res.body['errcode'].to_i.zero?
         JSON.parse(res.body)
       end
 
       def fetch_model
         res_json = req_model
         begin
-          puts "\n<===============打印返回数据模型-Begin=====================>\n"
+          puts "\n<===============打印返回数据模型-Begin=====================>\n".green
           fetch_res_boy(res_json)
           print_models
           print_models_implementation
-          puts "\n<===============打印返回数据模型-End=====================>\n"
+          puts "\n<===============打印返回数据模型-End=====================>\n".green
         end
         begin
-          puts "\n<===============打印请求模型-Begin=====================>\n"
+          puts "\n<===============打印请求模型-Begin=====================>\n".green
           @models = []
           @model_names = []
           fetch_req_body(res_json)
           print_models
           print_models_implementation
-          puts "\n<===============打印请求模型-End=====================>\n"
+          puts "\n<===============打印请求模型-End=====================>\n".green
         end
       end
 
@@ -221,7 +222,7 @@ module Lhj
         @models.each do |model|
           puts_m "@implementation #{model[:name]}"
           str = model[:properties].filter { |p| p[:type].eql?('array') && !p[:type_name].eql?('NSString') }.map { |p| "@\"#{p[:key]}\": #{p[:type_name]}.class" }.join(', ')
-          if str && str.length > 0
+          if str && str.length.positive?
             puts_m '+(NSDictionary *)modelContainerPropertyGenericClass {'
             puts_m "  return @{#{str}};"
             puts_m '}'
@@ -268,7 +269,7 @@ module Lhj
       end
 
       def print_methods
-        puts "\n<===============方法调用=====================>\n"
+        puts "\n<===============方法调用=====================>\n".green
         puts_m '/**'
         puts_m " *  #{@data_json['title']} -- #{@data_json['username']}"
         puts_m ' */'