thegarage-gitx 1.0.1 → 1.1.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aa002a2b9c5abb3c0983733c6120fd461ec078e
-  data.tar.gz: 9ec56924eca3eb7d5088ff115dd652d4c4603b14
+  metadata.gz: d12c2fe14f686a81cdbe194058f1ba83b6268adf
+  data.tar.gz: 632dc0ea0205114aa54e0fd1c52c4a24d9e73eda
 SHA512:
-  metadata.gz: 8b2214a8156a2ac6d04d35c5b09e36018e5b52a9e2ee52db3e51973b0ddf2e8d28e46d85009e0fc1a9caf2cfa3251ef08eb6a352402108a9931caf5dd258319b
-  data.tar.gz: db74fc9985f740710b7241b5056bf9f919c23cd308883d9feda00c279f7cf5d0d5ae0c8acbb269773caccf156016eb9e37cd93a868ac99accf6cd43366cf07d3
+  metadata.gz: 4a4d3a943e8f7797cba62f5882be5dfee168abb7e0e8dfbf856b9bb7b0819e9b3963c3d81a4ec6132497b90c8c64845d70fd30d8908d4d5c37655e77543d8514
+  data.tar.gz: c41b0a09c82b7f9478ed904e35c87062b84a0365ad7c8645ef3c6fa497f4809649b52742e5694170331ce09a5521005debb47ca56f1bb860c5d44e269664092d

data/lib/thegarage/gitx/cli.rb

@@ -16,7 +16,6 @@ module Thegarage
         # Brief description of the change, and how it accomplishes the task they set out to do.
       EOS
 
-      method_option :quiet, :type => :boolean, :aliases => '-q'
       method_option :trace, :type => :boolean, :aliases => '-v'
       def initialize(*args)
         super(*args)
@@ -33,7 +32,7 @@ module Thegarage
         token = authorization_token
         description = options[:description] || editor_input(PULL_REQUEST_DESCRIPTION)
         branch = current_branch
-        repo = current_repo
+        repo = current_remote_repo
         url = create_pull_request token, branch, repo, description
         say "Pull request created: #{url}"
       end
@@ -49,7 +48,7 @@ module Thegarage
         say "to have most recent changes from "
         say Thegarage::Gitx::BASE_BRANCH, :green
 
-        run_cmd "git pull origin #{branch}" rescue nil
+        run_cmd "git pull origin #{branch}", :allow_failure => true
         run_cmd "git pull origin #{Thegarage::Gitx::BASE_BRANCH}"
         run_cmd 'git push origin HEAD'
       end
@@ -111,13 +110,16 @@ module Thegarage
       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)
-        default_good_branch = "last_known_good_#{bad_branch}"
-        good_branch = options[:destination] || ask("What branch do you want to reset #{bad_branch} to? (default: #{default_good_branch})")
-        good_branch = default_good_branch if good_branch.length == 0
-        good_branch = "last_known_good_#{good_branch}" unless good_branch.starts_with?('last_known_good_')
+        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
 
-        removed_branches = nuke_branch(bad_branch, good_branch)
-        nuke_branch("last_known_good_#{bad_branch}", good_branch)
+        run_cmd "git fetch --tags"
+        good_tags = run_cmd("git tag -l 'build-#{good_branch}-*'").split
+        last_known_good_tag = good_tags.sort.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)
+
+        nuke_branch(bad_branch, last_known_good_tag)
       end
 
       desc 'release', 'release the current branch to production'

data/lib/thegarage/gitx/git.rb

@@ -14,31 +14,34 @@ module Thegarage
 
       # lookup the current branch of the PWD
       def current_branch
-        repo = Grit::Repo.new(Dir.pwd)
-        Grit::Head.current(repo).name
+        Grit::Head.current(current_repo).name
+      end
+
+      def current_repo
+        @repo ||= Grit::Repo.new(Dir.pwd)
       end
 
       # lookup the current repository of the PWD
       # ex: git@github.com:socialcast/thegarage/gitx.git OR https://github.com/socialcast/thegarage/gitx.git
-      def current_repo
-        repo = `git config -z --get remote.origin.url`.strip
+      def current_remote_repo
+        repo = current_repo.config['remote.origin.url']
         repo.gsub(/\.git$/,'').split(/[:\/]/).last(2).join('/')
       end
 
       # @returns [String] github username (ex: 'wireframe') of the current github.user
       # @returns empty [String] when no github.user is set on the system
       def current_user
