thegarage-gitx 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80aafd556ae6dca4c266fe24a0bdfb5800b35f14
-  data.tar.gz: 3832c3bc543af63458d8e3aa903c01f4b6cda9ba
+  metadata.gz: 9601c51e9fb7c39a2290715c05e752aeb5898c58
+  data.tar.gz: f0947bba05dcedbae40a94a770075b837f0b8fb3
 SHA512:
-  metadata.gz: 63a56af292e550422d1cce4160cf4dd85185cb3a7ea0af4c8a56c4f200644e386a3317d17c9c59fc546f937ad207ec38c1f93480a3c582d568bfaa286c07c129
-  data.tar.gz: 37c2ce8e2a6919ab9f9ea8ab7581e1af0f86d436862763cd59fe68d1703ea0357ef052297c3551d5fc6a9bff2ae09132365edc7372bec1b03ebcecdc0905ab18
+  metadata.gz: 8fb42815aa779d1b86f52d5c3c07f34fe1d06a8b97992a950d2e5cb7b1a9ab02d35d8131756cf780193039b5cfaf96bee9256204355878a6a8677a1ec6c07034
+  data.tar.gz: 5efd37b850dd801e9dd91537c70dc7e0616f1a4c601407789cf71594e9decbf5d5db221f8b90a4b0cd2b3b46dddc34066c7db7c4bd958c44e31093479fb2dc6f

data/README.md

@@ -1,6 +1,6 @@
 # thegarage-gitx
 
