git_reflow 0.8.9 → 0.8.10

data/lib/git_reflow/workflows/flat_merge.rb

@@ -1,10 +1,10 @@
-class FlatMerge < GitReflow::Workflows::Core
-  def self.deliver(**params)
-    base_branch     = params[:base] || 'master'
-    params[:squash] = false
-
-    super(**params)
-  end
-end
-
-FlatMerge
+class FlatMerge < GitReflow::Workflows::Core
+  def self.deliver(**params)
+    base_branch     = params[:base] || 'master'
+    params[:squash] = false
+
+    super(**params)
+  end
+end
+
+FlatMerge

data/spec/fixtures/awesome_workflow.rb

@@ -1,7 +1,7 @@
-class AwesomeWorkflow < GitReflow::Workflows::Core
-  def self.start(**args)
-    GitReflow.say "Awesome."
-  end
-end
-
-AwesomeWorkflow
+class AwesomeWorkflow < GitReflow::Workflows::Core
+  def self.start(**args)
+    GitReflow.say "Awesome."
+  end
+end
+
+AwesomeWorkflow

data/spec/fixtures/workflow_with_super.rb

@@ -1,8 +1,8 @@
-class WorkflowWithSuper < GitReflow::Workflows::Core
-  def self.start(**args)
-    GitReflow.say "Super."
-    super(feature_branch: args[:feature_branch], base: args[:base])
-  end
-end
-
-WorkflowWithSuper
+class WorkflowWithSuper < GitReflow::Workflows::Core
+  def self.start(**args)
+    GitReflow.say "Super."
+    super(feature_branch: args[:feature_branch], base: args[:base])
+  end
+end
+
+WorkflowWithSuper

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

