gitx 2.13.1

data/spec/fixtures/vcr_cassettes/pull_request_does_not_exist.yml

@@ -0,0 +1,133 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.github.com/repos/wireframe/gitx/pulls?head=wireframe:feature-branch&state=open
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 3.2.0
+      Authorization:
+      - token 123123
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Tue, 05 Aug 2014 17:14:02 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Status:
+      - 401 Unauthorized
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '59'
+      X-Ratelimit-Reset:
+      - '1407262442'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Content-Length:
+      - '83'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Github-Request-Id:
+      - 46C5E25C:552F:1BC5411:53E110DA
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '[]'
+    http_version:
+  recorded_at: Tue, 05 Aug 2014 17:14:02 GMT
+- request:
+    method: get
+    uri: https://api.github.com/repos/wireframe/gitx/commits/feature-branch/status
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 3.4.0
+      Content-Type:
+      - application/json
+      Authorization:
+      - token 123123
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Wed, 10 Dec 2014 19:01:27 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Transfer-Encoding:
+      - chunked
+      Status:
+      - 200 OK
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4993'
+      X-Ratelimit-Reset:
+      - '1418241620'
+      X-Oauth-Scopes:
+      - repo
+      X-Accepted-Oauth-Scopes:
+      - repo, repo:status
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Github-Request-Id:
+      - C6CBAFAF:141D:2F27072:54889887
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"state":"pending"}'
+    http_version:
+  recorded_at: Wed, 10 Dec 2014 19:14:11 GMT
+recorded_with: VCR 2.9.2

data/spec/gitx/cli/base_command_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'gitx/cli/base_command'
+
+describe Gitx::Cli::BaseCommand do
+  let(:args) { [] }
+  let(:options) { {} }
+  let(:config) do
+    {
+      pretend: true
+    }
+  end
+  let(:cli) { described_class.new(args, options, config) }
+  let(:repo) { cli.send(:repo) }
+
+  describe 'without custom .gitx.yml config file' do
+    it 'provides default options' do
+      expect(cli.send(:config).config).to eq Gitx::Configuration::DEFAULT_CONFIG
+    end
+  end
+
+  describe 'with custom .gitx.yml config file' do
+    let(:config) do
+      {
+  'aggregate_branches' => %w( foo bar ),
+  'reserved_branches' => %w( baz qux ),
+  'taggable_branches' => %w( quux corge )
+      }
+    end
+    before do
+      expect(repo).to receive(:workdir).and_return(temp_dir)
+      File.open(File.join(temp_dir, '.gitx.yml'), 'w') do |f|
+        f.puts config.to_yaml
+      end
+    end
+    it 'overrides default options' do
+      expect(cli.send(:config).aggregate_branches).to eq(%w( foo bar ))
+      expect(cli.send(:config).reserved_branches).to eq(%w( baz qux ))
+      expect(cli.send(:config).taggable_branches).to eq(%w( quux corge ))
+    end
+  end
+end

