git-process 0.9.1.pre3 → 0.9.2

data/spec/GitRepoHelper.rb

@@ -1,16 +1,13 @@
 require 'FileHelpers'
-require 'git-lib'
+require 'git-process/git_process'
 
 module GitRepoHelper
 
-
-  def gitlib
-    @gitlib ||= Git::GitLib.new(tmpdir, :log_level => log_level)
-  end
-
-
   def gitprocess
-    @gitprocess ||= Git::Process.new(nil, gitlib)
+    opts = {}
+    opts[:quiet] = true if log_level == Logger::ERROR
+    opts[:verbose] = true if log_level == Logger::DEBUG
+    @gitprocess ||= create_process(tmpdir, opts)
   end
 
 
@@ -20,7 +17,7 @@ module GitRepoHelper
 
 
   def commit_count
-    gitlib.log_count
+    gitprocess.log_count
   end
 
 
@@ -30,46 +27,63 @@ module GitRepoHelper
 
 
   def logger
-    gitlib.logger
+    gitprocess.logger
   end
 
 
   def create_files(file_names)
-    Dir.chdir(gitlib.workdir) do |dir|
+    Dir.chdir(gitprocess.workdir) do |dir|
       file_names.each do |fn|
-        gitlib.logger.debug {"Creating #{dir}/#{fn}"}
+        gitprocess.logger.debug {"Creating #{dir}/#{fn}"}
         FileUtils.touch fn
       end
     end
-    gitlib.add(file_names)
+    gitprocess.add(file_names)
   end
 
 
-  def change_file(filename, contents, lib = gitlib)
+  def change_file(filename, contents, lib = gitprocess)
     Dir.chdir(lib.workdir) do
       File.open(filename, 'w') {|f| f.puts contents}
     end
   end
 
 
-  def change_file_and_add(filename, contents, lib = gitlib)
+  def change_file_and_add(filename, contents, lib = gitprocess)
     change_file(filename, contents, lib)
     lib.add(filename)
   end
 
 
-  def change_file_and_commit(filename, contents, lib = gitlib)
+  def change_file_and_commit(filename, contents, lib = gitprocess)
     change_file_and_add(filename, contents, lib)
     lib.commit("#{filename} - #{contents}")
   end
 
 
-  def clone(branch='master', &block)
+  def create_process(dir, opts)
+    GitProc::Process.new(dir, opts)
+  end
+
+
+  def clone(branch='master', remote_name = 'origin', &block)
     td = Dir.mktmpdir
-    gl = Git::GitLib.new(td, :log_level => log_level)
-    gl.add_remote('origin', "file://#{tmpdir}")
-    gl.fetch
-    gl.checkout(branch, :new_branch => "origin/#{branch}")
+
+    logger.debug {"Cloning '#{tmpdir}' to '#{td}'"}
+
+    opts = {}
+    opts[:quiet] = true if log_level == Logger::ERROR
+    opts[:verbose] = true if log_level == Logger::DEBUG
+    gl = create_process(td, opts)
+    gl.add_remote(remote_name, "file://#{tmpdir}")
+    gl.fetch(remote_name)
+
+    if branch == 'master'
+      gl.reset("#{remote_name}/#{branch}", :hard => true)
+    else
+      gl.checkout(branch, :new_branch => "#{remote_name}/#{branch}")
+    end
+
     if block_given?
       begin
         block.arity < 1 ? gl.instance_eval(&block) : block.call(gl)

data/spec/{git-abstract-merge-error-builder_spec.rb → git_abstract_merge_error_builder_spec.rb}

@@ -1,11 +1,11 @@
-require 'git-abstract-merge-error-builder'
+require 'git-process/git_abstract_merge_error_builder'
 
-describe Git::AbstractMergeErrorBuilder do
+describe GitProc::AbstractMergeErrorBuilder do
 
   def builder
     unless @builder
       @builder = Object.new
