lhj-tools 0.1.3 → 0.1.7

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 ' */'

data/lib/lhj/command.rb

@@ -1,9 +1,13 @@
 require 'claide'
+require "tty-spinner"
+require 'lhj/action/sh_helper'
+require 'lhj/ui/ui'
 
 module Lhj
   # command plugin
   class Command < CLAide::Command
     require 'lhj/command/init'
+    require 'lhj/command/config'
     require 'lhj/command/head_import'
     require 'lhj/command/refactor_rename'
     require 'lhj/command/local/fetch'
@@ -19,8 +23,37 @@ module Lhj
     require 'lhj/command/rename_image'
     require 'lhj/command/trans'
     require 'lhj/command/yapi'
+    require 'lhj/command/file_path'
+    require 'lhj/command/http'
+    require 'lhj/command/sync_pod_repo'
 
     self.abstract_command = true
     self.command = 'lhj'
+
+    def auto_spin
+      print "正在处理...\n".green
+      # @spinner.auto_spin
+    end
+
+    def stop
+      print '处理完成'.green
+      # @spinner.success('Done!')
+    end
+
+    def initialize(argv)
+      super(argv)
+      @spinner = TTY::Spinner.new('...', output: $stdout, format: :dots, clear: true)
+    end
+
+    def run
+      auto_spin
+      handle
+      stop
+    end
+
+    def handle
+      raise 'A subclass should override the `Lhj::Command#run` method'
+    end
+
   end
 end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.3"
+    VERSION = "0.1.7"
   end
 end

data/lib/lhj/tools.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require_relative "tools/version"
+require 'colored'
 
 module Lhj
   require 'lhj/config'

data/lib/lhj/tree/directory_renderer.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Lhj
+  class Tree
+    # Render nodes as files paths explorer
+    class DirectoryRenderer
+      MARKERS = {
+        unicode: {
+          branch: '├──',
+          leaf: '└──',
+          pipe: '│'
+        },
+        ansi: {
+          branch: '|--',
+          leaf: '`--',
+          pipe: '|'
+        }
+      }.freeze
+
+      def initialize(nodes, options = {})
+        @nodes  = nodes
+        @indent = options.fetch(:indent, 4)
+        @pipe_mark  = MARKERS[:unicode][:pipe] + ' ' * [@indent - 1, 0].max
+        @space_mark = ' ' * @indent
+      end
+
+      def render
+        @nodes.reduce([]) do |acc, node|
+          render_node(acc, node, @pipe_mark, @space_mark)
+        end.join('')
+      end
+
+      private
+
+      def render_node(acc, node, pipe_mark, space_mark)
+        acc << node.prefix.gsub(/:pipe/, pipe_mark).gsub(/:space/, space_mark)
+        unless node.root?
+          acc << MARKERS[:unicode][node.leaf? ? :leaf : :branch]
+          acc << ' '
+        end
+        acc << node.name.to_s + "\n"
+      end
+    end
+  end
+end

data/lib/lhj/tree/hash_walker.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+require_relative 'node'
+
+module Lhj
+  class Tree
+    # Walk and collect nodes from hash data strcture.
+    #
+    # @api public
+    class HashWalker
+      attr_reader :nodes
+
+      attr_reader :files_count
+
+      attr_reader :dirs_count
+
+      def initialize(options = {})
+        @nodes       = []
+        @files_count = 0
+        @dirs_count  = 0
+        @level       = options.fetch(:level) { -1 }
+        @file_limit  = options.fetch(:file_limit) { - 1 }
+      end
+
+      def traverse(data)
+        walk(data, Pathname.new(''), '', 0, false)
+      end
+
+      def walk(data, parent_path, prefix, level, is_last)
+        node = is_last ? LeafNode : Node
+
+        case data
+        when Hash
+          return if @level != -1 && level + 1 > @level
+
+          data.each do |dir, item|
+            dir_node = node.new(dir.to_s, parent_path, prefix, level)
+            @nodes << dir_node
+            @dirs_count += 1 unless dir_node.root?
+
+            if level > 0
+              postfix = ':pipe'
+              postfix = ':space' if is_last
+            else
+              postfix = ''
+            end
+
+            walk(item, parent_path + dir.to_s,
+                 prefix + postfix, level + 1, false)
+          end
+        when Array
+          return if @file_limit != -1 && data.size > @file_limit
+
+          last_data_index = data.size - 1
+
+          data.each_with_index do |item, i|
+            last = (last_data_index == i)
+
+            walk(item, parent_path, prefix, level, last)
+          end
+        else
+          @nodes << node.new(data.to_s, parent_path, prefix, level)
+          @files_count += 1
+        end
+      end
+    end
+  end
+end

