watchdoge 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db9eab410f530c1dd00de8bfb39a4cfaa86d3e41aa86105d776c47e8c68ad9cb
-  data.tar.gz: 3196f93d3121f1aaafe6a4dfea5fc702dfbe54c4a985dfdd6b4f08abc3e515af
+  metadata.gz: 76fd10c6db817b3ab03f70178df61e1aebe01746bf65880852cfc3760a1153b5
+  data.tar.gz: 6f91b29949c9180a40980f24499a8ff2a803454a3cf99fa4572cded427175c50
 SHA512:
-  metadata.gz: ef68aed278dc48dd7eac239a9c91bbaf532b010f4bb28f4c32ddbd3c57d3dd271a26e7c087e86bf2d7b64abe37dc73a2c51c1990e3a73882ce41f05bdbc9f2ea
-  data.tar.gz: a9d02b67e9534ccf26047f4eb260b738251a68a92971fa7333689220dc13e1c4b089c36b0d507c950543cc3fbeff5d7adc3beb3602c32ecb373102fa868e7197
+  metadata.gz: 13fb74d5d2c25de6e884dc80dd3e60967bef9a3bc74e1f6934666982b472b8bbafcfdfcf8f49784ee978ee10136010adc4013b36c4282a56c59f526997daccf1
+  data.tar.gz: 72c8f4b464c69d87e056be7ef0e5edae5917bc31b345cd3e0a8ba79de18c71b7f0434dce53024f4f74ad9602cab65932ce2f14a093b99cea520082bce48987a6

data/lib/watchdoge/notification/base.rb

@@ -29,6 +29,8 @@ module WatchDoge
             File.write 'image.png', message.diff.to_blob
           end
         end
+
+        @message_queue = []
       end
     end
   end

data/lib/watchdoge/notification/gitlab_repo.rb

@@ -16,25 +16,29 @@ module WatchDoge
         @host = opt[:host] || ENV['CI_API_V4_URL']
         @project_id = opt[:project_id] || ENV['CI_PROJECT_ID']
         @source_branch = opt[:source_branch] || ENV['CI_COMMIT_REF_NAME']
+        @commit_short_sha = opt[:commit_short_sha] || ENV['CI_COMMIT_SHORT_SHA']
 
         @private_token = opt[:private_token]
       end
 
       def flush
-        iid = get_latest_request_iid
+        meesages_to_flush = @message_queue
+        @message_queue = []
+
+        target_id = get_latest_request_iid || get_commit_id
 
-        @message_queue = [] if iid.nil?
+        return if target_id.nil?
 
         table = markdown_table do |table_context|
-          @message_queue.each do |message|
+          meesages_to_flush.each do |message|
             case message
             when String
-              post_discussion request_iid: iid, message: message
+              post_discussion target_id, message: message
             when ChunkyPNG::Image
               upload_link = upload_image message
               link = md_img_link upload_link
 
-              post_discussion request_iid: iid, message: link
+              post_discussion target_id, message: link
             when WatchDoge::PixelTest
               before = md_img_link upload_image(message.before)
               after = md_img_link upload_image(message.after)
@@ -47,13 +51,17 @@ module WatchDoge
           table_context
         end
 
-        @message_queue = []
-
-        post_discussion request_iid: iid, message: table
+        post_discussion target_id, message: table
       end
 
-      def post_discussion request_iid:, message:
-        uri = project_uri "/merge_requests/#{request_iid}/discussions"
+      def post_discussion target_iid, message:
+        uri =
+          case @discussion_target
+          when :merge_request
+            project_uri("/merge_requests/#{target_iid}/discussions")
+          when :commit
+            project_uri("/commits/#{target_iid}/discussions")
+          end
 
         Net::HTTP.post uri,
                        { body: message }.to_json,
@@ -78,6 +86,8 @@ module WatchDoge
       end
 
       def get_latest_request_iid
+        @discussion_target = :merge_request
+
         uri = project_uri "/merge_requests?source_branch=#{@source_branch}&view=simple"
 
         req = Net::HTTP::Get.new uri
@@ -92,6 +102,23 @@ module WatchDoge
         JSON.parse(res)[0]['iid']
       end
 
+      def get_commit_id
+        @discussion_target = :commit
+
+        uri = project_uri "/repository/commits/#{@commit_short_sha}"
+
+        req = Net::HTTP::Get.new uri
+        req.add_field("PRIVATE-TOKEN", @private_token)
+
+        res = Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == "https")) do |http|
+          http.request(req).body
+        end
+
+        return nil if res.empty?
+
+        JSON.parse(res)[0]['id']
+      end
+
       private
 
       def md_img_link link
@@ -100,7 +127,10 @@ module WatchDoge
 
       # markdown_table do |context|
       def markdown_table
-        "<table>
+        "
+        #### Detail: #{ENV['CI_PIPELINE_URL']}
+
+        <table>
            <tr>
              <th>before</th>
              <th>after</th>

data/lib/watchdoge/notification/mattermost.rb

@@ -26,6 +26,8 @@ module WatchDoge
             post_file matter_most_meta(message.diff)
           end
         end
+
+        @message_queue = []
       end
 
       private

data/lib/watchdoge/notification/slack_webhook.rb

@@ -14,6 +14,8 @@ module WatchDoge
                          body,
                          "Content-Type" => "application/json"
         end
+
+        @message_queue = []
       end
 
       private

data/lib/watchdoge/version.rb

@@ -1,4 +1,4 @@
 # Version of WatchDoge
 module WatchDoge
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/watchdoge.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'watchdoge'
-  s.version     = '0.1.9'
+  s.version     = '0.1.10'
   s.date        = '2019-07-22'
   s.summary     = "dogi"
   s.description = "WatchDoge is Ruby on Rails friendly frontend regression test tool"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watchdoge
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Shen Lee