-      @builder.extend(Git::AbstractMergeErrorBuilder)
+      @builder.extend(GitProc::AbstractMergeErrorBuilder)
       @builder.stub(:lib).and_return(lib)
       @builder.stub(:continue_command).and_return(nil)
       @builder.stub(:error_message).and_return('')

data/spec/{git-lib_spec.rb → git_lib_spec.rb}

@@ -1,7 +1,46 @@
-require 'git-lib'
+require 'git-process/git_lib'
 require 'GitRepoHelper'
 
-describe Git::GitLib do
+describe GitProc::GitLib do
+
+  class GLStub
+    include GitProc::GitLib
+
+    def initialize(workdir, log_level)
+      @logger = Logger.new(STDOUT)
+      @logger.level = log_level || Logger::WARN
+      @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+      f = Logger::Formatter.new
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+        "#{msg}\n"
+      end
+
+      @workdir = workdir
+      if workdir
+        unless File.directory?(File.join(workdir, '.git'))
+          logger.info { "Initializing new repository at #{workdir}" }
+          command(:init)
+        else
+          logger.debug { "Opening existing repository at #{workdir}" }
+        end
+      end
+    end
+
+
+    def workdir
+      @workdir
+    end
+
+    def logger
+      @logger
+    end
+  end
+
+
+  def gitlib
+    gitprocess
+  end
+
 
   describe "branches" do
     include GitRepoHelper
@@ -24,7 +63,7 @@ describe Git::GitLib do
     attr_reader :lib
 
     before(:each) do
-      @lib = Git::GitLib.new(nil)
+      @lib = GLStub.new(nil, nil)
     end
 
 
@@ -58,7 +97,7 @@ describe Git::GitLib do
     attr_reader :lib
 
     before(:each) do
-      @lib = Git::GitLib.new(nil, :git => double('git'))
+      @lib = GLStub.new(nil, nil)
     end
 
 
@@ -83,6 +122,8 @@ describe Git::GitLib do
 
 
     it "should remove named branch on remote" do
+      lib.stub(:remote_name).and_return('remote')
+      lib.stub(:config).and_return('master')
       lib.should_receive(:command).with(:push, ['remote', '--delete', 'my_branch'])
 
       lib.push('remote', 'my_branch', nil, :delete => true)
@@ -90,28 +131,50 @@ describe Git::GitLib do
 
 
     it "should remove current branch on remote" do
+      lib.stub(:remote_name).and_return('remote')
+      lib.stub(:config).and_return('master')
       lib.should_receive(:command).with(:push, ['remote', '--delete', 'my_branch'])
 
       lib.push('remote', nil, nil, :delete => 'my_branch')
     end
 
 
-    # it "should create a branch with explicit base" do
-    #   lib.stub(:command).with(:branch, ['test_branch', 'other_branch'])
-    #   lib.branch('test_branch', :base_branch => 'other_branch')
-    # end
+    it "should not remove integration branch on remote" do
+      lib.stub(:remote_name).and_return('remote')
+      lib.stub(:config).and_return('master')
+
+      expect {lib.push('remote', nil, nil, :delete => 'master')}.should raise_error GitProc::GitProcessError
+    end
+
+  end
+
 
+  describe "#remote_name" do
+    include GitRepoHelper
 
-    # it "should delete a branch without force" do
-    #   lib.stub(:command).with(:branch, ['-d', 'test_branch'])
-    #   lib.branch('test_branch', :delete => true)
-    # end
+    def log_level
+      Logger::ERROR
+    end
 
 
-    # it "should delete a branch with force" do
-    #   lib.stub(:command).with(:branch, ['-D', 'test_branch'])
-    #   lib.branch('test_branch', :delete => true, :force => true)
-    # end
+    it "should work with origin" do
+      change_file_and_commit('a', '')
+
+      clone('master', 'origin') do |gl|
+        gl.remote_name.should == 'origin'
+        gl.branches.include?('origin/master').should be_true
+      end
+    end
+
+
+    it "should work with a different remote name" do
+      change_file_and_commit('a', '')
+
+      clone('master', 'a_remote') do |gl|
+        gl.remote_name.should == 'a_remote'
+        gl.branches.include?('a_remote/master').should be_true
+      end
+    end
 
   end
 