-[![Build Status](https://travis-ci.org/thegarage/thegarage-gitx.png?branch=fix-rspec-mocks)](https://travis-ci.org/thegarage/thegarage-gitx)
+[![Build Status](https://travis-ci.org/thegarage/thegarage-gitx.png?branch=master)](https://travis-ci.org/thegarage/thegarage-gitx)
 
 Useful Git eXtensions for Development workflow at The Garage.
 

data/lib/thegarage/gitx/cli.rb

@@ -12,13 +12,14 @@ module Thegarage
       include Thegarage::Gitx::Git
       include Thegarage::Gitx::Github
 
-      PULL_REQUEST_DESCRIPTION = "\n\n" + <<-EOS.dedent
+      TAGGABLE_BRANCHES = %w(master staging)
+      PULL_REQUEST_FOOTER = <<-EOS.dedent
+        # Pull Request Protips
+        # Include description of how this change accomplishes the task at hand.
         # Use GitHub flavored Markdown http://github.github.com/github-flavored-markdown/
-        # Links to screencasts or screenshots with a desciption of what this is showcasing. For architectual changes please include diagrams that will make it easier for the reviewer to understand the change. Format is ![title](url).
-        # Link to ticket describing feature/bug (plantain, JIRA, bugzilla). Format is [title](url).
-        # Brief description of the change, and how it accomplishes the task they set out to do.
+        # Review CONTRIBUTING.md for recommendations of artifacts, links, images, screencasts, etc.
+        # NOTE: this footer will automatically be stripped from the pull request.
       EOS
-      TAGGABLE_BRANCHES = %w(master staging)
 
       method_option :trace, :type => :boolean, :aliases => '-v'
       def initialize(*args)
@@ -34,11 +35,20 @@ module Thegarage
         update
 
         token = authorization_token
-        description = options[:description] || editor_input(PULL_REQUEST_DESCRIPTION)
+        changelog = run_cmd "git log #{BASE_BRANCH}...#{current_branch} --no-merges --pretty=format:'%ci - %s%n%b'"
+        description_template = []
+        description_template << options[:description]
+        description_template << "\n"
+        description_template << '### Changelog'
+        description_template << changelog
+        description_template << "\n"
+        description_template << PULL_REQUEST_FOOTER
+
+        description = editor_input(description_template.join("\n"))
         branch = current_branch
         repo = current_remote_repo
         url = create_pull_request token, branch, repo, description
-        say "Pull request created: #{url}"
+        say "Pull request created: #{url}", :green
       end
 
       # TODO: use --no-edit to skip merge messages
@@ -117,9 +127,7 @@ module Thegarage
         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
 
-        run_cmd "git fetch --tags"
-        good_tags = run_cmd("git tag -l 'build-#{good_branch}-*'").split
-        last_known_good_tag = good_tags.sort.last
+        last_known_good_tag = build_tags_for_branch(good_branch).last
         raise "No known good tag found for branch: #{good_branch}.  Verify tag exists via `git tag -l 'build-#{good_branch}-*'`" unless last_known_good_tag
         return unless yes?("Reset #{bad_branch} to #{last_known_good_tag}? (y/n)", :green)
 
@@ -143,20 +151,18 @@ module Thegarage
 
       desc 'buildtag', 'create a tag for the current Travis-CI build and push it back to origin'
       def buildtag
-        travis_branch = ENV['TRAVIS_BRANCH']
+        branch = ENV['TRAVIS_BRANCH']
         pull_request = ENV['TRAVIS_PULL_REQUEST']
-        
-        raise "Unknown branch. ENV['TRAVIS_BRANCH'] is required." unless travis_branch
-                
+
+        raise "Unknown branch. ENV['TRAVIS_BRANCH'] is required." unless branch
+
         if pull_request != 'false'
           say "Skipping creation of tag for pull request: #{pull_request}"
-        elsif !TAGGABLE_BRANCHES.include?(travis_branch)
-          say "Cannot create build tag for branch: #{travis_branch}. Only #{TAGGABLE_BRANCHES} are supported."
+        elsif !TAGGABLE_BRANCHES.include?(branch)
+          say "Cannot create build tag for branch: #{branch}. Only #{TAGGABLE_BRANCHES} are supported."
         else
-          timestamp = Time.now.utc.strftime '%Y-%m-%d-%H-%M-%S'
-          git_tag = "build-#{travis_branch}-#{timestamp}"
-          run_cmd "git tag #{git_tag} -a -m 'Generated tag from TravisCI build #{ENV['TRAVIS_BUILD_NUMBER']}'"
-          run_cmd "git push origin #{git_tag}"
+          label = "Generated tag from TravisCI build #{ENV['TRAVIS_BUILD_NUMBER']}"
+          create_build_tag(branch, label)
         end
       end
 

data/lib/thegarage/gitx/git.rb

@@ -60,19 +60,21 @@ module Thegarage
       end
 
       # reset the specified aggregate branch to the same set of commits as the destination branch
-      def nuke_branch(branch, head_branch)
-        return if branch == head_branch
-        raise "Only aggregate branches are allowed to be reset: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(branch)
+      def nuke_branch(outdated_branch, head_branch)
+        return if outdated_branch == head_branch
+        fail "Only aggregate branches are allowed to be reset: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(outdated_branch)
+        return if migrations_need_to_be_reverted?
+
         say "Resetting "
-        say "#{branch} ", :green
+        say "#{outdated_branch} ", :green
         say "branch to "
         say head_branch, :green
 
         run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
-        run_cmd "git branch -D #{branch}", :allow_failure => true
-        run_cmd "git push origin --delete #{branch}", :allow_failure => true
-        run_cmd "git checkout -b #{branch} #{head_branch}"
-        share_branch branch
+        run_cmd "git branch -D #{outdated_branch}", :allow_failure => true
+        run_cmd "git push origin --delete #{outdated_branch}", :allow_failure => true
+        run_cmd "git checkout -b #{outdated_branch} #{head_branch}"
+        share_branch outdated_branch
         run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
       end
 
@@ -132,9 +134,36 @@ module Thegarage
           pid = fork { exec "#{editor} #{flags} #{f.path}" }
           Process.waitpid(pid)
           description = File.read(f.path)
-          description.gsub(/^\#.*/, '').chomp.strip
+          description.gsub(CLI::PULL_REQUEST_FOOTER, '').chomp.strip
         end
       end
     end
+
+    def create_build_tag(branch, label)
+      timestamp = Time.now.utc.strftime '%Y-%m-%d-%H-%M-%S'
+      git_tag = "build-#{branch}-#{timestamp}"
+      run_cmd "git tag #{git_tag} -a -m '#{label}'"
+      run_cmd "git push origin #{git_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
+
+    def migrations_need_to_be_reverted?
+      return false unless File.exists?('db/migrate')
+      outdated_migrations = run_cmd("git diff #{head_branch}...#{outdated_branch} --name-only db/migrate").split
+      return false if outdated_migrations.empty?
+
+      say "#{outdated_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 #{outdated_branch}? (y/n) ", :green)
+    end
   end
 end

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '1.2.1'
+    VERSION = '1.3.0'
   end
 end

data/spec/thegarage/gitx/cli_spec.rb

@@ -16,7 +16,6 @@ describe Thegarage::Gitx::CLI do
     allow(cli).to receive(:current_branch).and_return('feature-branch')
   end
 
-
   describe '#update' do
     before do
       expect(cli).to receive(:run).with('git pull origin feature-branch', capture: true).ordered
@@ -277,7 +276,9 @@ describe Thegarage::Gitx::CLI do
 
   describe '#reviewrequest' do
     context 'when github.user is not configured' do
+      let(:current_user) { nil }
       it 'raises error' do
+        allow(cli).to receive(:current_user).and_return(current_user)
         expect(cli).to receive(:run).with("git pull origin feature-branch", capture: true).ordered
         expect(cli).to receive(:run).with("git pull origin master", capture: true).ordered
         expect(cli).to receive(:run).with("git push origin HEAD", capture: true).ordered
@@ -311,9 +312,11 @@ describe Thegarage::Gitx::CLI do
         expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', {:echo => false}).and_return(github_password)
         expect(cli).to receive(:github_auth_token=).with(authorization_token)
 
+        expect(cli).to receive(:editor_input).and_return('scrubbed text')
         expect(cli).to receive(:run).with("git pull origin feature-branch", capture: true).ordered
         expect(cli).to receive(:run).with("git pull origin master", capture: true).ordered
         expect(cli).to receive(:run).with("git push origin HEAD", capture: true).ordered
+        expect(cli).to receive(:run).with("git log master...feature-branch --no-merges --pretty=format:'%ci - %s%n%b'", capture: true).and_return("2013-01-01 did some stuff").ordered
 
         cli.reviewrequest
       end
@@ -336,9 +339,11 @@ describe Thegarage::Gitx::CLI do
 
         expect(cli).to receive(:authorization_token).and_return(authorization_token)
 
+        expect(cli).to receive(:editor_input).and_return('scrubbed text')
         expect(cli).to receive(:run).with("git pull origin feature-branch", capture: true).ordered
         expect(cli).to receive(:run).with("git pull origin master", capture: true).ordered
         expect(cli).to receive(:run).with("git push origin HEAD", capture: true).ordered
+        expect(cli).to receive(:run).with("git log master...feature-branch --no-merges --pretty=format:'%ci - %s%n%b'", capture: true).and_return("2013-01-01 did some stuff").ordered
 
         cli.reviewrequest
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit