gitx 2.14.2.ci.70.1 → 2.15.0.ci.75.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGU4NzQwZWM3ZDMwZjI5MGNhOTZlYTg3MDBlMDQyMDAxNjkxN2Y4Nw==
+    MzMxY2Q5YjdlNGQwMDQ4YzBkYTIxMzMzMDlkNzI1MDk2NTRmZmI0OQ==
   data.tar.gz: !binary |-
-    YWZkMGExMDc0YjY2NDE4ZGVjOGJiMmM0NzZkYzMyOTQwMzAxZDkyNA==
+    ZWIxNDE3ZGM1ZDE5YWEyOTBiNmUyNTNhMDBiYjg0N2E5NjQ5MjE3MA==
 SHA512:
   metadata.gz: !binary |-
-    ODg3Mjg0ZGM5MDIzNWU0YWJmNDBkYmQyNmIzYTM1MGU3N2NhNGNjM2ExZTE2
-    OTQ2NWU1MTRjYzg4MGM3YmQ4NjJiMWQ3YzNlMjlhYWViMDEwM2JhNTFlOWRi
-    MjFlYTFkZjM4NDU2NmZkMmRkYmFhODFlNzFjZTRkMmFhODBiYzI=
+    YzdmNTE4ZTI4OGNlMWQxYjgwNjFkNGZmYzE2N2NkZjRmM2VmNjViMzFhZGU3
+    MjMwZjAwYWNlN2U5YzMwMTc4OWY3YzAwNTUxMjAyZGMwNmZmYTNmYTcxNDcy
+    NDM0ZjY1ZmEwMmJkMzgzNmYxNWY5OGYzNTNlYmY1NjY5OTdiOTM=
   data.tar.gz: !binary |-
-    MGY0N2JkMDYwOTE3NjhlNGI1MzY2MGRjYjhlMmU2NGQ3ODQ3MDM2NTcwZDhm
-    MmRlM2QzYmI3OWEyYTJkZDk3YTY4ZmM5MGFhNjgwNjQyZTlkMWY1MGVjZDUy
-    M2RlNGFhOTExMGZlZTQ3ZTdkNTFhNWY1ZDM5M2Q4NGNiNTg1N2M=
+    MzljNjczZmNhOGE2MTE2ZjE1Njk0ZmE5YTU2NzhjNzA3YjQ0ODc5Y2ZhN2Vi
+    MTQ5ZjE2OGIxZmYxNDM2ZjZiZjRjZTI2NTYwZTk5NjFiY2MyODk0ODA2ZmVi
+    NmJmMDUyYTEzNjQ5NTIzOTBhMWVkOThmOTgzMjgxOWU4NWRmM2E=

data/.gitx.yml

@@ -0,0 +1,3 @@
+---
+after_release:
+  - rake release

data/README.md

@@ -68,6 +68,9 @@ reset an aggregate branch (ex: prototype, staging) back to a known good state.
 
 create a build tag for the current Travis-CI build and push it back to origin
 
+## Configuration
+Any of the [default settings defined in the gem](lib/gitx/defaults.yml) can be overridden
+by creating a custom `.gitx.yml` file in the root directory of your project.
 
 ## Contributing
 See [CONTRIBUTING.md](CONTRIBUTING.md)

data/lib/gitx/cli/release_command.rb

@@ -2,7 +2,6 @@ require 'thor'
 require 'gitx'
 require 'gitx/cli/base_command'
 require 'gitx/cli/update_command'
-require 'gitx/cli/integrate_command'
 require 'gitx/cli/cleanup_command'
 require 'gitx/github'
 
@@ -21,19 +20,34 @@ module Gitx
         checkout_branch(branch)
         execute_command(UpdateCommand, :update)
 
-        find_or_create_pull_request(branch)
-        status = branch_status(branch)
-        if status != 'success'
-          return unless yes?("Branch status is currently: #{status}.  Proceed with release? (y/n)", :red)
-        end
+        return unless confirm_branch_status?(branch)
 
         checkout_branch Gitx::BASE_BRANCH
         run_cmd "git pull origin #{Gitx::BASE_BRANCH}"
         run_cmd "git merge --no-ff #{branch}"
         run_cmd 'git push origin HEAD'
 
-        execute_command(IntegrateCommand, :integrate, 'staging')
-        execute_command(CleanupCommand, :cleanup) if options[:cleanup]
+        after_release
+      end
+
+      private
+
+      def confirm_branch_status?(branch)
+        find_or_create_pull_request(branch)
+        status = branch_status(branch)
+        if status == 'success'
+          true
+        else
+          yes?("Branch status is currently: #{status}.  Proceed with release? (y/n)", :red)
+        end
+      end
+
+      def after_release
+        after_release_scripts = config.after_release_scripts.dup
+        after_release_scripts << 'git cleanup' if options[:cleanup]
+        after_release_scripts.each do |cmd|
+          run_cmd cmd
+        end
       end
     end
   end

data/lib/gitx/configuration.rb

