lita-gitlab 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f37561665bdfd52aab2af51b43f6b076d5b763d
-  data.tar.gz: 6b0e0d041e495003ffaba88b71e8723e34811b70
+  metadata.gz: 6fe86ceb0dfe52c83ef5012502e4698869f72646
+  data.tar.gz: dd8f9098dabb15d526bb59d809b56e8e639a8760
 SHA512:
-  metadata.gz: 65177e85af88ad971cc18166821d989c73cd4d84fd29cbd5aa1073270159c07550dbdd783599c602fb4be9f82efb4f68a0b0e568e0d78926357fec0419593e94
-  data.tar.gz: b3e4fb379463ee6f58f0e36392ed7f1756a4ed9623c0bdbb4690b90933eb0a2b5469e7325ee1232f971c1c4898a630aa98c6d929d59d33eb15f74f2936713608
+  metadata.gz: 9729cb3159a9ff315949a108aad3ac882b687d40e86f097a7c452046192d1fad3d34d51dfe713b5212e431052f7df03ec3ef2213c43ce41ea4ac3ea2849fb2d0
+  data.tar.gz: 2859e810f328e5969efbe953611e6fc17f0772abe5b642db4d51ea2eaebca717ec63845ad0b1b64a3ce5c4d67a6cf8b6d9da0b73e691264fd89d019b0486a6cc

data/lib/lita/handlers/gitlab.rb

@@ -40,40 +40,52 @@ module Lita
       end
 
       def system_message(data)
-        build_message "system.#{data[:event_name]}", data
+        interpolate_message "system.#{data[:event_name]}", data
       rescue
         Lita.logger.warn "Error formatting message: #{data.inspect}"
       end
 
       def web_message(data)
         if data.key? :object_kind
-          if data[:object_attributes].key? :target_branch
-            # Merge request
-            url = "#{Lita.config.handlers.gitlab.url}"
-            url += data[:project] ? "#{Lita.config.handlers.gitlab.group}/#{data[:project]}/merge_requests/#{data[:object_attributes][:iid]}" : "groups/#{Lita.config.handlers.gitlab.group}"
-            data[:object_attributes][:link] =  "<#{url}|#{data[:object_attributes][:title]}>"
-            build_message "web.#{data[:object_kind]}.#{data[:object_attributes][:state]}", data[:object_attributes]
-          else
-            # Issue
-            build_message "web.#{data[:object_kind]}.#{data[:object_attributes][:state]}", data[:object_attributes]
-          end
+          # Merge has target branch
+          (data[:object_attributes].key? :target_branch) ? build_merge_message(data) : build_issue_message(data)
         else
           # Push has no object kind
-          branch = data[:ref].split('/').drop(2).join('/')
-          data[:link] = "<#{data[:repository][:homepage]}|#{data[:repository][:name]}>"
-          if data[:before] =~ /^0+$/
-            build_message 'web.push.new_branch', data
-          else
-            build_message 'web.push.add_to_branch', data
-          end
+          build_branch_message(data)
         end
       rescue
         Lita.logger.warn "Error formatting message: #{data.inspect}"
       end
 
+      def build_issue_message(data)
+        interpolate_message "web.#{data[:object_kind]}.#{data[:object_attributes][:state]}", data[:object_attributes]
+      end
+
+      def build_branch_message(data)
+        branch = data[:ref].split('/').drop(2).join('/')
+        data[:link] = "<#{data[:repository][:homepage]}|#{data[:repository][:name]}>"
+        if data[:before] =~ /^0+$/
+          interpolate_message 'web.push.new_branch', data
+        else
+          interpolate_message 'web.push.add_to_branch', data
+        end
+      end
+
+      def build_merge_message(data)
+        url = "#{Lita.config.handlers.gitlab.url}"
+        url += if data[:project] then
+                 "#{Lita.config.handlers.gitlab.group}/#{data[:project]}/merge_requests/#{data[:object_attributes][:iid]}"
+               else
+                 "groups/#{Lita.config.handlers.gitlab.group}"
+               end
+        data[:object_attributes][:project] = data[:project]
+        data[:object_attributes][:link] = "<#{url}|#{data[:object_attributes][:title]}>"
+        interpolate_message "web.#{data[:object_kind]}.#{data[:object_attributes][:state]}", data[:object_attributes]
+      end
+
       # General methods
 