data/spec/gitx/cli/buildtag_command_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+require 'gitx/cli/buildtag_command'
+
+describe Gitx::Cli::BuildtagCommand do
+  let(:args) { [] }
+  let(:options) { {} }
+  let(:config) do
+    {
+      pretend: true
+    }
+  end
+  let(:cli) { Gitx::Cli::BuildtagCommand.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 '#buildtag' do
+    let(:env_travis_branch) { nil }
+    let(:env_travis_build_number) { nil }
+    let(:env_ci_branch) { nil }
+    let(:env_ci_build_number) { nil }
+    before do
+      ENV['TRAVIS_BRANCH'] = env_travis_branch
+      ENV['TRAVIS_BUILD_NUMBER'] = env_travis_build_number
+      ENV['CI_BRANCH'] = env_ci_branch
+      ENV['CI_BUILD_NUMBER'] = env_ci_build_number
+    end
+    context 'when TRAVIS_BRANCH is nil' do
+      it 'raises Unknown Branch error' do
+        expect { cli.buildtag }.to raise_error(/Unknown branch/)
+      end
+    end
+    context 'when TRAVIS_BRANCH is NOT master or staging' do
+      let(:env_travis_branch) { 'random-branch' }
+      it 'raises unsupported branch error' do
+        expect { cli.buildtag }.to raise_error(/Branch must be one of the supported taggable branches/)
+      end
+    end
+    context 'when TRAVIS_BRANCH is master' do
+      let(:env_travis_branch) { 'master' }
+      let(:env_travis_build_number) { '24' }
+      before do
+        Timecop.freeze(Time.utc(2013, 10, 30, 10, 21, 28)) do
+          expect(cli).to receive(:run_cmd).with("git tag build-master-2013-10-30-10-21-28 -a -m 'buildtag generated by build 24'").ordered
+          expect(cli).to receive(:run_cmd).with('git push origin build-master-2013-10-30-10-21-28').ordered
+          cli.buildtag
+        end
+      end
+      it 'creates a tag for the branch and push it to github' do
+        should meet_expectations
+      end
+    end
+    context 'when CI_BRANCH is master' do
+      let(:env_ci_branch) { 'master' }
+      let(:env_ci_build_number) { '24' }
+      before do
+        Timecop.freeze(Time.utc(2013, 10, 30, 10, 21, 28)) do
+          expect(cli).to receive(:run_cmd).with("git tag build-master-2013-10-30-10-21-28 -a -m 'buildtag generated by build 24'").ordered
+          expect(cli).to receive(:run_cmd).with('git push origin build-master-2013-10-30-10-21-28').ordered
+          cli.buildtag
+        end
+      end
+      it 'creates a tag for the branch and push it to github' do
+        should meet_expectations
+      end
+    end
+  end
+end

data/spec/gitx/cli/cleanup_command_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'gitx/cli/cleanup_command'
+
+describe Gitx::Cli::CleanupCommand do
+  let(:args) { [] }
+  let(:options) { {} }
+  let(:config) do
+    {
+      pretend: true
+    }
+  end
+  let(:cli) { Gitx::Cli::CleanupCommand.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 '#cleanup' do
+    before do
+      allow(cli).to receive(:say)
+
+      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 remote prune origin').ordered
+      expect(cli).to receive(:run_cmd).with('git branch -r --merged').and_return('merged-remote-feature').ordered
+      expect(cli).to receive(:run_cmd).with('git push origin --delete merged-remote-feature').ordered
+      expect(cli).to receive(:run_cmd).with('git branch --merged').and_return('merged-local-feature').ordered
+      expect(cli).to receive(:run_cmd).with('git branch -d merged-local-feature').ordered
+
+      cli.cleanup
+    end
+    it 'runs expected commands' do
+      should meet_expectations
+    end
+  end
+end

data/spec/gitx/cli/integrate_command_spec.rb

@@ -0,0 +1,290 @@
+require 'spec_helper'
+require 'gitx/cli/integrate_command'
+
+describe Gitx::Cli::IntegrateCommand do
+  let(:args) { [] }
+  let(:options) { {} }
+  let(:config) do
+    {
+      pretend: true
+    }
+  end
+  let(:cli) { Gitx::Cli::IntegrateCommand.new(args, options, config) }
+  let(:current_branch) { double('fake branch', name: 'feature-branch', head?: true) }
+  let(:repo) { cli.send(:repo) }
+  let(:remote_branch_names) { ['origin/staging', 'origin/prototype'] }
+  let(:local_branch_names) { ['feature-branch'] }
+
+  before do
+    allow(cli).to receive(:current_branch).and_return(current_branch)
+    branches = double('fake branches')
+    allow(branches).to receive(:each_name).with(:local).and_return(local_branch_names)
+    allow(branches).to receive(:each_name).with(:remote).and_return(remote_branch_names)
+    allow(repo).to receive(:branches).and_return(branches)
+  end
+
+  describe '#integrate' do
+    context 'when integration branch is ommitted and remote branch exists' do
+      let(:authorization_token) { '123123' }
+      let(:remote_branch_names) { ['origin/staging'] }
+      before do
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
+
+        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
+        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
+        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
+        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+
+        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+
+        VCR.use_cassette('pull_request_does_exist_with_success_status') do
+          cli.integrate
+        end
+      end
+      it 'defaults to staging branch' do
+        should meet_expectations
+      end
+      it 'does not post comment to pull request' do
+        expect(WebMock).to_not have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
+      end
+    end
+    context 'when current_branch == master' do
+      let(:current_branch) { double('fake branch', name: 'master', head?: true) }
+      let(:local_branch_names) { ['master'] }
+      let(:authorization_token) { '123123' }
+      let(:remote_branch_names) { ['origin/staging'] }
+      before do
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
+
+        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
+        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
+        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
+        expect(cli).to receive(:run_cmd).with('git merge master').ordered
+        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+
+        cli.integrate
+      end
+      it 'does not create pull request' do
+        expect(WebMock).to_not have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/pulls')
+      end
+    end
+    context 'when staging branch does not exist remotely' do
+      let(:authorization_token) { '123123' }
+      let(:remote_branch_names) { [] }
+      before do
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
+
+        expect(repo).to receive(:create_branch).with('staging', 'master')
+
+        expect(cli).to receive(:run_cmd).with('git push origin staging:staging').ordered
+
+        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
+        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
+        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
+        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+
+        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+
+        VCR.use_cassette('pull_request_does_exist_with_success_status') do
+          cli.integrate
+        end
+      end
+      it 'creates remote aggregate branch' do
+        should meet_expectations
+      end
+    end
+    context 'when integration branch == prototype and remote branch exists' do
+      let(:authorization_token) { '123123' }
+      let(:remote_branch_names) { ['origin/prototype'] }
+      before do
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
+
+        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
+        expect(cli).to receive(:run_cmd).with('git branch -D prototype', allow_failure: true).ordered
+        expect(cli).to receive(:run_cmd).with('git checkout prototype').ordered
+        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+
+        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+
+        VCR.use_cassette('pull_request_does_exist_with_success_status') do
+          cli.integrate 'prototype'
+        end
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
+    end
+    context 'when integration branch is not an aggregate branch' do
+      it 'raises an error' do
+        expect { cli.integrate('some-other-branch') }.to raise_error(/Invalid aggregate branch: some-other-branch must be one of supported aggregate branches/)
+      end
+    end
+    context 'when merge conflicts occur during the Gitx::Cli::UpdateCommand execution' do
+      let(:remote_branch_names) { ['origin/staging'] }
+      before do
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update).and_raise(Gitx::Cli::BaseCommand::MergeError)
+
+        expect { cli.integrate }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge Conflict Occurred. Please Merge Conflict Occurred. Please fix merge conflict and rerun the integrate command')
+      end
+      it 'raises a helpful error' do
+        should meet_expectations
+      end
+    end
+    context 'when merge conflicts occur with the integrate command' do
+      let(:remote_branch_names) { ['origin/staging'] }
+      before do
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
+
+        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
+        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
+        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
+        expect(cli).to receive(:run_cmd).with('git merge feature-branch').and_raise('git merge feature-branch failed').ordered
+
+        expect { cli.integrate }.to raise_error(/Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume feature-branch flag/)
+      end
+      it 'raises a helpful error' do
+        should meet_expectations
+      end
+    end
+    context 'with --resume "feature-branch" flag when feature-branch exists' do
+      let(:options) do
+        {
+          resume: 'feature-branch'
+        }
+      end
+      let(:repo) { cli.send(:repo) }
+      let(:authorization_token) { '123123' }
+      before do
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
+
+        expect(cli).not_to receive(:run_cmd).with('git branch -D staging')
+        expect(cli).not_to receive(:run_cmd).with('git push origin HEAD')
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch')
+
+        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+
+        VCR.use_cassette('pull_request_does_exist_with_success_status') do
+          cli.integrate
+        end
+      end
+      it 'does not delete local staging branch' do
+        should meet_expectations
+      end
+    end
+    context 'with --resume "feature-branch" flag when feature-branch does not exist' do
+      let(:options) do
+        {
+          resume: 'invalid-feature-branch'
+        }
+      end
+      let(:local_branch_names) { ['feature-branch'] }
+      let(:authorization_token) { '123123' }
+      before do
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
+        expect(cli).to receive(:ask).and_return('feature-branch')
+
+        expect(cli).not_to receive(:run_cmd).with('git branch -D staging')
+        expect(cli).not_to receive(:run_cmd).with('git push origin HEAD')
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+
+        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        VCR.use_cassette('pull_request_does_exist_with_success_status') do
+          cli.integrate
+        end
+      end
+      it 'asks user for feature-branch name' do
+        should meet_expectations
+      end
+    end
+    context 'for default integration (to staging) with --comment flag' do
+      let(:options) do
+        { comment: true }
+      end
+      let(:authorization_token) { '123123' }
+      let(:remote_branch_names) { ['origin/staging'] }
+      before do
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
+
+        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
+        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
+        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
+        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+
+        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+
+        VCR.use_cassette('pull_request_does_exist_with_success_status') do
+          cli.integrate
+        end
+      end
+      it 'defaults to staging branch' do
+        should meet_expectations
+      end
+      it 'posts comment to pull request' do
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').
+          with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
+      end
+    end
+    context 'with --comment flag when a pull request doesn\'t exist for the feature-branch' do
+      let(:options) do
+        { comment: true }
+      end
+      let(:authorization_token) { '123123' }
+      let(:changelog) { '* made some fixes' }
+      let(:new_pull_request) do
+        {
+          html_url: 'https://path/to/html/pull/request',
+          issue_url: 'https://api/path/to/issue/url',
+          number: 10,
+          head: {
+            ref: 'branch_name'
+          }
+        }
+      end
+      before do
+        allow(cli).to receive(:ask_editor).and_return('description')
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update).twice
+
+        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
+        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
+        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
+        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return('2013-01-01 did some stuff').ordered
+
+        stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls').to_return(:status => 201, :body => new_pull_request.to_json, :headers => {'Content-Type' => 'application/json'})
+        stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').to_return(:status => 201)
+
+        VCR.use_cassette('pull_request_does_not_exist') do
+          cli.integrate
+        end
+      end
+      it 'creates github pull request' do
+        should meet_expectations
+      end
+      it 'creates github comment for integration' do
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').
+          with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
+      end
+    end
+  end
+end