git-process 0.9.1.pre3

data/spec/git-status_spec.rb

@@ -0,0 +1,101 @@
+require 'git-status'
+require 'GitRepoHelper'
+
+describe Git::GitStatus do
+
+  include GitRepoHelper
+
+  before(:each) do
+    create_files(['.gitignore'])
+    gitlib.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(@tmpdir)
+  end
+
+
+  it "should handle added files" do
+    create_files(['a', 'b', 'c'])
+
+    gitlib.status.added.should == ['a', 'b', 'c']
+  end
+
+
+  it "should handle a modification on both sides" do
+    change_file_and_commit('a', '')
+
+    gitlib.checkout('fb', :new_branch => 'master')
+    change_file_and_commit('a', 'hello')
+
+    gitlib.checkout('master')
+    change_file_and_commit('a', 'goodbye')
+
+    gitlib.merge('fb') rescue
+
+    status = gitlib.status
+    status.unmerged.should == ['a']
+    status.modified.should == ['a']
+  end
+
+
+  it "should handle an addition on both sides" do
+    gitlib.checkout('fb', :new_branch => 'master')
+    change_file_and_commit('a', 'hello')
+
+    gitlib.checkout('master')
+    change_file_and_commit('a', 'goodbye')
+
+    gitlib.merge('fb') rescue
+
+    status = gitlib.status
+    status.unmerged.should == ['a']
+    status.added.should == ['a']
+  end
+
+
+  it "should handle a merge deletion on fb" do
+    change_file_and_commit('a', '')
+
+    gitlib.checkout('fb', :new_branch => 'master')
+    gitlib.remove('a', :force => true)
+    gitlib.commit('removed a')
+
+    gitlib.checkout('master')
+    change_file_and_commit('a', 'goodbye')
+
+    gitlib.merge('fb') rescue
+
+    status = gitlib.status
+    status.unmerged.should == ['a']
+    status.deleted.should == ['a']
+  end
+
+
+  it "should handle a merge deletion on master" do
+    change_file_and_commit('a', '')
+
+    gitlib.checkout('fb', :new_branch => 'master')
+    change_file_and_commit('a', 'hello')
+
+    gitlib.checkout('master')
+    gitlib.remove('a', :force => true)
+    gitlib.commit('removed a')
+
+    gitlib.merge('fb') rescue
+
+    status = gitlib.status
+    status.unmerged.should == ['a']
+    status.deleted.should == ['a']
+  end
+
+
+  it "should return an empty result" do
+    gitlib.status.added.should == []
+    gitlib.status.deleted.should == []
+    gitlib.status.modified.should == []
+    gitlib.status.unmerged.should == []
+  end
+
+end

data/spec/github-service_spec.rb

