gitx 2.13.1

data/lib/gitx/cli/cleanup_command.rb

@@ -0,0 +1,45 @@
+require 'thor'
+require 'gitx'
+require 'gitx/cli/base_command'
+
+module Gitx
+  module Cli
+    class CleanupCommand < BaseCommand
+      desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
+      def cleanup
+        checkout_branch Gitx::BASE_BRANCH
+        run_cmd 'git pull'
+        run_cmd 'git remote prune origin'
+
+        say 'Deleting local and remote branches that have been merged into '
+        say Gitx::BASE_BRANCH, :green
+        merged_branches(remote: true).each do |branch|
+          run_cmd "git push origin --delete #{branch}"
+        end
+        merged_branches(remote: false).each do |branch|
+          run_cmd "git branch -d #{branch}"
+        end
+      end
+
+      private
+
+      # @return list of branches that have been merged
+      def merged_branches(options = {})
+        args = []
+        args << '-r' if options[:remote]
+        args << '--merged'
+        output = run_cmd("git branch #{args.join(' ')}").split("\n")
+        branches = output.map do |branch|
+          branch = branch.gsub(/\*/, '').strip.split(' ').first
+          branch = branch.split('/').last if options[:remote]
+          branch
+        end
+        branches.uniq!
+        branches -= config.reserved_branches
+        branches.reject! { |b| config.aggregate_branch?(b) }
+
+        branches
+      end
+    end
+  end
+end

data/lib/gitx/cli/integrate_command.rb

@@ -0,0 +1,94 @@
+require 'thor'
+require 'gitx'
+require 'gitx/cli/base_command'
+require 'gitx/cli/update_command'
+require 'gitx/github'
+
+module Gitx
+  module Cli
+    class IntegrateCommand < BaseCommand
+      include Gitx::Github
+      desc 'integrate', 'integrate the current branch into one of the aggregate development branches (default = staging)'
+      method_option :resume, :type => :string, :aliases => '-r', :desc => 'resume merging of feature-branch'
+      method_option :comment, :type => :boolean, :aliases => '-c', :desc => 'add a comment to the pull request for this branch. Creates a new PR if none exists.'
+      def integrate(integration_branch = 'staging')
+        assert_aggregate_branch!(integration_branch)
+
+        branch = feature_branch_name
+        print_message(branch, integration_branch)
+
+        begin
+          execute_command(UpdateCommand, :update)
+        rescue
+          fail MergeError, 'Merge Conflict Occurred. Please Merge Conflict Occurred. Please fix merge conflict and rerun the integrate command'
+        end
+
+        integrate_branch(branch, integration_branch) unless options[:resume]
+        checkout_branch branch
+
+        create_integrate_comment(branch) if options[:comment] && !config.reserved_branch?(branch)
+      end
+
+      private
+
+      def print_message(branch, integration_branch)
+        message = options[:resume] ? 'Resuming integration of' : 'Integrating'
+        say "#{message} "
+        say "#{branch} ", :green
+        say 'into '
+        say integration_branch, :green
+      end
+
+      def integrate_branch(branch, integration_branch)
+        fetch_remote_branch(integration_branch)
+        begin
+          run_cmd "git merge #{branch}"
+        rescue
+          fail MergeError, "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag"
+        end
+        run_cmd 'git push origin HEAD'
+      end
+
+      def feature_branch_name
+        @feature_branch ||= begin
+          feature_branch = options[:resume] || current_branch.name
+          until local_branch_exists?(feature_branch)
+            feature_branch = ask("#{feature_branch} does not exist. Please select one of the available local branches: #{local_branches}")
+          end
+          feature_branch
+        end
+      end
+
+      # nuke local branch and pull fresh version from remote repo
+      def fetch_remote_branch(target_branch)
+        create_remote_branch(target_branch) unless remote_branch_exists?(target_branch)
+        run_cmd 'git fetch origin'
+        run_cmd "git branch -D #{target_branch}", :allow_failure => true
+        checkout_branch target_branch
+      end
+
+      def local_branch_exists?(branch)
+        local_branches.include?(branch)
+      end
+
+      def local_branches
+        @local_branches ||= repo.branches.each_name(:local)
+      end
+
+      def remote_branch_exists?(target_branch)
+        repo.branches.each_name(:remote).include?("origin/#{target_branch}")
+      end
+
+      def create_remote_branch(target_branch)
+        repo.create_branch(target_branch, Gitx::BASE_BRANCH)
+        run_cmd "git push origin #{target_branch}:#{target_branch}"
+      end
+
+      def create_integrate_comment(branch)
+        pull_request = find_or_create_pull_request(branch)
+        comment = '[gitx] integrated into staging :twisted_rightwards_arrows:'
+        github_client.add_comment(github_slug, pull_request.number, comment)
+      end
+    end
+  end
+end