data/lib/lhj/tree/node.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+require 'pathname'
+
+module Lhj
+  class Tree
+    # A representation of tree node
+    #
+    # @api private
+    class Node
+      extend Forwardable
+
+      # The base name for the directory or file
+      attr_reader :name
+
+      # The parent directory path
+      attr_reader :parent
+
+      # The require path prefix
+      attr_reader :prefix
+
+      # The directory depth
+      attr_reader :level
+
+      # The file stat
+      attr_reader :stat
+
+      # The current path
+      attr_reader :path
+
+      def_delegators :@path, :directory?, :executable?, :file?,
+                     :symlink?, :socket?, :pipe?
+
+      def initialize(path, parent, prefix, level)
+        if path.is_a? String
+          # strip null bytes from the string to avoid throwing errors
+          path = path.delete("\0")
+        end
+
+        @path = Pathname.new(path)
+        @name   = @path.basename
+        @parent = Pathname.new(parent)
+        @prefix = prefix
+        @level  = level
+      end
+
+      def full_path
+        return parent if name.to_s.empty?
+
+        parent.join(name)
+      end
+
+      def root?
+        parent.to_s.empty?
+      end
+
+      def hidden?
+        name.to_s.start_with?('.')
+      end
+
+      def leaf?
+        false
+      end
+
+      def to_s
+        @name
+      end
+
+      def ==(other)
+        other.is_a?(self.class) && other.state_attrs == state_attrs
+      end
+      alias eql? ==
+
+      protected
+
+      def state_attrs
+        [@name, @path, @parent, @prefix, @level]
+      end
+
+      ROOT = Node.new('', Pathname.new(''), '', 0).freeze
+    end # Node
+
+    class LeafNode < Node
+      def leaf?
+        true
+      end
+    end
+  end
+end

data/lib/lhj/tree/number_renderer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Lhj
+  class Tree
+    # Render nodes as numbered list
+    class NumberRenderer
+      def initialize(nodes, options = {})
+        @indent = options.fetch(:indent, 4)
+        @nodes = nodes
+        @mark = ' ' * @indent
+      end
+
+      def render
+        @nodes.each_with_index.reduce([]) do |acc, (node, i)|
+          render_node(acc, node, i, @mark)
+        end.join
+      end
+
+      private
+
+      def render_node(acc, node, i, mark)
+        acc << node.prefix.gsub(/:pipe|:space/, mark)
+        unless node.root?
+          acc << "#{node.level}.#{i} "
+        end
+        acc << node.name.to_s + "\n"
+      end
+    end
+  end
+end

data/lib/lhj/tree/path_walker.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require 'pathname'
+require_relative 'node'
+
+module Lhj
+  class Tree
+    # Walk and collect nodes from directory.
+    #
+    # @api public
+    class PathWalker
+      attr_reader :nodes
+
+      attr_reader :files_count
+
+      attr_reader :dirs_count
+
+      # Create a PathWalker
+      #
+      # @api public
+      def initialize(options = {})
+        @files_count = 0
+        @dirs_count  = 0
+        @nodes       = []
+        @filters     = []
+        @level       = options.fetch(:level) { -1 }
+        @file_limit  = options.fetch(:file_limit) { - 1 }
+
+        unless options[:show_hidden]
+          add_filter(-> (p) { !p.basename.to_s.start_with?('.') })
+        end
+
+        if options[:only_dirs]
+          add_filter(-> (p) { p.directory? })
+        end
+      end
+
+      def add_filter(filter)
+        @filters << filter
+      end
+
+      # Traverse given path recursively
+      #
+      # @param [String] path
+      #   the path to traverse
+      #
+      # @api public
+      def traverse(path)
+        root_path  = Pathname.new(path)
+        empty_path = Pathname.new('')
+
+        unless root_path.directory?
+          raise ArgumentError, "#{root_path} is not a directory path"
+        end
+
+        @nodes << Node.new(root_path, empty_path, '', 0)
+
+        walk(root_path, root_path.children, '', 1)
+      end
+
+      private
+
+      # Filter entries
+      #
+      # @api private
+      def filter_entries(entries, filters)
+        return entries if filters.nil? || filters.empty?
+        filter = filters[0]
+        filter_entries(entries.select(&filter), filters[1..-1])
+      end
+
+      # Walk paths recursively
+      #
+      # @api private
+      def walk(parent_path, entries, prefix, level)
+        if entries.empty? || (@level != -1 && @level < level)
+          return
+        else
+          return if @file_limit != -1 && entries.size > @file_limit
+          processed_paths = filter_entries(entries, @filters).sort
+          last_path_index = processed_paths.size - 1
+
+          processed_paths.each_with_index do |path, i|
+            sub_path = path.relative_path_from(parent_path)
+
+            node = last_path_index == i ? LeafNode : Node
+
+            if path.directory?
+              next if @level != -1 && level + 1 > @level
+
+              @nodes << node.new(sub_path, parent_path, prefix, level)
+              @dirs_count += 1
+
+              postfix = ':pipe'
+              postfix = ':space' if i == last_path_index
+
+              walk(path, path.children, prefix + postfix, level + 1)
+            elsif path.file?
+              @nodes << node.new(path, parent_path, prefix, level)
+              @files_count += 1
+            end
+          end
+        end
+      end
+    end
+  end
+end