@@ -0,0 +1,209 @@
+require 'github-service'
+require 'webmock/rspec'
+require 'json'
+require 'octokit'
+require 'tempfile'
+require 'rspec/mocks/methods'
+require 'rspec/mocks/test_double'
+require 'rspec/mocks/mock'
+
+
+class GHS
+  include GitHubService
+
+  def initialize(user = nil, password = nil, site = nil)
+    @user = user
+    @password = password
+    @site = site
+
+    logger = RSpec::Mocks::Mock.new('logger')
+    logger.stub(:debug)
+    logger.stub(:info)
+
+    @lib = RSpec::Mocks::Mock.new('lib')
+    @lib.stub(:logger).and_return(logger)
+  end
+
+  def lib
+    @lib
+  end
+end
+
+
+describe GitHubService do
+
+  def test_token
+    'hfgkdjfgksjhdfkls'
+  end
+
+
+  describe "create_authorization" do
+
+    def ghs
+      unless @ghs
+        @ghs = GHS.new('tu', 'dfsdf')
+        @ghs.lib.stub(:config).with('remote.origin.url').and_return('git@github.com:jdigger/git-process.git')
+      end
+      @ghs
+    end
+
+
+    it "should return an auth_token for a good request" do
+      ghs.lib.should_receive(:config).with('gitProcess.github.authToken', anything).once
+
+      stub_request(:post, /api.github.com\/authorizations/).
+        to_return(:status => 200, :body => JSON({:token => test_token}))
+
+      ghs.create_authorization().should == test_token
+    end
+
+
+    it "should 401 for bad password" do
+      stub_request(:post, /api.github.com\/authorizations/).
+        to_return(:status => 401)
+
+      lambda { ghs.create_authorization() }.should raise_error Octokit::Unauthorized
+    end
+
+  end
+
+
+  describe "auth_token" do
+
+    it "should get the token from config if it exists" do
+      ghs = GHS.new
+      ghs.lib.stub(:config).with('github.user').and_return('test_user')
+      ghs.lib.stub(:config).with('remote.origin.url').and_return('git@github.com:jdigger/git-process.git')
+      ghs.lib.stub(:config).with('gitProcess.github.authToken').and_return(test_token)
+
+      ghs.auth_token.should == test_token
+    end
+
+
+    it "should get the token from the server if it does not exist in config" do
+      ghs = GHS.new(nil, 'dfsdf')
+      ghs.lib.stub(:config).with('github.user').and_return('test_user')
+      ghs.lib.stub(:config).with('remote.origin.url').and_return('git@github.com:jdigger/git-process.git')
+      ghs.lib.stub(:config).with('gitProcess.github.authToken').and_return('')
+      ghs.lib.should_receive(:config).with('gitProcess.github.authToken', anything).once
+
+      stub_request(:post, /api.github.com\/authorizations/).
+        to_return(:status => 200, :body => JSON({:token => test_token}))
+
+      ghs.auth_token.should == test_token
+    end
+
+  end
+
+
+  describe "user" do
+
+    it "should get the value from config" do
+      ghs = GHS.new(nil, 'dfsdf')
+      ghs.lib.stub(:config).with('github.user').and_return('test_user')
+
+      ghs.user.should == 'test_user'
+    end
+
+
+    it "should prompt the user and store it in the config" do
+      ghs = GHS.new(nil, 'dfsdf')
+      ghs.lib.stub(:config).with('github.user').and_return('')
+      ghs.lib.stub(:config).with('github.user', anything).once
+
+      ghs.stub(:ask).with(/username/).and_return('test_user')
+      ghs.user.should == 'test_user'
+    end
+
+  end
+
+
+  describe "using GHE instead of GitHub.com" do
+
+    def ghs
+      @ghs ||= GHS.new('tu', 'dfsdf', nil)
+    end
+
+
+    it "should use the correct server and path for a non-GitHub.com site" do
+      ghs.lib.stub(:config).with('remote.origin.url').and_return('git@myco.com:jdigger/git-process.git')
+      ghs.lib.should_receive(:config).with('gitProcess.github.authToken', anything).once
+
+      stub_request(:post, /myco.com\/api\/v3\/authorizations/).
+        to_return(:status => 200, :body => JSON({:token => test_token}))
+
+      ghs.create_authorization().should == test_token
+    end
+
+
+    it "site should work for git@... ssh address" do
+      ghs.lib.stub(:config).with('remote.origin.url').and_return('git@myco.com:jdigger/git-process.git')
+
+      ghs.site.should == 'http://myco.com'
+    end
+
+
+    it "site should work for https address" do
+      ghs.lib.stub(:config).with('remote.origin.url').and_return('https://myco.com/jdigger/git-process.git')
+
+      ghs.site.should == 'https://myco.com'
+    end
+
+
+    it "site should work for http address" do
+      ghs.lib.stub(:config).with('remote.origin.url').and_return('http://jdigger@myco.com/jdigger/git-process.git')
+
+      ghs.site.should == 'http://myco.com'
+    end
+
+
+    it "site should work for git://myco.com/ address" do
+      ghs.lib.stub(:config).with('remote.origin.url').and_return('git://myco.com/jdigger/git-process.git')
+
+      ghs.site.should == 'http://myco.com'
+    end
+
+
+    it "site should raise an error if remote.origin.url not set" do
+      ghs.lib.stub(:config).with('remote.origin.url').and_return('')
+
+      lambda {ghs.site}.should raise_error GitHubService::NoRemoteRepository
+    end
+
+
+    it "site should not work for a garbase url address" do
+      ghs.lib.stub(:config).with('remote.origin.url').and_return('garbage')
+
+      lambda {ghs.site}.should raise_error URI::InvalidURIError
+    end
+
+
+    def in_tempfile(content, &block)
+      file = Tempfile.new('ssh_config')
+      file.puts content
+      file.flush
+
+      begin
+        block.call(file)
+      ensure
+        file.close
+        file.unlink
+      end
+    end
+
+
+    it "site should work for an ssh-configged url address" do
+      ghs.lib.stub(:config).with('remote.origin.url').and_return('mygithub:jdigger/git-process.git')
+
+      content = "\nHost mygithub\n"+
+        "  User git\n"+
+        "  HostName github.myco.com\n"
+
+      in_tempfile(content) do |file|
+        ghs.site(:ssh_config_file => file.path).should == 'http://github.myco.com'
+      end
+    end
+
+  end
+
+end

data/spec/pull-request_spec.rb

