git-process 1.0.11 → 1.1.0

data/spec/git_remote_spec.rb

@@ -0,0 +1,188 @@
+require 'git-process/git_remote'
+require 'GitRepoHelper'
+include GitProc
+
+describe GitRemote do
+
+  def log_level
+    Logger::ERROR
+  end
+
+
+  describe '#name' do
+    include GitRepoHelper
+
+    it 'should work with origin' do
+      change_file_and_commit('a', '')
+
+      clone_repo('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_repo('master', 'a_remote') do |gl|
+        gl.remote.name.should == 'a_remote'
+        gl.branches.include?('a_remote/master').should be_true
+      end
+    end
+
+
+    it 'should work with an overridden remote name' do
+      change_file_and_commit('a', '')
+
+      clone_repo('master', 'a_remote') do |gl|
+        gl.config['gitProcess.remoteName'] = 'something_else'
+
+        gl.remote.name.should == 'something_else'
+      end
+    end
+
+  end
+
+
+  describe "#expanded_url" do
+    include GitRepoHelper
+
+    it "should work for an ssh address" do
+      remote.add('torigin', 'tuser@github.myco.com:jdigger/git-process.git')
+
+      remote.expanded_url('torigin').should == 'ssh://tuser@github.myco.com/jdigger/git-process.git'
+    end
+
+
+    it 'should work for an http address' do
+      remote.add('torigin', 'http://github.myco.com:8080/jdigger/git-process.git')
+
+      remote.expanded_url('torigin').should == 'http://github.myco.com:8080/jdigger/git-process.git'
+    end
+
+
+    it "should work for an https address" do
+      remote.add('torigin', 'https://github.myco.com/jdigger/git-process.git')
+
+      remote.expanded_url('torigin').should == 'https://github.myco.com/jdigger/git-process.git'
+    end
+
+
+    it "should work for an ssh-configured url address" do
+      remote.add('origin', 'mygithub:jdigger/git-process.git')
+
+      content = "\nHost mygithub\n"+
+          "  User tuser\n"+
+          "  HostName github.myco.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        remote.expanded_url('origin', nil, :ssh_config_file => file.path).should == 'ssh://tuser@github.myco.com/jdigger/git-process.git'
+      end
+    end
+
+  end
+
+
+  describe "#hostname_and_user_from_ssh_config" do
+    include GitRepoHelper
+
+    it "should find in a single entry" do
+      content = "\nHost mygithub\n"+
+          "  User git\n"+
+          "  HostName github.myco.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        GitRemote.hostname_and_user_from_ssh_config('mygithub', file.path).should == %w(github.myco.com git)
+      end
+    end
+
+
+    it "should find in multiple entries" do
+      content = "\nHost mygithub1\n"+
+          "  User gittyw\n"+
+          "  HostName github.mycoy.com\n"+
+          "Host mygithub2\n"+
+          "  User gitty\n"+
+          "  HostName github.myco.com\n"+
+          "Host mygithub3\n"+
+          "  User gittyz\n"+
+          "  HostName github.mycoz.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        GitRemote.hostname_and_user_from_ssh_config('mygithub2', file.path).should == %w(github.myco.com gitty)
+      end
+    end
+
+
+    it "should return nil when no file" do
+      GitRemote.hostname_and_user_from_ssh_config('mygithub', '/bogus_file').should == nil
+    end
+
+
+    it "should return nil when given an unknown host" do
+      content = "\nHost mygithub1\n"+
+          "  User gittyw\n"+
+          "  HostName github.mycoy.com\n"+
+          "Host mygithub2\n"+
+          "  User gitty\n"+
+          "  HostName github.myco.com\n"+
+          "Host mygithub3\n"+
+          "  User gittyz\n"+
+          "  HostName github.mycoz.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        GitRemote.hostname_and_user_from_ssh_config('UNKNOWNZ', file.path).should == nil
+      end
+    end
+
+
+    it "should return nil when no hostname for an existing host" do
+      content = "\nHost mygithub1\n"+
+          "  User gittyw\n"+
+          "  HostName github.mycoy.com\n"+
+          "Host mygithub2\n"+
+          "  User gitty\n"+
+          "Host mygithub3\n"+
+          "  User gittyz\n"+
+          "  HostName github.mycoz.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        GitRemote.hostname_and_user_from_ssh_config('mygithub2', file.path).should == nil
+      end
+    end
+
+
+    it "should return hostname but no username when no user for an existing host" do
+      content = "\nHost mygithub1\n"+
+          "  User gittyw\n"+
+          "  HostName github.mycoy.com\n"+
+          "Host mygithub2\n"+
+          "  HostName github.myco.com\n"+
+          "Host mygithub3\n"+
+          "  User gittyz\n"+
+          "  HostName github.mycoz.com\n"
+
+      in_tempfile('ssh_config', content) do |file|
+        GitRemote.hostname_and_user_from_ssh_config('mygithub2', file.path).should == ['github.myco.com', nil]
+      end
+    end
+
+  end
+
+end
+
+
+def in_tempfile(filename, content, &block)
+  file = Tempfile.new(filename)
+  file.puts content
+  file.flush
+
+  begin
+    block.call(file)
+  ensure
+    file.close
+    file.unlink
+  end
+end
+

data/spec/git_status_spec.rb

@@ -13,49 +13,49 @@ describe GitProc::GitStatus do
 
   before(:each) do
     create_files(%w(.gitignore))
-    gitprocess.commit('initial')
+    gitlib.commit('initial')
   end
 
 
   after(:each) do
-    rm_rf(@tmpdir)
+    rm_rf(gitlib.workdir)
   end
 
 
-  it "should handle added files" do
+  it 'should handle added files' do
     create_files(['a', 'b file.txt', 'c'])
 
-    gitprocess.status.added.should == ['a', 'b file.txt', 'c']
+    gitlib.status.added.should == ['a', 'b file.txt', 'c']
   end
 
 
-  it "should handle a modification on both sides" do
+  it 'should handle a modification on both sides' do
     change_file_and_commit('a', '')
 
-    gitprocess.checkout('fb', :new_branch => 'master')
+    gitlib.checkout('fb', :new_branch => 'master')
     change_file_and_commit('a', 'hello')
 
-    gitprocess.checkout('master')
+    gitlib.checkout('master')
     change_file_and_commit('a', 'goodbye')
 
-    gitprocess.merge('fb') rescue ''
+    gitlib.merge('fb') rescue ''
 
-    status = gitprocess.status
+    status = gitlib.status
     status.unmerged.should == %w(a)
     status.modified.should == %w(a)
   end
 
 
   it "should handle an addition on both sides" do
-    gitprocess.checkout('fb', :new_branch => 'master')
+    gitlib.checkout('fb', :new_branch => 'master')
     change_file_and_commit('a', 'hello')
 
-    gitprocess.checkout('master')
+    gitlib.checkout('master')
     change_file_and_commit('a', 'goodbye')
 
-    gitprocess.merge('fb') rescue ''
+    gitlib.merge('fb') rescue ''
 
-    status = gitprocess.status
+    status = gitlib.status
     status.unmerged.should == %w(a)
     status.added.should == %w(a)
   end
@@ -64,16 +64,16 @@ describe GitProc::GitStatus do
   it "should handle a merge deletion on fb" do
     change_file_and_commit('a', '')
 
-    gitprocess.checkout('fb', :new_branch => 'master')
-    gitprocess.remove('a', :force => true)
-    gitprocess.commit('removed a')
+    gitlib.checkout('fb', :new_branch => 'master')
+    gitlib.remove('a', :force => true)
+    gitlib.commit('removed a')
 
-    gitprocess.checkout('master')
+    gitlib.checkout('master')
     change_file_and_commit('a', 'goodbye')
 
-    gitprocess.merge('fb') rescue ''
+    gitlib.merge('fb') rescue ''
 
-    status = gitprocess.status
+    status = gitlib.status
     status.unmerged.should == %w(a)
     status.deleted.should == %w(a)
   end
@@ -82,41 +82,41 @@ describe GitProc::GitStatus do
   it "should handle a merge deletion on master" do
     change_file_and_commit('a', '')
 
-    gitprocess.checkout('fb', :new_branch => 'master')
+    gitlib.checkout('fb', :new_branch => 'master')
     change_file_and_commit('a', 'hello')
 
-    gitprocess.checkout('master')
-    gitprocess.remove('a', :force => true)
-    gitprocess.commit('removed a')
+    gitlib.checkout('master')
+    gitlib.remove('a', :force => true)
+    gitlib.commit('removed a')
 
-    gitprocess.merge('fb') rescue ''
+    gitlib.merge('fb') rescue ''
 
-    status = gitprocess.status
+    status = gitlib.status
     status.unmerged.should == %w(a)
     status.deleted.should == %w(a)
   end
 
 
   it "should handle a move/rename" do
-    FileUtils.cp __FILE__, File.join(gitprocess.workdir, 'a file.txt')
-    gitprocess.add('a file.txt')
-    gitprocess.commit('a with content')
+    FileUtils.cp __FILE__, File.join(gitlib.workdir, 'a file.txt')
+    gitlib.add('a file.txt')
+    gitlib.commit('a with content')
 
-    FileUtils.cp __FILE__, File.join(gitprocess.workdir, 'b file.txt')
-    gitprocess.remove 'a file.txt'
-    gitprocess.add 'b file.txt'
+    FileUtils.cp __FILE__, File.join(gitlib.workdir, 'b file.txt')
+    gitlib.remove 'a file.txt'
+    gitlib.add 'b file.txt'
 
-    status = gitprocess.status
+    status = gitlib.status
     status.deleted.should == ['a file.txt']
     status.added.should == ['b file.txt']
   end
 
 
   it "should return an empty result" do
-    gitprocess.status.added.should == []
-    gitprocess.status.deleted.should == []
-    gitprocess.status.modified.should == []
-    gitprocess.status.unmerged.should == []
+    gitlib.status.added.should == []
+    gitlib.status.deleted.should == []
+    gitlib.status.modified.should == []
+    gitlib.status.unmerged.should == []
   end
 
 end

data/spec/github_configuration_spec.rb

@@ -0,0 +1,152 @@
+require 'git-process/github_configuration'
+require 'json'
+require 'github_test_helper'
+
+
+describe GitHubService::Configuration, :git_repo_helper do
+  include GitHubTestHelper
+
+
+  def test_token
+    'hfgkdjfgksjhdfkls'
+  end
+
+
+  def ghc
+    @ghc ||= GitHubService::Configuration.new(gitlib.config, :user => 'tu', :password => 'dfsdf')
+  end
+
+
+  describe 'create_authorization' do
+
+    it "should return an auth_token for a good request" do
+      gitlib.remote.add('origin', 'git@github.com:jdigger/git-process.git')
+      stub_post('https://tu:dfsdf@api.github.com/authorizations', :send => auth_json,
+                :body => {:token => test_token})
+
+      ghc.create_authorization().should == test_token
+    end
+
+
+    it 'should 401 for bad password' do
+      gitlib.remote.add('origin', 'git@github.com:jdigger/git-process.git')
+      stub_post('https://tu:dfsdf@api.github.com/authorizations', :send => auth_json,
+                :status => 401)
+
+      expect { ghc.create_authorization() }.to raise_error Octokit::Unauthorized
+    end
+
+  end
+
+
+  describe "auth_token no username or password" do
+
+    it "should get the token from config if it exists" do
+      gitlib.config['github.user'] = 'test_user'
+      gitlib.config['gitProcess.github.authToken'] = test_token
+
+      ghc.auth_token.should == test_token
+    end
+
+  end
+
+
+  describe 'auth_token with password but no username' do
+
+    def ghc
+      @ghc ||= GitHubService::Configuration.new(gitlib.config, :user => nil, :password => 'dfsdf')
+    end
+
+
+    it 'should get the token from the server if it does not exist in config' do
+      gitlib.remote.add('origin', 'git@github.com:jdigger/git-process.git')
+      gitlib.config['github.user'] = 'test_user'
+      gitlib.config['gitProcess.github.authToken'] = ''
+
+      stub_post('https://test_user:dfsdf@api.github.com/authorizations', :send => auth_json,
+                :body => {:token => test_token})
+
+      ghc.auth_token.should == test_token
+    end
+
+  end
+
+
+  describe "user" do
+
+    def ghc
+      @ghc ||= GitHubService::Configuration.new(gitlib.config, :user => nil, :password => 'dfsdf')
+    end
+
+
+    it "should get the value from config" do
+      gitlib.config['github.user'] = 'test_user'
+
+      ghc.user.should == 'test_user'
+    end
+
+
+    it "should prompt the user and store it in the config" do
+      gitlib.config['github.user'] = ''
+
+      GitHubService::Configuration.stub(:ask_for_user).and_return('test_user')
+      ghc.user.should == 'test_user'
+    end
+
+  end
+
+
+  describe "using GHE instead of GitHub.com" do
+
+    it "should use the correct server and path for a non-GitHub.com site" do
+      gitlib.remote.add('origin', 'git@myco.com:jdigger/git-process.git')
+
+      stub_post('https://tu:dfsdf@myco.com/api/v3/authorizations',
+                :send => auth_json,
+                :body => {:token => test_token})
+
+      ghc.create_authorization().should == test_token
+    end
+
+
+    it "site should raise an error if remote.origin.url not set" do
+      gitlib.config['remote.origin.url'] = ''
+
+      expect { ghc.base_github_api_url_for_remote }.to raise_error GitHubService::NoRemoteRepository
+    end
+
+
+    it "site should not work for a garbage url address" do
+      gitlib.remote.add('origin', 'garbage')
+
+      expect { ghc.base_github_api_url_for_remote }.to raise_error URI::InvalidURIError
+    end
+
+
+    it "site should work for an ssh-configured url address" do
+      gitlib.remote.add('origin', 'git@github.myco.com:fooble')
+
+      ghc.base_github_api_url_for_remote.should == 'https://github.myco.com'
+    end
+
+  end
+
+
+  it "#url_to_base_github_api_url" do
+    c = GitHubService::Configuration
+
+    c.url_to_base_github_api_url('ssh://git@github.myco.com/fooble').should == 'https://github.myco.com'
+    c.url_to_base_github_api_url('git://myco.com/jdigger/git-process.git').should == 'https://myco.com'
+    c.url_to_base_github_api_url('http://github.myco.com/fooble').should == 'http://github.myco.com'
+    c.url_to_base_github_api_url('http://tu@github.myco.com/fooble').should == 'http://github.myco.com'
+    c.url_to_base_github_api_url('https://github.myco.com/fooble').should == 'https://github.myco.com'
+    c.url_to_base_github_api_url('https://github.com/fooble').should == 'https://api.github.com'
+  end
+
+
+  def auth_json
+    JSON({:note_url => 'http://jdigger.github.com/git-process',
+          :scopes => %w(repo user gist), :note => "Git-Process"})
+  end
+
+end