-        `git config -z --get github.user`.strip
+        current_repo.config['github.user']
       end
 
       # @returns [String] auth token stored in git (current repo, user config or installed global settings)
       def github_auth_token
-        `git config -z --get thegarage.gitx.githubauthtoken`.strip
+        current_repo.config['thegarage.gitx.githubauthtoken']
       end
 
       # store new auth token in the local project git config
       def github_auth_token=(new_token)
-        `git config thegarage.gitx.githubauthtoken "#{new_token}"`
+        current_repo.config['thegarage.gitx.githubauthtoken'] = new_token
       end
 
       # retrieve a list of branches
@@ -56,11 +59,9 @@ module Thegarage
         branches.uniq
       end
 
-      # reset the specified branch to the same set of commits as the destination branch
-      # reverts commits on aggregate branches back to a known good state
-      # returns list of branches that were removed
+      # 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
+        return if branch == head_branch
         raise "Only aggregate branches are allowed to be reset: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(branch)
         say "Resetting "
         say "#{branch} ", :green
@@ -68,15 +69,11 @@ module Thegarage
         say head_branch, :green
 
         run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
-        refresh_branch_from_remote head_branch
-        removed_branches = branches(:remote => true, :merged => "origin/#{branch}") - branches(:remote => true, :merged => "origin/#{head_branch}")
-        run_cmd "git branch -D #{branch}" rescue nil
-        run_cmd "git push origin --delete #{branch}" rescue nil
-        run_cmd "git checkout -b #{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 checkout #{Thegarage::Gitx::BASE_BRANCH}"
-
-        removed_branches
       end
 
       # share the local branch in the remote repo
@@ -86,7 +83,7 @@ module Thegarage
       end
 
       def track_branch(branch)
-        run_cmd "git branch --set-upstream #{branch} origin/#{branch}"
+        run_cmd "git branch --set-upstream-to origin/#{branch}"
       end
 
       # integrate a branch into a destination aggregate branch
@@ -107,30 +104,13 @@ module Thegarage
 
       # nuke local branch and pull fresh version from remote repo
       def refresh_branch_from_remote(destination_branch)
-        run_cmd "git branch -D #{destination_branch}" rescue nil
+        run_cmd "git branch -D #{destination_branch}", :allow_failure => true
         run_cmd "git fetch origin"
         run_cmd "git checkout #{destination_branch}"
       end
 
       def aggregate_branch?(branch)
-        AGGREGATE_BRANCHES.include?(branch) || branch.starts_with?('last_known_good')
-      end
-
-      # build a summary of changes
-      def changelog_summary(branch)
-        changes = `git diff --stat origin/#{Thegarage::Gitx::BASE_BRANCH}...#{branch}`.split("\n")
-        stats = changes.pop
-        if changes.length > 5
-          dirs = changes.map do |file_change|
-            filename = "#{file_change.split.first}"
-            dir = filename.gsub(/\/[^\/]+$/, '')
-            dir
-          end
-          dir_counts = Hash.new(0)
-          dirs.each {|dir| dir_counts[dir] += 1 }
-          changes = dir_counts.to_a.sort_by {|k,v| v}.reverse.first(5).map {|k,v| "#{k} (#{v} file#{'s' if v > 1})"}
-        end
-        (changes + [stats]).join("\n")
+        AGGREGATE_BRANCHES.include?(branch)
       end
 
       # launch configured editor to retreive message/string
