git_reflow 0.8.10 → 0.9.4

data/spec/lib/git_reflow/workflows/flat_merge_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 describe 'FlatMerge' do
-  let(:workflow_path) { File.join(File.expand_path("../../../../../lib/git_reflow/workflows", __FILE__), "/flat_merge.rb") }
   let(:mergable_pr) { double(good_to_merge?: true, merge!: true) }
   let(:git_server)  { double(find_open_pull_request: mergable_pr) }
 
   before  do
     allow(GitReflow::Config).to receive(:get).and_call_original
-    allow(GitReflow::Config).to receive(:get).with("reflow.workflow").and_return(workflow_path)
     allow(GitReflow).to receive(:git_server).and_return(git_server)
     allow(GitReflow).to receive(:status)
+    # Makes sure we are loading the right workflow
+    workflow_path = File.join(File.expand_path("../../../../../lib/git_reflow/workflows", __FILE__), "FlatMergeWorkflow")
+    use_workflow(workflow_path)
   end
 
-  # Makes sure we are loading the right workflow
-  specify { expect( GitReflow.workflow ).to eql(GitReflow::Workflow::FlatMerge) }
+  after { GitReflow::Workflow.reset! }
 
   context ".deliver" do
     subject { GitReflow.deliver }
@@ -25,6 +25,7 @@ describe 'FlatMerge' do
       let!(:github_api) { github.connection }
 
       before do
+        allow(File).to receive(:read).and_call_original
         allow_any_instance_of(GitReflow::GitServer::PullRequest).to receive(:deliver?).and_return(false)
         allow(GitReflow::Workflows::Core).to receive(:status)
         allow(GitReflow.git_server).to receive(:get_build_status).and_return(Struct.new(:state, :description, :url, :target_url).new)
@@ -33,7 +34,12 @@ describe 'FlatMerge' do
       end
 
       it "overrides squash merge in favor of flat merge" do
-        expect(pr).to receive(:merge!).with(base: 'master', squash: false)
+        expect(pr).to receive(:merge!).with(
+          base: "master",
+          merge_method: "merge",
+          force: false,
+          skip_lgtm: false
+        )
         subject
       end
     end
@@ -51,7 +57,12 @@ describe 'FlatMerge' do
       end
 
       it "doesn't squash merge" do
-        expect(pr).to receive(:merge!).with(base: 'master', squash: false, force: true)
+        expect(pr).to receive(:merge!).with(
+          base: "master",
+          merge_method: "merge",
+          force: true,
+          skip_lgtm: false
+        )
         subject
       end
     end

data/spec/lib/git_reflow_spec.rb

@@ -17,24 +17,11 @@ describe GitReflow do
     end
   end
 
-  describe ".default_editor" do
-    subject { GitReflow.default_editor }
-
-    context "when the environment has EDITOR set" do
-      before  { allow(ENV).to receive(:[]).with('EDITOR').and_return('emacs') }
-      specify { expect( subject ).to eql('emacs') }
-    end
-
-    context "when the environment has no EDITOR set" do
-      before  { allow(ENV).to receive(:[]).with('EDITOR').and_return(nil) }
-      specify { expect( subject ).to eql('vi') }
-    end
-  end
-
   describe ".git_server" do
     subject { GitReflow.git_server }
 
     before do
+      allow(GitReflow::Config).to receive(:get)
       allow(GitReflow::Config).to receive(:get).with('reflow.git-server').and_return('GitHub ')
     end
 
@@ -52,23 +39,13 @@ describe GitReflow do
     end
 
     context "when a workflow is set" do
-
       it "calls the defined workflow methods instead of the default core" do
         workflow_path = File.join(File.expand_path("../../fixtures", __FILE__), "/awesome_workflow.rb")
         allow(GitReflow::Config).to receive(:get).with("reflow.workflow").and_return(workflow_path)
+        expect(GitReflow::Workflows::Core).to receive(:load_raw_workflow).with(File.read(workflow_path)).and_call_original
 
-        expect(GitReflow.workflow).to eql(GitReflow::Workflow::AwesomeWorkflow)
         expect{ subject.start }.to have_said "Awesome."
       end
-
-      it "the workflow can call super" do
-        workflow_path = File.join(File.expand_path("../../fixtures", __FILE__), "/workflow_with_super.rb")
-        allow(GitReflow::Config).to receive(:get).with("reflow.workflow").and_return(workflow_path)
-
-        expect(GitReflow.workflow).to eql(GitReflow::Workflow::WorkflowWithSuper)
-        expect{ subject.start }.to have_said "Super."
-        expect{ subject.start }.to have_said "usage: git-reflow start [new-branch-name]", :error
-      end
     end
 
   end

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ RSpec.configure do |config|
   config.include GitReflow::RSpec::CommandLineHelpers
   config.include GithubHelpers
   config.include GitReflow::RSpec::StubHelpers
+  config.include GitReflow::RSpec::WorkflowHelpers
 
   config.expect_with :rspec do |c|
     c.syntax = [:should, :expect]
