fir-cli-xsl 1.0.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3163b3f0857a13a5f6f29e2a859d270678c8d52ca3af78290a4419feca215291
-  data.tar.gz: 06af771c4b2636ca69daec6f06e75db3989711355e6ba8d5b6b7f89e183d406e
+  metadata.gz: eeef6926f6443ad2b31a7ddd0a93a18cd3c8dcdc949c8334d81525f4503e1161
+  data.tar.gz: 8636697ecf8312500396d143c09e156f0b90350c7d7e242033c4ff9c3affb4ea
 SHA512:
-  metadata.gz: f4340a37136584970049f7cffb67a341ead6217a4cc40fb86f1b23b651db46069d0c20b2582a4345b256f40b36e61026c074b3530a5396c79de6367c5736e525
-  data.tar.gz: c49b43abc04dcc8d6286f57a1e44f9fc6427c777d27f230e91701ce17e59c4057b7ec20a73a6d88bdada465c296547830a4bb49b65aa31f53dd8aca1869d45a6
+  metadata.gz: a44af9459519d521d1898c1b3625d3d96a13ed43051e1eee5e090cf25ed79cc78efdaa1fb8b09bf23e609aef4f54f42795a0258e7bd855f60720ab36acb8895a
+  data.tar.gz: 1492faf33e1670529528fcb5e66af3f0480d50653e5168d6ff06044b4fede30068892175487707fe29c56bdffa5abc3bf47fd0d71e9635da6faeac6743c743b3

data/lib/fir/cli.rb

@@ -44,7 +44,7 @@ module FIR
     method_option :proj,          type: :string,  aliases: '-P', desc: 'Project id in BugHD.com if upload app mapping file'
     method_option :open,          type: :boolean, desc: 'true/false if open for everyone'
     method_option :password,      type: :string,  desc: 'Set password for app'
-    method_option :content,       type: :string,  aliases: '-ct', desc: 'Set Dtalk robot message'
+
     def build_ipa(*args)
       prepare :build_ipa
 
@@ -76,7 +76,7 @@ module FIR
     method_option :qrcode,    type: :boolean, aliases: '-Q', desc: 'Generate qrcode'
     method_option :open,      type: :boolean, desc: 'true/false if open for everyone, the default is: true', default: true
     method_option :password,  type: :string,  desc: 'Set password for app'
-    method_option :content,   type: :string,  aliases: '-ct', desc: 'Set Dtalk robot message'
+
     def build_apk(*args)
       prepare :build_apk
 
@@ -116,14 +116,6 @@ module FIR
 
     method_option :open,        type: :boolean, desc: 'true/false if open for everyone'
     method_option :password,    type: :string,  desc: 'Set password for app'
-    method_option :content,     type: :string,  aliases: '-ct', desc: 'Set Dtalk robot message'
-    map 'dt' => :dingtalk
-    
-    def dingtalk(*args)
-      prepare :dingtalk
-
-      FIR.dingtalk(*args, options)
-    end
 
     def publish(*args)
       prepare :publish
@@ -131,6 +123,17 @@ module FIR
       FIR.publish(*args, options)
     end
 
+    desc 'dtalk', 'dtalk robot'
+    map 'dt' => :dingtalk
+    method_option :dingtalk_robot_msg,     type: :string,  aliases: '-M', desc: 'Set Dtalk robot message'
+    method_option :dingtalk_access_token, type: :string, aliases: '-D', desc: 'Send msg to dingtalk, only need access_token, not whole url'
+
+    def dingtalk(*args)
+      prepare :dingtalk
+
+      FIR.dingtalk(*args, options)
+    end
+
     desc 'login', 'Login fir.im (aliases: `l`).'
     map 'l' => :login
     def login(*args)

data/lib/fir/util/publish.rb

@@ -2,17 +2,17 @@
 module FIR
   module Publish
     def dingtalk(*args, options)
-      initialize_dtalk_options
-      if @token
+      if options[:dingtalk_access_token]
         payload = {
           "msgtype": 'markdown',
           "markdown": {
             "title": "ceshi",
-            "text": @content
+            "text": options[:dingtalk_robot_msg]
           }
         }
-        url = "https://oapi.dingtalk.com/robot/send?access_token=#{@token}"
+        url = "https://oapi.dingtalk.com/robot/send?access_token=#{options[:dingtalk_access_token]}"
         DefaultRest.post(url, payload)
+      end
     end
 
     def initialize_dtalk_options(args, options)

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = '1.0.4'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli-xsl
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - NaixSpirit