thegarage-gitx 1.5.5.pre1 → 2.0.0.pre1

data/spec/thegarage/gitx/cli/start_command_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+require 'thegarage/gitx/cli/start_command'
+
+describe Thegarage::Gitx::Cli::StartCommand do
+  let(:args) { [] }
+  let(:options) { {} }
+  let(:config) do
+    {
+      pretend: true
+    }
+  end
+  let(:cli) { Thegarage::Gitx::Cli::StartCommand.new(args, options, config) }
+  let(:branch) { double('fake branch', name: 'feature-branch') }
+
+  before do
+    allow(cli).to receive(:current_branch).and_return(branch)
+  end
+
+  describe '#start' do
+    context 'when user inputs branch that is valid' do
+      before do
+        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(cli).to receive(:run_cmd).with('git pull').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout -b new-branch').ordered
+
+        cli.start 'new-branch'
+      end
+      it do
+        should meet_expectations
+      end
+    end
+    context 'when user does not input a branch name' do
+      before do
+        expect(cli).to receive(:ask).and_return('another-new-branch')
+
+        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(cli).to receive(:run_cmd).with('git pull').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout -b another-new-branch').ordered
+
+        cli.start
+      end
+      it 'prompts user to enter a new branch name' do
+        should meet_expectations
+      end
+    end
+    context 'when user inputs an invalid branch name' do
+      before do
+        expect(cli).to receive(:ask).and_return('another-new-branch')
+
+        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(cli).to receive(:run_cmd).with('git pull').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout -b another-new-branch').ordered
+
+        cli.start 'a bad_branch-name?'
+      end
+      it 'prompts user to enter a new branch name' do
+        should meet_expectations
+      end
+    end
+  end
+end

data/spec/thegarage/gitx/cli/track_command_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'thegarage/gitx/cli/track_command'
+
+describe Thegarage::Gitx::Cli::TrackCommand do
+  let(:args) { [] }
+  let(:options) { {} }
+  let(:config) do
+    {
+      pretend: true
+    }
+  end
+  let(:cli) { Thegarage::Gitx::Cli::TrackCommand.new(args, options, config) }
+  let(:branch) { double('fake branch', name: 'feature-branch') }
+
+  before do
+    allow(cli).to receive(:current_branch).and_return(branch)
+  end
+
+  describe '#track' do
+    before do
+      allow(cli).to receive(:say)
+
+      expect(cli).to receive(:run_cmd).with('git branch --set-upstream-to origin/feature-branch').ordered
+
+      cli.track
+    end
+    it 'runs expected commands' do
+      should meet_expectations
+    end
+  end
+end

data/spec/thegarage/gitx/cli/update_command_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'thegarage/gitx/cli/update_command'
+
+describe Thegarage::Gitx::Cli::UpdateCommand do
+  let(:args) { [] }
+  let(:options) { {} }
+  let(:config) do
+    {
+      pretend: true
+    }
+  end
+  let(:cli) { Thegarage::Gitx::Cli::UpdateCommand.new(args, options, config) }
+  let(:branch) { double('fake branch', name: 'feature-branch') }
+
+  before do
+    allow(cli).to receive(:current_branch).and_return(branch)
+  end
+
+  describe '#update' do
+    before do
+      allow(cli).to receive(:say)
+
+      expect(cli).to receive(:run_cmd).with('git pull origin feature-branch', allow_failure: true).ordered
+      expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
+      expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+
+      cli.update
+    end
+    it 'runs expected commands' do
+      should meet_expectations
+    end
+  end
+end

data/thegarage-gitx.gemspec

@@ -28,4 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry", '>= 0'
   spec.add_development_dependency "webmock", '>= 0'
   spec.add_development_dependency "timecop", "~> 0.6.3"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "coveralls"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 1.5.5.pre1
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -136,6 +136,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Git eXtensions for common development workflow
 email:
 - ryan.sonnek@gmail.com
@@ -160,6 +202,7 @@ files:
 - .ruby-version
 - .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -175,17 +218,32 @@ files:
 - bin/git-update
 - bin/git-wtf
 - lib/thegarage/gitx.rb
-- lib/thegarage/gitx/cli.rb
-- lib/thegarage/gitx/git.rb
-- lib/thegarage/gitx/github.rb
+- lib/thegarage/gitx/cli/base_command.rb
+- lib/thegarage/gitx/cli/buildtag_command.rb
+- lib/thegarage/gitx/cli/cleanup_command.rb
+- lib/thegarage/gitx/cli/integrate_command.rb
+- lib/thegarage/gitx/cli/nuke_command.rb
+- lib/thegarage/gitx/cli/release_command.rb
+- lib/thegarage/gitx/cli/review_request_command.rb
+- lib/thegarage/gitx/cli/share_command.rb
+- lib/thegarage/gitx/cli/start_command.rb
+- lib/thegarage/gitx/cli/track_command.rb
+- lib/thegarage/gitx/cli/update_command.rb
 - lib/thegarage/gitx/runner.rb
 - lib/thegarage/gitx/string_extensions.rb
 - lib/thegarage/gitx/version.rb
 - spec/spec_helper.rb
 - spec/support/meet_expectations_matcher.rb