@@ -1,81 +1,81 @@
-require 'spec_helper'
-
-describe GitReflow::GitServer::BitBucket do
-  let(:user)         { 'reenhanced' }
-  let(:password)     { 'shazam' }
-  let(:repo)         { 'repo' }
-  let(:api_key)      { 'a1b2c3d4e5f6g7h8i9j0' }
-  let(:hostname)     { 'hostname.local' }
-  let(:api_endpoint) { 'https://bitbucket.org/api/1.0' }
-  let(:site)         { 'https://bitbucket.org' }
-  let(:remote_url)   { "git@bitbucket.org:#{user}/#{repo}.git" }
-
-  before do
-    allow_any_instance_of(HighLine).to receive(:ask) do |terminal, question|
-      values = {
-        "Please enter your BitBucket username: " => user
-      }
-     return_value = values[question]
-     question = ""
-     return_value
-    end
-  end
-
-  describe '#initialize(options)' do
-    subject { GitReflow::GitServer::BitBucket.new({}) }
-
-    it 'sets the reflow git server provider to BitBucket in the git config' do
-      expect(GitReflow::Config).to receive(:set).once.with('reflow.git-server', 'BitBucket', local: false)
-      subject
-    end
-
-    context 'storing git config settings only for this project' do
-      subject { GitReflow::GitServer::BitBucket.new(project_only: true) }
-
-      it 'sets the enterprise site and api as the site and api endpoints for the BitBucket provider in the git config' do
-        expect(GitReflow::Config).to receive(:set).once.with('reflow.git-server', 'BitBucket', local: true)
-        subject
-      end
-    end
-
-  end
-
-  describe '#authenticate' do
-    let(:bitbucket)      { GitReflow::GitServer::BitBucket.new( { }) }
-    let!(:bitbucket_api) { BitBucket.new }
-    subject              { bitbucket.authenticate }
-
-    context 'already authenticated' do
-      it "notifies the user of successful setup" do
-        allow(GitReflow::Config).to receive(:set).with('reflow.git-server', 'BitBucket', local: false)
-        allow(GitReflow::Config).to receive(:get).with('remote.origin.url').and_return(remote_url)
-        allow(GitReflow::Config).to receive(:get).with('bitbucket.user', local: false).and_return(user)
-        allow(GitReflow::Config).to receive(:get).with('bitbucket.api-key', reload: true, local: false).and_return(api_key)
-        allow(GitReflow::Config).to receive(:get).with('reflow.local-projects', all: true).and_return('')
-        expect { subject }.to have_said "\nYour BitBucket account was already setup with:"
-        expect { subject }.to have_said "\tUser Name: #{user}"
-      end
-    end
-
-    context 'not yet authenticated' do
-      context 'with valid BitBucket credentials' do
-        before do
-          allow(GitReflow::Config).to receive(:get).and_return('')
-          allow(GitReflow::Config).to receive(:set)
-          allow(GitReflow::Config).to receive(:set).with('bitbucket.api-key', reload: true).and_return(api_key)
-          allow(GitReflow::Config).to receive(:get).with('bitbucket.api-key', reload: true).and_return('')
-          allow(GitReflow::Config).to receive(:get).with('remote.origin.url').and_return(remote_url)
-          allow(GitReflow::Config).to receive(:get).with('reflow.local-projects').and_return('')
-          allow(bitbucket).to receive(:connection).and_return double(repos: double(all: []))
-        end
-
-        it "prompts me to setup an API key" do
-          expect { subject }.to have_said "\nIn order to connect your BitBucket account,"
-          expect { subject }.to have_said "you'll need to generate an API key for your team"
-          expect { subject }.to have_said "Visit https://bitbucket.org/account/user/reenhanced/api-key/, to generate it\n"
-        end
-      end
-    end
-  end
-
-end
+require 'spec_helper'
+
+describe GitReflow::GitServer::BitBucket do
+  let(:user)         { 'reenhanced' }
+  let(:password)     { 'shazam' }
+  let(:repo)         { 'repo' }
+  let(:api_key)      { 'a1b2c3d4e5f6g7h8i9j0' }
+  let(:hostname)     { 'hostname.local' }
+  let(:api_endpoint) { 'https://bitbucket.org/api/1.0' }
+  let(:site)         { 'https://bitbucket.org' }
+  let(:remote_url)   { "git@bitbucket.org:#{user}/#{repo}.git" }
+
+  before do
+    allow_any_instance_of(HighLine).to receive(:ask) do |terminal, question|
+      values = {
+        "Please enter your BitBucket username: " => user
+      }
+     return_value = values[question]
+     question = ""
+     return_value
+    end
+  end
+
+  describe '#initialize(options)' do
+    subject { GitReflow::GitServer::BitBucket.new({}) }
+
+    it 'sets the reflow git server provider to BitBucket in the git config' do
+      expect(GitReflow::Config).to receive(:set).once.with('reflow.git-server', 'BitBucket', local: false)
+      subject
+    end
+
+    context 'storing git config settings only for this project' do
+      subject { GitReflow::GitServer::BitBucket.new(project_only: true) }
+
+      it 'sets the enterprise site and api as the site and api endpoints for the BitBucket provider in the git config' do
+        expect(GitReflow::Config).to receive(:set).once.with('reflow.git-server', 'BitBucket', local: true)
+        subject
+      end
+    end
+
+  end
+
+  describe '#authenticate' do
+    let(:bitbucket)      { GitReflow::GitServer::BitBucket.new( { }) }
+    let!(:bitbucket_api) { BitBucket.new }
+    subject              { bitbucket.authenticate }
+
+    context 'already authenticated' do
+      it "notifies the user of successful setup" do
+        allow(GitReflow::Config).to receive(:set).with('reflow.git-server', 'BitBucket', local: false)
+        allow(GitReflow::Config).to receive(:get).with('remote.origin.url').and_return(remote_url)
+        allow(GitReflow::Config).to receive(:get).with('bitbucket.user', local: false).and_return(user)
+        allow(GitReflow::Config).to receive(:get).with('bitbucket.api-key', reload: true, local: false).and_return(api_key)
+        allow(GitReflow::Config).to receive(:get).with('reflow.local-projects', all: true).and_return('')
+        expect { subject }.to have_said "\nYour BitBucket account was already setup with:"
+        expect { subject }.to have_said "\tUser Name: #{user}"
+      end
+    end
+
+    context 'not yet authenticated' do
+      context 'with valid BitBucket credentials' do
+        before do
+          allow(GitReflow::Config).to receive(:get).and_return('')
+          allow(GitReflow::Config).to receive(:set)
+          allow(GitReflow::Config).to receive(:set).with('bitbucket.api-key', reload: true).and_return(api_key)
+          allow(GitReflow::Config).to receive(:get).with('bitbucket.api-key', reload: true).and_return('')
+          allow(GitReflow::Config).to receive(:get).with('remote.origin.url').and_return(remote_url)
+          allow(GitReflow::Config).to receive(:get).with('reflow.local-projects').and_return('')
+          allow(bitbucket).to receive(:connection).and_return double(repos: double(all: []))
+        end
+
+        it "prompts me to setup an API key" do
+          expect { subject }.to have_said "\nIn order to connect your BitBucket account,"
+          expect { subject }.to have_said "you'll need to generate an API key for your team"
+          expect { subject }.to have_said "Visit https://bitbucket.org/account/user/reenhanced/api-key/, to generate it\n"
+        end
+      end
+    end
+  end
+
+end

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

