mr_bump 0.0.8 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmIzZTExNjEyN2NjYTg3OTBjNTcwYmFlMGIzNDc3NmQ5YTI0MzIwYw==
+    NDljMWFkOGIzNmMxZDViNWNmODNiZTdmMjYxNzg2OWJjYmE0NGNiNw==
   data.tar.gz: !binary |-
-    MTZmODQ0YjkzN2ZhYTM1NmZlZTg2OWI0ODgwM2MzMTc4MzY4YTkzYw==
+    ZGFiZTIwNzI4Njk2YjFhMzA3OTkwNzY4YzI2ZmRlMjdjMjM4NjZlYw==
 SHA512:
   metadata.gz: !binary |-
-    ZWViYzE0YTU2ODE5MGQxZGVmZTA3YTM2Y2YyNzA2ZjY1YTcwYTY5ZTNhMTk3
-    MDM4ZDQxYzc0NTg2Mjk5NWZlZWUwNjBkN2UwZDk5ZjM3MzM0YTljYTlhNmM2
-    YmYzZTNiMmQ1YzFmOTNkNTM5MDY4MDdhY2M1NjNiNzdlNWEzYTU=
+    ZjM5NjZjZjRjODcyNjRkMjg4ZGYxN2E3MDgyOTk0YTM0YTQxNmY2ZWU1MTc0
+    MjZmM2RiNWU1ZDdkMDllYWQyM2UxZjg3ZGJmM2UyYTg0ZTMxOTU2N2FlOGM5
+    ZTJhNTY1OTg0MzFmYmJmMTJkMGE5MjViNTBhOTQ5MDhlZjkxMWY=
   data.tar.gz: !binary |-
-    OTViODQwMWVjYzkyNDkxNjE0YjI4NDEwMTEzZjEyOGQ2NDE0NDNhODg3YjAx
-    YmNmZmZkZDEyMzExMzg3ODFjMWEwOGQ1YzgwZWZkNDI3NzMxMmM3NmZlNDIx
-    NDM0ZjI1NmYxZjk1Njc1ZDU0YjdiY2FkMjk2NWExMjFhMGY5NjA=
+    ODUxNjNlN2UyMmYzMjAzZjgyMjk0ZThhNDEyYzk3ZjI1ZTUwZWE1NDU0ZTIy
+    MzY3ZGUzZGJiNmViYzQ5ZGZjOGE3NzllYmM3ZjM1NmQ1MjBkMDEwNDBjNzJm
+    NGMyYjViYmViNjQ1NWYwNWE2ZDQ0ZGM2ZDZkOWQyMTQ0NDlmZTA=

data/bin/mr_bump

@@ -10,6 +10,12 @@ unless release || master
   exit 1
 end
 
+unless master || MrBump.current_branch.to_s == "release/#{MrBump.current_uat_major}"
+  puts "On release branch '#{MrBump.current_branch}'. " \
+       "Expected release branch 'release/#{MrBump.current_uat_major}'"
+  exit 1
+end
+
 unless system('git remote update > /dev/null 2>&1')
   puts 'Failed to update remotes. (Connectivity problems?)'
   exit 1

data/lib/mr_bump/git_config.rb

@@ -0,0 +1,47 @@
+module MrBump
+  # This class gathers configuration infromation from git
+  class GitConfig
+    attr_reader :user, :username, :repo_url, :repo_name, :orgin
+    GITHUB_URL_REGEX = Regexp.new(
+      '(https?://((?<user>[\w_\-\d]+)@)?|git@)(?<domain>github.com)[:/](?<path>[\w_\-\d]+)/' \
+      '(?<repo_name>[\w_\-\d\.]+?)(\.git)?$'
+    ).freeze
+
+    def initialize(origin, repo_name, repo_url, username, user)
+      @origin = origin
+      @repo_name = repo_name
+      @repo_url = repo_url
+      @username = username
+      @user = user || `git config user.name`
+    end
+
+    def self.from_origin(origin, user = nil)
+      match = GITHUB_URL_REGEX.match(origin)
+      raise ArgumentError,
+            "Couldn't parse needed information from remote url '#{git_url}'" unless match
+      GitConfig.new(
+        origin,
+        match['repo_name'],
+        "https://#{match['domain']}/#{match['path']}/#{match['repo_name']}/",
+        match['user'],
+        user
+      )
+    end
+
+    def self.from_current_path
+      from_origin(`git remote get-url origin`.strip)
+    end
+
+    def user_icon
+      'https://avatars.githubusercontent.com/' + username if username
+    end
+
+    def user_link
+      'https://github.com/' + username if username
+    end
+
+    def get_sha(pattern)
+      `git log --grep=#{pattern} --merges --format=format:%H`.split("\n").first
+    end
+  end
+end

data/lib/mr_bump/slack.rb

@@ -2,19 +2,13 @@ require 'slack-notifier'
 module MrBump
   # This class uses a slack webhook to push notifications to slack
   class Slack
