git-si 0.3.1 → 0.4.0

data/lib/git/si/actions.rb

@@ -0,0 +1,153 @@
+require "git/si/errors"
+
+module Git
+
+  module Si
+
+    module Actions
+
+      def do_status_action( args=[] )
+        on_local_branch do
+          return if do_revisions_differ()
+          svn_status = get_command_output( Git::Si::SvnControl.status_command( args ) )
+          print_colordiff Git::Si::SvnControl.parse_svn_status( svn_status ).join( "\n" )
+        end
+      end
+
+      def do_diff_action( args=[] )
+        on_local_branch do
+          return if do_revisions_differ()
+
+          notice_message "Adding any files that are not already in svn to ensure an accurate diff."
+          do_readd_action
+
+          print_colordiff get_command_output( Git::Si::SvnControl.diff_command( args ) )
+        end
+      end
+
+      def do_add_action( args=[] )
+        on_local_branch do
+          run_command( Git::Si::SvnControl.add_command( args ) )
+          run_command( Git::Si::GitControl.add_command( args ) )
+        end
+      end
+
+      def do_readd_action
+        on_local_branch do
+          files_to_add = []
+          Git::Si::SvnControl.parse_unknown_files( get_command_output( Git::Si::SvnControl.status_command ) ).each do |filename|
+            if is_file_in_git?( filename )
+              files_to_add << filename if filename != '.gitignore'
+            end
+          end
+
+          if files_to_add.empty?
+            notice_message "There are no files to add."
+            return
+          end
+
+          using_stderr do
+            files_to_add.each do |filename|
+              say filename
+            end
+            if yes? "Do you want to add the above files to svn? [y/N] ", :green
+              run_command( Git::Si::SvnControl.add_command( files_to_add ) )
+              success_message "Added files to svn that had been added to git."
+            end
+          end
+
+        end
+      end
+
+      def do_fetch_action
+        stashed_changes = stash_local_changes
+        on_mirror_branch do
+          notice_message "Fetching remote data from svn"
+          updated_files = get_command_output( Git::Si::SvnControl.update_command )
+          revert_files_to_svn_update( updated_files )
+          delete_files_after_svn_update( updated_files )
+          add_files_after_svn_update( updated_files )
+          run_command( Git::Si::GitControl.commit_revision_command( get_svn_revision ) )
+        end
+        unstash_local_changes( stashed_changes )
+        success_message "fetch complete!"
+      end
+
+      def do_rebase_action
+        on_local_branch do
+          stashed_changes = stash_local_changes
+          run_command( Git::Si::GitControl.rebase_command( get_mirror_branch ) )
+          unstash_local_changes( stashed_changes )
+          success_message "rebase complete!"
+        end
+      end
+
+      def do_pull_action
+        do_fetch_action
+        do_rebase_action
+      end
+
+      def do_commit_action
+        local_branch = get_local_branch()
+        if local_branch == 'master'
+          error_message "Please do not commit changes on the master branch"
+          return
+        end
+
+        on_local_branch do
+          raise Git::Si::GitError.new("There are local changes; please commit them before continuing.") if are_there_git_changes?
+
+          notice_message "Adding any files that are not already in svn to ensure changes are committed."
+          do_readd_action
+
+          svn_diff = get_command_output( Git::Si::SvnControl.diff_command )
+          raise Git::Si::SvnError.new("There are no changes to commit.") if svn_diff.strip.empty?
+
+          run_command( Git::Si::SvnControl.commit_command )
+          success_message "commit complete!"
+
+          if are_there_git_changes? and yes?( "Some files were added or modified during the commit; should I revert them? [y/N] ", :yellow )
+            run_command( Git::Si::GitControl.hard_reset_command )
+          end
+        end
+
+        notice_message "Updating mirror branch to latest commit"
+        do_fetch_action
+
+        delete_committed_branch( local_branch ) if yes?( "Do you want to switch to the master branch and delete the committed branch '#{local_branch}'? [y/N] ", :green )
+      end
+
+      def do_init_action
+        on_local_branch do
+          # check for svn repo
+          run_command( Git::Si::SvnControl.info_command, { :allow_errors => true } )
+          raise Git::Si::SvnError.new("No svn repository was found here. Maybe you're in the wrong directory?") unless did_last_command_succeed?
+
+          # make sure svn repo is up-to-date
+          run_command( Git::Si::SvnControl.update_command )
+
+          make_a_commit = false
+
+          # check for existing .git repo
+          make_a_commit = true if create_git_repository()
+
+          # check for existing .gitignore
+          make_a_commit = true if create_gitignore()
+
+          # make initial commit
+          if make_a_commit
+            notice_message "Making initial commit."
+            run_command( Git::Si::GitControl.commit_revision_command(get_svn_revision) )
+          end
+
+          # check for exiting mirror branch
+          create_mirror_branch()
+
+          success_message "init complete!"
+        end
+      end
+
+    end
+  end
+end
+

