lhj-tools 0.1.51 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de06842336189852e95b075ad1453d775ba3c6772d4a65992137231184d4fbb3
-  data.tar.gz: 39afffe676c83d5813cfa161fe9973099783198452695e84441a15caaad9cd26
+  metadata.gz: ba3c81ae4e0b59daafc45266b2b3fea814b1a15547eb0501b3e2bba19b167240
+  data.tar.gz: 5c818f2bffe07c9e3f5ef50544f82ecc4303f2b020099ba0064cf93f12575723
 SHA512:
-  metadata.gz: d8f6b7401acebd536537b2230222a67bb2f35ff544a5b5a6c23732176a1d221617e4ddf7eefe1f17d0a8195230722b708581b350cab33c3e2027badf4406cd30
-  data.tar.gz: 7957577a7f52e83aca575f09300e01b78e2737db0844c72ace6d4103546386c40e967ecb2cef7d4b5f758b81cac11892b5db77f26cdf7690f75edd682e915424
+  metadata.gz: a87a98b3150d9763a7e41f153a3af6ef8291e7ae1074c8c12fd6f51fafc4ed36557605bb484d13d2b3ae5e9a58b0ffac69b95af951f15023bc1a90e06ddd78a5
+  data.tar.gz: 20d3838363aa11ce08db7e18f5ff5efb24abcb627e2b3ab1b8c15c72bbf0d0555eda8d8a8742ddd892fda9ecbef387904480616173faccc011d57808bfe05ef5

data/lib/lhj/command/sync_pod_code.rb

@@ -0,0 +1,43 @@
+require 'lhj/config'
+require 'highline'
+require 'lhj/helper/pod_repo_config'
+
+module Lhj
+  class Command
+    # sync code to pod
+    class SyncPodCode < Command
+      self.summary = '同步代码到目标目录'
+
+      def initialize(argv)
+        @cli = HighLine.new
+        super
+      end
+
+      def begin_title
+        '读取映射文件~/.lhj/pod_config.yml'
+      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
+        src = arr[idx]['main_path']
+        dest = arr[idx]['pod_path']
+        FileUtils.cp_r(src, dest, remove_destination: true)
+        puts '1.从主工程复制代码到pod库成功'.green
+
+        Dir.chdir(dest) do
+
+          Actions.sh('git add .')
+          puts '2.git add成功'.green
+
+        end
+      end
+    end
+  end
+end

data/lib/lhj/command.rb

@@ -27,6 +27,7 @@ module Lhj
     require 'lhj/command/http'
     require 'lhj/command/sync_pod_repo'
     require 'lhj/command/sync_pod_version'
+    require 'lhj/command/sync_pod_code'
     require 'lhj/command/pgyer_upload'
     require 'lhj/command/duplicate_imageset'
     require 'lhj/command/jenkins_build'

data/lib/lhj/helper/app_version_info.rb

@@ -0,0 +1,66 @@
+require_relative 'log_helper'
+require_relative 'pgyer_shortcut_helper'
+
+module Lhj
+  # version info
+  class AppVersionInfo
+    # @param [Symbol] env
+    def initialize(env, build_number, work_path)
+      @env = env
+      @build_number = build_number
+      @work_path = work_path
+    end
+
+    # build_app_version (build_app_version_no) (build: build_version)
+    def build_info
+      "#{build_app_version} (#{build_app_version_no}) (build: #{build_version})"
+    end
+
+    def build_app_version
+      # app version '1.0.0'
+      vers = []
+      Dir.glob("#{@work_path}/*.xcodeproj/*.pbxproj").each do |file|
+        File.readlines(file).each do |l|
+          if /MARKETING_VERSION.*(\d+\.\d+\.\d+)/ =~ l
+            ma = l.match(/(\d+\.\d+\.\d+)/)
+            vers << ma[0]
+          end
+        end
+      end
+      vers[0]
+    end
+
+    def build_app_version_no
+      # xcode build version
+      # ${BUILD_NUMBER} of jenkins
+      @build_number || '1'
+    end
+
+    def build_version
+      # pu gong ying build number
+      client = Lhj::PgyerShortcut.new(@env)
+      version = 0
+      version = client.build_version.to_i if client.build_version
+      version += 1
+      version.to_s
+    end
+
+    def build_updated
+      time = Time.now
+      time.strftime('%Y-%m-%d %H:%M:%S')
+    end
+
+    def branch_name
+      Dir.chdir(@work_path) do
+        Lhj::LogHelper.instance.current_branch(@work_path)
+      end
+    end
+
+    def update_log
+      Dir.chdir(@work_path) do
+        Lhj::Actions.git_log_last_commits(' %an %ar - %s;', 3, :exclude_merges, 'short', false)
+      end
+    end
+
+  end
+end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.51"
+    VERSION = "0.1.54"
   end
 end

data/lib/lhj/tools.rb

@@ -21,6 +21,7 @@ module Lhj
   require 'lhj/helper/git_helper'
   require 'lhj/helper/log_helper'
   require 'lhj/helper/vika_helper'
+  require 'lhj/helper/app_version_info'
 
   class Error < StandardError; end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.51
+  version: 0.1.54
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-18 00:00:00.000000000 Z
+date: 2022-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -320,6 +320,7 @@ files:
 - lib/lhj/command/refactor_rename.rb
 - lib/lhj/command/rename_image.rb
 - lib/lhj/command/reverse_import.rb
+- lib/lhj/command/sync_pod_code.rb
 - lib/lhj/command/sync_pod_repo.rb
 - lib/lhj/command/sync_pod_version.rb
 - lib/lhj/command/template.rb
@@ -334,6 +335,7 @@ files:
 - lib/lhj/command/yapi/formatters/template/yapi.erb
 - lib/lhj/config.rb
 - lib/lhj/env.rb
+- lib/lhj/helper/app_version_info.rb
 - lib/lhj/helper/dingtalk_config.rb
 - lib/lhj/helper/dingtalk_helper.rb
 - lib/lhj/helper/git_branch_feature_config.rb