@@ -490,10 +490,10 @@ describe GitReflow::GitServer::GitHub::PullRequest do
     context "and force-merging" do
       let(:inputs) do
         {
-          base:      "base_branch",
-          title:     "title",
-          message:   "message",
-          skip_lgtm: true
+          base:    "base_branch",
+          title:   "title",
+          message: "message",
+          force:   true
         }
       end
 

data/spec/lib/git_reflow/git_server_spec.rb

@@ -1,101 +1,101 @@
-require 'spec_helper'
-
-describe GitReflow::GitServer do
-  let(:connection_options) { nil }
-
-  subject { GitReflow::GitServer.connect connection_options }
-
-  before do
-    allow(GitReflow::GitServer::GitHub).to receive(:new)
-
-    module GitReflow::GitServer
-      class DummyHub < Base
-        def initialize(options)
-          "Initialized with #{options}"
-        end
-
-        def authenticate(options={})
-        end
-
-        def connection
-          'Connected!'
-        end
-      end
-    end
-  end
-
-  describe '.connect(options)' do
-    it 'initializes a new GitHub server provider by default' do
-      stubbed_github = Class.new
-      allow(stubbed_github).to receive(:authenticate)
-      expect(GitReflow::GitServer::GitHub).to receive(:new).and_return(stubbed_github)
-      subject
-    end
-
-    context 'provider is specified' do
-      let(:connection_options) { {provider: 'DummyHub'}.merge(expected_server_options) }
-      let(:expected_server_options) {{ basic_auth: 'user:pass', end_point: 'https://api.example.com' }}
-
-      it 'initializes any server provider that has been implemented' do
-        dummy_hub = GitReflow::GitServer::DummyHub.new({})
-        expect(GitReflow::GitServer::DummyHub).to receive(:new).with(expected_server_options).and_return(dummy_hub)
-        expect(subject).to eq(dummy_hub)
-        expect($says).not_to include 'GitServer not setup for: DummyHub'
-      end
-    end
-
-    context 'provider not yet implemented' do
-      let(:connection_options) {{ provider: 'GitLab' }}
-      it { expect{ subject }.to have_said "Error connecting to GitLab: GitServer not setup for \"GitLab\"", :error }
-    end
-  end
-
-  describe '.current_provider' do
-    subject { GitReflow::GitServer.current_provider }
-
-    before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server', local: true).and_return(nil) }
-
-    context 'Reflow setup to use GitHub' do
-      before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('GitHub') }
-      it     { is_expected.to eq(GitReflow::GitServer::GitHub) }
-    end
-
-    context 'Reflow has not yet been setup' do
-      before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('') }
-      it     { is_expected.to be_nil }
-      it     { expect{ subject }.to have_said "Reflow hasn't been setup yet.  Run 'git reflow setup' to continue", :notice }
-    end
-
-    context 'an unknown server provider is stored in the git config' do
-      before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('GittyUp') }
-
-      it { is_expected.to be_nil }
-      it { expect{ subject }.to have_said "GitServer not setup for \"GittyUp\"", :error }
-    end
-  end
-
-  describe '.connection' do
-    subject { GitReflow::GitServer.connection }
-
-    before do
-      allow(GitReflow::Config).to receive(:get).with('reflow.git-server', local: true).and_return(nil)
-      allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return(nil)
-    end
-
-    it { is_expected.to be_nil }
-
-    context "with a valid provider" do
-      before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('GitHub') }
-      it 'calls connection on the provider' do
-        expect(GitReflow::GitServer::GitHub).to receive(:connection)
-        subject
-      end
-    end
-
-    context "with an invalid provider" do
-      before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('GittyUp') }
-      it     { is_expected.to be_nil }
-      it     { expect{ subject }.to have_said "GitServer not setup for \"GittyUp\"", :error }
-    end
-  end
-end
+require 'spec_helper'
+
+describe GitReflow::GitServer do
+  let(:connection_options) { nil }
+
+  subject { GitReflow::GitServer.connect connection_options }
+
+  before do
+    allow(GitReflow::GitServer::GitHub).to receive(:new)
+
+    module GitReflow::GitServer
+      class DummyHub < Base
+        def initialize(options)
+          "Initialized with #{options}"
+        end
+
+        def authenticate(options={})
+        end
+
+        def connection
+          'Connected!'
+        end
+      end
+    end
+  end
+
+  describe '.connect(options)' do
+    it 'initializes a new GitHub server provider by default' do
+      stubbed_github = Class.new
+      allow(stubbed_github).to receive(:authenticate)
+      expect(GitReflow::GitServer::GitHub).to receive(:new).and_return(stubbed_github)
+      subject
+    end
+
+    context 'provider is specified' do
+      let(:connection_options) { {provider: 'DummyHub'}.merge(expected_server_options) }
+      let(:expected_server_options) {{ basic_auth: 'user:pass', end_point: 'https://api.example.com' }}
+
+      it 'initializes any server provider that has been implemented' do
+        dummy_hub = GitReflow::GitServer::DummyHub.new({})
+        expect(GitReflow::GitServer::DummyHub).to receive(:new).with(expected_server_options).and_return(dummy_hub)
+        expect(subject).to eq(dummy_hub)
+        expect($says).not_to include 'GitServer not setup for: DummyHub'
+      end
+    end
+
+    context 'provider not yet implemented' do
+      let(:connection_options) {{ provider: 'GitLab' }}
+      it { expect{ subject }.to have_said "Error connecting to GitLab: GitServer not setup for \"GitLab\"", :error }
+    end
+  end
+
+  describe '.current_provider' do
+    subject { GitReflow::GitServer.current_provider }
+
+    before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server', local: true).and_return(nil) }
+
+    context 'Reflow setup to use GitHub' do
+      before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('GitHub') }
+      it     { is_expected.to eq(GitReflow::GitServer::GitHub) }
+    end
+
+    context 'Reflow has not yet been setup' do
+      before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('') }
+      it     { is_expected.to be_nil }
+      it     { expect{ subject }.to have_said "Reflow hasn't been setup yet.  Run 'git reflow setup' to continue", :notice }
+    end
+
+    context 'an unknown server provider is stored in the git config' do
+      before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('GittyUp') }
+
+      it { is_expected.to be_nil }
+      it { expect{ subject }.to have_said "GitServer not setup for \"GittyUp\"", :error }
+    end
+  end
+
+  describe '.connection' do
+    subject { GitReflow::GitServer.connection }
+
+    before do
+      allow(GitReflow::Config).to receive(:get).with('reflow.git-server', local: true).and_return(nil)
+      allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return(nil)
+    end
+
+    it { is_expected.to be_nil }
+
+    context "with a valid provider" do
+      before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('GitHub') }
+      it 'calls connection on the provider' do
+        expect(GitReflow::GitServer::GitHub).to receive(:connection)
+        subject
+      end
+    end
+
+    context "with an invalid provider" do
+      before { allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('GittyUp') }
+      it     { is_expected.to be_nil }
+      it     { expect{ subject }.to have_said "GitServer not setup for \"GittyUp\"", :error }
+    end
+  end
+end