data/spec/git_process_spec.rb

@@ -0,0 +1,36 @@
+require 'git-process/git_process'
+require 'GitRepoHelper'
+require 'fileutils'
+
+describe GitProc::Process do
+  include GitRepoHelper
+
+  before(:each) do
+    create_files(['.gitignore'])
+    gitprocess.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(tmpdir)
+  end
+
+
+  describe "workdir" do
+
+    it "should use the passed in directory when the top level is a git workdir" do
+      proc = GitProc::Process.new(tmpdir)
+      proc.workdir.should == tmpdir
+    end
+
+
+    it "should find the parent git workdir" do
+      dir = "#{tmpdir}/a/b/c/d/e/f/g"
+      mkdir_p dir
+      proc = GitProc::Process.new(dir)
+      proc.workdir.should == tmpdir
+    end
+
+  end
+
+end

data/spec/{git-status_spec.rb → git_status_spec.rb}

@@ -1,13 +1,12 @@
-require 'git-status'
+require 'git-process/git_status'
 require 'GitRepoHelper'
 
-describe Git::GitStatus do
-
+describe GitProc::GitStatus do
   include GitRepoHelper
 
   before(:each) do
     create_files(['.gitignore'])
-    gitlib.commit('initial')
+    gitprocess.commit('initial')
   end
 
 
@@ -19,37 +18,37 @@ describe Git::GitStatus do
   it "should handle added files" do
     create_files(['a', 'b', 'c'])
 
-    gitlib.status.added.should == ['a', 'b', 'c']
+    gitprocess.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')
+    gitprocess.checkout('fb', :new_branch => 'master')
     change_file_and_commit('a', 'hello')
 
-    gitlib.checkout('master')
+    gitprocess.checkout('master')
     change_file_and_commit('a', 'goodbye')
 
-    gitlib.merge('fb') rescue
+    gitprocess.merge('fb') rescue
 
-    status = gitlib.status
+    status = gitprocess.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')
+    gitprocess.checkout('fb', :new_branch => 'master')
     change_file_and_commit('a', 'hello')
 
-    gitlib.checkout('master')
+    gitprocess.checkout('master')
     change_file_and_commit('a', 'goodbye')
 
-    gitlib.merge('fb') rescue
+    gitprocess.merge('fb') rescue
 
-    status = gitlib.status
+    status = gitprocess.status
     status.unmerged.should == ['a']
     status.added.should == ['a']
   end
@@ -58,16 +57,16 @@ describe Git::GitStatus do
   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')
+    gitprocess.checkout('fb', :new_branch => 'master')
+    gitprocess.remove('a', :force => true)
+    gitprocess.commit('removed a')
 
-    gitlib.checkout('master')
+    gitprocess.checkout('master')
     change_file_and_commit('a', 'goodbye')
 
-    gitlib.merge('fb') rescue
+    gitprocess.merge('fb') rescue
 
-    status = gitlib.status
+    status = gitprocess.status
     status.unmerged.should == ['a']
     status.deleted.should == ['a']
   end
@@ -76,26 +75,26 @@ describe Git::GitStatus do
   it "should handle a merge deletion on master" do
     change_file_and_commit('a', '')
 
-    gitlib.checkout('fb', :new_branch => 'master')
+    gitprocess.checkout('fb', :new_branch => 'master')
     change_file_and_commit('a', 'hello')
 
-    gitlib.checkout('master')
-    gitlib.remove('a', :force => true)
-    gitlib.commit('removed a')
+    gitprocess.checkout('master')
+    gitprocess.remove('a', :force => true)
+    gitprocess.commit('removed a')
 
-    gitlib.merge('fb') rescue
+    gitprocess.merge('fb') rescue
 
-    status = gitlib.status
+    status = gitprocess.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 == []
+    gitprocess.status.added.should == []
+    gitprocess.status.deleted.should == []
+    gitprocess.status.modified.should == []
+    gitprocess.status.unmerged.should == []
   end
 
 end