data/lib/gitx/cli/nuke_command.rb

@@ -0,0 +1,62 @@
+require 'thor'
+require 'gitx'
+require 'gitx/cli/base_command'
+
+module Gitx
+  module Cli
+    class NukeCommand < BaseCommand
+      desc 'nuke', 'nuke the specified aggregate branch and reset it to a known good state'
+      method_option :destination, :type => :string, :aliases => '-d', :desc => 'destination branch to reset to'
+      def nuke(bad_branch)
+        good_branch = options[:destination] || ask("What branch do you want to reset #{bad_branch} to? (default: #{bad_branch})")
+        good_branch = bad_branch if good_branch.length == 0
+
+        last_known_good_tag = current_build_tag(good_branch)
+        return unless yes?("Reset #{bad_branch} to #{last_known_good_tag}? (y/n)", :green)
+        assert_aggregate_branch!(bad_branch)
+        return if migrations_need_to_be_reverted?(bad_branch, last_known_good_tag)
+
+        say 'Resetting '
+        say "#{bad_branch} ", :green
+        say 'branch to '
+        say last_known_good_tag, :green
+
+        checkout_branch Gitx::BASE_BRANCH
+        run_cmd "git branch -D #{bad_branch}", :allow_failure => true
+        run_cmd "git push origin --delete #{bad_branch}", :allow_failure => true
+        run_cmd "git checkout -b #{bad_branch} #{last_known_good_tag}"
+        run_cmd "git push origin #{bad_branch}"
+        run_cmd "git branch --set-upstream-to origin/#{bad_branch}"
+        checkout_branch Gitx::BASE_BRANCH
+      end
+
+      private
+
+      def migrations_need_to_be_reverted?(bad_branch, last_known_good_tag)
+        return false unless File.exist?('db/migrate')
+        outdated_migrations = run_cmd("git diff #{last_known_good_tag}...#{bad_branch} --name-only db/migrate").split
+        return false if outdated_migrations.empty?
+
+        say "#{bad_branch} contains migrations that may need to be reverted.  Ensure any reversable migrations are reverted on affected databases before nuking.", :red
+        say 'Example commands to revert outdated migrations:'
+        outdated_migrations.reverse.each do |migration|
+          version = File.basename(migration).split('_').first
+          say "rake db:migrate:down VERSION=#{version}"
+        end
+        !yes?("Are you sure you want to nuke #{bad_branch}? (y/n) ", :green)
+      end
+
+      def current_build_tag(branch)
+        last_build_tag = build_tags_for_branch(branch).last
+        raise "No known good tag found for branch: #{branch}.  Verify tag exists via `git tag -l 'build-#{branch}-*'`" unless last_build_tag
+        last_build_tag
+      end
+
+      def build_tags_for_branch(branch)
+        run_cmd 'git fetch --tags'
+        build_tags = run_cmd("git tag -l 'build-#{branch}-*'").split
+        build_tags.sort
+      end
+    end
+  end
+end

data/lib/gitx/cli/release_command.rb

@@ -0,0 +1,40 @@
+require 'thor'
+require 'gitx'
+require 'gitx/cli/base_command'
+require 'gitx/cli/update_command'
+require 'gitx/cli/integrate_command'
+require 'gitx/cli/cleanup_command'
+require 'gitx/github'
+
+module Gitx
+  module Cli
+    class ReleaseCommand < BaseCommand
+      include Gitx::Github
+
+      desc 'release', 'release the current branch to production'
+      method_option :cleanup, :type => :boolean, :desc => 'cleanup merged branches after release'
+      def release(branch = nil)
+        return unless yes?("Release #{current_branch.name} to production? (y/n)", :green)
+
+        branch ||= current_branch.name
+        assert_not_protected_branch!(branch, 'release')
+        checkout_branch(branch)
+        execute_command(UpdateCommand, :update)
+
+        find_or_create_pull_request(branch)
+        status = branch_status(branch)
+        if status != 'success'
+          return unless yes?("Branch status is currently: #{status}.  Proceed with release? (y/n)", :red)
+        end
+
+        checkout_branch Gitx::BASE_BRANCH
+        run_cmd "git pull origin #{Gitx::BASE_BRANCH}"
+        run_cmd "git merge --no-ff #{branch}"
+        run_cmd 'git push origin HEAD'
+
+        execute_command(IntegrateCommand, :integrate, 'staging')
+        execute_command(CleanupCommand, :cleanup) if options[:cleanup]
+      end
+    end
+  end
+end