data/spec/lib/git_reflow/sandbox_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe GitReflow::Sandbox do
 
     it "when blocking is flagged off, the command exits silently" do
       allow(GitReflow::Sandbox).to receive(:run).and_call_original
-      expect { GitReflow::Sandbox.run("ls wtf", blocking: false) }.to_not raise_error SystemExit
+      expect { GitReflow::Sandbox.run("ls wtf", blocking: false) }.to_not raise_error
     end
   end
 end

data/spec/lib/git_reflow/workflow_spec.rb

@@ -1,59 +1,59 @@
-require 'spec_helper'
-
-describe GitReflow::Workflow do
-
-  class DummyWorkflow
-    include GitReflow::Workflow
-  end
-
-  let(:workflow) { DummyWorkflow }
-  let(:loader)   { double() }
-
-  describe ".current" do
-    subject { GitReflow::Workflow.current }
-
-    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
-      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) }
-    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"
-      end
-
-      expect(DummyWorkflow.bogus).to eql("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]}!"
-      end
-
-      expect(DummyWorkflow.bogus(feature_branch: "donuts")).to eql("Woohoo donuts!")
-    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|
-        donut_excitement = "Woohoo #{params[:feature_branch]}"
-        donut_excitement += " with #{params[:decoration]}" if params[:decoration]
-        "#{donut_excitement}!"
-      end
-
-      expect(DummyWorkflow.bogus(feature_branch: "donuts")).to eql("Woohoo donuts with sprinkles!")
-    end
-  end
-
-end
+require 'spec_helper'
+
+describe GitReflow::Workflow do
+
+  class DummyWorkflow
+    include GitReflow::Workflow
+  end
+
+  let(:workflow) { DummyWorkflow }
+  let(:loader)   { double() }
+
+  describe ".current" do
+    subject { GitReflow::Workflow.current }
+
+    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
+      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) }
+    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"
+      end
+
+      expect(DummyWorkflow.bogus).to eql("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]}!"
+      end
+
+      expect(DummyWorkflow.bogus(feature_branch: "donuts")).to eql("Woohoo donuts!")
+    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|
+        donut_excitement = "Woohoo #{params[:feature_branch]}"
+        donut_excitement += " with #{params[:decoration]}" if params[:decoration]
+        "#{donut_excitement}!"
+      end
+
+      expect(DummyWorkflow.bogus(feature_branch: "donuts")).to eql("Woohoo donuts with sprinkles!")
+    end
+  end
+
+end