git_reflow 0.3.5 → 0.4.0

data/spec/support/github_helpers.rb

@@ -0,0 +1,98 @@
+$LOAD_PATH << 'lib'
+require 'git_reflow'
+require 'github_api'
+require File.expand_path('../web_mocks', __FILE__)
+require File.expand_path('../fixtures', __FILE__)
+
+module GithubHelpers
+  def stub_github_with(options = {})
+
+    hostname         = options[:hostname] || 'hostname.local'
+    api_endpoint     = options[:api_endpoint] || "https://api.github.com"
+    site_url         = options[:site_url] || "https://github.com"
+    user             = options[:user] || 'reenhanced'
+    password         = options[:passwordl] || 'shazam'
+    oauth_token_hash = Hashie::Mash.new({ token: 'a1b2c3d4e5f6g7h8i9j0', note: 'git-reflow (hostname.local)'})
+    repo             = options[:repo] || 'repo'
+    branch           = options[:branch] || 'new-feature'
+    pull             = options[:pull]
+
+    HighLine.any_instance.stub(:ask) do |terminal, question|
+      values = {
+        "Please enter your GitHub username: "                                                 => user,
+        "Please enter your GitHub password (we do NOT store this): "                          => password,
+        "Please enter your Enterprise site URL (e.g. https://github.company.com):"            => enterprise_site,
+        "Please enter your Enterprise API endpoint (e.g. https://github.company.com/api/v3):" => enterprise_api
+      }
+     return_value = values[question] || values[terminal]
+     question = ""
+     return_value
+    end
+
+    github = Github.new do |config|
+      config.oauth_token = oauth_token_hash.token
+      config.endpoint    = api_endpoint
+      config.site        = site_url
+      config.adapter     = :net_http
+      config.ssl         = {:verify => false}
+    end
+
+    stub_request(:get, "#{api_endpoint}/authorizations?").to_return(:body => [oauth_token_hash].to_json, status: 200, headers: {})
+    Github.stub(:new).and_return(github)
+    GitReflow.stub(:push_current_branch).and_return(true)
+    GitReflow.stub(:github).and_return(github)
+    GitReflow.stub(:current_branch).and_return(branch)
+    GitReflow.stub(:remote_repo_name).and_return(repo)
+    GitReflow.stub(:remote_user).and_return(user)
+    GitReflow.stub(:fetch_destination).and_return(true)
+    GitReflow.stub(:update_destination).and_return(true)
+
+    GitReflow::GitServer::GitHub.any_instance.stub(:run).with('hostname', loud: false).and_return(hostname)
+    github_server = GitReflow::GitServer::GitHub.new
+    github_server.class.stub(:user).and_return(user)
+    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)
+
+    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+/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"})
+
+      # Stubbing pull request finder
+      stub_get("/repos/#{user}/pulls").with(:query => {'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"})
+      stub_get("/repos/#{user}/#{repo}/pulls").with(:query => {'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?").
+        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?").
+        to_return(:body => fixture('issues/comments.json'), :status => 201, :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+
+    github_server
+  end
+end
+
+# the github_api gem does some overrides to Hash so we have to make sure
+# this still works here...
+class Hash
+  def except(*keys)
+    cpy = self.dup
+    keys.each { |key| cpy.delete(key) }
+    cpy
+  end
+end

data/spec/support/rspec_stub_helpers.rb

@@ -0,0 +1,7 @@
+module RspecStubHelpers
+  def stub_with_fallback(obj, method)
+    original_method = obj.method(method)
+    obj.stub(method).with(anything()) { |*args| original_method.call(*args) }
+    return obj.stub(method)
+  end
+end

data/spec/support/web_mocks.rb

@@ -0,0 +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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_reflow
 version: !ruby/object:Gem::Version
-  version: 0.3.5
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Valentino Stoll
@@ -11,76 +10,95 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -88,7 +106,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -96,83 +113,73 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.12.2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: github_api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.12.1
 description: Git Reflow manages your git workflow.
 email:
 - dev@reenhanced.com
@@ -183,7 +190,7 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -199,44 +206,79 @@ files:
 - lib/git_reflow/commands/setup.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
+- lib/git_reflow/git_server/base.rb
+- lib/git_reflow/git_server/git_hub.rb
+- lib/git_reflow/sandbox.rb
 - lib/git_reflow/version.rb
+- spec/fixtures/git/git_config
+- spec/fixtures/issues/comments.json
+- spec/fixtures/pull_requests/comments.json
+- 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/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/git_hub_spec.rb
+- spec/spec_helper.rb
+- spec/support/command_line_helpers.rb
+- spec/support/fixtures.rb
+- spec/support/github_helpers.rb
+- spec/support/rspec_stub_helpers.rb
+- spec/support/web_mocks.rb
 homepage: http://github.com/reenhanced/gitreflow
 licenses:
 - MIT
-post_install_message: ! 'You need to setup your GitHub OAuth token
-
-  Please run ''git-reflow setup'''
+metadata: {}
+post_install_message: |-
+  You need to setup your GitHub OAuth token
+  Please run 'git-reflow setup'
 rdoc_options:
-- --title
+- "--title"
 - git_reflow
-- --main
+- "--main"
 - README.rdoc
-- -ri
+- "-ri"
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4495408522000953472
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4495408522000953472
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A better git process
-test_files: []
+test_files:
+- spec/fixtures/git/git_config
+- spec/fixtures/issues/comments.json
+- spec/fixtures/pull_requests/comments.json
+- 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/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/git_hub_spec.rb
+- spec/spec_helper.rb
+- spec/support/command_line_helpers.rb
+- spec/support/fixtures.rb
+- spec/support/github_helpers.rb
+- spec/support/rspec_stub_helpers.rb
+- spec/support/web_mocks.rb