mr_bump 0.0.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjQ1NzQ4YzlkMWI2MDJkZmYwYTY0MWRjNGFlOTY3NjUyMTgwZTc0YQ==
+  data.tar.gz: !binary |-
+    YWMwNTc5MjFlODY3ZDhjY2QwMmRjNTQyZDg1OGU0YjY5NGU3YTA4MQ==
+SHA512:
+  metadata.gz: !binary |-
+    NzI5ZGJmNmY4NDhmZmYxNTgxZWMxODU5ZmVkMTM5NDYzYjNmYTc1ZmM0ZmU2
+    OGMwNjhhOWY4YTU3MWNjY2ZkNGI3NjUxMmI0ODg0NDg2ZmFkNGY0YjcxZmY1
+    NWVhZTQ1YmZmNWQwMTFiZGQyZjBlYzljNzhmMzIxYjVhNTdkMmE=
+  data.tar.gz: !binary |-
+    YjM0OGVmOWJkNDViNzdlZDFjZjAwNjYzMzg5ZjExMDM3Yzc3ZmQ2MjFhNmU2
+    NmFmNjRjOWU2Mjg1ZmI2YzBkOTRkNTgxYzQ5MGU4MTZiYTYzZjU2YzI1YTNh
+    MWM4YTQ3M2FmZjAyMGI1ZWE5NDZmNjIwODk4YzBhZTQyYWQ2NDM=

data/bin/mr_bump

@@ -0,0 +1,109 @@
+#!/usr/bin/env ruby
+# Small script to tag releases and update changelogs
+require 'mr_bump'
+
+release = !MrBump.current_branch[/^release/].nil?
+master = !MrBump.current_branch[/^master$/].nil?
+
+unless release || master
+  puts 'Need to be on either release or master branch'
+  exit 1
+end
+
+unless system('git remote update > /dev/null 2>&1')
+  puts 'Failed to update remotes. (Connectivity problems?)'
+  exit 1
+end
+
+unless `git rev-parse @` == `git rev-parse @{u}`
+  puts 'Not up to date with origin! Please run git pull'
+  exit 1
+end
+
+unless File.file?('CHANGELOG.md')
+  puts "Couldn't find CHANGELOG.md. ensure you are in the root of the git checkout"
+  exit 1
+end
+
+if release
+  last_release = MrBump.current_uat
+  current_uat_major = MrBump.current_uat_major
+  changes = MrBump.change_log_items_for_range(last_release, "release/#{current_uat_major}")
+else
+  last_release = MrBump.current_master
+  changes = MrBump.change_log_items_for_range(last_release, 'master')
+end
+
+new_release = last_release.bump_patch
+changes = changes.join('')
+md_changes = "# #{new_release}#{changes}\n\n"
+
+puts 'Changelog additions'
+puts '----------'
+puts md_changes
+puts '----------'
+
+loop do
+  print '[A]ccept these changes / Manually [E]dit / [C]ancel Release : '
+  choice = gets.chomp.upcase
+
+  case choice
+  when 'A'
+    MrBump.file_prepend('CHANGELOG.md', md_changes)
+    break
+  when 'E'
+    MrBump.file_prepend('CHANGELOG.md', md_changes)
+    system 'nano CHANGELOG.md'
+    loop do
+      log = File.open('CHANGELOG.md', 'r').read
+      md_changes = log.split("\n\n").first.split("\n").drop(1)
+      puts 'Modified Changelog additions'
+      puts '----------'
+      puts md_changes
+      puts '----------'
+      print '[A]ccept modified changes / [C]ancel Release : '
+      choice2 = gets.chomp.upcase
+      if choice2 == 'C'
+        exit 1
+      elsif choice2 == 'A'
+        break
+      else
+        puts "I'm sorry Dave; I'm afraid I can't do that."
+      end
+    end
+    break
+  when 'C'
+    exit 1
+  else
+    puts "I'm sorry Dave; I'm afraid I can't do that."
+  end
+end
+
+`git commit -m 'Bump version to #{new_release}' CHANGELOG.md`
+`git tag #{new_release}`
+`git push && git push --tags`
+
+MrBump.slack_notifier(new_release, md_changes.join("\n"))
+
+config_file = MrBump.config_file()
+branch_type = release ? "release" : 'master'
+bump_cmd_exists = config_file.key?('post_bump') &&
+                  config_file['post_bump'].key?(branch_type)
+if bump_cmd_exists
+  loop do
+    puts 'Would you like to execute post bump commands? '
+    print '[Y]es execute / [N]o Im done : '
+    choice = gets.chomp.upcase
+
+    case choice
+    when 'Y'
+      post_command = config_file['post_bump'][branch_type]
+      system post_command
+      break
+    when 'N'
+      break
+    else
+      puts "I'm sorry Dave; I'm afraid I can't do that."
+    end
+  end
+end