-      def build_message(key, data)
+      def interpolate_message(key, data)
         t(key) % data
       end
 

data/lita-gitlab.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-gitlab'
-  spec.version       = '1.0.3'
+  spec.version       = '1.0.4'
   spec.authors       = ['Emilio Figueroa']
   spec.email         = ['emiliofigueroatorres@gmail.com']
   spec.description   = %q{A Lita handler that will display GitLab messages in the channel}

data/locales/en.yml

@@ -3,7 +3,7 @@ en:
     handlers:
       gitlab:
         system:
-          user_add_to_team: "%{user_name} has joined the %{project_name} project"
+          user_add_to_team: "%{user_name} has joined to the %{project_name} project"
           project_create: "%{owner_name} has created the %{name} project!"
           project_destroy: "%{owner_name} has destroyed the %{name} project!"
           user_remove_from_team: "%{user_name} has left the %{project_name} project"
@@ -15,11 +15,11 @@ en:
             reopened: "The issue '%{title}' has been reopened."
             closed: "The issue '%{title}' is now closed"
           merge_request:
-            opened: "New merge-request: %{link}"
-            reopened: "The merge-request '%{link}' has been reopened."
-            closed: "The merge-request '%{title}' is now closed."
+            opened: "New merge-request #%{iid} en %{project}: %{link}"
+            reopened: "The merge-request #%{iid} en %{project} '%{link}' has been reopened."
+            closed: "The merge-request #%{iid} en %{project} '%{title}' is now closed."
             locked: ""
-            merged: "Yay! The merge-request '%{link}' is has been merged."
+            merged: "Yay! The merge-request #%{iid} en %{project} '%{link}' is has been merged."
           push:
-            new_branch: "%{user_name} created the new branch '%{link}'"
-            add_to_branch: "%{user_name} added %{total_commits_count} commits to branch '%{link}'"
+            new_branch: "%{user_name} created the new branch '%{link}' in project %{project}"
+            add_to_branch: "%{user_name} added %{total_commits_count} commits to branch '%{link}' in project %{project}"

data/spec/fixtures/system/project_created.json

@@ -3,7 +3,7 @@
     "event_name": "project_create",
     "name": "StoreCloud",
     "owner_email": "johnsmith@gmail.com",
-    "owner_name": "John Smit",
+    "owner_name": "John Smith",
     "path": "stormcloud",
     "path_with_namespace": "jsmith/stormcloud",
     "project_id": 74

data/spec/lita/handlers/gitlab_spec.rb

@@ -23,9 +23,12 @@ describe Lita::Handlers::Gitlab, lita_handler: true do
   let(:project) { 'test_project' }
   let(:matchers) {
     {
-      new_team_member: 'join',
-      project_created: 'created',
-      project_destroyed: 'destroyed',
+      new_team_member: 'John Smith has joined to the StoreCloud project',
+      project_created: 'John Smith has created the StoreCloud project!',
+      project_destroyed: 'John Smith has destroyed the Underscore project!',
+      issue_opened: 'New issue >> New API: create/update/delete file: Create new API for manipulations with repository',
+      add_to_branch: "John Smith added 4 commits to branch '<http://localhost/diaspora|Diaspora>' in project test_project",
+      merge_request_opened: 'New merge-request #1 en test_project: <http://example.gitlab/group_name/test_project/merge_requests/1|MS-Viewport>'
     }
   }
 
@@ -46,7 +49,7 @@ describe Lita::Handlers::Gitlab, lita_handler: true do
         it 'notifies to the applicable rooms' do
           expect(robot).to receive(:send_message) do |target, message|
             expect(target.room).to eq('#baz')
-            expect(message).to include matchers[:new_team_member]
+            expect(message).to eq matchers[:new_team_member]
           end
           subject.receive(request, response)
         end
