lhj-tools 0.1.38 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4b7a07edf3348968838d40729cca25f41ba64ce15e201923d13d931590e7e97
-  data.tar.gz: 5c5ec0c49a7653d41c07dab04c2838f8b10e94bb986eb645e2eeb3c664a61536
+  metadata.gz: c8fa90967ee885cff64ed4b4d175cf1178919449b42aa8e644ad5fedf17386de
+  data.tar.gz: 750834e640eb75b5653e4f9639dc9b09bf5c320ac34bf721ab637f881729fc08
 SHA512:
-  metadata.gz: 672eee52600ff602c54aa7ae0a98e2dd418b33efac5b0ccbe3dc61ca47008a6af9eb7a124087437265b77663a5f0b92a87a4efef80d852fc38d93717afa66437
-  data.tar.gz: eac0a1544282d3e4826419fb5e7e8648c067d3664717630d89da95632eae0a69f3eee1931e9cee65d218bc7a33ac0da7dbb53615b1f8adbe06d0dd491a275a08
+  metadata.gz: b08ab0ab7d6bb7ac5fe0e38bd823032779370b4e6265444db96f691078502d10c199656297b7190f1eaa1be92a76c701f6ec1c467aede28c49464853ccb1add1
+  data.tar.gz: 1a546488cdfca768c14599022da2d80cb5eca23a272d71fbc75b879b74a2f9d99d9574afae62316fad2cd7ebd54010a001396219a5b42eec7f065ba87f09d6cc

data/lib/lhj/command/code/template/dispatch_source.erb

@@ -21,7 +21,7 @@
         dispatch_source_set_timer(self.timer, DISPATCH_TIME_NOW, 1.0 * NSEC_PER_SEC, 0);
         __weak __typeof(self)weakSelf = self;
         dispatch_source_set_event_handler(self.timer, ^{
-            if(weakSelf.leftTime <= 0){ //倒計時結束，關閉
+            if(weakSelf.leftTime <= 0){
                 [[NSNotificationCenter defaultCenter] postNotificationName:kOrderTimerFinishedNotification object:nil];
                 dispatch_source_cancel(weakSelf.timer);
             }else{

data/lib/lhj/command/jenkins_build.rb

@@ -0,0 +1,37 @@
+
+module Lhj
+  class Command
+    class JenkinsBuild < Command
+      self.summary = '执行jenkins的build任务'
+
+      self.arguments = [
+        CLAide::Argument.new('--server_url=http://www.jenkins.com', true),
+        CLAide::Argument.new('--job=job1', true)
+      ]
+
+      def self.options
+        [
+          %w[--server_url jenkins的地址],
+          %w[--job 运行的任务名]
+        ]
+      end
+
+      def validate!
+        super
+        help! '输入jenkins的地址' unless @server_url
+        help! '输入任务名' unless @job
+      end
+
+      def initialize(argv)
+        @server_url = argv.option('server_url')
+        @job = argv.option('job')
+        super
+      end
+
+      def handle
+        client = Lhj::JenkinsApi::Client.new(:server_url => @server_url)
+        client.job.build(@job)
+      end
+    end
+  end
+end

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

@@ -6,7 +6,6 @@ module Lhj
   class Command
     class OSS < Command
       class Del < OSS
-        self.summary = '删除OSS的key'
 
         def initialize(argv)
           @cli = HighLine.new

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

@@ -7,7 +7,6 @@ module Lhj
   class Command
     class OSS < Command
       class Download < OSS
-        self.summary = '下载OSS'
 
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd

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

@@ -5,7 +5,6 @@ module Lhj
   class Command
     class OSS < Command
       class List < OSS
-        self.summary = '查看oss列表'
 
         def handle
           objects = Lhj::OSS::Helper.instance.list

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

@@ -8,7 +8,6 @@ module Lhj
     class OSS < Command
       # OSS file upload
       class Upload < OSS
-        self.summary = '上传文件(添加标签 --tag=XX)'
 
         self.arguments = [
           CLAide::Argument.new('tag', false)

data/lib/lhj/command/oss.rb

@@ -3,7 +3,6 @@ module Lhj
   class Command
     # sync config
     class OSS < Command
-      self.summary = 'oss操作'
       self.abstract_command = true
     end
   end

data/lib/lhj/command.rb

@@ -29,6 +29,7 @@ module Lhj
     require 'lhj/command/sync_pod_version'
     require 'lhj/command/pgyer_upload'
     require 'lhj/command/duplicate_imageset'
+    require 'lhj/command/jenkins_build'
 
     self.abstract_command = true
     self.command = 'lhj'

data/lib/lhj/helper/pgyer_helper.rb

@@ -18,6 +18,7 @@ module Lhj
       @api_key = Lhj::PgyerConfig.api_key(env)
       @user_key = Lhj::PgyerConfig.user_key(env)
       @password = Lhj::PgyerConfig.password(env)
+      @env = env
       @result = { 'data' => {} }
     end
 
@@ -38,7 +39,6 @@ module Lhj
     end
 
     def upload_file(file, des)
-
       update_description = @result[:update_description]
       update_description = '' if update_description.nil?
       params = {
@@ -49,6 +49,7 @@ module Lhj
         'installType' => 2,
         'file' => Faraday::UploadIO.new(file, 'application/octet-stream')
       }
+      upload_code
       begin
         puts 'begin upload...'
         response = http_client.post API_HOST, params
@@ -65,6 +66,15 @@ module Lhj
       end
     end
 
+    def upload_code
+      if @env == :release
+        # packing
+        current_dir = File.dirname(__FILE__)
+        puts current_dir
+        # upload to oss
+      end
+    end
+
     def render_template
       temp_str = File.read(File.join(Lhj::Config.instance.home_dir, 'pgyer.erb'))
       Lhj::ErbFormatter::Service.new(self).render_template(temp_str)

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.38"
+    VERSION = "0.1.41"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.38
+  version: 0.1.41
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -305,6 +305,7 @@ files:
 - lib/lhj/command/head_import.rb
 - lib/lhj/command/http.rb
 - lib/lhj/command/init.rb
+- lib/lhj/command/jenkins_build.rb
 - lib/lhj/command/local/fetch.rb
 - lib/lhj/command/local/filter.rb
 - lib/lhj/command/local/local.rb