git_reflow 0.4.2 → 0.5.0

data/spec/support/command_line_helpers.rb

@@ -2,6 +2,7 @@ module CommandLineHelpers
   def stub_command_line
     $commands_ran = []
     $output       = []
+    $says         = []
 
     stub_run_for GitReflow
     stub_run_for GitReflow::Sandbox
@@ -18,6 +19,9 @@ module CommandLineHelpers
       $commands_ran << Hashie::Mash.new(command: command, options: options)
       command = "" # we need this due to a bug in rspec that will keep this assignment on subsequent runs of the stub
     end
+    module_to_stub.stub(:say) do |output, type|
+      $says << {message: output, type: type}
+    end
   end
 
   def reset_stubbed_command_line
@@ -84,6 +88,19 @@ RSpec::Matchers.define :have_run_commands_in_order do |commands|
   end
 end
 
+RSpec::Matchers.define :have_said do |expected_message, expected_type|
+  match do |block|
+    block.call
+    $says.include?({message: expected_message, type: expected_type})
+  end
+
+  supports_block_expectations
+
+  failure_message do |block|
+    "expected GitReflow to have said #{expected_message} with #{expected_type.inspect} but didn't: \n\t#{$says.inspect}"
+  end
+end
+
 RSpec::Matchers.define :have_output do |expected_output|
   match do |block|
     block.call
@@ -96,4 +113,3 @@ RSpec::Matchers.define :have_output do |expected_output|
     "expected STDOUT to include #{expected_output} but didn't: \n\t#{$output.inspect}"
   end
 end
-

data/spec/support/github_helpers.rb

@@ -53,20 +53,21 @@ module GithubHelpers
     github_server.class.stub(:oauth_token).and_return(oauth_token_hash.token)
     github_server.class.stub(:site_url).and_return(site_url)
     github_server.class.stub(:api_endpoint).and_return(api_endpoint)
-    github_server.stub(:remote_user).and_return(user)
-    github_server.stub(:remote_repo).and_return(repo)
-    github_server.stub(:oauth_token).and_return(oauth_token_hash.token)
-    github_server.stub(:get_commited_time).and_return(Time.now)
+    github_server.class.stub(:remote_user).and_return(user)
+    github_server.class.stub(:remote_repo).and_return(repo)
+    github_server.class.stub(:oauth_token).and_return(oauth_token_hash.token)
+    github_server.class.stub(:get_commited_time).and_return(Time.now)
 
     GitReflow.stub(:git_server).and_return(github_server)
 
     # Stubbing statuses for a given commit
+    stub_request(:get, %r{#{GitReflow.git_server.class.api_endpoint}/repos/#{user}/commits/\w+}).
+      to_return(:body => fixture('repositories/commit.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
     stub_request(:get, %r{#{GitReflow.git_server.class.api_endpoint}/repos/#{user}/commits/\w+/statuses?}).
       to_return(:body => fixture('pull_requests/pull_requests.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
 
     if pull
       # Stubbing review
-      github.pull_requests.stub(:create).with(user, repo, pull.except('state')).and_return(Hashie::Mash.new(:number => '1', :title => pull['title'], :html_url => "https://github.com/#{user}/#{repo}/pulls/1"))
       stub_post("/repos/#{user}/#{repo}/pulls").
         to_return(:body => pull.to_s, :status => 201, :headers => {:content_type => "application/json\; charset=utf-8"})
 
@@ -76,10 +77,10 @@ module GithubHelpers
       stub_get("/repos/#{user}/#{repo}/pulls").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0', 'base' => 'master', 'head' => "#{user}:#{branch}", 'state' => 'open'}).
         to_return(:body => fixture('pull_requests/pull_requests.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
       # Stubbing pull request comments
-      stub_get("/repos/#{user}/pulls/#{pull[:number]}/comments?").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
+      stub_get("/repos/#{user}/pulls/#{pull.number}/comments?").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
         to_return(:body => fixture('pull_requests/comments.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
       # Stubbing issue comments
-      stub_get("/repos/#{user}/issues/#{pull[:number]}/comments?").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
+      stub_get("/repos/#{user}/issues/#{pull.number}/comments?").with(:query => {'access_token' => 'a1b2c3d4e5f6g7h8i9j0'}).
         to_return(:body => fixture('issues/comments.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Valentino Stoll
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +110,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -180,6 +208,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.12.3
+- !ruby/object:Gem::Dependency
+  name: reenhanced_bitbucket_api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 description: Git Reflow manages your git workflow.
 email:
 - dev@reenhanced.com
@@ -191,6 +233,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".gitignore"
+- Appraisals
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -198,6 +241,7 @@ files:
 - Rakefile
 - bin/git-reflow
 - bin/gitreflow-common
+- circle.yml
 - git_reflow.gemspec
 - lib/git_reflow.rb
 - lib/git_reflow/base.rb
@@ -210,6 +254,7 @@ files:
 - lib/git_reflow/git_helpers.rb
 - lib/git_reflow/git_server.rb
 - lib/git_reflow/git_server/base.rb
+- lib/git_reflow/git_server/bit_bucket.rb
 - lib/git_reflow/git_server/git_hub.rb
 - lib/git_reflow/sandbox.rb
 - lib/git_reflow/version.rb
@@ -219,11 +264,13 @@ files:
 - spec/fixtures/pull_requests/pull_request.json
 - spec/fixtures/pull_requests/pull_request_exists_error.json
 - spec/fixtures/pull_requests/pull_requests.json
+- spec/fixtures/repositories/commit.json
 - spec/fixtures/repositories/statuses.json
 - spec/git_reflow_spec.rb
 - spec/lib/git_reflow/config_spec.rb
 - spec/lib/git_reflow/git_helpers_spec.rb
 - spec/lib/git_reflow/git_server_spec.rb
+- spec/lib/git_server/bit_bucket_spec.rb
 - spec/lib/git_server/git_hub_spec.rb
 - spec/spec_helper.rb
 - spec/support/command_line_helpers.rb
@@ -259,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A better git process
@@ -270,11 +317,13 @@ test_files:
 - spec/fixtures/pull_requests/pull_request.json
 - spec/fixtures/pull_requests/pull_request_exists_error.json
 - spec/fixtures/pull_requests/pull_requests.json
+- spec/fixtures/repositories/commit.json
 - spec/fixtures/repositories/statuses.json
 - spec/git_reflow_spec.rb
 - spec/lib/git_reflow/config_spec.rb
 - spec/lib/git_reflow/git_helpers_spec.rb
 - spec/lib/git_reflow/git_server_spec.rb
+- spec/lib/git_server/bit_bucket_spec.rb
 - spec/lib/git_server/git_hub_spec.rb
 - spec/spec_helper.rb
 - spec/support/command_line_helpers.rb