data/lib/git/si/errors.rb

@@ -0,0 +1,20 @@
+module Git
+  module Si
+
+    class GitSiError < StandardError
+    end
+
+    class ShellError < GitSiError
+    end
+
+    class GitError < GitSiError
+    end
+
+    class SvnError < GitSiError
+    end
+
+    class VersionError < GitSiError
+    end
+
+  end
+end

data/lib/git/si/git-control.rb

@@ -0,0 +1,112 @@
+require "git/si/version"
+
+module Git
+  module Si
+    class GitControl
+      @@default_git_binary = 'git'
+      @@git_binary = 'git'
+
+      def self.git_binary=(binary)
+        @@git_binary = binary && binary.length > 0 ? binary : @@default_git_binary
+      end
+
+      def self.status_command(*args)
+        command = "#{@@git_binary} status --porcelain"
+        if ( args.length > 0 )
+          command += " " + args.join(' ')
+        end
+        command
+      end
+
+      def self.log_command(*args)
+        command = "#{@@git_binary} log"
+        if ( args.length > 0 )
+          command += " " + args.join(' ')
+        end
+        command
+      end
+
+      def self.parse_last_svn_revision(info)
+        results = info.match(/svn update to version (\d+)/i)
+        return results[1] if results
+      end
+
+      def self.add_command(*files)
+        raise GitSiError.new("Add command requires filenames") if ( files.length == 0 )
+        "#{@@git_binary} add " + files.join(' ')
+      end
+
+      def self.are_there_changes?(status_output)
+        status_output.match(/^\s*[MADRC]/)
+      end
+
+      def self.commit_revision_command(revision)
+        version = Git::Si::Version.version
+        "#{@@git_binary} commit --allow-empty -am 'git-si #{version} svn update to version #{revision}'"
+      end
+
+      def self.stash_command
+        "#{@@git_binary} stash"
+      end
+
+      def self.unstash_command
+        "#{@@git_binary} stash pop"
+      end
+
+      def self.rebase_command(branch)
+        raise GitSiError.new("Rebase command requires branch name") if branch.empty?
+        "#{@@git_binary} rebase '#{branch}'"
+      end
+
+      def self.checkout_command(branch)
+        raise GitSiError.new("Checkout command requires branch name") if branch.empty?
+        "#{@@git_binary} checkout #{branch}"
+      end
+
+      def self.create_branch_command(branch)
+        raise GitSiError.new("New branch command requires branch name") if branch.empty?
+        "#{@@git_binary} branch #{branch}"
+      end
+
+      def self.delete_branch_command(branch)
+        raise GitSiError.new("Delete branch command requires branch name") if branch.empty?
+        "#{@@git_binary} branch -D #{branch}"
+      end
+
+      def self.branch_command
+        "#{@@git_binary} branch"
+      end
+
+      def self.parse_current_branch(git_branches)
+        results = git_branches.match(/^\*\s+(\S+)/)
+        return results[1] if results
+      end
+
+      def self.hard_reset_command
+        "#{@@git_binary} reset --hard HEAD"
+      end
+
+      def self.list_file_command(filename)
+        raise GitSiError.new("List file command requires filename") if filename.empty?
+        "#{@@git_binary} ls-files #{filename}"
+      end
+
+      def self.init_command
+        "#{@@git_binary} init"
+      end
+
+      def self.show_branch_command(branch)
+        raise GitSiError.new("Show branch command requires branch name") if branch.empty?
+        "#{@@git_binary} show-ref refs/heads/#{branch}"
+      end
+
+      def self.delete_command(filename)
+        raise GitSiError.new("Remove file command requires filename") if filename.empty?
+        "#{@@git_binary} rm #{filename}"
+      end
+
+    end
+  end
+end
+
+

data/lib/git/si/git-ignore.rb

@@ -0,0 +1,23 @@
+module Git
+  module Si
+    class GitIgnore
+      @@gitignore_patterns = [".*", "!.gitignore", ".svn", "*.sw?", ".config", "*.err", "*.pid", "*.log", "svn-commit.*", "*.orig", "node_modules"]
+
+      def self.ignore_patterns
+        @@gitignore_patterns
+      end
+
+      def self.get_missing_lines_from(lines, patterns=@@gitignore_patterns)
+        patterns.reject do |pattern|
+          lines.detect do |line|
+            line.strip.eql? pattern.strip
+          end
+        end
+      end
+
+    end
+  end
+end
+
+
+