@@ -0,0 +1,57 @@
+require 'pull-request'
+require 'webmock/rspec'
+require 'json'
+require 'octokit'
+require 'tempfile'
+require 'GitRepoHelper'
+
+
+describe GitHub::PullRequest do
+  include GitRepoHelper
+
+  def lib
+    unless @lib
+      @lib = double('lib')
+      @lib.stub(:logger).and_return(logger)
+    end
+    @lib
+  end
+
+
+  def test_token
+    'hfgkdjfgksjhdfkls'
+  end
+
+
+  def pull_request
+    @pr ||= GitHub::PullRequest.new(lib, 'test_repo', :user => 'test_user')
+  end
+
+
+  before(:each) do
+    lib.stub(:config).with('gitProcess.github.authToken').and_return(test_token)
+    lib.stub(:config).with('remote.origin.url').and_return('git@github.com:jdigger/git-process.git')
+  end
+
+
+  it "should return a pull request for a good request" do
+    stub_request(:post, "https://api.github.com/repos/test_repo/pulls?access_token=#{test_token}").
+      to_return(:status => 200, :body => JSON({:number => 1, :state => 'open'}))
+
+    pull_request.create('test_base', 'test_head', 'test title', 'test body')[:state].should == 'open'
+  end
+
+
+  it "should handle asking for a duplicate pull request" do
+    # trying to create the request should return "HTTP 422: Unprocessable Entity" because it already exists
+    stub_request(:post, "https://api.github.com/repos/test_repo/pulls?access_token=#{test_token}").
+      to_return(:status => 422)
+
+    # listing all existing pull requests should contain the current branch
+    stub_request(:get, /test_repo\/pulls\?access_token=/).
+      to_return(:status => 200, :body => JSON([{:html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
+
+    pull_request.create('test_base', 'test_head', 'test title', 'test body')[:html_url].should == 'test_url'
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib/git-process')

metadata

@@ -0,0 +1,133 @@
+--- !ruby/object:Gem::Specification 
+name: git-process
+version: !ruby/object:Gem::Version 
+  prerelease: true
+  segments: 
+  - 0
+  - 9
+  - 1
+  - pre
+  - 3
+  version: 0.9.1.pre3
+platform: ruby
+authors: 
+- Jim Moore
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2012-07-02 00:00:00 -06:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  name: rspec
+  requirement: *id001
+  prerelease: false
+description: A set of scripts to make working with git easier and more consistent
+email: 
+- moore.jim@gmail.com
+executables: 
+- git-new-fb
+- git-pull-request
+- git-sync
+- git-to-master
+extensions: []
+
+extra_rdoc_files: []
+
+files: 
+- .gitignore
+- .rspec
+- .travis.yml
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README.md
+- Rakefile
+- bin/git-new-fb
+- bin/git-pull-request
+- bin/git-sync
+- bin/git-to-master
+- git-process.gemspec
+- lib/git-process/abstract-error-builder.rb
+- lib/git-process/git-abstract-merge-error-builder.rb
+- lib/git-process/git-branch.rb
+- lib/git-process/git-branches.rb
+- lib/git-process/git-lib.rb
+- lib/git-process/git-merge-error.rb
+- lib/git-process/git-new-fb-options.rb
+- lib/git-process/git-process-error.rb
+- lib/git-process/git-process-options.rb
+- lib/git-process/git-process.rb
+- lib/git-process/git-pull-request-options.rb
+- lib/git-process/git-rebase-error.rb
+- lib/git-process/git-status.rb
+- lib/git-process/git-sync-options.rb
+- lib/git-process/git-to-master-options.rb
+- lib/git-process/github-client.rb
+- lib/git-process/github-service.rb
+- lib/git-process/parked-changes-error.rb
+- lib/git-process/pull-request.rb
+- lib/git-process/uncommitted-changes-error.rb
+- lib/git-process/version.rb
+- spec/FileHelpers.rb
+- spec/GitRepoHelper.rb
+- spec/git-abstract-merge-error-builder_spec.rb
+- spec/git-lib_spec.rb
+- spec/git-process_spec.rb
+- spec/git-status_spec.rb
+- spec/github-service_spec.rb
+- spec/pull-request_spec.rb
+- spec/spec_helper.rb
+has_rdoc: true
+homepage: http://jdigger.github.com/git-process/
+licenses: []
+
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.3.6
+signing_key: 
+specification_version: 3
+summary: A set of scripts for a good git process
+test_files: 
+- spec/FileHelpers.rb
+- spec/GitRepoHelper.rb
+- spec/git-abstract-merge-error-builder_spec.rb
+- spec/git-lib_spec.rb
+- spec/git-process_spec.rb
+- spec/git-status_spec.rb
+- spec/github-service_spec.rb
+- spec/pull-request_spec.rb
+- spec/spec_helper.rb