-
-    def initialize(opts)
-      raise ArgumentError, 'No Slack webhook found.' unless opts["webhook_url"]
-      @webhook = opts["webhook_url"]
-      @username = opts["username"] || 'Mr Bump'
-      if opts['jira_url']
-        @jira_url = opts['jira_url']
-      else
-        @jira_url = nil
-      end
-      if opts['icon']
-        @icon = (opts['icon'].is_a? Array) ? opts['icon'].sample : opts['icon']
-      end
+    def initialize(git_config, opts)
+      raise ArgumentError, 'No Slack webhook found.' unless opts['webhook_url']
+      @webhook = opts['webhook_url']
+      @username = opts['username'] || 'Mr Bump'
+      @jira_url = opts['jira_url']
+      @icon = (opts['icon'].is_a? Array) ? opts['icon'].sample : opts['icon']
+      @git = git_config
     end
 
     def bump(version, changes)
@@ -28,83 +22,48 @@ module MrBump
       @notifier ||= ::Slack::Notifier.new(@webhook, username: @username)
     end
 
-    def user
-      `git config user.name`.gsub(/\n/, '')
-    end
-
-    def git_url
-      @git_url ||= `git remote get-url origin`
-    end
-
-    def git_user
-      git_url[/[^@]+/].partition('//').last
-    end
-
-    def git_icon
-      'https://avatars.githubusercontent.com/' + git_user
-    end
-
-    def git_link
-      'https://github.com/' + git_user
-    end
-
-    def repo_name
-      `git config --get remote.origin.url`[/[\w\.]+(?=\.git$)/]
-    end
-
     def jira_ids(changes)
-      changes.split('* ').map { |i| i.split(' - ',3)[1]}.compact
+      changes.split('* ').map { |i| i.split(' - ', 3)[1] }.compact
     end
 
     def jira_urls(changes)
       jira_ids(changes).map do |ticket|
-        if ticket!= 'UNKNOWN'
-          '<' + @jira_url + '/browse/' + ticket + '|Jira link - ' + ticket + ">\n"
+        if ticket != 'UNKNOWN'
+          "<#{@jira_url}/browse/#{ticket}|Jira link - #{ticket}>\n"
         end
       end.join
     end
 
     def jira_field(changes)
       if @jira_url && !@jira_url.empty?
-        {value: jira_urls(changes), short: true, unfurl_links: false}
+        { value: jira_urls(changes), short: true, unfurl_links: false }
       end
     end
 
-    def get_sha(id)
-      `git log --grep=#{id} --merges --format=format:%H`.split("\n").first
-    end
-
-    def git_repo_url
-      'https://' + git_url.partition('@').last.gsub(".git\n", '')
-    end
-
     def git_shas(changes)
       jira_ids(changes).map do |ticket|
-        if ticket!= 'UNKNOWN' && !get_sha(ticket).nil?
-          '<' + git_repo_url + '/commit/'  + get_sha(ticket) + '|Git merge link - ' + ticket + ">\n"
+        if ticket != 'UNKNOWN' && !@git.get_sha(ticket).nil?
+          "<#{@git.repo_url}/commit/#{@git.get_sha(ticket)}|Git merge link - #{ticket}>\n"
         end
       end.join
     end
 
-
     def attatchment(version, changes)
       {
         fallback: changes,
         color: "#009de4",
-        author_name: user,
-        author_icon: git_icon,
-        author_link: git_link,
+        author_name: @git.user,
+        author_icon: @git.user_icon,
+        author_link: @git.user_link,
         fields: [
-                  {title: 'Version', value: version, short: true},
-                  {title: 'Repository', value: repo_name, short: true},
-                  {title: 'Change Log', value: changes, short: false},
-                  jira_field(changes),
-                  {value: git_shas(changes), short: true}
-                ],
+          { title: 'Version', value: version, short: true },
+          { title: 'Repository', value: @git.repo_name, short: true },
+          { title: 'Change Log', value: changes, short: false },
+          jira_field(changes),
+          { value: git_shas(changes), short: true }
+        ],
         mrkdwn_in: ["text", "title", "fallback", "fields"]
       }
     end
-
-
   end
 end

data/lib/mr_bump.rb

@@ -1,6 +1,8 @@
 require 'mr_bump/version'
 require 'mr_bump/slack'
 require 'mr_bump/config'
+require 'mr_bump/git_config'
+
 
 module MrBump
   def self.current_branch
@@ -90,7 +92,7 @@ module MrBump
 
     def self.slack_notifier(version, changelog)
       if config_file.key? 'slack'
-        MrBump::Slack.new(config_file["slack"]).bump(version, changelog)
+        MrBump::Slack.new(MrBump::GitConfig.from_current_path, config_file["slack"]).bump(version, changelog)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mr_bump
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Richard Fitzgerald
@@ -35,6 +35,7 @@ files:
 - bin/mr_bump
 - lib/mr_bump.rb
 - lib/mr_bump/config.rb
+- lib/mr_bump/git_config.rb
 - lib/mr_bump/slack.rb
 - lib/mr_bump/version.rb
 homepage: https://github.com/xulaus/mr_bump