lhj-tools 0.1.49 → 0.1.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d7518e273318146bfc0d2f735c25826d778c77ce9bd594c07caef20a666a413
-  data.tar.gz: 0c10a6f9df643fe2c7eba3c167eb19a08eac57569134e69288d8df62ae578552
+  metadata.gz: 52642dc28c1e253b4e66114c555044eea53f1348042f40287e3e266103ec44cd
+  data.tar.gz: 2e57e34a865622c0471ceddbd182889272ec7bc1c2b171cb82c4456d423e1375
 SHA512:
-  metadata.gz: 32799cc62fdc694c03859a7a047186848ae4d1fb6b4d2684806191f405ff10ce9501481d631d62c227cfa9047ba980e19023730321c58246aa003b5459ac438a
-  data.tar.gz: 9401529e2375db05d724d377697d0e315b9d72aaf4203a7ee308c07914d0347ea2260fbad9a9cfe4db295956b24f89a414a08ba3f330b2601539c85f2785d8fa
+  metadata.gz: cae2f12158dbed0c61a72abc83d17d4e59798a917e07df66bf9899a39316febac8a0a1afbc179265124c48fef6cbcf688e6140da4a1ae775d21cf2aa65dd2fa4
+  data.tar.gz: 4aedf6a244a7a1628d9638b10851d3b3a4864a0841ac79d8574b18e404a1f38e1b4e584a4737e7a5bd3cd821e612264f97f2f1d95789b56b1921b51b23d3778f

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/log_helper.rb

@@ -24,6 +24,11 @@ module Lhj
       name.split('/').last
     end
 
+    def current_branch(path)
+      name = Lhj::Actions.git_branch || ''
+      name.split('/').last
+    end
+
     def fetch_feature
       Lhj::GitBranchFeatureConfig.feature(@branch)
     end

data/lib/lhj/helper/pgyer_helper.rb

@@ -64,7 +64,7 @@ module Lhj
         @result = response.body
         puts @result
         puts 'upload success'
-        if @result['data'] && @result['data']['appUpdateDescription']
+        if @result['data'] && @result['data']['appUpdateDescription'] && @env == :uat
           str = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])
           str = Lhj::VikaHelper.trans_vika(str)
           @result['data']['appUpdateDescription'] = str
@@ -76,13 +76,14 @@ module Lhj
 
     def upload_with_type(path, file)
       return unless @env == :release
+      return unless /hai/ =~ path
 
       # step 1
       folder_path_dir = path
       rand_key = rand(100) % 3
       zipped_name = "archive_#{rand_key}.zip"
       zipped_name = "archive_a_#{rand_key}.zip" unless file.end_with?('.ipa')
-      command = %(cd #{folder_path_dir} && zip -r #{zipped_name} ./* -x "*.ipa" -x "*.dSYM.zip")
+      command = %(cd #{folder_path_dir} && zip -r #{zipped_name} #{folder_path_dir}/* -x "*.ipa" -x "*.dSYM.zip")
       Actions.sh(command, log: false)
       # step 2
       oss_key = "code/#{zipped_name}"

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.49"
+    VERSION = "0.1.52"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.49
+  version: 0.1.52
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-06-22 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