data/lib/gitx/cli/review_command.rb

@@ -0,0 +1,93 @@
+require 'thor'
+require 'gitx'
+require 'gitx/cli/base_command'
+require 'gitx/github'
+
+module Gitx
+  module Cli
+    class ReviewCommand < BaseCommand
+      include Gitx::Github
+
+      BUMP_COMMENT_PREFIX = '[gitx] review bump :tada:'
+      BUMP_COMMENT_FOOTER = <<-EOS.dedent
+  # Bump comments should include:
+  # * summary of what changed
+  #
+  # This footer will automatically be stripped from the created comment
+      EOS
+      APPROVAL_COMMENT_PREFIX  = '[gitx] review approved :shipit:'
+      APPROVAL_COMMENT_FOOTER = <<-EOS.dedent
+  # Approval comments can include:
+  # * feedback
+  # * post-release follow-up items
+  #
+  # This footer will automatically be stripped from the created comment
+      EOS
+      REJECTION_COMMENT_PREFIX = '[gitx] review rejected'
+      REJECTION_COMMENT_FOOTER = <<-EOS.dedent
+  # Rejection comments should include:
+  # * feedback for fixes required before approved
+  #
+  # This footer will automatically be stripped from the created comment
+      EOS
+
+      desc 'review', 'Create or update a pull request on github'
+      method_option :description, :type => :string, :aliases => '-d', :desc => 'pull request description'
+      method_option :assignee, :type => :string, :aliases => '-a', :desc => 'pull request assignee'
+      method_option :open, :type => :boolean, :aliases => '-o', :desc => 'open the pull request in a web browser'
+      method_option :bump, :type => :boolean, :aliases => '-b', :desc => 'bump an existing pull request by posting a comment to re-review new changes'
+      method_option :approve, :type => :boolean, :desc => 'approve the pull request an post comment on pull request'
+      method_option :reject, :type => :boolean, :desc => 'reject the pull request an post comment on pull request'
+      # @see http://developer.github.com/v3/pulls/
+      def review(branch = nil)
+        fail 'Github authorization token not found' unless authorization_token
+
+        branch ||= current_branch.name
+        pull_request = find_or_create_pull_request(branch)
+        bump_pull_request(pull_request) if options[:bump]
+        approve_pull_request(pull_request) if options[:approve]
+        reject_pull_request(pull_request) if options[:reject]
+        assign_pull_request(pull_request) if options[:assignee]
+
+        run_cmd "open #{pull_request.html_url}" if options[:open]
+      end
+
+      private
+
+      def assign_pull_request(pull_request)
+        assignee = options[:assignee]
+        say 'Assigning pull request to '
+        say assignee, :green
+
+        title = pull_request.title
+        body = pull_request.body
+        options = {
+          assignee: assignee
+        }
+        github_client.update_issue(github_slug, pull_request.number, title, body, options)
+      end
+
+      def bump_pull_request(pull_request)
+        comment = comment_from_template(pull_request, BUMP_COMMENT_PREFIX, BUMP_COMMENT_FOOTER)
+        update_review_status(pull_request, 'pending', 'Peer review in progress')
+      end
+
+      def reject_pull_request(pull_request)
+        comment = comment_from_template(pull_request, REJECTION_COMMENT_PREFIX, REJECTION_COMMENT_FOOTER)
+        update_review_status(pull_request, 'failure', 'Peer review rejected')
+      end
+
+      def approve_pull_request(pull_request)
+        comment = comment_from_template(pull_request, APPROVAL_COMMENT_PREFIX, APPROVAL_COMMENT_FOOTER)
+        update_review_status(pull_request, 'success', 'Peer review approved')
+      end
+
+      def comment_from_template(pull_request, prefix, footer)
+        text = ask_editor("\n\n#{footer}", repo.config['core.editor'])
+        comment = [prefix, text].join("\n\n")
+        comment = comment.gsub(footer, '').chomp.strip
+        github_client.add_comment(github_slug, pull_request.number, comment)
+      end
+    end
+  end
+end

data/lib/gitx/cli/share_command.rb