data/lib/mr_bump/config.rb

@@ -0,0 +1,25 @@
+require 'yaml'
+
+module MrBump
+  # This class sets up access to the config file
+  class Config
+    attr_reader :config_file
+
+    def initialize(config_file = nil)
+      @config_file = config_file || default_file
+    end
+
+    def config
+      @config ||= if File.exist?(@config_file)
+        YAML.load_file(@config_file) || {}
+      else
+        {}
+      end
+    end
+
+    def default_file
+      File.join(".mr_bump")
+    end
+
+  end
+end

data/lib/mr_bump/slack.rb

@@ -0,0 +1,110 @@
+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
+    end
+
+    def bump(version, changes)
+      options = {}
+      options[:icon_url] = @icon if @icon
+      options[:attachments] = [attatchment(version, changes)]
+      notifier.ping 'There is a new version bump!', options
+    end
+
+    def notifier
+      @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
+    end
+
+    def jira_urls(changes)
+      jira_ids(changes).map do |ticket|
+        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}
+      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"
+        end
+      end.join
+    end
+
+
+    def attatchment(version, changes)
+      {
+        fallback: changes,
+        color: "#009de4",
+        author_name: user,
+        author_icon: git_icon,
+        author_link: git_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}
+                ],
+        mrkdwn_in: ["text", "title", "fallback", "fields"]
+      }
+    end
+
+
+  end
+end

data/lib/mr_bump/version.rb

@@ -0,0 +1,55 @@
+module MrBump
+  # This class enables comparison and bumping of sementic versions and
+  # conversion to and from strings
+  class Version
+    include Comparable
+    attr_reader :major, :minor, :patch
+    def initialize(version_str)
+      regex = Regexp.new('^([0-9]+)(\.([0-9]+)(\.([0-9]*))?)?')
+      numbers = version_str.match(regex).captures
+      @major = numbers[0].to_i
+      @minor = (numbers.size > 2) ? numbers[2].to_i : 0
+      @patch = (numbers.size > 4) ? numbers[4].to_i : 0
+    end
+
+    def <=>(other)
+      major_com = major <=> other.major
+      minor_com = (major_com == 0) ? minor <=> other.minor : major_com
+      (minor_com == 0) ? patch <=> other.patch : minor_com
+    end
+
+    def to_s
+      "#{major}.#{minor}.#{patch}"
+    end
+
+    def bump_major
+      dup.bump_major!
+    end
+
+    def bump_major!
+      @major += 1
+      @minor = 0
+      @patch = 0
+      self
+    end
+
+    def bump_minor
+      dup.bump_minor!
+    end
+
+    def bump_minor!
+      @minor += 1
+      @patch = 0
+      self
+    end
+
+    def bump_patch
+      dup.bump_patch!
+    end
+
+    def bump_patch!
+      @patch += 1
+      self
+    end
+  end
+end

data/lib/mr_bump.rb