-- spec/thegarage/gitx/cli_spec.rb
-- spec/thegarage/gitx/git_spec.rb
-- spec/thegarage/gitx/github_spec.rb
+- spec/thegarage/gitx/cli/buildtag_command_spec.rb
+- spec/thegarage/gitx/cli/cleanup_command_spec.rb
+- spec/thegarage/gitx/cli/integrate_command_spec.rb
+- spec/thegarage/gitx/cli/nuke_command_spec.rb
+- spec/thegarage/gitx/cli/release_command_spec.rb
+- spec/thegarage/gitx/cli/review_request_command_spec.rb
+- spec/thegarage/gitx/cli/share_command_spec.rb
+- spec/thegarage/gitx/cli/start_command_spec.rb
+- spec/thegarage/gitx/cli/track_command_spec.rb
+- spec/thegarage/gitx/cli/update_command_spec.rb
 - thegarage-gitx.gemspec
 homepage: ''
 licenses:
@@ -214,6 +272,13 @@ summary: Utility scripts for Git to increase productivity for common operations
 test_files:
 - spec/spec_helper.rb
 - spec/support/meet_expectations_matcher.rb
-- spec/thegarage/gitx/cli_spec.rb
-- spec/thegarage/gitx/git_spec.rb
-- spec/thegarage/gitx/github_spec.rb
+- spec/thegarage/gitx/cli/buildtag_command_spec.rb
+- spec/thegarage/gitx/cli/cleanup_command_spec.rb
+- spec/thegarage/gitx/cli/integrate_command_spec.rb
+- spec/thegarage/gitx/cli/nuke_command_spec.rb
+- spec/thegarage/gitx/cli/release_command_spec.rb
+- spec/thegarage/gitx/cli/review_request_command_spec.rb
+- spec/thegarage/gitx/cli/share_command_spec.rb
+- spec/thegarage/gitx/cli/start_command_spec.rb
+- spec/thegarage/gitx/cli/track_command_spec.rb
+- spec/thegarage/gitx/cli/update_command_spec.rb

data/lib/thegarage/gitx/cli.rb

@@ -1,117 +0,0 @@
-require 'English'
-require "thor"
-require 'rest_client'
-require 'thegarage/gitx'
-require 'thegarage/gitx/git'
-require 'thegarage/gitx/github'
-require 'thegarage/gitx/runner'
-
-module Thegarage
-  module Gitx
-    class CLI < Thor
-      include Thor::Actions
-      add_runtime_options!
-
-      method_option :trace, :type => :boolean, :aliases => '-v'
-      def initialize(*args)
-        super(*args)
-        RestClient.proxy = ENV['HTTPS_PROXY'] if ENV.has_key?('HTTPS_PROXY')
-        RestClient.log = Logger.new(STDOUT) if options[:trace]
-      end
-
-      desc "reviewrequest", "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'
-      # @see http://developer.github.com/v3/pulls/
-      def reviewrequest
-        fail 'Github authorization token not found' unless github.authorization_token
-
-        branch = git.current_branch.name
-        pull_request = github.find_pull_request(branch)
-        if pull_request.nil?
-          git.update
-          changelog = runner.run_cmd "git log #{Thegarage::Gitx::BASE_BRANCH}...#{branch} --no-merges --pretty=format:'* %s%n%b'"
-          pull_request = github.create_pull_request(branch, changelog, options)
-          say 'Pull request created: '
-          say pull_request['html_url'], :green
-        end
-        github.assign_pull_request(pull_request, options[:assignee]) if options[:assignee]
-
-        runner.run_cmd "open #{pull_request['html_url']}" if options[:open]
-      end
-
-      desc 'update', 'Update the current branch with latest changes from the remote feature branch and master'
-      def update
-        git.update
-      end
-
-      desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
-      def cleanup
-        git.cleanup
-      end
-
-      desc 'track', 'set the current branch to track the remote branch with the same name'
-      def track
-        git.track
-      end
-
-      desc 'start', 'start a new git branch with latest changes from master'
-      def start(branch_name = nil)
-        until git.valid_new_branch_name?(branch_name)
-          example_branch = %w{ api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link }.sample
-          branch_name = ask("What would you like to name your branch? (ex: #{example_branch})")
-        end
-
-        git.start branch_name
-      end
-
-      desc 'share', 'Share the current branch in the remote repository'
-      def share
-        git.share
-      end
-
-      desc 'integrate', 'integrate the current branch into one of the aggregate development branches'
-      def integrate(target_branch = 'staging')
-        git.integrate target_branch
-      end
-
-      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 = git.current_build_tag(good_branch)
-        return unless yes?("Reset #{bad_branch} to #{last_known_good_tag}? (y/n)", :green)
-
-        git.nuke bad_branch, last_known_good_tag
-      end
-
-      desc 'release', 'release the current branch to production'
-      def release
-        return unless yes?("Release #{git.current_branch.name} to production? (y/n)", :green)
-        git.release
-      end
-
-      desc 'buildtag', 'create a tag for the current Travis-CI build and push it back to origin'
-      def buildtag
-        git.buildtag
-      end
-
-      private
-
-      def github
-        @github ||= Thegarage::Gitx::Github.new(git.repo, shell)
-      end
-
-      def git
-        @git ||= Thegarage::Gitx::Git.new(shell, runner)
-      end
-
-      def runner
-        @runner ||= Thegarage::Gitx::Runner.new(shell, options)
-      end
-    end
-  end
-end