@@ -61,7 +64,7 @@ describe Lita::Handlers::Gitlab, lita_handler: true do
         it 'notifies to the applicable rooms' do
           expect(robot).to receive(:send_message) do |target, message|
             expect(target.room).to eq('#baz')
-            expect(message).to include matchers[:project_created]
+            expect(message).to eq matchers[:project_created]
           end
           subject.receive(request, response)
         end
@@ -76,7 +79,7 @@ describe Lita::Handlers::Gitlab, lita_handler: true do
         it 'notifies to the applicable rooms' do
           expect(robot).to receive(:send_message) do |target, message|
             expect(target.room).to eq('#baz')
-            expect(message).to include matchers[:project_destroyed]
+            expect(message).to eq matchers[:project_destroyed]
           end
           subject.receive(request, response)
         end
@@ -86,7 +89,7 @@ describe Lita::Handlers::Gitlab, lita_handler: true do
     context 'when web project hook' do
 
       context 'when issue event' do
-        let(:issue_payload) { fixture_file('web/issue') }
+        let(:issue_payload) { fixture_file('web/issue_opened') }
         before do
           allow(params).to receive(:[]).with('payload').and_return(issue_payload)
         end
@@ -94,14 +97,14 @@ describe Lita::Handlers::Gitlab, lita_handler: true do
         it 'notifies to the applicable rooms' do
           expect(robot).to receive(:send_message) do |target, message|
             expect(target.room).to eq('#baz')
-            expect(message).to include 'New issue'
+            expect(message).to eq matchers[:issue_opened]
           end
           subject.receive(request, response)
         end
       end
 
       context 'when push event' do
-        let(:push_payload) { fixture_file('web/push') }
+        let(:push_payload) { fixture_file('web/add_to_branch') }
         before do
           allow(params).to receive(:[]).with('payload').and_return(push_payload)
         end
@@ -109,14 +112,14 @@ describe Lita::Handlers::Gitlab, lita_handler: true do
         it 'notifies to the applicable rooms' do
           expect(robot).to receive(:send_message) do |target, message|
             expect(target.room).to eq('#baz')
-            expect(message).to include 'branch'
+            expect(message).to eq matchers[:add_to_branch]
           end
           subject.receive(request, response)
         end
       end
 
       context 'when merge request event' do
-        let(:merge_request_payload) { fixture_file('web/merge_request') }
+        let(:merge_request_payload) { fixture_file('web/merge_request_opened') }
         before do
           allow(params).to receive(:[]).with('payload').and_return(merge_request_payload)
         end
@@ -124,7 +127,7 @@ describe Lita::Handlers::Gitlab, lita_handler: true do
         it 'notifies to the applicable rooms' do
           expect(robot).to receive(:send_message) do |target, message|
             expect(target.room).to eq('#baz')
-            expect(message).to include 'merge'
+            expect(message).to eq matchers[:merge_request_opened]
           end
           subject.receive(request, response)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-gitlab
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Emilio Figueroa
@@ -131,9 +131,9 @@ files:
 - spec/fixtures/system/team_member_removed.json
 - spec/fixtures/system/user_created.json
 - spec/fixtures/system/user_removed.json
-- spec/fixtures/web/issue.json
-- spec/fixtures/web/merge_request.json
-- spec/fixtures/web/push.json
+- spec/fixtures/web/add_to_branch.json
+- spec/fixtures/web/issue_opened.json
+- spec/fixtures/web/merge_request_opened.json
 - spec/lita/handlers/gitlab_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/milo-ft/lita-gitlab
@@ -168,8 +168,8 @@ test_files:
 - spec/fixtures/system/team_member_removed.json
 - spec/fixtures/system/user_created.json
 - spec/fixtures/system/user_removed.json
-- spec/fixtures/web/issue.json
-- spec/fixtures/web/merge_request.json
-- spec/fixtures/web/push.json
+- spec/fixtures/web/add_to_branch.json
+- spec/fixtures/web/issue_opened.json
+- spec/fixtures/web/merge_request_opened.json
 - spec/lita/handlers/gitlab_spec.rb
 - spec/spec_helper.rb