git_reflow 0.8.10 → 0.9.0

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.9.0
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -152,20 +152,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.17.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.17.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -200,14 +186,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: reenhanced_bitbucket_api
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +217,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".ruby-version"
 - Appraisals
 - CHANGELOG.md
@@ -247,13 +234,6 @@ files:
 - 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 +248,12 @@ 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/awesome_workflow.rb
 - spec/fixtures/git/git_config
 - spec/fixtures/issues/comment.json.erb
@@ -285,6 +266,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 +275,6 @@ 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/lib/git_reflow/config_spec.rb
 - spec/lib/git_reflow/git_helpers_spec.rb
 - spec/lib/git_reflow/git_server/bit_bucket_spec.rb
@@ -355,6 +336,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 +345,6 @@ 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/lib/git_reflow/config_spec.rb
 - spec/lib/git_reflow/git_helpers_spec.rb
 - spec/lib/git_reflow/git_server/bit_bucket_spec.rb

data/lib/git_reflow/commands/deliver.rb

@@ -1,10 +0,0 @@
-desc 'deliver your feature branch'
-long_desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
-
-command :deliver do |c|
-  c.desc 'merge your feature branch down to your base branch, and cleanup your feature branch'
-  c.switch [:f, :'skip-lgtm'], desc: 'skip the lgtm checks and deliver your feature branch'
-  c.action do |global_options, options, args|
-    GitReflow.deliver base: args[0], force: options[:'skip-lgtm']
-  end
-end

data/lib/git_reflow/commands/refresh.rb

@@ -1,20 +0,0 @@
-desc 'Updates and synchronizes your base branch and feature branch.'
-long_desc <<LONGTIME
-  Performs the following:\n
-  \t$ git checkout <base_branch>\n
-  \t$ git pull <remote_location> <base_branch>\n
-  \t$ git checkout <current_branch>\n
-  \t$ git pull origin <current_branch>\n
-  \t$ git merge <base_branch>\n
-LONGTIME
-arg_name '[remote_location] - remote repository name to fetch updates from (origin by default), [base_branch] - branch that you want to merge with (master by default)'
-command :refresh do |c|
-  c.desc 'updates base_branch based on remote and merges the base with your feature_branch'
-  c.flag [:r,:remote], default_value: 'origin'
-  c.flag [:b,:base], default_value: 'master'
-  c.action do |global_options, options, args|
-
-    GitReflow.refresh base: options[:base], remote: options[:remote]
-
-  end
-end

data/lib/git_reflow/commands/review.rb

@@ -1,13 +0,0 @@
-desc 'review will push your latest feature branch changes to your remote repo and create a pull request'
-arg_name 'Describe arguments to review here'
-command :review do |c|
-  c.desc 'push your latest feature branch changes to your remote repo and create a pull request against the destination branch'
-  c.arg_name '[destination_branch] - the branch you want to merge your feature branch into'
-  c.flag [:t, :title]
-  c.flag [:m, :message]
-  c.action do |global_options,options,args|
-
-    GitReflow.review base: args[0], title: options[:title], body: options[:message]
-
-  end
-end

data/lib/git_reflow/commands/setup.rb

@@ -1,11 +0,0 @@
-desc 'Setup your GitHub account'
-command :setup do |c|
-  c.desc 'sets up your api token with GitHub'
-  c.switch [:l, :local], default_value: false, desc: 'setup GitReflow for the current project only'
-  c.switch [:e, :enterprise], default_value: false, desc: 'setup GitReflow with a Github Enterprise account'
-  c.action do |global_options, options, args|
-
-    GitReflow.setup local: options[:local], enterprise: options[:enterprise]
-
-  end
-end

data/lib/git_reflow/commands/stage.rb

@@ -1,9 +0,0 @@
-desc 'Deliver your changes to a staging server'
-command :stage do |c|
-  c.desc 'deliver your feature branch to the staging branch'
-  c.action do |global_options, options, args|
-
-    GitReflow.stage
-
-  end
-end

data/lib/git_reflow/commands/start.rb

@@ -1,18 +0,0 @@
-
-desc 'Start will create a new feature branch and setup remote tracking'
-long_desc <<LONGTIME
-  Performs the following:\n
-  \t$ git checkout <base_branch>\n
-  \t$ git pull origin <base_branch>\n
-  \t$ git push origin <base_branch>:refs/heads/[new_feature_branch]\n
-  \t$ git checkout --track -b [new_feature_branch] origin/[new_feature_branch]\n
-LONGTIME
-arg_name '[new-feature-branch-name] - name of the new feature branch'
-command :start do |c|
-  c.flag [:b,:base], default_value: 'master'
-  c.action do |global_options, options, args|
-
-    GitReflow.start feature_branch: args[0], base: options[:base]
-
-  end
-end

data/lib/git_reflow/commands/status.rb

@@ -1,7 +0,0 @@
-desc 'Display information about the status of your feature in the review process'
-arg_name "destination_branch - the branch you're merging your feature into ('master' is default)"
-command :status do |c|
-  c.action do |global_options, options, args|
-    GitReflow.status destination_branch: args[0]
-  end
-end

data/lib/git_reflow/workflows/flat_merge.rb

@@ -1,10 +0,0 @@
-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/workflow_with_super.rb

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