@@ -0,0 +1,98 @@
+require 'mr_bump/version'
+require 'mr_bump/slack'
+require 'mr_bump/config'
+
+module MrBump
+  def self.current_branch
+    @current_branch ||= `git rev-parse --abbrev-ref HEAD`
+    @current_branch.strip
+  end
+
+  def self.current_uat_major
+    prefix = 'origin/release/'
+    vers = `git branch -r`
+    regex = Regexp.new("^#{prefix}(\\d+\\.\\d+\\.0)$")
+    vers = vers.each_line.map do |branch|
+      branch = branch.strip
+      MrBump::Version.new(branch.gsub(regex, '\1')) if branch[regex]
+    end.compact
+    vers.max
+  end
+
+  def self.current_uat
+    uat = current_uat_major
+    vers = `git tag -l`
+    vers = vers.each_line.map do |branch|
+      MrBump::Version.new(branch) rescue nil
+    end.compact
+    vers.select { |ver| ver.major == uat.major && ver.minor == uat.minor }.max
+  end
+
+  def self.current_master
+    uat = current_uat_major
+    vers = `git tag -l`
+    vers = vers.each_line.map do |branch|
+      MrBump::Version.new(branch) rescue nil
+    end.compact
+    vers.select { |ver| ver < uat }.max
+  end
+
+  def self.story_information(merge_str)
+    branch_fmt = '(?<fix_type>bugfix|feature|hotfix)/(?<dev_id>\w+[-_]?\d+)?'
+    merge_pr_fmt = "^Merge pull request #(?<pr_number>\\d+) from \\w+/#{branch_fmt}"
+    merge_manual_fmt = "^Merge branch '#{branch_fmt}'"
+    matches = Regexp.new(merge_pr_fmt + '|' + merge_manual_fmt).match(merge_str)
+    if matches
+      type = matches['fix_type'].capitalize
+      dev_id = (matches['dev_id'].nil? ? 'UNKNOWN' : matches['dev_id'])
+      "#{type} - #{dev_id} - "
+    end
+  end
+
+  def self.merge_logs(rev, head)
+    git_cmd = "git log --pretty='format:%B' --grep '(^Merge pull request | into #{current_branch}$)' --merges -E"
+    log = `#{git_cmd} #{rev}..#{head}`
+    log.each_line.map(&:strip).select { |str| !(str.nil? || str == '' || str[0] == '#') }
+  end
+
+  def self.ignored_merges_regex
+    @ignored_merges_regex ||= begin
+      ignored_branch = '(release|master|develop)'
+      regex_pr = "^Merge pull request #\\d+ from Intellection/#{ignored_branch}"
+      regex_manual = "^Merge branch '?#{ignored_branch}"
+      Regexp.new("#{regex_pr}|#{regex_manual}")
+    end
+  end
+
+  def self.change_log_items_for_range(rev, head)
+    chunked_log = merge_logs(rev, head).chunk { |change| change[/^Merge/].nil? }
+    chunked_log.each_slice(2).map do |merge_str, comment|
+      merge_str = merge_str[1][0]
+      unless merge_str[ignored_merges_regex]
+        "\n* #{story_information(merge_str)}" + comment[1].join("\n  ")
+      end
+    end.compact
+  end
+
+  def self.file_prepend(file, str)
+    new_contents = ''
+    File.open(file, 'r') do |fd|
+      contents = fd.read
+      new_contents = str + contents
+    end
+    File.open(file, 'w') do |fd|
+      fd.write(new_contents)
+    end
+
+    def self.config_file
+      MrBump::Config.new().config
+    end
+
+    def self.slack_notifier(version, changelog)
+      if config_file.key? 'slack'
+        MrBump::Slack.new(config_file["slack"]).bump(version, changelog)
+      end
+    end
+
+  end
+end

metadata

@@ -0,0 +1,63 @@
+--- !ruby/object:Gem::Specification
+name: mr_bump
+version: !ruby/object:Gem::Version
+  version: 0.0.7
+platform: ruby
+authors:
+- Richard Fitzgerald
+- Josh Bryant
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2016-08-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: slack-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: Bump versions
+email: richard.fitzgerald36@gmail.com
+executables:
+- mr_bump
+extensions: []
+extra_rdoc_files: []
+files:
+- bin/mr_bump
+- lib/mr_bump.rb
+- lib/mr_bump/config.rb
+- lib/mr_bump/slack.rb
+- lib/mr_bump/version.rb
+homepage: https://github.com/xulaus/mr_bump
+licenses: []
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.4.8
+signing_key: 
+specification_version: 3
+summary: BUMP!
+test_files: []