@@ -155,24 +135,6 @@ module Thegarage
           description.gsub(/^\#.*/, '').chomp.strip
         end
       end
-
-      # load SC Git Extensions Config YAML
-      # @returns [Hash] of configuration options from YAML file (if it exists)
-      def config
-        @config ||= begin
-          if config_file.exist?
-            YAML.load_file(config_file)
-          else
-            {}
-          end
-        end
-      end
-
-      # @returns a [Pathname] for the scgitx.yml Config File
-      # from either ENV['SCGITX_CONFIG_PATH'] or default $PWD/config/scgitx.yml
-      def config_file
-        Pathname((ENV['SCGITX_CONFIG_PATH'] || ([Dir.pwd, '/config/scgitx.yml']).join))
-      end
     end
   end
 end

data/lib/thegarage/gitx/github.rb

@@ -6,6 +6,8 @@ module Thegarage
   module Gitx
     module Github
       include Thegarage::Gitx::Git
+      CLIENT_NAME = 'The Garage Git eXtensions'
+      CLIENT_URL = 'https://github.com/thegarage/thegarage-gitx'
 
       private
       # request github authorization token
@@ -15,17 +17,32 @@ module Thegarage
       # @see http://developer.github.com/v3/#user-agent-required
       def authorization_token
         auth_token = github_auth_token
-        return auth_token unless auth_token.blank?
+        return auth_token unless auth_token.to_s.blank?
 
         username = current_user
         raise "Github user not configured.  Run: `git config --global github.user 'me@email.com'`" if username.empty?
-        password = ask("Github password for #{username}: ") { |q| q.echo = false }
+        password = ask("Github password for #{username}: ", :echo => false)
 
-        payload = {:scopes => ['repo'], :note => 'Socialcast Git eXtension', :note_url => 'https://github.com/socialcast/thegarage/gitx'}.to_json
-        response = RestClient::Request.new(:url => "https://api.github.com/authorizations", :method => "POST", :user => username, :password => password, :payload => payload, :headers => {:accept => :json, :content_type => :json, :user_agent => 'thegarage/gitx'}).execute
+        payload = {
+          :scopes => ['repo'],
+          :note => CLIENT_NAME,
+          :note_url => CLIENT_URL
+        }.to_json
+        response = RestClient::Request.new({
+          :url => "https://api.github.com/authorizations",
+          :method => "POST",
+          :user => username,
+          :password => password,
+          :payload => payload,
+          :headers => {
+            :accept => :json,
+            :content_type => :json,
+            :user_agent => 'thegarage/gitx'
+          }
+        }).execute
         data = JSON.parse response.body
         token = data['token']
-        github_auth_token = token
+        self.github_auth_token = token
         token
       rescue RestClient::Exception => e
         process_error e

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '1.0.1'
+    VERSION = '1.1.0.alpha'
   end
 end

data/lib/thegarage/gitx.rb

@@ -1,4 +1,3 @@
-require "thegarage/gitx/version"
 require 'thegarage/gitx/version'
 require 'thegarage/gitx/string_extensions'
 require 'thegarage/gitx/git'
@@ -12,10 +11,14 @@ module Thegarage
     private
 
     # execute a shell command and raise an error if non-zero exit code is returned
-    def run_cmd(cmd)
+    # return the string output from the command
+    def run_cmd(cmd, options = {})
       say "\n$ "
       say cmd.gsub("'", ''), :red
-      raise "#{cmd} failed" unless system cmd
+      output = `#{cmd}`
+      success = !!$?.to_i
+      raise "#{cmd} failed" unless success || options[:allow_failure]
+      output
     end
   end
 end

data/spec/thegarage/gitx/cli_spec.rb

@@ -8,8 +8,9 @@ describe Thegarage::Gitx::CLI do
     end
     private
     # stub out command execution and record commands for test inspection
-    def run_cmd(cmd)
+    def run_cmd(cmd, options={})
       self.class.stubbed_executed_commands << cmd
+      ''
     end
     # stub branch to always be a known branch
     def current_branch
@@ -134,46 +135,32 @@ describe Thegarage::Gitx::CLI do
         prototype_branches = %w( dev-foo dev-bar )
         master_branches = %w( dev-foo )
         Thegarage::Gitx::CLI.any_instance.should_receive(:branches).and_return(prototype_branches, master_branches, prototype_branches, master_branches)
+        Thegarage::Gitx::CLI.any_instance.should_receive(:yes?).and_return(false)
         Thegarage::Gitx::CLI.start ['nuke', 'prototype', '--destination', 'master']
       end
       it 'should run expected commands' do
         Thegarage::Gitx::CLI.stubbed_executed_commands.should == [
           "git checkout master",
-          "git branch -D last_known_good_master",
-          "git fetch origin",
-          "git checkout last_known_good_master",
           "git branch -D prototype",
           "git push origin --delete prototype",
-          "git checkout -b prototype",
+          "git checkout -b prototype build-master-2013-10-01-01",
           "git push origin prototype",
           "git branch --set-upstream prototype origin/prototype",
-          "git checkout master",
-          "git checkout master",
-          "git branch -D last_known_good_master",
-          "git fetch origin",
-          "git checkout last_known_good_master",
-          "git branch -D last_known_good_prototype",
-          "git push origin --delete last_known_good_prototype",
-          "git checkout -b last_known_good_prototype",
-          "git push origin last_known_good_prototype",
-          "git branch --set-upstream last_known_good_prototype origin/last_known_good_prototype",
           "git checkout master"
         ]
       end
     end
-    context 'when target branch == staging and --destination == last_known_good_staging' do
+    context 'when target branch == staging and --destination == staging' do
       before do
-        Thegarage::Gitx::CLI.start ['nuke', 'staging', '--destination', 'last_known_good_staging']
+        Thegarage::Gitx::CLI.any_instance.should_receive(:yes?).and_return(false)
+        Thegarage::Gitx::CLI.start ['nuke', 'staging', '--destination', 'staging']
       end
       it 'should run expected commands' do
         Thegarage::Gitx::CLI.stubbed_executed_commands.should == [
           "git checkout master",
-          "git branch -D last_known_good_staging",
-          "git fetch origin",
-          "git checkout last_known_good_staging",
           "git branch -D staging",
           "git push origin --delete staging",
-          "git checkout -b staging",
+          "git checkout -b staging build-staging-2013-10-02-02",
           "git push origin staging",
           "git branch --set-upstream staging origin/staging",
           "git checkout master"
@@ -183,17 +170,15 @@ describe Thegarage::Gitx::CLI do
     context 'when target branch == prototype and destination prompt == nil' do
       before do
         Thegarage::Gitx::CLI.any_instance.should_receive(:ask).and_return('')
+        Thegarage::Gitx::CLI.any_instance.should_receive(:yes?).and_return(false)
         Thegarage::Gitx::CLI.start ['nuke', 'prototype']
       end
-      it 'defaults to last_known_good_prototype and should run expected commands' do
+      it 'defaults to prototype and should run expected commands' do
         Thegarage::Gitx::CLI.stubbed_executed_commands.should == [
           "git checkout master",
-          "git branch -D last_known_good_prototype",
-          "git fetch origin",
-          "git checkout last_known_good_prototype",
           "git branch -D prototype",
           "git push origin --delete prototype",
-          "git checkout -b prototype",
+          "git checkout -b prototype build-prototype-2013-10-02-03",
           "git push origin prototype",
           "git branch --set-upstream prototype origin/prototype",
           "git checkout master"
@@ -203,29 +188,17 @@ describe Thegarage::Gitx::CLI do
     context 'when target branch == prototype and destination prompt = master' do
       before do
         Thegarage::Gitx::CLI.any_instance.should_receive(:ask).and_return('master')
+        Thegarage::Gitx::CLI.any_instance.should_receive(:yes?).and_return(false)
         Thegarage::Gitx::CLI.start ['nuke', 'prototype']
       end
       it 'should run expected commands' do
         Thegarage::Gitx::CLI.stubbed_executed_commands.should == [
           "git checkout master",
-          "git branch -D last_known_good_master",
-          "git fetch origin",
-          "git checkout last_known_good_master",
           "git branch -D prototype",
           "git push origin --delete prototype",
-          "git checkout -b prototype",
+          "git checkout -b prototype build-master-2013-10-01-01",
           "git push origin prototype",
           "git branch --set-upstream prototype origin/prototype",
-          "git checkout master",
-          "git checkout master",
-          "git branch -D last_known_good_master",
-          "git fetch origin",
-          "git checkout last_known_good_master",
-          "git branch -D last_known_good_prototype",
-          "git push origin --delete last_known_good_prototype",
-          "git checkout -b last_known_good_prototype",
-          "git push origin last_known_good_prototype",
-          "git branch --set-upstream last_known_good_prototype origin/last_known_good_prototype",
           "git checkout master"
         ]
       end
@@ -234,10 +207,23 @@ describe Thegarage::Gitx::CLI do
       it 'should raise error' do
         lambda {
           Thegarage::Gitx::CLI.any_instance.should_receive(:ask).and_return('master')
+          Thegarage::Gitx::CLI.any_instance.should_receive(:yes?).and_return(false)
           Thegarage::Gitx::CLI.start ['nuke', 'asdfasdf']
         }.should raise_error /Only aggregate branches are allowed to be reset/
       end
     end
+    context 'when user does not confirm nuking the target branch' do
+      before do
+        Thegarage::Gitx::CLI.any_instance.should_receive(:ask).and_return('master')
+        Thegarage::Gitx::CLI.any_instance.should_receive(:yes?).and_return(false)
+        Thegarage::Gitx::CLI.start ['nuke', 'prototype']
+      end
+      it 'should run expected commands' do
+        Thegarage::Gitx::CLI.stubbed_executed_commands.should == [
+          "git fetch --tags"
+        ]
+      end
+    end
   end
 
   describe '#reviewrequest' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0.alpha
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -180,12 +180,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations