git-si 0.3.1 → 0.4.0

data/lib/git/si/util.rb

@@ -0,0 +1,304 @@
+require "git/si/errors"
+
+module Git
+
+  module Si
+
+    module Util
+
+      def did_last_command_succeed?
+        $?.success?
+      end
+
+      def run_command(command, options={})
+        output = ''
+        debug "run_command `#{command}`, options: #{options}"
+        if STDOUT.tty? and not @silent
+          output = run(command, options)
+        else
+          output = run(command, options.update(verbose: false, capture: true))
+        end
+        raise Git::Si::ShellError.new("There was an error while trying to run the command: #{command}. Look above for any errors.") if not options[:allow_errors] and not did_last_command_succeed?
+        return output
+      end
+
+      def get_command_output(command, options={})
+        run_command(command, options.merge( capture: true ))
+      end
+
+      def batch_add_files_to_git( filenames )
+        filenames.each_slice(10) do |batch|
+          begin
+            run_command( Git::Si::GitControl.add_command( batch ) )
+          rescue
+            # try to batch the files but add them individually if there is an error
+            add_files_to_git( batch )
+          end
+        end
+      end
+
+      def add_files_to_git( filenames )
+        filenames.each do |filename|
+          begin
+            run_command( Git::Si::GitControl.add_command(filename) )
+          rescue
+            # errors here are not important enough to stop the whole process
+          end
+        end
+      end
+
+      def configure
+        Git::Si::SvnControl.svn_binary = options[:svn]
+        Git::Si::GitControl.git_binary = options[:git]
+      end
+
+      # Return the most recent svn revision number stored in git
+      def get_git_si_revision
+        info = get_command_output(Git::Si::GitControl.log_command('--pretty=%B'))
+        return Git::Si::GitControl.parse_last_svn_revision(info)
+      end
+
+      # Return the most recent svn revision number
+      def get_svn_revision
+        svn_info = get_command_output(Git::Si::SvnControl.info_command)
+        return Git::Si::SvnControl.parse_last_revision(svn_info)
+      end
+
+      def get_svn_root
+        svn_info = get_command_output(Git::Si::SvnControl.info_command, {:allow_errors => true})
+        root_dir = Git::Si::SvnControl.parse_root_path(svn_info)
+        raise Git::Si::SvnError.new("Could not find the svn root directory.") unless root_dir
+        root_dir
+      end
+
+      def get_local_branch
+        git_branches = get_command_output(Git::Si::GitControl.branch_command)
+        local_branch = Git::Si::GitControl.parse_current_branch(git_branches)
+        raise Git::Si::GitError.new("Could not find local branch name.") unless local_branch
+        return local_branch
+      end
+
+      def in_svn_root(&block)
+        root_dir = get_svn_root
+        notice_message "Changing directory to svn root: #{root_dir}"
+        Dir.chdir(root_dir) do
+          yield
+        end
+      end
+
+      def on_local_branch(&block)
+        begin
+          in_svn_root do
+            yield
+          end
+        rescue Git::Si::GitSiError => err
+          error_message err
+          exit false
+        end
+      end
+
+      def get_mirror_branch
+        return 'MIRRORBRANCH'
+      end
+
+      def on_mirror_branch(&block)
+        local_branch = get_local_branch()
+        run_command( Git::Si::GitControl.checkout_command(get_mirror_branch) )
+        begin
+          in_svn_root do
+            yield
+          end
+        rescue Git::Si::GitSiError => err
+          error_message err
+          exit false
+        ensure
+          run_command( Git::Si::GitControl.checkout_command(local_branch) )
+        end
+      end
+
+      def using_stderr(&block)
+        old_stdout = $stdout
+        $stdout = $stderr
+        @silent = true
+        begin
+          yield
+        ensure
+          $stdout = old_stdout
+          @silent = false
+        end
+      end
+
+      def success_message(message)
+        $stderr.puts set_color message, :green
+      end
+
+      def notice_message(message)
+        $stderr.puts set_color message, :yellow unless options[:quiet]
+      end
+
+      def error_message(message)
+        $stderr.puts set_color message, :red
+      end
+
+      def debug(message)
+        $stderr.puts message if options[:debug]
+      end
+
+      def do_revisions_differ
+        last_fetched_version = get_svn_revision()
+        last_rebased_version = get_git_si_revision()
+
+        if ! last_fetched_version or ! last_rebased_version
+          notice_message "Could not determine last git-si version information. This may be fine if you haven't used git-si before."
+          return
+        end
+
+        debug "comparing last fetched revision #{last_fetched_version} and last rebased revision #{last_rebased_version}"
+
+        if last_fetched_version > last_rebased_version
+          raise Git::Si::VersionError.new("This branch is out-of-date (svn revision #{last_rebased_version}; svn is at #{last_fetched_version}). You should do a git si rebase or git si pull.")
+        elsif last_fetched_version < last_rebased_version
+          return true if ask("This branch is newer (svn revision #{last_rebased_version}) than svn (rev #{last_fetched_version}). That can happen when svn changes have been made directly and may be fine. Do you want to continue? [Y/n] ", :green) =~ /\s*^n/i
+        end
+      end
+
+      def print_colordiff(diff)
+        debug "print_colordiff"
+        if ! STDOUT.tty?
+          debug "print_colordiff returning without colorizing"
+          return say diff
+        end
+        debug "print_colordiff colorizing..."
+        diff.each_line do |line|
+          line.rstrip!
+          case line
+          when /^\+/, /^A/
+            line = set_color line, :green
+          when /^\-/, /^M/
+            line = set_color line, :red
+          when /^\?/
+            line = set_color line, :yellow
+          end
+          say line
+        end
+      end
+
+      def are_there_git_changes?
+        Git::Si::GitControl.are_there_changes?( get_command_output( Git::Si::GitControl.status_command ) )
+      end
+
+      def create_git_repository
+        if File.exist? '.git'
+          notice_message "Looks like a git repository already exists here."
+          return false
+        end
+        notice_message "Initializing git repository"
+        run_command(Git::Si::GitControl.init_command, {:allow_errors => true})
+        raise Git::Si::GitError.new("Failed to initialize git repository. I'm not sure why. Check for any errors above.") unless did_last_command_succeed?
+        add_all_svn_files()
+        true
+      end
+
+      def create_gitignore
+        # add externals to gitignore
+        gitignore_patterns = Git::Si::GitIgnore.ignore_patterns
+        gitignore_patterns += Git::Si::SvnControl.parse_external_repos( get_command_output( Git::Si::SvnControl.status_command ) )
+
+        if not File.exist? '.gitignore'
+          notice_message "Creating gitignore file."
+          create_file('.gitignore', gitignore_patterns.join( "\n" ))
+          run_command( Git::Si::GitControl.add_command('.gitignore') )
+          return true
+        end
+
+        notice_message "Looks like a gitignore file already exists here."
+        missing_patterns = Git::Si::GitIgnore.get_missing_lines_from( File.readlines( '.gitignore' ), gitignore_patterns )
+        if not missing_patterns.empty?
+          using_stderr do
+            say "The .gitignore file is missing the following recommended patterns:\n#{missing_patterns.join( "\n" )}"
+            if yes?("Do you want to add them? [Y/n] ", :green)
+              append_to_file( '.gitignore', missing_patterns.join("\n") )
+              run_command( Git::Si::GitControl.add_command('.gitignore') )
+              return true
+            end
+          end
+        end
+        false
+      end
+
+      def add_all_svn_files
+        notice_message "Adding all files present in the svn repository."
+        all_svn_files = Git::Si::SvnControl.parse_file_list( get_command_output( Git::Si::SvnControl.list_file_command ) )
+        raise Git::Si::GitSiError.new("No files could be found in the svn repository.") if all_svn_files.empty?
+        batch_add_files_to_git( all_svn_files )
+      end
+
+      def create_mirror_branch
+        begin
+          run_command( Git::Si::GitControl.show_branch_command(get_mirror_branch) )
+        rescue
+          # no problem. It just means the branch does not exist.
+        end
+        if did_last_command_succeed?
+          notice_message "Looks like the mirror branch already exists here."
+        else
+          notice_message "Creating mirror branch '#{get_mirror_branch}'."
+          run_command( Git::Si::GitControl.create_branch_command(get_mirror_branch) )
+        end
+      end
+
+      def stash_local_changes
+        on_local_branch do
+          if are_there_git_changes?
+            notice_message "Preserving uncommitted changed files"
+            run_command( Git::Si::GitControl.stash_command )
+            return true
+          end
+        end
+        false
+      end
+
+      def unstash_local_changes( did_stash_changes )
+        if did_stash_changes
+          notice_message "Restoring uncommitted changed files"
+          run_command( Git::Si::GitControl.unstash_command )
+        end
+      end
+
+      def is_file_in_git?( filename )
+        not get_command_output( Git::Si::GitControl.list_file_command( filename ) ).empty?
+      end
+
+      def revert_files_to_svn_update( updated_files )
+        notice_message "Reverting any local changes in mirror branch"
+        # revert everything, but sometimes that doesn't work, so revert conflicts too.
+        run_command( Git::Si::SvnControl.revert_command )
+        Git::Si::SvnControl.parse_conflicted_files( updated_files ).each do |filename|
+          run_command( Git::Si::SvnControl.revert_command( filename ) )
+        end
+      end
+
+      def delete_files_after_svn_update( updated_files )
+        # delete deleted files.
+        Git::Si::SvnControl.parse_deleted_files( updated_files ).each do |filename|
+          run_command( Git::Si::GitControl.delete_command( filename ) )
+        end
+      end
+
+      def add_files_after_svn_update( updated_files )
+        notice_message "Updating mirror branch to match new data"
+        # add updated files
+        updated_files = Git::Si::SvnControl.parse_updated_files( updated_files )
+        batch_add_files_to_git( updated_files )
+      end
+
+      def delete_committed_branch( local_branch )
+        run_command( Git::Si::GitControl.checkout_command( 'master' ) )
+        do_rebase_action
+        run_command( Git::Si::GitControl.delete_branch_command( local_branch ) )
+        success_message "branch '#{local_branch}' deleted!"
+      end
+
+    end
+  end
+end

data/lib/git/si/version.rb

@@ -1,5 +1,16 @@
 module Git
   module Si
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
+
+    class Version
+      def self.version
+        Git::Si::VERSION
+      end
+
+      def self.version_string
+        "git-si version #{Git::Si::VERSION}"
+      end
+    end
+
   end
 end

data/spec/actions_spec.rb

@@ -0,0 +1,356 @@
+require "git/si/util"
+require "git/si/actions"
+
+describe Git::Si::Actions do
+  let( :runner_spy ) { spy( 'runner_spy' ) }
+  let( :test_mixin_host ) {
+    Class.new do
+      include Git::Si::Util
+      include Git::Si::Actions
+
+      def initialize( spy )
+        @spy = spy
+      end
+
+      def say(toss)
+      end
+
+      def debug(toss)
+      end
+
+      def in_svn_root
+        yield
+      end
+
+      def on_mirror_branch
+        yield
+      end
+
+      def error_message(toss)
+      end
+
+      def success_message(toss)
+      end
+
+      def notice_message(toss)
+      end
+
+      def did_last_command_succeed?
+        true
+      end
+
+      def run_command( command, options={} )
+        @spy.run_command( command, options )
+        raise "test error" if command =~ /raise/
+        "testing run_command"
+      end
+    end
+  }
+
+  let( :svn_status_output ) { "Z foobar
+X foobar
+? .git
+M foobar.git
+M foobar.swp
+M barfoo
+A something
+D something else
+? whatever
+" }
+
+  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.
+" }
+
+  subject { test_mixin_host.new( runner_spy ) }
+
+  describe "#do_status_action" do
+    before do
+      allow( subject ).to receive( :run_command ).and_return( '' )
+    end
+
+    it "sends status output to print_colordiff" do
+      data = "Z foobar
+M something else"
+      allow( subject ).to receive( :run_command ).with( /svn status/, any_args ).and_return( data )
+      allow( subject ).to receive( :print_colordiff )
+      expect( subject ).to receive( :print_colordiff ).with( data )
+      subject.do_status_action
+    end
+
+    it "calls svn status with passed arguments" do
+      expect( subject ).to receive( :run_command ).with( /svn status .+ foobar barfoo/, any_args )
+      subject.do_status_action( [ 'foobar', 'barfoo' ] )
+    end
+  end
+
+  describe "#do_diff_action" do
+    before do
+      allow( subject ).to receive( :do_readd_action )
+      allow( subject ).to receive( :run_command ).and_return( '' )
+    end
+
+    it "calls do_revisions_differ" do
+      allow( subject ).to receive( :do_revisions_differ )
+      expect( subject ).to receive( :do_revisions_differ ).once
+      subject.do_diff_action
+    end
+
+    it "calls the readd action" do
+      expect( subject ).to receive( :do_readd_action ).once
+      subject.do_diff_action
+    end
+
+    it "sends diff output to print_colordiff" do
+      data = "+ foobar
+- something else"
+      allow( subject ).to receive( :run_command ).with( /svn diff/, any_args ).and_return( data )
+      allow( subject ).to receive( :print_colordiff )
+      expect( subject ).to receive( :print_colordiff ).with( data )
+      subject.do_diff_action
+    end
+
+    it "calls svn diff with passed arguments" do
+      expect( subject ).to receive( :run_command ).with( /svn diff.+foobar barfoo/, any_args )
+      subject.do_diff_action( [ 'foobar', 'barfoo' ] )
+    end
+  end
+
+  describe "#do_add_action" do
+    it "calls git add with the passed arguments" do
+      allow( subject ).to receive( :run_command ).and_return( '' )
+      expect( subject ).to receive( :run_command ).with( /git add.+foobar barfoo/ )
+      subject.do_add_action( [ 'foobar', 'barfoo' ] )
+    end
+
+    it "calls svn add with the passed arguments" do
+      allow( subject ).to receive( :run_command ).and_return( '' )
+      expect( subject ).to receive( :run_command ).with( /svn add.+foobar barfoo/ )
+      subject.do_add_action( [ 'foobar', 'barfoo' ] )
+    end
+  end
+
+  describe "#do_fetch_action" do
+    it "calls stash_local_changes" do
+      expect( subject ).to receive( :stash_local_changes ).once
+      subject.do_fetch_action
+    end
+
+    it "calls svn update" do
+      expect( runner_spy ).to receive( :run_command ).with( /svn up/, any_args )
+      subject.do_fetch_action
+    end
+
+    it "calls revert_files_to_svn_update with update output" do
+      allow( subject ).to receive( :run_command ).and_return( '' )
+      allow( subject ).to receive( :run_command ).with( /svn up/, any_args ).and_return( svn_update_output )
+      expect( subject ).to receive( :revert_files_to_svn_update ).with( svn_update_output )
+      subject.do_fetch_action
+    end
+
+    it "calls delete_files_after_svn_update with update output" do
+      allow( subject ).to receive( :run_command ).and_return( '' )
+      allow( subject ).to receive( :run_command ).with( /svn up/, any_args ).and_return( svn_update_output )
+      expect( subject ).to receive( :delete_files_after_svn_update ).with( svn_update_output )
+      subject.do_fetch_action
+    end
+
+    it "calls add_files_after_svn_update with update output" do
+      allow( subject ).to receive( :run_command ).and_return( '' )
+      allow( subject ).to receive( :run_command ).with( /svn up/, any_args ).and_return( svn_update_output )
+      expect( subject ).to receive( :add_files_after_svn_update ).with( svn_update_output )
+      subject.do_fetch_action
+    end
+
+    it "makes a git commit with the svn revision" do
+      allow( subject ).to receive( :get_svn_revision ).and_return( '1012' )
+      expect( runner_spy ).to receive( :run_command ).with( /git commit .+1012/, any_args )
+      subject.do_fetch_action
+    end
+
+    it "calls unstash_local_changes with true if changes were stashed" do
+      allow( subject ).to receive( :stash_local_changes ).and_return( true )
+      expect( subject ).to receive( :unstash_local_changes ).with( true ).once
+      subject.do_fetch_action
+    end
+
+    it "calls unstash_local_changes with false if no changes were stashed" do
+      allow( subject ).to receive( :stash_local_changes ).and_return( false )
+      expect( subject ).to receive( :unstash_local_changes ).with( false ).once
+      subject.do_fetch_action
+    end
+  end
+
+  describe "#do_rebase_action" do
+    it "calls stash_local_changes" do
+      expect( subject ).to receive( :stash_local_changes ).once
+      subject.do_rebase_action
+    end
+
+    it "calls unstash_local_changes with true if changes were stashed" do
+      allow( subject ).to receive( :stash_local_changes ).and_return( true )
+      expect( subject ).to receive( :unstash_local_changes ).with( true ).once
+      subject.do_rebase_action
+    end
+
+    it "calls unstash_local_changes with false if no changes were stashed" do
+      allow( subject ).to receive( :stash_local_changes ).and_return( false )
+      expect( subject ).to receive( :unstash_local_changes ).with( false ).once
+      subject.do_rebase_action
+    end
+
+    it "calls rebase command with the mirror branch" do
+      allow( subject ).to receive( :get_mirror_branch ).and_return( 'testbranch' )
+      expect( runner_spy ).to receive( :run_command ).with( /git rebase .+testbranch/, any_args )
+      subject.do_rebase_action
+    end
+  end
+
+  describe "#do_pull_action" do
+    it "calls fetch action" do
+      expect( subject ).to receive( :do_fetch_action ).once
+      subject.do_pull_action
+    end
+
+    it "calls rebase action" do
+      expect( subject ).to receive( :do_rebase_action ).once
+      subject.do_pull_action
+    end
+  end
+
+  describe "#do_commit_action" do
+    before do
+      allow( subject ).to receive( :get_local_branch ).and_return( 'testbranch' )
+      allow( subject ).to receive( :yes? ).and_return( 'y' )
+    end
+
+    it "calls the readd action" do
+      expect( subject ).to receive( :do_readd_action ).once
+      subject.do_commit_action
+    end
+
+    it "runs a commit if the local branch is not master" do
+      expect( runner_spy ).to receive( :run_command ).with( /svn commit/, any_args )
+      subject.do_commit_action
+    end
+
+    it "does not run a commit if the local branch is master" do
+      allow( subject ).to receive( :get_local_branch ).and_return( 'master' )
+      expect( runner_spy ).not_to receive( :run_command ).with( /svn commit/, any_args )
+      subject.do_commit_action
+    end
+
+    it "does not run a commit if there are git changes pending" do
+      allow( subject ).to receive( :are_there_git_changes? ).and_return( true )
+      expect( runner_spy ).not_to receive( :run_command ).with( /svn commit/, any_args )
+      expect { subject.do_commit_action }.to raise_error
+    end
+
+    it "does not run a commit if there are no svn changes" do
+      allow( subject ).to receive( :run_command ).and_return( '' )
+      allow( subject ).to receive( :run_command ).with( /svn diff/, any_args ).and_return( '' )
+      expect( runner_spy ).not_to receive( :run_command ).with( /svn commit/, any_args )
+      expect { subject.do_commit_action }.to raise_error
+    end
+
+    it "calls delete_committed_branch" do
+      expect( subject ).to receive( :delete_committed_branch ).once
+      subject.do_commit_action
+    end
+
+    it "calls the fetch action" do
+      expect( subject ).to receive( :do_fetch_action ).once
+      subject.do_commit_action
+    end
+  end
+
+  describe "#do_readd_action" do
+    before do
+      allow( subject ).to receive( :yes? ).and_return( 'y' )
+      allow( subject ).to receive( :run_command ).and_return( '' )
+      allow( subject ).to receive( :run_command ).with( /svn status/, any_args ).and_return( svn_status_output )
+    end
+
+    it "does not run svn add if there are no git files unknown to svn" do
+      allow( subject ).to receive( :is_file_in_git? ).and_return( false )
+      expect( subject ).not_to receive( :run_command ).with( /svn add/, any_args )
+      subject.do_readd_action
+    end
+
+    it "runs svn add if there are git files unknown to svn" do
+      allow( subject ).to receive( :is_file_in_git? ).and_return( true )
+      expect( subject ).to receive( :run_command ).with( /svn add.+whatever/, any_args )
+      subject.do_readd_action
+    end
+
+    it "includes the correct files in the svn add command" do
+      allow( subject ).to receive( :is_file_in_git? ).and_return( false )
+      allow( subject ).to receive( :is_file_in_git? ).with( 'whatever' ).and_return( true )
+      expect( subject ).to receive( :run_command ).with( /svn add.+whatever/, any_args )
+      subject.do_readd_action
+    end
+
+    it "does not include the incorrect files in the svn add command" do
+      allow( subject ).to receive( :is_file_in_git? ).and_return( true )
+      allow( subject ).to receive( :is_file_in_git? ).with( 'whatever' ).and_return( false )
+      expect( subject ).not_to receive( :run_command ).with( /svn add.+something/, any_args )
+      subject.do_readd_action
+    end
+  end
+
+  describe "#do_init_action" do
+    before do
+      allow( subject ).to receive( :create_file )
+      allow( subject ).to receive( :append_to_file )
+      allow( subject ).to receive( :yes? ).and_return( 'y' )
+      allow( subject ).to receive( :run_command ).and_return( '' )
+    end
+
+    it "raises an error if not in an svn repo" do
+      allow( subject ).to receive( :did_last_command_succeed? ).and_return( false )
+      expect { subject.do_init_action }.to raise_error
+    end
+
+    it "runs an svn update" do
+      expect( subject ).to receive( :run_command ).with( /svn up/, any_args )
+      subject.do_init_action
+    end
+
+    it "calls create_git_repository" do
+      expect( subject ).to receive( :create_git_repository ).once
+      subject.do_init_action
+    end
+
+    it "calls create_gitignore" do
+      expect( subject ).to receive( :create_gitignore ).once
+      subject.do_init_action
+    end
+
+    it "calls create_mirror_branch" do
+      expect( subject ).to receive( :create_mirror_branch ).once
+      subject.do_init_action
+    end
+
+    it "runs git commit with the initial commit message" do
+      allow( subject ).to receive( :get_svn_revision ).and_return( '1012' )
+      expect( subject ).to receive( :run_command ).with( /git commit.+1012/, any_args )
+      subject.do_init_action
+    end
+  end
+
+end
+
+