data/lib/git/si/svn-control.rb

@@ -0,0 +1,135 @@
+module Git
+  module Si
+    class SvnControl
+      @@default_svn_binary = 'svn'
+      @@svn_binary = 'svn'
+
+      def self.svn_binary=(binary)
+        @@svn_binary = binary && binary.length > 0 ? binary : @@default_svn_binary
+      end
+
+      def self.status_command(*args)
+        command = "#{@@svn_binary} status --ignore-externals"
+        if ( args.length > 0 )
+          command += " " + args.join(' ')
+        end
+        command
+      end
+
+      def self.info_command
+        "#{@@svn_binary} info"
+      end
+
+      def self.diff_command(*args)
+        command = "#{@@svn_binary} diff"
+        if ( args.length > 0 )
+          command += " " + args.join(' ')
+        end
+        command
+      end
+
+      def self.parse_last_revision(svn_info)
+        results = svn_info.match(/^Revision:\s+(\d+)/)
+        return results[1] if results
+        return nil
+      end
+
+      def self.parse_root_path(svn_info)
+        results = svn_info.match(/Root Path:\s+(.+)/)
+        return results[1] if results
+        return nil
+      end
+
+      def self.parse_updated_files(svn_update_output)
+        svn_update_output.split(/\r?\n/).collect do |line|
+          line.strip.match(Regexp.union(/^\s*[AGU]\s+(\S.+)/, /^Restored '(.+)'/, /^Resolved conflicted state of '(.+)'/)) do |pattern|
+            pattern.to_a.compact.last
+          end
+        end.compact
+      end
+
+      def self.parse_deleted_files(svn_update_output)
+        svn_update_output.split(/\r?\n/).collect do |line|
+          line.strip.match(Regexp.union(/^\s*D\s+(\S.+)/)) do |pattern|
+            pattern.to_a.compact.last
+          end
+        end.compact
+      end
+
+      def self.parse_conflicted_files(svn_update_output)
+        svn_update_output.split(/\r?\n/).collect do |line|
+          line.strip.match(Regexp.union(/^\s*C\s+(\S.+)/, /^Resolved conflicted state of '(.+)'/)) do |pattern|
+            pattern.to_a.compact.last
+          end
+        end.compact
+      end
+
+      def self.parse_unknown_files(svn_update_output)
+        svn_update_output.split(/\r?\n/).collect do |line|
+          line.strip.match(/^\s*\?\s+(\S.+)/) do |pattern|
+            pattern.to_a.compact.last
+          end
+        end.compact
+      end
+
+      def self.add_command(*files)
+        raise GitSiError.new("Add command requires filenames") if ( files.length == 0 )
+        "#{@@svn_binary} add " + files.join(' ')
+      end
+
+      def self.blame_command(*files)
+        raise GitSiError.new("Blame command requires filenames") if ( files.length == 0 )
+        "#{@@svn_binary} blame " + files.join(' ')
+      end
+
+      def self.update_command
+        "#{@@svn_binary} up --accept theirs-full --ignore-externals"
+      end
+
+      def self.revert_command(*args)
+        command = "#{@@svn_binary} revert -R"
+        if ( args.length > 0 )
+          command += " " + args.join(' ')
+        else
+          command += " ."
+        end
+        command
+      end
+
+      def self.commit_command(*args)
+        command = "#{@@svn_binary} commit"
+        if ( args.length > 0 )
+          command += " " + args.join(' ')
+        end
+        command
+      end
+
+      def self.list_file_command
+        "#{@@svn_binary} list -R"
+      end
+
+      def self.parse_file_list(list_output)
+        list_output.split(/\r?\n/).collect do |filename|
+          filename.strip if filename.strip !~ Regexp.union( /\/$/, /^\./, /\/\./ ) and not filename.empty?
+        end.compact
+      end
+
+      def self.parse_svn_status(status_string)
+        return '' unless status_string
+        status_string.split(/\r?\n/).select do |line|
+          line.strip !~ /(^X|\.git|\.swp$)/
+        end
+      end
+
+      def self.parse_external_repos(status_string)
+        status_string.split(/\r?\n/).collect do |line|
+          line.strip.match(/^\s*X\s+(\S.+)/) do |pattern|
+            pattern.to_a.compact.last
+          end
+        end.compact
+      end
+
+    end
+  end
+end
+