data/lib/thegarage/gitx/git.rb

@@ -1,210 +0,0 @@
-require 'pathname'
-require 'rugged'
-
-module Thegarage
-  module Gitx
-    class Git
-      AGGREGATE_BRANCHES = %w( staging prototype )
-      RESERVED_BRANCHES = %w( HEAD master next_release ) + AGGREGATE_BRANCHES
-      TAGGABLE_BRANCHES = %w( master staging )
-
-      attr_accessor :shell, :runner, :repo
-
-      def initialize(shell, runner, path = Dir.pwd)
-        @shell = shell
-        @runner = runner
-        root_path = Rugged::Repository.discover(path)
-        @repo = Rugged::Repository.new(root_path)
-      end
-
-      def update
-        shell.say 'Updating '
-        shell.say "#{current_branch.name} ", :green
-        shell.say "with latest changes from "
-        shell.say Thegarage::Gitx::BASE_BRANCH, :green
-
-        runner.run_cmd "git pull origin #{current_branch.name}", :allow_failure => true
-        runner.run_cmd "git pull origin #{Thegarage::Gitx::BASE_BRANCH}"
-        runner.run_cmd 'git push origin HEAD'
-      end
-
-      def track
-        runner.run_cmd "git branch --set-upstream-to origin/#{current_branch.name}"
-      end
-
-      def share
-        runner.run_cmd "git push origin #{current_branch.name}"
-        track
-      end
-
-      def valid_new_branch_name?(branch)
-        remote_branches = Rugged::Branch.each_name(repo, :remote).to_a.map { |branch| branch.split('/').last }
-        branch =~ /^[A-Za-z0-9\-_]+$/ && !remote_branches.include?(branch)
-      end
-
-      def start(branch_name)
-        runner.run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
-        runner.run_cmd 'git pull'
-        runner.run_cmd "git checkout -b #{branch_name}"
-      end
-
-      def cleanup
-        runner.run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
-        runner.run_cmd "git pull"
-        runner.run_cmd 'git remote prune origin'
-
-        shell.say "Deleting branches that have been merged into "
-        shell.say Thegarage::Gitx::BASE_BRANCH, :green
-        branches(:merged => true, :remote => true).each do |branch|
-          runner.run_cmd "git push origin --delete #{branch}" unless aggregate_branch?(branch)
-        end
-        branches(:merged => true).each do |branch|
-          runner.run_cmd "git branch -d #{branch}" unless aggregate_branch?(branch)
-        end
-      end
-
-      def integrate(target_branch = 'staging')
-        update
-
-        branch = current_branch.name
-        integrate_branch(branch, target_branch)
-        runner.run_cmd "git checkout #{branch}"
-      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
-
-      # reset the specified aggregate branch to the same set of commits as the destination branch
-      def nuke(outdated_branch, target_reference)
-        return if outdated_branch == target_reference
-        fail "Only aggregate branches are allowed to be reset: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(outdated_branch)
-        return if migrations_need_to_be_reverted?
-
-        shell.say "Resetting "
-        shell.say "#{outdated_branch} ", :green
-        shell.say "branch to "
-        shell.say target_reference, :green
-
-        runner.run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
-        runner.run_cmd "git branch -D #{outdated_branch}", :allow_failure => true
-        runner.run_cmd "git push origin --delete #{outdated_branch}", :allow_failure => true
-        runner.run_cmd "git checkout -b #{outdated_branch} #{target_reference}"
-        runner.run_cmd "git push origin #{outdated_branch}"
-        runner.run_cmd "git branch --set-upstream-to origin/#{outdated_branch}"
-        runner.run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
-      end
-
-      # lookup the current branch of the repo
-      def current_branch
-        repo.branches.find(&:head?)
-      end
-
-      def release
-        branch = current_branch.name
-        assert_not_protected_branch!(branch, 'release')
-        update
-
-        runner.run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
-        runner.run_cmd "git pull origin #{Thegarage::Gitx::BASE_BRANCH}"
-        runner.run_cmd "git pull . #{branch}"
-        runner.run_cmd "git push origin HEAD"
-        integrate('staging')
-        cleanup
-      end
-
-      def buildtag
-        branch = ENV['TRAVIS_BRANCH']
-        pull_request = ENV['TRAVIS_PULL_REQUEST']
-
-        raise "Unknown branch. ENV['TRAVIS_BRANCH'] is required." unless branch
-
-        if pull_request != 'false'
-          shell.say "Skipping creation of tag for pull request: #{pull_request}"
-        elsif !TAGGABLE_BRANCHES.include?(branch)
-          shell.say "Cannot create build tag for branch: #{branch}. Only #{TAGGABLE_BRANCHES} are supported."
-        else
-          label = "Generated tag from TravisCI build #{ENV['TRAVIS_BUILD_NUMBER']}"
-          create_build_tag(branch, label)
-        end
-      end
-
-      private
-
-      def assert_not_protected_branch!(branch, action)
-        raise "Cannot #{action} reserved branch" if RESERVED_BRANCHES.include?(branch) || aggregate_branch?(branch)
-      end
-
-      # retrieve a list of branches
-      def branches(options = {})
-        branches = []
-        args = []
-        args << '-r' if options[:remote]
-        args << "--merged #{options[:merged].is_a?(String) ? options[:merged] : ''}" if options[:merged]
-        output = `git branch #{args.join(' ')}`.split("\n")
-        output.each do |branch|
-          branch = branch.gsub(/\*/, '').strip.split(' ').first
-          branch = branch.split('/').last if options[:remote]
-          branches << branch unless RESERVED_BRANCHES.include?(branch)
-        end
-        branches.uniq
-      end
-
-      # integrate a branch into a destination aggregate branch
-      # blow away the local aggregate branch to ensure pulling into most recent "clean" branch
-      def integrate_branch(branch, destination_branch)
-        assert_not_protected_branch!(branch, 'integrate') unless aggregate_branch?(destination_branch)
-        raise "Only aggregate branches are allowed for integration: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(destination_branch) || destination_branch == Thegarage::Gitx::BASE_BRANCH
-        shell.say "Integrating "
-        shell.say "#{branch} ", :green
-        shell.say "into "
-        shell.say destination_branch, :green
-
-        refresh_branch_from_remote destination_branch
-        runner.run_cmd "git pull . #{branch}"
-        runner.run_cmd "git push origin HEAD"
-        runner.run_cmd "git checkout #{branch}"
-      end
-
-      # nuke local branch and pull fresh version from remote repo
-      def refresh_branch_from_remote(destination_branch)
-        runner.run_cmd "git branch -D #{destination_branch}", :allow_failure => true
-        runner.run_cmd "git fetch origin"
-        runner.run_cmd "git checkout #{destination_branch}"
-      end
-
-      def aggregate_branch?(branch)
-        AGGREGATE_BRANCHES.include?(branch)
-      end
-
-      def create_build_tag(branch, label)
-        timestamp = Time.now.utc.strftime '%Y-%m-%d-%H-%M-%S'
-        git_tag = "build-#{branch}-#{timestamp}"
-        runner.run_cmd "git tag #{git_tag} -a -m '#{label}'"
-        runner.run_cmd "git push origin #{git_tag}"
-      end
-
-      def build_tags_for_branch(branch)
-        runner.run_cmd "git fetch --tags"
-        build_tags = runner.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 = runner.run_cmd("git diff #{head_branch}...#{outdated_branch} --name-only db/migrate").split
-        return false if outdated_migrations.empty?
-
-        shell.say "#{outdated_branch} contains migrations that may need to be reverted.  Ensure any reversable migrations are reverted on affected databases before nuking.", :red
-        shell.say 'Example commands to revert outdated migrations:'
-        outdated_migrations.reverse.each do |migration|
-          version = File.basename(migration).split('_').first
-          shell.say "rake db:migrate:down VERSION=#{version}"
-        end
-        !yes?("Are you sure you want to nuke #{outdated_branch}? (y/n) ", :green)
-      end
-    end
-  end
-end