@@ -0,0 +1,15 @@
+require 'thor'
+require 'gitx'
+require 'gitx/cli/base_command'
+
+module Gitx
+  module Cli
+    class ShareCommand < BaseCommand
+      desc 'share', 'Share the current branch in the remote repository'
+      def share
+        run_cmd "git push origin #{current_branch.name}"
+        run_cmd "git branch --set-upstream-to origin/#{current_branch.name}"
+      end
+    end
+  end
+end

data/lib/gitx/cli/start_command.rb

@@ -0,0 +1,37 @@
+require 'thor'
+require 'gitx'
+require 'gitx/cli/base_command'
+
+module Gitx
+  module Cli
+    class StartCommand < BaseCommand
+      EXAMPLE_BRANCH_NAMES = %w( api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link )
+      VALID_BRANCH_NAME_REGEX = /^[A-Za-z0-9\-_]+$/
+
+      desc 'start', 'start a new git branch with latest changes from master'
+      def start(branch_name = nil)
+        until valid_new_branch_name?(branch_name)
+          branch_name = ask("What would you like to name your branch? (ex: #{EXAMPLE_BRANCH_NAMES.sample})")
+        end
+
+        checkout_branch Gitx::BASE_BRANCH
+        run_cmd 'git pull'
+        repo.create_branch branch_name, Gitx::BASE_BRANCH
+        checkout_branch branch_name
+      end
+
+      private
+
+      def valid_new_branch_name?(branch)
+        return false if repo_branches.include?(branch)
+        branch =~ VALID_BRANCH_NAME_REGEX
+      end
+
+      def repo_branches
+        @branch_names ||= repo.branches.each_name.map do |branch|
+          branch.split('/').last
+        end
+      end
+    end
+  end
+end

data/lib/gitx/cli/track_command.rb

@@ -0,0 +1,14 @@
+require 'thor'
+require 'gitx'
+require 'gitx/cli/base_command'
+
+module Gitx
+  module Cli
+    class TrackCommand < BaseCommand
+      desc 'track', 'set the current branch to track the remote branch with the same name'
+      def track
+        run_cmd "git branch --set-upstream-to origin/#{current_branch.name}"
+      end
+    end
+  end
+end

data/lib/gitx/cli/update_command.rb

@@ -0,0 +1,35 @@
+require 'thor'
+require 'gitx'
+require 'gitx/cli/base_command'
+
+module Gitx
+  module Cli
+    class UpdateCommand < BaseCommand
+      desc 'update', 'Update the current branch with latest changes from the remote feature branch and master'
+      def update
+        say 'Updating '
+        say "#{current_branch.name} ", :green
+        say 'with latest changes from '
+        say Gitx::BASE_BRANCH, :green
+
+        update_branch(current_branch.name) if remote_branch_exists?(current_branch.name)
+        update_branch(Gitx::BASE_BRANCH)
+        run_cmd 'git push origin HEAD'
+      end
+
+      private
+
+      def update_branch(branch)
+        begin
+          run_cmd "git pull origin #{branch}"
+        rescue
+          fail MergeError, 'Merge Conflict Occurred. Please fix merge conflict and rerun the update command'
+        end
+      end
+
+      def remote_branch_exists?(branch)
+        repo.branches.each_name(:remote).include?("origin/#{branch}")
+      end
+    end
+  end
+end

data/lib/gitx/configuration.rb

@@ -0,0 +1,44 @@
+require 'yaml'
+
+module Gitx
+  class Configuration
+    DEFAULT_CONFIG = {
+      'aggregate_branches' => %w( staging prototype ),
+      'reserved_branches' => %w( HEAD master next_release staging prototype ),
+      'taggable_branches' => %w( master staging )
+    }
+    CONFIG_FILE = '.gitx.yml'
+
+    attr_reader :config
+
+    def initialize(root_dir)
+      @config = Thor::CoreExt::HashWithIndifferentAccess.new(DEFAULT_CONFIG)
+      config_file_path = File.join(root_dir, CONFIG_FILE)
+      @config.merge!(::YAML.load_file(config_file_path)) if File.exist?(config_file_path)
+    end
+
+    def aggregate_branches
+      config[:aggregate_branches]
+    end
+
+    def aggregate_branch?(branch)
+      aggregate_branches.include?(branch)
+    end
+
+    def reserved_branches
+      config[:reserved_branches]
+    end
+
+    def reserved_branch?(branch)
+      reserved_branches.include?(branch)
+    end
+
+    def taggable_branches
+      config[:taggable_branches]
+    end
+
+    def taggable_branch?(branch)
+      taggable_branches.include?(branch)
+    end
+  end
+end