git_reflow 0.8.10 → 0.9.4

data/spec/lib/git_reflow/git_server/git_hub/pull_request_spec.rb

@@ -86,21 +86,21 @@ describe GitReflow::GitServer::GitHub::PullRequest do
           pull_request: {
             number: existing_pull_request.number,
             comments: [{author: comment_author}],
-            reviews: []
+            reviews: [{author: existing_pull_request.user.login}]
           },
           issue: {
             number: existing_pull_request.number,
-            comments: [{author: comment_author}]
+            comments: [{author: comment_author}, {author: existing_pull_request.user.login}]
           }
         )
       end
-      specify { expect(subject).to eql(existing_pull_comments.to_a + existing_issue_comments.to_a) }
+      specify { expect(subject).to eql(existing_pull_comments.to_a + existing_issue_comments.to_a - [existing_pull_request.user.login]) }
     end
 
     context "Testing Nil Comments" do
       before do
         stub_request(:get, "https://api.github.com/repos/reenhanced/repo/pulls/2/comments?access_token=a1b2c3d4e5f6g7h8i9j0").
-         with(:headers => {'Accept'=>'application/vnd.github.v3+json,application/vnd.github.beta+json;q=0.5,application/json;q=0.1', 'Accept-Charset'=>'utf-8', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'token a1b2c3d4e5f6g7h8i9j0', 'User-Agent'=>'Github API Ruby Gem 0.15.0'}).
+         with(:headers => {'Accept'=>'application/vnd.github.v3+json,application/vnd.github.beta+json;q=0.5,application/json;q=0.1', 'Accept-Charset'=>'utf-8', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization'=>'token a1b2c3d4e5f6g7h8i9j0', 'User-Agent'=>'Github API Ruby Gem 0.19.0'}).
          to_return(:status => 200, :body => "", :headers => {})
 
         FakeGitHub.new(
@@ -133,7 +133,7 @@ describe GitReflow::GitServer::GitHub::PullRequest do
           number: existing_pull_request.number,
           owner: existing_pull_request.user.login,
           comments: [{author: 'tito'}, {author: 'bobby'}, {author: 'ringo'}],
-          reviews:  [{author: 'nature-boy'}]
+          reviews:  [{author: 'ringo'}, {author: 'nature-boy'}]
         },
         issue: {
           number: existing_pull_request.number,
@@ -484,7 +484,7 @@ describe GitReflow::GitServer::GitHub::PullRequest do
       allow(GitReflow.git_server).to receive(:connection).and_return(github_api)
       allow(GitReflow.git_server).to receive(:get_build_status).and_return(Struct.new(:state, :description, :target_url).new())
       allow_any_instance_of(GitReflow::GitServer::PullRequest).to receive(:commit_message_for_merge).and_return('Bingo')
-      allow_any_instance_of(GitReflow).to receive(:append_to_squashed_commit_message).and_return(true)
+      allow_any_instance_of(GitReflow).to receive(:append_to_merge_commit_message).and_return(true)
     end
 
     context "and force-merging" do

data/spec/lib/git_reflow/git_server/git_hub_spec.rb

@@ -78,7 +78,7 @@ describe GitReflow::GitServer::GitHub do
     subject                     { github.authenticate }
 
     before  do
-      allow(GitReflow::GitServer::GitHub).to receive(:user).and_return('reenhanced')
+      allow(GitReflow::GitServer::GitHub).to receive(:user).and_return(user)
       allow(github_api).to receive(:oauth).and_return(github_authorizations)
       allow(github_api).to receive_message_chain(:oauth, :all).and_return([])
       allow(github).to receive(:run).with('hostname', loud: false).and_return(hostname)
@@ -151,12 +151,86 @@ describe GitReflow::GitServer::GitHub do
           body: { error: "GET https://api.github.com/authorizations: 401 Bad credentials" }
         }}
 
+        before do
+          allow(GitReflow::Config).to receive(:get).and_call_original
+          allow(GitReflow::Config).to receive(:get).with('github.oauth-token').and_return(oauth_token_hash[:token])
+          allow(Github::Client).to receive(:new).and_return(github_api)
+          allow(github_authorizations).to receive(:authenticated?).and_return(true)
+          allow(github_api.oauth).to receive(:create).with({ scopes: ['repo'], note: "git-reflow (#{hostname})" }).and_return(oauth_token_hash)
+
+          stub_request(:get, %r{/user}).
+            to_return(
+              body: Fixture.new('authentication_failure.json').to_s,
+              status: 401,
+              headers: {'content-type' => 'application/json; charset=utf-8', status: 'Unauthorized'},
+            )
+        end
+
+        it "notifies the user of successful setup" do
+          expect { subject }.to have_said "Your GitHub account was successfully setup!", :success
+        end
+
+        it "creates a new GitHub oauth token" do
+          expect(github_api.oauth).to receive(:create).and_return(oauth_token_hash)
+          subject
+        end
+
+        it "creates git config keys for github connections" do
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.site \"#{github_site}\"", blocking: false
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.endpoint \"#{github_api_endpoint}\"", blocking: false
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.oauth-token \"#{oauth_token_hash[:token]}\"", blocking: false
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all reflow.git-server \"GitHub\"", blocking: false
+        end
+
+      end
+    end
+
+    context 'already authenticated' do
+      let(:oauth_token) { "abc123" }
+
+      before do
+        allow(GitReflow::Config).to receive(:get).and_call_original
+        allow(GitReflow::Config).to receive(:get).with('github.oauth-token').and_return(oauth_token)
+      end
+
+      context "and authentication token is still valid" do
+        before do
+          stub_request(:get, %r{/user}).
+            to_return(
+              body: Fixture.new('users/user.json').to_s,
+              status: 200,
+              headers: { content_type: "application/json; charset=utf-8" }
+            )
+
+          allow(Github::Client).to receive(:new).and_return(github_api)
+          allow(github_api).to receive(:oauth).and_return(github_authorizations)
+          allow(github_authorizations).to receive(:authenticated?).and_return(true)
+          allow(github_api.oauth).to receive(:create).with({ scopes: ['repo'], note: "git-reflow (#{hostname})" }).and_return(oauth_token_hash)
+        end
+
+        it "resolves all missing git-reflow configurations" do
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.site \"#{github_site}\"", blocking: false
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all github.endpoint \"#{github_api_endpoint}\"", blocking: false
+          expect{ subject }.to have_run_command_silently "git config -f #{GitReflow::Config::CONFIG_FILE_PATH} --replace-all reflow.git-server \"GitHub\"", blocking: false
+          expect { subject }.to have_said "Your GitHub account was already setup with: "
+          expect { subject }.to have_said "\tUser Name: #{user}"
+          expect { subject }.to have_said "\tEndpoint: #{github_api_endpoint}"
+        end
+      end
+
+      context "and authentication token is expired" do
+        let(:unauthorized_error_response) {{
+          response_headers: {'content-type' => 'application/json; charset=utf-8', status: 'Unauthorized'},
+          method: 'GET',
+          status: '401',
+          body: { error: "GET https://api.github.com/authorizations: 401 Bad credentials" }
+        }}
+
         before do
           allow(Github::Client).to receive(:new).and_raise Github::Error::Unauthorized.new(unauthorized_error_response)
         end
 
-        it "notifies user of invalid login details" do
-          expect { subject }.to have_said "Github Authentication Error: #{Github::Error::Unauthorized.new(unauthorized_error_response).inspect}", :error
+        it "requests a new oauth token" do
         end
       end
     end

data/spec/lib/git_reflow/git_server/pull_request_spec.rb

@@ -364,7 +364,7 @@ describe GitReflow::GitServer::PullRequest do
     subject { pr.merge! inputs }
 
     before do
-      allow(GitReflow).to receive(:append_to_squashed_commit_message)
+      allow(GitReflow).to receive(:append_to_merge_commit_message)
       allow(pr).to receive(:commit_message_for_merge).and_return(commit_message_for_merge)
     end
 
@@ -376,7 +376,7 @@ describe GitReflow::GitServer::PullRequest do
       it "updates both feature and destination branch and squash-merges feature into base branch" do
         expect(GitReflow).to receive(:update_current_branch)
         expect(GitReflow).to receive(:fetch_destination).with(pr.base_branch_name)
-        expect(GitReflow).to receive(:append_to_squashed_commit_message).with(pr.commit_message_for_merge)
+        expect(GitReflow).to receive(:append_to_merge_commit_message).with(pr.commit_message_for_merge)
         expect { subject }.to have_run_commands_in_order [
           "git checkout #{pr.base_branch_name}",
           "git pull origin #{pr.base_branch_name}",
@@ -470,6 +470,12 @@ describe GitReflow::GitServer::PullRequest do
       before  { allow(pr).to receive(:approvals).and_return(['sally', 'joey']) }
       specify { expect(subject).to include "\nLGTM given by: @sally, @joey\n" }
     end
+
+    context "with custom merge commit message template" do
+      before { allow(GitReflow).to receive(:merge_commit_template).and_return("Super cool changes") }
+      specify { expect(subject).to include "Super cool changes" }
+      specify { expect(subject).to_not include "\nMerges ##{pr.number}\n" }
+    end
   end
 
   context "#cleanup_feature_branch?" do
@@ -485,14 +491,42 @@ describe GitReflow::GitServer::PullRequest do
         allow(GitReflow::Config).to receive(:get).with('reflow.always-cleanup').and_return('false')
       end
 
-      context "and user chooses to cleanup" do
-        before { expect(pr).to receive(:ask).with('Would you like to push this branch to your remote repo and cleanup your feature branch? ').and_return('yes') }
+      context "and always cleanup local config is set" do
+      end
+
+      context "and always cleanup remote config is set" do
+      end
+
+      context "and user chooses to cleanup local only" do
+        before do
+          expect(pr).to receive(:ask).with('Would you like to cleanup your local feature branch? ').and_return('yes')
+          allow(pr).to receive(:ask).with('Would you like to cleanup your remote feature branch? ').and_return('no')
+        end
+        it { should be_truthy }
+      end
+
+      context "and user chooses to cleanup remote only" do
+        before do
+          expect(pr).to receive(:ask).with('Would you like to cleanup your local feature branch? ').and_return('no')
+          expect(pr).to receive(:ask).with('Would you like to cleanup your remote feature branch? ').and_return('yes')
+        end
         it     { should be_truthy }
       end
 
-      context "and user choose not to cleanup" do
-        before { expect(pr).to receive(:ask).with('Would you like to push this branch to your remote repo and cleanup your feature branch? ').and_return('no') }
-        it     { should be_falsy }
+      context "and user chooses to cleanup local and remote" do
+        before do
+          allow(pr).to receive(:ask).with('Would you like to cleanup your local feature branch? ').and_return('yes')
+          allow(pr).to receive(:ask).with('Would you like to cleanup your remote feature branch? ').and_return('yes')
+        end
+        it { should be_truthy }
+      end
+
+      context "and user chooses to cleanup neither local nor remote" do
+        before do
+          expect(pr).to receive(:ask).with('Would you like to cleanup your local feature branch? ').and_return('no')
+          allow(pr).to receive(:ask).with('Would you like to cleanup your remote feature branch? ').and_return('no')
+        end
+        it     { should be_falsey }
       end
     end
   end

data/spec/lib/git_reflow/workflow_spec.rb

@@ -6,54 +6,299 @@ describe GitReflow::Workflow do
     include GitReflow::Workflow
   end
 
+  class DummyBundler
+    def gemfile(&block)
+      instance_eval &block
+    end
+
+    def source(name); end
+    def gem(name, *args); end
+  end
+
+  class DummyGemifiedWorkflow
+    include GitReflow::Workflow
+
+    command :whirl do
+      puts "whirl"
+    end
+  end
+
   let(:workflow) { DummyWorkflow }
   let(:loader)   { double() }
 
   describe ".current" do
     subject { GitReflow::Workflow.current }
 
+    before do
+      allow(GitReflow::Workflows::Core).to receive(:load_raw_workflow)
+    end
+
     context "when no workflow is set" do
       before  { allow(GitReflow::Config).to receive(:get).with("reflow.workflow").and_return('') }
       specify { expect( subject ).to eql(GitReflow::Workflows::Core) }
     end
 
-    context "when a workflow is set" do
+    context "when a global workflow is set" do
       let(:workflow_path) { File.join(File.expand_path("../../../fixtures", __FILE__), "/awesome_workflow.rb") }
 
       before  { allow(GitReflow::Config).to receive(:get).with("reflow.workflow").and_return(workflow_path) }
-      specify { expect( subject ).to eql(GitReflow::Workflow::AwesomeWorkflow) }
+      specify { expect( subject ).to eql(GitReflow::Workflows::Core) }
+    end
+
+    context "when a local workflow is set" do
+      let(:workflow_content) do
+        <<~WORKFLOW_CONTENT
+          command :dummy do
+            GitReflow.say "derp"
+          end
+        WORKFLOW_CONTENT
+      end
+
+      before do
+        allow(File).to receive(:exists?).with("#{GitReflow.git_root_dir}/Workflow").and_return(true)
+        allow(File).to receive(:read).with("#{GitReflow.git_root_dir}/Workflow").and_return(workflow_content)
+        expect(GitReflow::Workflows::Core).to receive(:load_raw_workflow).with(workflow_content).and_call_original
+      end
+
+      specify { expect( subject ).to respond_to(:dummy) }
+      specify { expect( subject ).to eql(GitReflow::Workflows::Core) }
+    end
+
+    context "when both a local and a global workflow are set" do
+      let(:workflow_path) { File.join(File.expand_path("../../../fixtures", __FILE__), "/awesome_workflow.rb") }
+      let(:workflow_content) do
+        <<~WORKFLOW_CONTENT
+          command :dummy do
+            GitReflow.say "derp"
+          end
+        WORKFLOW_CONTENT
+      end
+
+      before  do
+        allow(File).to receive(:exists?).with("#{GitReflow.git_root_dir}/Workflow").and_return(true)
+        allow(File).to receive(:read).with("#{GitReflow.git_root_dir}/Workflow").and_return(workflow_content)
+        allow(GitReflow::Config).to receive(:get).with("reflow.workflow").and_return(workflow_path)
+        allow(GitReflow::Workflows::Core).to receive(:load_raw_workflow).and_call_original
+      end
+
+      specify { expect(subject).to respond_to(:dummy) }
+      specify { expect(subject).to eql(GitReflow::Workflows::Core) }
+    end
+  end
+
+  describe ".before" do
+    it "executes the block before the command" do
+      GitReflow::Workflows::Core.load_raw_workflow <<~WORKFLOW_CONTENT
+        command :yips do
+          puts "Yips."
+        end
+
+        before :yips do
+          puts "Would you like a donut?"
+        end
+      WORKFLOW_CONTENT
+
+      allow(GitReflow::Workflows::Core).to receive(:load_workflow).and_return(true)
+
+      expect { GitReflow.workflow.yips }.to have_output "Would you like a donut?\nYips."
+    end
+
+    it "executes blocks sequentially by order of appearance" do
+      GitReflow::Workflows::Core.load_raw_workflow <<~WORKFLOW_CONTENT
+        command :yips do
+          puts "Yips."
+        end
+
+        before :yips do
+          puts "Cupcake?"
+        end
+
+        before :yips do
+          puts "Would you like a donut?"
+        end
+      WORKFLOW_CONTENT
+
+      allow(GitReflow::Workflows::Core).to receive(:load_workflow).and_return(true)
+
+      expect { GitReflow.workflow.yips }.to have_output "Cupcake?\nWould you like a donut?\nYips."
+    end
+
+    it "proxies any arguments returned to the command" do
+      GitReflow::Workflows::Core.load_raw_workflow <<~WORKFLOW_CONTENT
+        command :yips, arguments: { spiced: false } do |**params|
+          puts params[:spiced] ? "Too spicy." : "Yips."
+        end
+
+        before :yips do
+          puts "Wasabe?"
+          { spiced: true }
+        end
+      WORKFLOW_CONTENT
+
+      allow(GitReflow::Workflows::Core).to receive(:load_workflow).and_return(true)
+
+      expect { GitReflow.workflow.yips }.to have_output "Wasabe?\nToo spicy."
+    end
+  end
+
+  describe ".after" do
+    it "executes the block after the command" do
+      GitReflow::Workflows::Core.load_raw_workflow <<~WORKFLOW_CONTENT
+        command :vroom do
+          puts "Vroom"
+        end
+
+        after :vroom do
+          puts "VROOOOM"
+        end
+      WORKFLOW_CONTENT
+
+      allow(GitReflow::Workflows::Core).to receive(:load_workflow).and_return(true)
+
+      expect { GitReflow.workflow.vroom }.to have_output "Vroom\nVROOOOM"
+    end
+
+    it "executes blocks sequentially by order of appearance" do
+      GitReflow::Workflows::Core.load_raw_workflow <<~WORKFLOW_CONTENT
+        command :vroom do
+          puts "Vroom"
+        end
+
+        after :vroom do
+          puts "Vrooom"
+        end
+
+        after :vroom do
+          puts "VROOOOM"
+        end
+      WORKFLOW_CONTENT
+
+      allow(GitReflow::Workflows::Core).to receive(:load_workflow).and_return(true)
+
+      expect { GitReflow.workflow.vroom }.to have_output "Vroom\nVrooom\nVROOOOM"
     end
   end
 
   describe ".command" do
     it "creates a class method for a bogus command" do
-      class DummyWorkflow
-        include GitReflow::Workflow
-      end
       workflow.command :bogus do
-        "Woohoo"
+        GitReflow.say "Woohoo"
       end
 
-      expect(DummyWorkflow.bogus).to eql("Woohoo")
+      expect { DummyWorkflow.bogus }.to have_said("Woohoo")
     end
 
     it "creates a method for a bogus command with arguments" do
-      workflow.command :bogus, arguments: [:feature_branch] do |**params|
-        "Woohoo #{params[:feature_branch]}!"
+      workflow.command :bogus, arguments: { feature_branch: nil } do |**params|
+        GitReflow.say "Woohoo #{params[:feature_branch]}!"
       end
 
-      expect(DummyWorkflow.bogus(feature_branch: "donuts")).to eql("Woohoo donuts!")
+      expect { DummyWorkflow.bogus(feature_branch: "arguments") }.to have_said("Woohoo arguments!")
     end
 
-    it "creates a class method for a bogus command with default options" do
-      workflow.command :bogus, arguments: [:feature_branch], defaults: {decoration: 'sprinkles'} do |**params|
+    it "creates a class method for a bogus command with default arguments" do
+      workflow.command :bogus, arguments: { feature_branch: nil, decoration: "sprinkles" } do |**params|
         donut_excitement = "Woohoo #{params[:feature_branch]}"
         donut_excitement += " with #{params[:decoration]}" if params[:decoration]
-        "#{donut_excitement}!"
+        GitReflow.say "#{donut_excitement}!"
+      end
+
+      expect { DummyWorkflow.bogus(feature_branch: "donuts") }.to have_said("Woohoo donuts with sprinkles!")
+    end
+
+    it "creates a class method for a bogus command with flags" do
+      workflow.command :bogus, flags: { feature_branch: nil } do |**params|
+        GitReflow.say "Woohoo #{params[:feature_branch]}!"
+      end
+
+      expect { DummyWorkflow.bogus(feature_branch: "flags") }.to have_said("Woohoo flags!")
+    end
+
+    it "creates a class method for a bogus command with default flags" do
+      workflow.command :bogus, flags: { feature_branch: "donuts" } do |**params|
+        GitReflow.say "Woohoo #{params[:feature_branch]}!"
+      end
+
+      expect { DummyWorkflow.bogus }.to have_said("Woohoo donuts!")
+    end
+
+    it "creates a class method for a bogus command with switches" do
+      workflow.command :bogus, switches: { feature_branch: nil } do |**params|
+        GitReflow.say "Woohoo #{params[:feature_branch]}!"
+      end
+
+      expect { DummyWorkflow.bogus(feature_branch: "switches") }.to have_said("Woohoo switches!")
+    end
+
+    it "creates a class method for a bogus command with default switches" do
+      workflow.command :bogus, switches: { feature_branch: "donuts" } do |**params|
+        GitReflow.say "Woohoo #{params[:feature_branch]}!"
       end
 
-      expect(DummyWorkflow.bogus(feature_branch: "donuts")).to eql("Woohoo donuts with sprinkles!")
+      expect { DummyWorkflow.bogus }.to have_said("Woohoo donuts!")
     end
   end
 
+  describe ".use(workflow_name)" do
+    it "Uses a pre-existing workflow as a basis" do
+      allow(GitReflow::Workflows::Core).to receive(:load_workflow)
+      expect(GitReflow::Workflows::Core).to receive(:load_workflow)
+        .with(workflow.workflows["FlatMergeWorkflow"])
+        .and_return(true)
+      workflow.use "FlatMergeWorkflow"
+    end
+  end
+
+  describe ".use_gem(name, *ags)" do
+    let(:mock_bundler) { DummyBundler.new }
+
+    before do
+      allow(DummyGemifiedWorkflow).to receive(:gemfile) do |&block|
+        mock_bundler.gemfile(&block)
+      end
+      stub_run_for(DummyGemifiedWorkflow)
+    end
+
+    it "Installs a gem using Bundler's inline gemfile" do
+      stub_command(command: "gem list -ie whirly", options: { loud: false, raise: true }, return_value: "false")
+      expect(mock_bundler).to receive(:source).with("https://rubygems.org")
+      expect(mock_bundler).to receive(:gem).with("whirly", "0.2.6")
+
+      DummyGemifiedWorkflow.class_eval do
+        use_gem "whirly", "0.2.6"
+      end
+    end
+
+    it "Uses an existing gem if it's already installed" do
+      stub_command(command: "gem list -ie whirly", options: { loud: false, raise: false }, return_value: "true")
+      expect(DummyGemifiedWorkflow).to_not receive(:gemfile)
+
+      DummyGemifiedWorkflow.class_eval do
+        use_gem "whirly", "0.2.6"
+      end
+    end
+  end
+
+  describe ".use_gemfile(&block)" do
+    let(:mock_bundler) { DummyBundler.new }
+
+    before do
+      allow(DummyGemifiedWorkflow).to receive(:gemfile) do |&block|
+        mock_bundler.gemfile(&block)
+      end
+      stub_run_for(DummyGemifiedWorkflow)
+    end
+
+    it "runs bundler's inline gemfile with the provided block" do
+      expect(mock_bundler).to receive(:source).with("https://rubygems.org")
+      expect(mock_bundler).to receive(:gem).with("standard")
+
+      DummyGemifiedWorkflow.class_eval do
+        use_gemfile do
+          source "https://rubygems.org"
+          gem "standard"
+        end
+      end
+    end
+  end
 end