@@ -28,6 +29,8 @@ RSpec.configure do |config|
   config.before(:each) do
     WebMock.reset!
     stub_command_line
+    suppress_loading_of_external_workflows
+    GitReflow::Workflow.reset!
     allow_message_expectations_on_nil
   end
 

data/spec/support/github_helpers.rb

@@ -39,7 +39,7 @@ module GithubHelpers
     stub_request(:get, "#{api_endpoint}/authorizations?").to_return(:body => [oauth_token_hash].to_json, status: 200, headers: {})
     allow(Github::Client).to receive(:new).and_return(github)
     allow(GitReflow).to receive(:push_current_branch).and_return(true)
-    allow(GitReflow).to receive(:github).and_return(github)
+    allow(GitReflow).to receive(:git_server).and_return(github)
     allow(GitReflow).to receive(:current_branch).and_return(branch)
     allow(GitReflow).to receive(:remote_repo_name).and_return(repo)
     allow(GitReflow).to receive(:remote_user).and_return(user)

data/spec/support/mock_pull_request.rb

@@ -1,17 +1,17 @@
-class MockPullRequest < GitReflow::GitServer::PullRequest
-  DESCRIPTION         = "Bingo! Unity."
-  HTML_URL            = "https://github.com/reenhanced/gitreflow/pulls/0"
-  FEATURE_BRANCH_NAME = "feature_branch"
-  BASE_BRANCH_NAME    = "base"
-  NUMBER              = 0
-
-  def initialize(attributes = Struct.new(:description, :html_url, :feature_branch_name, :base_branch_name, :number).new)
-    self.description         = attributes.description || DESCRIPTION
-    self.html_url            = attributes.html_url || HTML_URL
-    self.feature_branch_name = attributes.feature_branch_name || FEATURE_BRANCH_NAME
-    self.base_branch_name    = attributes.base_branch_name || BASE_BRANCH_NAME
-    self.build               = Build.new
-    self.number              = attributes.number || NUMBER
-    self.source_object       = attributes
-  end
-end
+class MockPullRequest < GitReflow::GitServer::PullRequest
+  DESCRIPTION         = "Bingo! Unity."
+  HTML_URL            = "https://github.com/reenhanced/gitreflow/pulls/0"
+  FEATURE_BRANCH_NAME = "feature_branch"
+  BASE_BRANCH_NAME    = "base"
+  NUMBER              = 0
+
+  def initialize(attributes = Struct.new(:description, :html_url, :feature_branch_name, :base_branch_name, :number).new)
+    self.description         = attributes.description || DESCRIPTION
+    self.html_url            = attributes.html_url || HTML_URL
+    self.feature_branch_name = attributes.feature_branch_name || FEATURE_BRANCH_NAME
+    self.base_branch_name    = attributes.base_branch_name || BASE_BRANCH_NAME
+    self.build               = Build.new
+    self.number              = attributes.number || NUMBER
+    self.source_object       = attributes
+  end
+end

data/spec/support/web_mocks.rb

@@ -1,39 +1,39 @@
-def stub_get(path, endpoint = GitReflow.git_server.class.api_endpoint)
-  stub_request(:get, endpoint + path)
-end
-
-def stub_post(path, endpoint = GitReflow.git_server.class.api_endpoint)
-  stub_request(:post, endpoint + path)
-end
-
-def stub_patch(path, endpoint = Github.endpoint.to_s)
-  stub_request(:patch, endpoint + path)
-end
-
-def stub_put(path, endpoint = Github.endpoint.to_s)
-  stub_request(:put, endpoint + path)
-end
-
-def stub_delete(path, endpoint = Github.endpoint.to_s)
-  stub_request(:delete, endpoint + path)
-end
-
-def a_get(path, endpoint = Github.endpoint.to_s)
-  a_request(:get, endpoint + path)
-end
-
-def a_post(path, endpoint = Github.endpoint.to_s)
-  a_request(:post, endpoint + path)
-end
-
-def a_patch(path, endpoint = Github.endpoint.to_s)
-  a_request(:patch, endpoint + path)
-end
-
-def a_put(path, endpoint = Github.endpoint)
-  a_request(:put, endpoint + path)
-end
-
-def a_delete(path, endpoint = Github.endpoint)
-  a_request(:delete, endpoint + path)
-end
+def stub_get(path, endpoint = GitReflow.git_server.class.api_endpoint)
+  stub_request(:get, endpoint + path)
+end
+
+def stub_post(path, endpoint = GitReflow.git_server.class.api_endpoint)
+  stub_request(:post, endpoint + path)
+end
+
+def stub_patch(path, endpoint = Github.endpoint.to_s)
+  stub_request(:patch, endpoint + path)
+end
+
+def stub_put(path, endpoint = Github.endpoint.to_s)
+  stub_request(:put, endpoint + path)
+end
+
+def stub_delete(path, endpoint = Github.endpoint.to_s)
+  stub_request(:delete, endpoint + path)
+end
+
+def a_get(path, endpoint = Github.endpoint.to_s)
+  a_request(:get, endpoint + path)
+end
+
+def a_post(path, endpoint = Github.endpoint.to_s)
+  a_request(:post, endpoint + path)
+end
+
+def a_patch(path, endpoint = Github.endpoint.to_s)
+  a_request(:patch, endpoint + path)
+end
+
+def a_put(path, endpoint = Github.endpoint)
+  a_request(:put, endpoint + path)
+end
+
+def a_delete(path, endpoint = Github.endpoint)
+  a_request(:delete, endpoint + path)
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.9.4
 platform: ruby
 authors:
 - Valentino Stoll
 - Robert Stern
 - Nicholas Hance
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -27,21 +27,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -130,98 +130,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: codenamev_bitbucket_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.17.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.17.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: github_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
-  name: github_api
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: reenhanced_bitbucket_api
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0'
 description: Git Reflow manages your git workflow.
 email:
 - dev@reenhanced.com