data/spec/github_pull_request_spec.rb

@@ -0,0 +1,91 @@
+require 'git-process/pull_request'
+require 'GitRepoHelper'
+require 'webmock/rspec'
+require 'json'
+require 'octokit'
+require 'tempfile'
+
+
+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
+
+
+  describe "#create" do
+
+    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
+
+
+  describe "#close" do
+
+    it "should close a good current pull request" do
+      stub_request(:get, /test_repo\/pulls\?access_token=/).
+        to_return(:status => 200, :body => JSON([{:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
+      stub_request(:patch, /test_repo\/pulls\/1\?access_token=/).with(:body => JSON({:state => 'closed'})).
+        to_return(:status => 200, :body => JSON({:number => 1, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}))
+
+      pull_request.close('test_base', 'test_head')[:state].should == 'closed'
+    end
+
+
+    it "should close a good current pull request using the pull request number" do
+      stub_request(:patch, /test_repo\/pulls\/1\?access_token=/).with(:body => JSON({:state => 'closed'})).
+        to_return(:status => 200, :body => JSON({:number => 1, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}))
+
+      pull_request.close(1)[:state].should == 'closed'
+    end
+
+
+    it "should complain about a missing pull request" do
+      stub_request(:get, /test_repo\/pulls\?access_token=/).
+        to_return(:status => 200, :body => JSON([{:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
+
+      expect {pull_request.close('test_base', 'missing_head')}.should raise_error GitHub::PullRequest::NotFoundError
+    end
+
+  end
+
+end

data/spec/{github-service_spec.rb → github_service_spec.rb}

@@ -1,4 +1,4 @@
-require 'github-service'
+require 'git-process/github_service'
 require 'webmock/rspec'
 require 'json'
 require 'octokit'

data/spec/new_fb_spec.rb

@@ -0,0 +1,80 @@
+require 'git-process/new_fb'
+require 'GitRepoHelper'
+
+describe GitProc::NewFeatureBranch do
+  include GitRepoHelper
+
+  before(:each) do
+    create_files(['.gitignore'])
+    gitprocess.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(tmpdir)
+  end
+
+
+  def create_process(dir, opts)
+    opts[:branch_name] = 'test_branch'
+    GitProc::NewFeatureBranch.new(dir, opts)
+  end
+
+
+  describe "#new_feature_branch" do
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    it "should create the named branch against origin/master" do
+      clone do |gp|
+        new_branch = gp.run
+
+        new_branch.name.should == 'test_branch'
+        new_branch.sha.should == gp.branches['origin/master'].sha
+      end
+    end
+
+
+    it "should bring committed changes on _parking_ over to the new branch" do
+      gitprocess.branch('origin/master', :base_branch => 'master')
+      gitprocess.checkout('_parking_', :new_branch => 'master')
+      change_file_and_commit('a', '')
+      change_file_and_commit('b', '')
+
+      new_branch = gitprocess.run
+
+      new_branch.name.should == 'test_branch'
+      Dir.chdir(gitprocess.workdir) do |dir|
+        File.exists?('a').should be_true
+        File.exists?('b').should be_true
+      end
+
+      gitprocess.branches.parking.should be_nil
+    end
+
+
+    it "should bring new/uncommitted changes on _parking_ over to the new branch" do
+      gitprocess.branch('origin/master', :base_branch => 'master')
+      gitprocess.checkout('_parking_', :new_branch => 'master')
+      change_file_and_commit('a', '')
+      change_file_and_add('b', '')
+      change_file('c', '')
+
+      new_branch = gitprocess.run
+
+      new_branch.name.should == 'test_branch'
+      Dir.chdir(gitprocess.workdir) do |dir|
+        File.exists?('a').should be_true
+        File.exists?('b').should be_true
+        File.exists?('c').should be_true
+      end
+
+      gitprocess.branches.parking.should be_nil
+    end
+
+  end
+
+end