lhj-tools 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f8ff17bf0bbd3cbb38c92aa203ecb3983da440b5bb158fa1af980adc9fc452
-  data.tar.gz: c43f7f0ad99e94fd7602e64aaf1246ca1244c588b53794960b937a02ce4e6783
+  metadata.gz: 2ccdf622ec71e3f0f9b8c090e0587ecde300a61d05cccde837d3730b9b0fdebe
+  data.tar.gz: 92d0a661cf877bce61751e137f764155244cc3c8f629c910556c342b0766ae6d
 SHA512:
-  metadata.gz: b200a275276a8b419427203042365a4641920df44420637d4be89d5f588a173d9a6a944fe65f00d2d956262aae0ebe3bf379dc2ce63afec749401923294f6f3f
-  data.tar.gz: c3bb0f9d4cce6b7f789a00856efe2398274cadb9cbee4b8b5d1b7af6a7c6398f02c33422dff1527f1edeefe3353d65f341d5e637a6a87ead4e283a7e410c4e8c
+  metadata.gz: 6fd7f9f518499f766beb7afd778e1542d61c40522958ff02ffdf5f3d167ed1260ea5e915de33848e0b2fbfc042313bfd96920f5436c72648e5222eddeda76d6b
+  data.tar.gz: b9df71c7bb5d7cdb63e18319fe23278d08d13d9a39d94133be4cf99cb8e3cc4f7f04f4f4cce73f528dbe88f757dcd5c0e87fb04a302cd2dd56939a78d89fcd75

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,7 +11,7 @@ module Lhj
       self.summary = '初始化控件'
       self.description = '使用工具前先执行`lhj init`'
 
-      def run
+      def handle
         FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
         download_file
       end
@@ -36,7 +36,7 @@ module Lhj
       end
 
       def file_name_with_url(url)
-        url.scan(%r{(/.[^/]*)}).flatten.last
+        url.scan(%r{/([^/]+)}).flatten.last
       end
 
       def download_file

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

@@ -8,27 +8,40 @@ module Lhj
         self.summary = '删除OSS的key'
 
         self.arguments = [
-          CLAide::Argument.new('--key=XX', true)
+          CLAide::Argument.new('--key=XX', true),
+          CLAide::Argument.new('--type=XX', true)
         ]
 
         def self.options
           [
-            %w[--key OSS对应的key]
+            %w[--key OSS对应的key],
+            %w[--type OSS对应的类型]
           ]
         end
 
         def initialize(argv)
           @key = argv.option('key')
+          @type = argv.option('type')
           super
         end
 
         def validate!
-          help! '请输入key' unless @key
+          help! '请输入key或者类型' unless @key || @type
           super
         end
 
-        def run
-          Lhj::OSS::Helper.instance.delete(@key)
+        def handle
+          if @type
+            objects = Lhj::OSS::Helper.instance.list
+            objects.each do |o|
+              if /#{@type}/ =~ o.key
+                puts "成功删除#{o.key}"
+                Lhj::OSS::Helper.instance.delete(o.key)
+              end
+            end
+          else
+            Lhj::OSS::Helper.instance.delete(@key)
+          end
         end
       end
     end

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

@@ -1,4 +1,5 @@
 require 'lhj/helper/oss_helper'
+require 'terminal-table'
 
 module Lhj
   class Command
@@ -6,12 +7,15 @@ module Lhj
       class List < OSS
         self.summary = '查看oss列表'
 
-        def run
+        def handle
           objects = Lhj::OSS::Helper.instance.list
+          rows = []
           objects.each do |o|
             path = "#{Lhj::OSS::Helper.instance.url_path}/#{o.key}"
-            puts path
+            rows << [path]
           end
+          table = Terminal::Table.new title: 'OSS List', headings: ['URL'], rows: rows
+          puts table
         end
       end
     end

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

@@ -11,30 +11,33 @@ module Lhj
 
         self.arguments = [
           CLAide::Argument.new('type', false),
-          CLAide::Argument.new('name', false)
+          CLAide::Argument.new('name', false),
+          CLAide::Argument.new('tag', false)
         ]
 
         def self.options
           [
             %w[--type 文件类型],
-            %w[--name 文件名]
+            %w[--name 文件名],
+            %w[--tag 标签]
           ]
         end
 
         def validate!
           super
-          help! '类型或名字必须输入' unless @name && @type
+          help! '类型或名字必须输入' unless @name || @type
         end
 
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd
           @type = argv.option('type')
           @name = argv.option('name')
+          @tag = argv.option('tag')
           super
         end
 
-        def run
-          Dir.glob(@current_path).each do |f|
+        def handle
+          Dir.glob("#{@current_path}/*").each do |f|
             file_name = File.basename(f)
             if @name && /#{@name}/ =~ file_name
               upload(f, file_name)
@@ -48,6 +51,7 @@ module Lhj
 
         def upload(file, file_name)
           oss_key = file_name
+          oss_key = "#{@tag}/#{file_name}" if @tag
           Lhj::OSS::Helper.instance.upload(oss_key, file)
           url = Lhj::OSS::Helper.instance.object_url(oss_key)
           puts "云端上传成功：#{url}\n"

data/lib/lhj/command/refactor_rename.rb

@@ -2,6 +2,7 @@
 
 require 'find'
 require 'fileutils'
+require 'terminal-table'
 
 module Lhj
   class Command
@@ -31,11 +32,13 @@ module Lhj
         @current_path = argv.shift_argument || Dir.pwd
         @key = argv.option('key')
         @other = argv.option('other')
+        @modify_files = []
         super
       end
 
-      def run
+      def handle
         update_source_file
+        print_info
       end
 
       def update_source_file
@@ -69,9 +72,22 @@ module Lhj
 
       def format_string(file, line)
         result = line
-        result = result.gsub(/(\W)(#{@key})(\W)/, "\\1#{@other}\\3") if /(\W)(#{@key})(\W)/ =~ line
+        if /(\W)(#{@key})(\W)/ =~ line
+          result = result.gsub(/(\W)(#{@key})(\W)/, "\\1#{@other}\\3")
+          @modify_files << file unless @modify_files.include?(file)
+        end
         result
       end
+
+      def print_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/rename_image.rb

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