@@ -230,7 +230,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/multi-ruby-tests.yml"
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-version"
 - Appraisals
 - CHANGELOG.md
@@ -239,21 +241,14 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Workflow
 - _config.yml
 - bin/console
 - bin/setup
-- circle.yml
 - exe/git-reflow
 - git_reflow.gemspec
 - lib/git_reflow.rb
 - lib/git_reflow/base.rb
-- lib/git_reflow/commands/deliver.rb
-- lib/git_reflow/commands/refresh.rb
-- lib/git_reflow/commands/review.rb
-- lib/git_reflow/commands/setup.rb
-- lib/git_reflow/commands/stage.rb
-- lib/git_reflow/commands/start.rb
-- lib/git_reflow/commands/status.rb
 - lib/git_reflow/config.rb
 - lib/git_reflow/git_helpers.rb
 - lib/git_reflow/git_server.rb
@@ -268,11 +263,13 @@ files:
 - lib/git_reflow/rspec.rb
 - lib/git_reflow/rspec/command_line_helpers.rb
 - lib/git_reflow/rspec/stub_helpers.rb
+- lib/git_reflow/rspec/workflow_helpers.rb
 - lib/git_reflow/sandbox.rb
 - lib/git_reflow/version.rb
 - lib/git_reflow/workflow.rb
+- lib/git_reflow/workflows/FlatMergeWorkflow
 - lib/git_reflow/workflows/core.rb
-- lib/git_reflow/workflows/flat_merge.rb
+- spec/fixtures/authentication_failure.json
 - spec/fixtures/awesome_workflow.rb
 - spec/fixtures/git/git_config
 - spec/fixtures/issues/comment.json.erb
@@ -285,6 +282,7 @@ files:
 - spec/fixtures/pull_requests/external_pull_request.json
 - spec/fixtures/pull_requests/pull_request.json
 - spec/fixtures/pull_requests/pull_request.json.erb
+- spec/fixtures/pull_requests/pull_request_branch_nonexistent_error.json
 - spec/fixtures/pull_requests/pull_request_exists_error.json
 - spec/fixtures/pull_requests/pull_requests.json
 - spec/fixtures/pull_requests/review.json.erb
@@ -293,7 +291,7 @@ files:
 - spec/fixtures/repositories/commit.json.erb
 - spec/fixtures/repositories/commits.json.erb
 - spec/fixtures/repositories/statuses.json
-- spec/fixtures/workflow_with_super.rb
+- spec/fixtures/users/user.json
 - spec/lib/git_reflow/config_spec.rb
 - spec/lib/git_reflow/git_helpers_spec.rb
 - spec/lib/git_reflow/git_server/bit_bucket_spec.rb
@@ -337,12 +335,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A better git process
 test_files:
+- spec/fixtures/authentication_failure.json
 - spec/fixtures/awesome_workflow.rb
 - spec/fixtures/git/git_config
 - spec/fixtures/issues/comment.json.erb
@@ -355,6 +353,7 @@ test_files:
 - spec/fixtures/pull_requests/external_pull_request.json
 - spec/fixtures/pull_requests/pull_request.json
 - spec/fixtures/pull_requests/pull_request.json.erb
+- spec/fixtures/pull_requests/pull_request_branch_nonexistent_error.json
 - spec/fixtures/pull_requests/pull_request_exists_error.json
 - spec/fixtures/pull_requests/pull_requests.json
 - spec/fixtures/pull_requests/review.json.erb
@@ -363,7 +362,7 @@ test_files:
 - spec/fixtures/repositories/commit.json.erb
 - spec/fixtures/repositories/commits.json.erb
 - spec/fixtures/repositories/statuses.json
-- spec/fixtures/workflow_with_super.rb
+- spec/fixtures/users/user.json
 - spec/lib/git_reflow/config_spec.rb
 - spec/lib/git_reflow/git_helpers_spec.rb
 - spec/lib/git_reflow/git_server/bit_bucket_spec.rb