git-si 0.3.1 → 0.4.0

data/spec/git-control_spec.rb

@@ -0,0 +1,254 @@
+require "git/si/git-control"
+require "git/si/version"
+
+describe Git::Si::GitControl do
+  describe ".status_command" do
+    it "returns the correct git command" do
+      expected = "git status --porcelain"
+      actual = Git::Si::GitControl.status_command
+      expect(actual).to eq(expected)
+    end
+
+    it "includes extra arguments if specified" do
+      expected = "git status --porcelain foobar"
+      actual = Git::Si::GitControl.status_command( "foobar" )
+      expect(actual).to eq(expected)
+    end
+
+    context "when a different binary is set" do
+      before do
+        Git::Si::GitControl.git_binary = "testbin"
+      end
+
+      after do
+        Git::Si::GitControl.git_binary = nil
+      end
+
+      it "uses the different binary" do
+        expected = "testbin status --porcelain"
+        actual = Git::Si::GitControl.status_command
+        expect(actual).to eq(expected)
+      end
+    end
+  end
+
+  describe ".are_there_changes?" do
+    it "returns true if there are changes" do
+      data = "
+ M test1
+"
+      expect(Git::Si::GitControl.are_there_changes?( data )).to be_truthy
+    end
+
+    it "returns true if there are additions" do
+      data = "
+ A test1
+"
+      expect(Git::Si::GitControl.are_there_changes?( data )).to be_truthy
+    end
+
+    it "returns true if there are deletions" do
+      data = "
+ D test1
+"
+      expect(Git::Si::GitControl.are_there_changes?( data )).to be_truthy
+    end
+
+    it "returns true if there are renamed files" do
+      data = "
+ R test1
+"
+      expect(Git::Si::GitControl.are_there_changes?( data )).to be_truthy
+    end
+
+    it "returns true if there are copied files" do
+      data = "
+ C test1
+"
+      expect(Git::Si::GitControl.are_there_changes?( data )).to be_truthy
+    end
+
+    it "returns false if there are no changes" do
+      data = "
+?? testdir/
+"
+      expect(Git::Si::GitControl.are_there_changes?( data )).to be_falsey
+    end
+  end
+
+  describe ".log_command" do
+    it "returns the correct git command" do
+      expect( Git::Si::GitControl.log_command ).to eq( "git log" )
+    end
+
+    it "includes extra arguments if specified" do
+      expect( Git::Si::GitControl.log_command( "--pretty=%B" ) ).to eq( "git log --pretty=%B" )
+    end
+
+    context "when a different binary is set" do
+      before do
+        Git::Si::GitControl.git_binary = "testbingit"
+      end
+
+      after do
+        Git::Si::GitControl.git_binary = nil
+      end
+
+      it "uses the different binary" do
+        expect(Git::Si::GitControl.log_command).to eq("testbingit log")
+      end
+    end
+  end
+
+  describe ".parse_last_svn_revision" do
+    it "returns the correct svn version number" do
+      data = "
+git-si 0.4.0 svn update to version 1015
+
+some other commit
+
+git-si 0.3.0 svn update to version 1014
+"
+      expect(Git::Si::GitControl.parse_last_svn_revision( data )).to eq( '1015' )
+    end
+
+    it "returns nil if no version number could be found" do
+      expect(Git::Si::GitControl.parse_last_svn_revision( 'foobar' )).to be_nil
+    end
+  end
+
+  describe ".add_command" do
+    it "raises an error if no files are specified" do
+      expect { Git::Si::GitControl.add_command }.to raise_error
+    end
+
+    it "returns the correct command with files" do
+      expect( Git::Si::GitControl.add_command( "foobar" ) ).to eq( "git add foobar" )
+    end
+  end
+
+  describe ".commit_revision_command" do
+    it "raises an error if no version is specified" do
+      expect { Git::Si::GitControl.commit_revision_command }.to raise_error
+    end
+
+    it "returns the correct command with the revision" do
+      version = Git::Si::Version.version
+      expect( Git::Si::GitControl.commit_revision_command( 21356 ) ).to eq( "git commit --allow-empty -am 'git-si #{version} svn update to version 21356'" )
+    end
+  end
+
+  describe ".stash_command" do
+    it "returns the correct command" do
+      expect(Git::Si::GitControl.stash_command).to eq( "git stash" )
+    end
+  end
+
+  describe ".unstash_command" do
+    it "returns the correct command" do
+      expect(Git::Si::GitControl.unstash_command).to eq( "git stash pop" )
+    end
+  end
+
+  describe ".rebase_command" do
+    it "raises an error if no branch is specified" do
+      expect { Git::Si::GitControl.rebase_command }.to raise_error
+    end
+
+    it "returns the correct command with the branch" do
+      expect( Git::Si::GitControl.rebase_command( 'master' ) ).to eq( "git rebase 'master'" )
+    end
+  end
+
+  describe ".create_branch_command" do
+    it "returns the correct command" do
+      expect(Git::Si::GitControl.create_branch_command('foo')).to eq( "git branch foo" )
+    end
+
+    it "raises an error if no branch is specified" do
+      expect { Git::Si::GitControl.create_branch_command }.to raise_error
+    end
+  end
+
+  describe ".delete_branch_command" do
+    it "returns the correct command" do
+      expect(Git::Si::GitControl.delete_branch_command('foo')).to eq( "git branch -D foo" )
+    end
+
+    it "raises an error if no branch is specified" do
+      expect { Git::Si::GitControl.delete_branch_command }.to raise_error
+    end
+  end
+
+  describe ".branch_command" do
+    it "returns the correct command" do
+      expect(Git::Si::GitControl.branch_command).to eq( "git branch" )
+    end
+  end
+
+  describe ".parse_current_branch" do
+    it "returns the correct branch" do
+      data = "
+  MIRRORBRANCH
+* master
+"
+      expect(Git::Si::GitControl.parse_current_branch( data )).to eq( 'master' )
+    end
+
+    it "returns nil if no branch could be found" do
+      expect(Git::Si::GitControl.parse_current_branch( 'foobar' )).to be_nil
+    end
+  end
+
+  describe ".checkout_command" do
+    it "raises an error if no branch is specified" do
+      expect { Git::Si::GitControl.checkout_command }.to raise_error
+    end
+
+    it "returns the correct command with the branch" do
+      expect( Git::Si::GitControl.checkout_command( 'master' ) ).to eq( "git checkout master" )
+    end
+  end
+
+  describe ".hard_reset_command" do
+    it "returns the correct command" do
+      expect(Git::Si::GitControl.hard_reset_command).to eq( "git reset --hard HEAD" )
+    end
+  end
+
+  describe ".list_file_command" do
+    it "raises an error if no filename is specified" do
+      expect { Git::Si::GitControl.list_file_command }.to raise_error
+    end
+
+    it "returns the correct command" do
+      expect(Git::Si::GitControl.list_file_command('foobar')).to eq( "git ls-files foobar" )
+    end
+  end
+
+  describe ".init_command" do
+    it "returns the correct command" do
+      expect( Git::Si::GitControl.init_command ).to eq( "git init" )
+    end
+  end
+
+  describe ".show_branch_command" do
+    it "raises an error if no branch is specified" do
+      expect { Git::Si::GitControl.show_branch_command }.to raise_error
+    end
+
+    it "returns the correct command with the branch" do
+      expect( Git::Si::GitControl.show_branch_command( 'master' ) ).to eq( "git show-ref refs/heads/master" )
+    end
+  end
+
+  describe ".delete_command" do
+    it "raises an error if no filename is specified" do
+      expect { Git::Si::GitControl.delete_command }.to raise_error
+    end
+
+    it "returns the correct command" do
+      expect(Git::Si::GitControl.delete_command('foobar')).to eq( "git rm foobar" )
+    end
+  end
+end