@@ -36,6 +36,10 @@ module Gitx
       taggable_branches.include?(branch)
     end
 
+    def after_release_scripts
+      config[:after_release]
+    end
+
     private
 
     # load configuration file

data/lib/gitx/defaults.yml

@@ -11,3 +11,5 @@ reserved_branches:
 taggable_branches:
   - master
   - staging
+after_release:
+  - git integrate

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '2.14.2'
+  VERSION = '2.15.0'
 end

data/spec/gitx/cli/release_command_spec.rb

@@ -12,6 +12,7 @@ describe Gitx::Cli::ReleaseCommand do
   let(:cli) { described_class.new(args, options, config) }
   let(:branch) { double('fake branch', name: 'feature-branch') }
   let(:authorization_token) { '123123' }
+  let(:repo) { cli.send(:repo) }
 
   before do
     allow(cli).to receive(:current_branch).and_return(branch)
@@ -31,9 +32,8 @@ describe Gitx::Cli::ReleaseCommand do
     end
     context 'when user confirms release and pull request exists with non-success status' do
       before do
+        expect(repo).to receive(:workdir).and_return(temp_dir)
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-        expect(cli).to_not receive(:execute_command).with(Gitx::Cli::IntegrateCommand, :integrate, 'staging')
-        expect(cli).to_not receive(:execute_command).with(Gitx::Cli::CleanupCommand, :cleanup)
 
         expect(cli).to receive(:yes?).with('Release feature-branch to production? (y/n)', :green).and_return(true)
         expect(cli).to receive(:yes?).with('Branch status is currently: failure.  Proceed with release? (y/n)', :red).and_return(false)
@@ -52,11 +52,42 @@ describe Gitx::Cli::ReleaseCommand do
         should meet_expectations
       end
     end
-    context 'when user confirms release and pull request exists with success status' do
+    context 'when user confirms release and pull request exists with success status with default config' do
       before do
+        expect(repo).to receive(:workdir).and_return(temp_dir)
+
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
+
+        expect(cli).to receive(:yes?).and_return(true)
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout master').ordered
+        expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
+        expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git integrate').ordered
+
+        VCR.use_cassette('pull_request_does_exist_with_success_status') do
+          cli.release
+        end
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
+    end
+    context 'when user confirms release and pull request exists with success status with custom after_release config' do
+      let(:gitx_config) do
+        {
+          'after_release' => ['echo hello']
+        }
+      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 gitx_config.to_yaml
+        end
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::IntegrateCommand, :integrate, 'staging')
-        expect(cli).to_not receive(:execute_command).with(Gitx::Cli::CleanupCommand, :cleanup)
 
         expect(cli).to receive(:yes?).and_return(true)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
@@ -66,6 +97,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
         expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('echo hello').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.release
@@ -77,9 +109,8 @@ describe Gitx::Cli::ReleaseCommand do
     end
     context 'when target_branch is not nil and user confirms release and pull request exists with success status' do
       before do
+        expect(repo).to receive(:workdir).and_return(temp_dir)
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::IntegrateCommand, :integrate, 'staging')
-        expect(cli).to_not receive(:execute_command).with(Gitx::Cli::CleanupCommand, :cleanup)
 
         expect(cli).to receive(:yes?).and_return(true)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
@@ -89,6 +120,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
         expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git integrate').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.release 'feature-branch'
@@ -110,12 +142,11 @@ describe Gitx::Cli::ReleaseCommand do
         }
       end
       before do
+        expect(repo).to receive(:workdir).and_return(temp_dir)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
         allow(cli).to receive(:ask_editor).and_return('description')
 
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update).twice
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::IntegrateCommand, :integrate, 'staging')
-        expect(cli).to_not receive(:execute_command).with(Gitx::Cli::CleanupCommand, :cleanup)
 
         expect(cli).to receive(:yes?).with('Release feature-branch to production? (y/n)', :green).and_return(true)
         expect(cli).to receive(:yes?).with('Branch status is currently: pending.  Proceed with release? (y/n)', :red).and_return(true)
@@ -127,6 +158,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
         expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git integrate').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' })
         VCR.use_cassette('pull_request_does_not_exist') do
@@ -147,9 +179,8 @@ describe Gitx::Cli::ReleaseCommand do
         }
       end
       before do
+        expect(repo).to receive(:workdir).and_return(temp_dir)
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::IntegrateCommand, :integrate, 'staging')
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::CleanupCommand, :cleanup)
 
         expect(cli).to receive(:yes?).and_return(true)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
@@ -159,6 +190,8 @@ describe Gitx::Cli::ReleaseCommand do
         expect(cli).to receive(:run_cmd).with('git pull origin master').ordered
         expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git integrate').ordered
+        expect(cli).to receive(:run_cmd).with('git cleanup').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.release

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 2.14.2.ci.70.1
+  version: 2.15.0.ci.75.1
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -252,6 +252,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .gitx.yml
 - .hound.yml
 - .rspec
 - .rubocop.yml