Contents

module GitPivotalTracker
  class Finish < Base

    def run!
      return 1 if super

      unless story_id
        puts "Branch name must contain a Pivotal Tracker story id"
        return 1
      end

      if options[:rebase]
        puts "Fetching origin and rebasing #{current_branch}"
        log repository.git.checkout({:raise => true}, integration_branch)
        log repository.git.pull({:raise => true})
        log repository.git.rebase({:raise => true}, integration_branch, current_branch)
      end

      puts "Merging #{current_branch} into #{integration_branch}"
      log repository.git.checkout({:raise => true}, integration_branch)

      merge_options = {:raise => true}
      merge_options[:no_ff] = true unless options[:fast_forward]
      log repository.git.merge(merge_options, current_branch)

      puts "Pushing #{integration_branch}"
      log repository.git.push({:raise => true}, 'origin', integration_branch)

      puts "Marking Story #{story_id} as finished..."
      if story.update(:current_state => finished_state)
        delete_current_branch if options[:delete_branch]
        puts "Success"
        return 0
      else
        puts "Unable to mark Story #{story_id} as finished"
        return 1
      end
    rescue Grit::Git::CommandFailed => e
      puts "git error: #{e.err}"
      return 1
    end

    private

    def finished_state
      story.story_type == "chore" ? "accepted" : "finished"
    end

    def delete_current_branch
      puts "Deleting #{current_branch}"
      log repository.git.branch({:raise => true, :d => true}, current_branch)
    end
  end
end

Version data entries

2 entries across 2 versions & 1 rubygems

Version	Path
git_pivotal_tracker-0.2.1	lib/git_pivotal_tracker/finish.rb
git_pivotal_tracker-0.2.0	lib/git_pivotal_tracker/finish.rb