data/spec/git-ignore_spec.rb

@@ -0,0 +1,37 @@
+require "git/si/git-ignore"
+
+describe Git::Si::GitIgnore do
+  describe ".ignore_patterns" do
+    it "allows .gitignore files" do
+      expect( Git::Si::GitIgnore.ignore_patterns ).to include( '!.gitignore' )
+    end
+  end
+
+  describe ".get_missing_lines_from" do
+    it "returns lines not present in the passed arguments" do
+      data = ["svn-commit.*", "*.orig"]
+      expect( Git::Si::GitIgnore.get_missing_lines_from( data ) ).to include( '*.log' )
+    end
+
+    it "does not return lines present in the passed arguments" do
+      data = ["svn-commit.*", "*.orig"]
+      expect( Git::Si::GitIgnore.get_missing_lines_from( data ) ).not_to include( '*.orig' )
+    end
+
+    it "returns an empty array if all the lines are present" do
+      data = Git::Si::GitIgnore.ignore_patterns
+      expect( Git::Si::GitIgnore.get_missing_lines_from( data ) ).to be_empty
+    end
+
+    it "returns lines not present in the passed arguments from the passed patterns" do
+      data = ["foo", "bar"]
+      expect( Git::Si::GitIgnore.get_missing_lines_from( data, ['baz'] ) ).to include( 'baz' )
+    end
+
+    it "does not return lines not present in the passed arguments from the passed patterns" do
+      data = ["foo", "bar"]
+      expect( Git::Si::GitIgnore.get_missing_lines_from( data, ['foo'] ) ).not_to include( 'bar' )
+    end
+  end
+end
+

