fastlane-plugin-mattermost 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a6ce14080c474420332e09866867696f02dd154a7dda144f084e98fa8efb0b8
-  data.tar.gz: 1044ecf0bf0acbcf8b6f4935285ecf01f374f35eb18bafeec9420cea63be3fd2
+  metadata.gz: c701b3dbc10a3a5253f79e37d69ca4a58a8eb0ebc7fcae8ed6ec455c1be2da37
+  data.tar.gz: d8f226d48259e6a78d62a3d6f7074db1d7caf67a4c3d073d5cc3f119964d3bcd
 SHA512:
-  metadata.gz: 4572a7cb2d28a7df22e3fb957fdce2ba09a5e89dcbc8772b84e5b221d25f09ef4d0f5f0149003ef2f3dea595920c217bbab586313d9e58b11089a2aa2929834a
-  data.tar.gz: db47dac6786d5138910c3d3f04409c52d58f34ecf13fd6d9f8ef0c823fc13f8ad4070d15d035b412c9c7c3db4be10757115db580d81aa8ab682cd84dae668954
+  metadata.gz: 5cabb2243dc8536b56a9e01fe8ed968475e4cbc65e6ce8210d487d85d7ccf53b5b2d5d12d24e3cbd843d245da583c63ee814b9fb7da3d47527bb726357dd91c2
+  data.tar.gz: 4ea495ccdc0a43227b1666efd7435f763a412abfdabb91f51db428acd0b8fbb5e56e59d14e3c4013ca40a771064284f746bdc947b151ec3754adddfe217a534c

data/README.md

@@ -26,7 +26,7 @@ lane :build_android do
     # Minimum params example
     mattermost(
         url: "https://example.mattermost.com/hooks/xxx-generatedkey-xxx",           # mandatory
-        text: "Hello, this is some text\nThis is more text. :tada:",                # mandatory
+        text: "Hello, this is some text\nThis is more text. :tada:",                # mandatory if 'attachments' is not set
         username: "Fastlane Mattermost",                                            # optional
         icon_url: "https://www.mattermost.org/wp-content/uploads/2016/04/icon.png"  # optional
     )
@@ -38,7 +38,7 @@ lane :build_android do
         icon_url: "https://www.mattermost.org/wp-content/uploads/2016/04/icon.png", # optional
         channel: ... ,                                                              # optional
         icon_emoji: ... ,                                                           # optional
-        attachments: ... ,                                                          # optional
+        attachments: [...] ,                                                        # optional
         props: ... ,                                                                # optional
         type: ...                                                                   # optional
     )

data/lib/fastlane/plugin/mattermost/actions/mattermost_action.rb

@@ -4,10 +4,10 @@ require_relative '../helper/mattermost_helper'
 DEFAULT_USERNAME = "Fastlane Mattermost"
 DEFAULT_ICON_URL = "https://www.mattermost.org/wp-content/uploads/2016/04/icon.png"
 
-def is_blank? variable
+def is_set variable
   str_variable = variable
   str_variable = variable.strip if variable.class.to_s == "String"
-  str_variable.nil? || str_variable.empty?
+  variable && !(str_variable.nil? || str_variable.empty?)
 end
 
 module Fastlane
@@ -25,15 +25,21 @@ module Fastlane
             'Content-Type': 'application/json'
           }
           body = {
-            'text': params[:text],
-            'username': (is_blank?(params[:username]) ? DEFAULT_USERNAME : params[:username]),
-            'icon_url': (is_blank?(params[:icon_url]) ? DEFAULT_ICON_URL : params[:icon_url])
+            'username': (is_set(params[:username]) ? params[:username] : DEFAULT_USERNAME),
+            'icon_url': (is_set(params[:icon_url]) ? params[:icon_url] : DEFAULT_ICON_URL)
           }
-          body.merge!('channel': params[:channel]) if is_blank?(params[:channel])
-          body.merge!('icon_emoji': params[:icon_emoji]) if is_blank?(params[:icon_emoji])
-          body.merge!('attachments': params[:attachments]) if is_blank?(params[:attachments])
-          body.merge!('props': params[:props]) if is_blank?(params[:props])
-          body.merge!('type': params[:type]) if is_blank?(params[:type])
+
+          if !is_set(params[:text]) && !is_set(params[:attachments])
+            UI.error("You need to set either 'text' or 'attachments'")
+            return
+          end
+
+          body.merge!('text': params[:text]) if is_set(params[:text])
+          body.merge!('channel': params[:channel]) if is_set(params[:channel])
+          body.merge!('icon_emoji': params[:icon_emoji]) if is_set(params[:icon_emoji])
+          body.merge!('attachments': params[:attachments]) if is_set(params[:attachments])
+          body.merge!('props': params[:props]) if is_set(params[:props])
+          body.merge!('type': params[:type]) if is_set(params[:type])
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = (uri.scheme == 'https')
           request = Net::HTTP::Post.new(uri.request_uri, header)
@@ -41,9 +47,10 @@ module Fastlane
           response = http.request(request)
         rescue => exception
           UI.error("Exception: #{exception}")
-        ensure
-          UI.success('Successfully push messages to Mattermost')
+          return
         end
+
+        UI.success('Successfully push messages to Mattermost')
       end
 
       def self.description
@@ -70,8 +77,9 @@ module Fastlane
                                        sensitive: true,
                                        description: "Mattermost Incoming Webhooks URL"),
           FastlaneCore::ConfigItem.new(key: :text,
-                                       env_name: "MATTERMOST_WEBHOOKS_PARAMS",
-                                       description: "Mattermost Incoming Webhooks Params"),
+                                       env_name: "MATTERMOST_WEBHOOKS_TEXT",
+                                       optional: true,
+                                       description: "Mattermost Incoming Webhooks Text"),
           FastlaneCore::ConfigItem.new(key: :username,
                                        env_name: "MATTERMOST_WEBHOOKS_USERNAME",
                                        optional: true,
@@ -91,6 +99,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :attachments,
                                        env_name: "MATTERMOST_WEBHOOKS_ATTACHMENTS",
                                        optional: true,
+                                       skip_type_validation: true,
                                        description: "Mattermost Incoming Webhooks Attachments"),
           FastlaneCore::ConfigItem.new(key: :props,
                                        env_name: "MATTERMOST_WEBHOOKS_PROPS",

data/lib/fastlane/plugin/mattermost/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Mattermost
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-mattermost
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - cpfriend1721994
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -84,16 +84,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-require_tools
   requirement: !ruby/object:Gem::Requirement
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Fastlane plugin for push messages to Mattermost