data/spec/svn-control_spec.rb

@@ -0,0 +1,391 @@
+require "git/si/svn-control"
+
+describe Git::Si::SvnControl do
+  let( :svn_status_output ) {
+    "Z foobar
+X foobar
+M foobar.git
+M foobar.swp
+M barfoo
+A something
+D something else
+? whatever
+" }
+
+  let( :svn_info_output ) {
+      "
+Path: .
+Working Copy Root Path: /path/place
+URL: file:///Users/path/place
+Relative URL: ^/test
+Repository Root: file:///Users/path/place
+Repository UUID: 0101010101
+Revision: 1014
+Node Kind: directory
+Schedule: normal
+Last Changed Author: me
+Last Changed Rev: 1
+" }
+
+  let( :svn_update_output ) {
+      "
+Restored 'bin/tests/importantthing'
+A    bin/tests/foobar
+U    bin/tests/api/goobar
+G    bin/tests/api/special
+U    bin/tests/api/anotherfile
+A    bin/tests/barfoo
+?    unknownfile.md
+D    byefile
+   C myimage.png
+D    badjs.js
+   C something/javascript.js
+   A something/newjs.js
+C    css/_base.scss
+Updated to revision 113333.
+Resolved conflicted state of 'weirdthing/weird.php'
+" }
+
+  describe ".status_command" do
+    it "returns the correct svn command" do
+      expected = "svn status --ignore-externals"
+      actual = Git::Si::SvnControl.status_command
+      expect(actual).to eq(expected)
+    end
+
+    it "includes extra arguments if specified" do
+      expected = "svn status --ignore-externals --verbose"
+      actual = Git::Si::SvnControl.status_command( "--verbose" )
+      expect(actual).to eq(expected)
+    end
+
+    context "when a different binary is set" do
+      before do
+        Git::Si::SvnControl.svn_binary = "testbin"
+      end
+
+      after do
+        Git::Si::SvnControl.svn_binary = nil
+      end
+
+      it "uses the different binary" do
+        expected = "testbin status --ignore-externals"
+        actual = Git::Si::SvnControl.status_command
+        expect(actual).to eq(expected)
+      end
+    end
+  end
+
+  describe ".diff_command" do
+    it "returns the correct svn command" do
+      expected = "svn diff"
+      actual = Git::Si::SvnControl.diff_command
+      expect(actual).to eq(expected)
+    end
+
+    it "includes extra arguments if specified" do
+      expected = "svn diff foobar"
+      actual = Git::Si::SvnControl.diff_command( "foobar" )
+      expect(actual).to eq(expected)
+    end
+  end
+
+  describe ".info_command" do
+    it "returns the correct svn command" do
+      expected = "svn info"
+      actual = Git::Si::SvnControl.info_command
+      expect(actual).to eq(expected)
+    end
+  end
+
+  describe ".parse_last_revision" do
+    it "returns nil from incorrect data" do
+      actual = Git::Si::SvnControl.parse_last_revision('foobar 12345')
+      expect(actual).to be_nil
+    end
+
+    it "returns the revision number from correct data" do
+      expected = "1014"
+      actual = Git::Si::SvnControl.parse_last_revision( svn_info_output )
+      expect(actual).to eq(expected)
+    end
+  end
+
+  describe ".add_command" do
+    it "raises an error if no files are specified" do
+      expect { Git::Si::SvnControl.add_command }.to raise_error
+    end
+
+    it "returns the correct command with a file" do
+      expect( Git::Si::SvnControl.add_command( "foobar" ) ).to eq( "svn add foobar" )
+    end
+
+    it "returns the correct command with an array of files" do
+      expect( Git::Si::SvnControl.add_command( ["foobar", "barfoo"] ) ).to eq( "svn add foobar barfoo" )
+    end
+  end
+
+  describe ".update_command" do
+    it "returns the correct command" do
+      expect( Git::Si::SvnControl.update_command ).to eq( "svn up --accept theirs-full --ignore-externals" )
+    end
+  end
+
+  describe ".parse_updated_files" do
+    it "returns files that have been added" do
+      expected = [
+        'bin/tests/foobar',
+        'bin/tests/barfoo'
+      ]
+      expect( Git::Si::SvnControl.parse_updated_files( svn_update_output ) ).to include( *expected )
+    end
+
+    it "returns files that have been restored" do
+      expected = [
+        'bin/tests/importantthing'
+      ]
+      expect( Git::Si::SvnControl.parse_updated_files( svn_update_output ) ).to include( *expected )
+    end
+
+    it "returns files that are updated" do
+      expected = [
+        'bin/tests/api/goobar',
+        'bin/tests/api/special',
+        'bin/tests/api/anotherfile'
+      ]
+      expect( Git::Si::SvnControl.parse_updated_files( svn_update_output ) ).to include( *expected )
+    end
+
+    it "returns files that are resolved conflicts" do
+      expected = [
+        'weirdthing/weird.php'
+      ]
+      expect( Git::Si::SvnControl.parse_updated_files( svn_update_output ) ).to include( *expected )
+    end
+
+    it "does not return files that are in conflict" do
+      expected = [
+        'myimage.png',
+        'css/_base.scss',
+        'something/javascript.js'
+      ]
+      expect( Git::Si::SvnControl.parse_updated_files( svn_update_output ) ).not_to include( *expected )
+    end
+
+    it "does not return files that are deleted" do
+      expected = [
+        'byefile',
+        'badjs.js'
+      ]
+      expect( Git::Si::SvnControl.parse_updated_files( svn_update_output ) ).not_to include( *expected )
+    end
+
+    it "returns files whose properties have been updated" do
+      expected = [
+        'something/newjs.js'
+      ]
+      expect( Git::Si::SvnControl.parse_updated_files( svn_update_output ) ).to include( *expected )
+    end
+  end
+
+  describe ".parse_deleted_files" do
+    it "does not return files that are deleted" do
+      expected = [
+        'byefile',
+        'badjs.js'
+      ]
+      expect( Git::Si::SvnControl.parse_deleted_files( svn_update_output ) ).to include( *expected )
+    end
+  end
+
+  describe ".parse_conflicted_files" do
+    it "returns files that are resolved conflicts" do
+      expected = [
+        'weirdthing/weird.php'
+      ]
+      expect( Git::Si::SvnControl.parse_conflicted_files( svn_update_output ) ).to include( *expected )
+    end
+
+    it "returns files which have conflicts" do
+      expected = [
+        'myimage.png',
+        'css/_base.scss',
+        'something/javascript.js'
+      ]
+      expect( Git::Si::SvnControl.parse_conflicted_files( svn_update_output ) ).to include( *expected )
+    end
+  end
+
+  describe ".parse_unknown_files" do
+    it "returns files that are not tracked" do
+      expected = [
+        'unknownfile.md'
+      ]
+      expect( Git::Si::SvnControl.parse_unknown_files( svn_update_output ) ).to include( *expected )
+    end
+
+    it "does not return files that are tracked" do
+      expected = [
+        'myimage.png',
+        'css/_base.scss',
+        'something/javascript.js'
+      ]
+      expect( Git::Si::SvnControl.parse_unknown_files( svn_update_output ) ).not_to include( *expected )
+    end
+  end
+
+  describe ".revert_command" do
+    it "returns the correct command for all files" do
+      expect( Git::Si::SvnControl.revert_command ).to eq('svn revert -R .')
+    end
+
+    it "returns the correct command for some files" do
+      expect( Git::Si::SvnControl.revert_command(['foobar', 'barfoo']) ).to eq('svn revert -R foobar barfoo')
+    end
+  end
+
+  describe ".commit_command" do
+    it "returns the correct command for all files" do
+      expect( Git::Si::SvnControl.commit_command ).to eq('svn commit')
+    end
+
+    it "returns the correct command for some files" do
+      expect( Git::Si::SvnControl.commit_command(['foobar', 'barfoo']) ).to eq('svn commit foobar barfoo')
+    end
+  end
+
+  describe ".blame_command" do
+    it "raises an error with no files" do
+      expect { Git::Si::SvnControl.blame_command }.to raise_error
+    end
+
+    it "returns the correct command" do
+      expect( Git::Si::SvnControl.blame_command('foobar') ).to eq( 'svn blame foobar' )
+    end
+  end
+
+  describe ".parse_root_path" do
+    it "raises an error with no data" do
+      expect { Git::Si::SvnControl.parse_root_path }.to raise_error
+    end
+
+    it "returns the correct root path" do
+      data = "
+Path: .
+Working Copy Root Path: /Users/foobar/git-si/testdir/test-copy
+URL: file:///Users/foobar/git-si/testdir/SVNrep/test
+Relative URL: ^/test
+Repository Root: file:///Users/foobar/git-si/testdir/SVNrep
+Repository UUID: 0101010101
+Revision: 1432
+"
+      expect( Git::Si::SvnControl.parse_root_path(data) ).to eq( '/Users/foobar/git-si/testdir/test-copy' )
+    end
+  end
+
+  describe ".list_file_command" do
+    it "returns the correct command" do
+      expect( Git::Si::SvnControl.list_file_command ).to eq( 'svn list -R' )
+    end
+  end
+
+  describe ".parse_file_list" do
+    let ( :svn_list_output ) { "
+.hiddenfile
+.hiddendir/
+.hiddendir/regularfile.txt
+myimage.png
+something/
+something/.subhidden/
+something/.subhidden/regularfile.txt
+something/javascript.js
+" }
+
+    it "returns files in the list" do
+      expected = [
+        'myimage.png',
+        'something/javascript.js'
+      ]
+      expect( Git::Si::SvnControl.parse_file_list( svn_list_output ) ).to include( *expected )
+    end
+
+    it "does not return directories" do
+      expected = [
+        'something/'
+      ]
+      expect( Git::Si::SvnControl.parse_file_list( svn_list_output ) ).not_to include( *expected )
+    end
+
+    it "does not return empty strings" do
+      expected = [
+        '',
+        ' ',
+      ]
+      expect( Git::Si::SvnControl.parse_file_list( svn_list_output ) ).not_to include( *expected )
+    end
+
+    it "does not return hidden files or files in hidden directories" do
+      expected = [
+        '.hiddenfile',
+        '.hiddendir/regularfile.txt',
+        'something/.subhidden/regularfile.txt'
+      ]
+      expect( Git::Si::SvnControl.parse_file_list( svn_list_output ) ).not_to include( *expected )
+    end
+  end
+
+  describe ".parse_external_repos" do
+    it "includes lines beginning with 'X'" do
+      expected = [ 'foobar' ]
+      actual = Git::Si::SvnControl.parse_external_repos( svn_status_output )
+      expect(actual).to include(*expected)
+    end
+
+    it "excludes lines starting with 'M'" do
+      expected = [ 'barfoo' ]
+      actual = Git::Si::SvnControl.parse_external_repos( svn_status_output )
+      expect(actual).not_to include(expected)
+    end
+  end
+
+  describe ".parse_svn_status" do
+    it "excludes lines beginning with 'X'" do
+      expected = 'X foobar'
+      actual = Git::Si::SvnControl.parse_svn_status( svn_status_output )
+      expect(actual).to_not include(expected)
+    end
+
+    it "excludes lines ending with '.git'" do
+      expected = 'foobar.git'
+      actual = Git::Si::SvnControl.parse_svn_status( svn_status_output )
+      expect(actual).to_not include(expected)
+    end
+
+    it "excludes lines ending with '.swp'" do
+      expected = 'foobar.swp'
+      actual = Git::Si::SvnControl.parse_svn_status( svn_status_output )
+      expect(actual).to_not include(expected)
+    end
+
+    it "includes lines starting with 'M'" do
+      expected = 'M barfoo'
+      actual = Git::Si::SvnControl.parse_svn_status( svn_status_output )
+      expect(actual).to include(expected)
+    end
+
+    it "includes lines starting with 'A'" do
+      expected = 'A something'
+      actual = Git::Si::SvnControl.parse_svn_status( svn_status_output )
+      expect(actual).to include(expected)
+    end
+
+    it "includes lines starting with '?'" do
+      expected = '? whatever'
+      actual = Git::Si::SvnControl.parse_svn_status( svn_status_output )
+      expect(actual).to include(expected)
+    end
+  end
+
+end
+
+