git-si 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bf20760b268eea61a8be1559cbb9021308312f1
-  data.tar.gz: 5b3e9643cdd6c24bb1fb4c400b06bc4845068b16
+  metadata.gz: f699eab35b01983b28c6a305f4f052bff51c877b
+  data.tar.gz: 66757783cb35d72353a1aea64c982148114771d5
 SHA512:
-  metadata.gz: 9d65955697dd0fc1e1b4b25421143cff2a690ba6d29b65ce39d699621a09d9963e8a4d231f77f2cbbb5768c06611634717cba9acb7d01f45c21532944f2b7ddc
-  data.tar.gz: d65170ca5833a3da1507c587d8e14d8a9f54a511dc54480bd7c8fa474d01718ee57ede7830db06103bdace19a61953fdfb7a36a9e8639971e3a5760e579066b4
+  metadata.gz: 7f47abf1fc81a97582940b27708e1e362c30d0947fb3d19017c7a91a07243704742d837d47eaf67b6273ad06209ebd570edeaa5781818b3f4f936494f75c54af
+  data.tar.gz: df346172fd8e64b4ef85cbcf106fa9d8952b8005fdf91ecfdf228d29b87bc60c76e6310b1d462372df3bb743c43fa35ea134c39b038cbd6bf542fbcd61d7cd2d

data/git-si.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "thor"
   spec.add_development_dependency "pager"
+  spec.add_development_dependency "rspec"
 
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "pager"

data/lib/git/si.rb

@@ -1,4 +1,10 @@
 require "git/si/version"
+require "git/si/errors"
+require "git/si/svn-control"
+require "git/si/git-control"
+require "git/si/git-ignore"
+require "git/si/util"
+require "git/si/actions"
 require "thor"
 require "pager"
 
@@ -6,41 +12,37 @@ module Git
 
   module Si
 
-    class GitSiError < StandardError
-    end
-
-    class ShellError < GitSiError
-    end
-
-    class GitError < GitSiError
-    end
-
-    class SvnError < GitSiError
-    end
-
-    class VersionError < GitSiError
-    end
-
     class SvnInterface < Thor
       include Thor::Actions
       include Pager
+      include Git::Si::Util
+      include Git::Si::Actions
 
-      default_task :usage
+      class_option :debug, :type => :boolean, :desc => 'Print lots of output', :default => false
+      class_option :quiet, :type => :boolean, :desc => 'Print only the minimum output', :default => false
+      class_option :svn, :type => :string, :desc => 'The path to the svn binary', :default => 'svn'
+      class_option :git, :type => :string, :desc => 'The path to the git binary', :default => 'git'
 
-      @@mirror_branch = 'MIRRORBRANCH'
+      default_task :usage
 
+      ################
+      # Action: version
+      ################
       desc "version", "Print the version."
       def version
-        say "git-si version #{Git::Si::VERSION}"
+        say Git::Si::Version.version_string
       end
 
+      ################
+      # Action: usage
+      ################
       desc "usage", "How does this thing work?"
       def usage
-        say "git-si #{Git::Si::VERSION}
+        say "#{Git::Si::Version.version_string}
 
 Git Svn Interface: a simple git extention to use git locally with a remote svn
-repo. It's like a simple version of git-svn which doesn't keep track of history
-locally.
+repository. It's like a simple version of git-svn just for using local
+branching. It does not keep track of the full history of the svn repository.
 
 Start with the init command to set up the mirror branch and from there you can
 use the commands below.
@@ -49,387 +51,84 @@ use the commands below.
         help
       end
 
+      ################
+      # Action: status
+      ################
       desc "status [FILES]", "Perform an svn status."
       def status(*args)
-        on_local_branch do
-          command = "svn status --ignore-externals " + args.join(' ')
-          svn_status = `#{command}`
-          raise SvnError.new("Failed to get the svn status. I'm not sure why. Check for any errors above.") if ! $?.success?
-          svn_status.each_line do |line|
-            case line.strip!
-            when /^X/, /\.git/, /\.swp$/
-            else
-              if STDOUT.tty?
-                print_colordiff line
-              else
-                say line
-              end
-            end
-          end
-        end
+        configure
+        do_status_action( args )
       end
 
+      ################
+      # Action: diff
+      ################
       desc "diff [FILES]", "Perform an svn diff piped through a colorizer. Also tests to be sure a rebase is not needed."
       def diff(*args)
-        on_local_branch do
-          last_fetched_version = get_svn_version()
-          git_log = `git log --pretty=%B`
-          results = git_log.match(/svn update to version (\d+)/i)
-          last_rebased_version = results[1] if results
-          if last_fetched_version and last_rebased_version
-            if last_fetched_version > last_rebased_version
-              raise VersionError.new("This branch is out-of-date (rev #{last_rebased_version}; mirror branch is at #{last_fetched_version}). You should do a git si rebase.")
-            elsif last_fetched_version < last_rebased_version
-              return if ask("This branch is newer (rev #{last_rebased_version}) than the mirror branch (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
-          else
-            notice_message "Could not determine last version information. This may be fine if you haven't used git-si before."
-          end
-
-          notice_message "Adding any files that are not already in svn to ensure an accurate diff."
-          readd()
-
-          command = "svn diff " + args.join(' ')
-          notice_message "Running #{command}"
-          results = `#{command}`
-          if STDOUT.tty?
-            page
-            print_colordiff results
-          else
-            say results
-          end
-        end
+        configure
+        do_diff_action( args )
       end
 
+      ################
+      # Action: add
+      ################
       desc "add [FILES]", "Perform an svn and a git add on the files."
       def add(*args)
-        on_local_branch do
-          command = "svn add " + args.join(' ')
-          run_command(command)
-          command = "git add " + args.join(' ')
-          run_command(command)
-        end
+        configure
+        do_add_action( args )
       end
 
+      ################
+      # Action: fetch
+      ################
       desc "fetch", "Updates mirror branch to latest svn commit."
       def fetch
-        on_local_branch do
-          git_status = `git status --porcelain`
-          raise GitError.new("There are local changes; please commit them before continuing.") if git_status.match(/^[^\?]/)
-        end
-        on_mirror_branch do
-          notice_message "Fetching remote data from svn"
-          updated_files = `svn up --accept theirs-full --ignore-externals`
-          files_to_add = []
-          updated_files.each_line do |line|
-            say line
-            case line.strip!
-            when /^A\s+(\S.+)/, /^Restored '(.+)'\s*$/
-              files_to_add << '"' + $1 + '"'
-            end
-          end
-          notice_message "Reverting any local changes in mirror branch"
-          run_command("svn revert -R ./")
-          unless files_to_add.empty?
-            files_to_add.each do |filename|
-              say "Updating file in git: #{filename}"
-            end
-            notice_message "Adding all those files"
-            system("git add --all " + files_to_add.join(' '))
-          end
-          run_command("git commit --allow-empty -am 'svn update to version #{get_svn_version}'")
-        end
-        success_message "fetch complete!"
+        configure
+        do_fetch_action
       end
 
+      ################
+      # Action: rebase
+      ################
       desc "rebase", "Rebases current branch to mirror branch."
       def rebase
-        on_local_branch do
-          run_command("git rebase '#{@@mirror_branch}'")
-          success_message "rebase complete!"
-        end
+        configure
+        do_rebase_action
       end
 
+      ################
+      # Action: pull
+      ################
       desc "pull", "Fetch the latest svn commit and rebase the current branch."
       def pull
-        fetch
-        rebase
+        do_pull_action
       end
 
+      ################
+      # Action: commit
+      ################
       desc "commit", "Perform an svn commit and update the mirror branch."
       def commit
-        mirror_is_updated = false
-
-        on_local_branch do
-          local_branch = get_local_branch()
-          if local_branch == 'master'
-            notice_message "Warning: you're using the master branch as working copy. This can
-cause trouble because when your changes are committed and you try to
-rebase on top of them, you may end up with merge errors as you are
-trying to apply patches of previous versions of your code. If you
-continue, it's wise to reset the master branch afterward."
-            return if ask("Do you want to continue with this commit? [Y/n] ", :green) =~ /\s*^n/i
-          end
-
-          git_status = `git status --porcelain`
-          raise GitError.new("There are local changes; please commit them before continuing.") if git_status.match(/^[^\?]/)
-
-          notice_message "Adding any files that are not already in svn to ensure changes are committed."
-          readd()
-
-          svn_diff = `svn diff`
-          raise SvnError.new("Failed to get the svn diff. I'm not sure why. Check for any errors above.") if ! $?.success?
-          raise SvnError.new("There are no changes to commit.") if svn_diff.strip.empty?
-
-          run_command("svn commit")
-          success_message "commit complete!"
-
-          files_unchanged = true
-          git_status = `git status --porcelain`
-          files_unchanged = false if git_status.match(/^[^\?]/)
-          unless files_unchanged
-            if yes? "Some files were added or modified during the commit; should I revert them? [y/N] ", :yellow
-              run_command("git reset --hard HEAD")
-              files_unchanged = true
-            end
-          end
-
-          if files_unchanged and yes? "Do you want to update the mirror branch to the latest commit? [y/N] ", :green
-            fetch
-            mirror_is_updated = true
-          end
-        end
-
-        if mirror_is_updated
-          local_branch = get_local_branch()
-          if local_branch == 'master'
-            if yes? "Do you want to reset the current branch to the latest commit (losing all git history)? [y/N] ", :green
-              run_command("git checkout #{@@mirror_branch}")
-              run_command("git branch -D '#{local_branch}'")
-              run_command("git checkout -b #{local_branch}")
-              success_message "branch '#{local_branch}' reset!"
-            end
-          else
-            if yes? "Do you want to switch to master and delete the committed branch '#{local_branch}'? [y/N] ", :green
-              run_command("git checkout master")
-              rebase
-              run_command("git branch -D '#{local_branch}'")
-              success_message "branch '#{local_branch}' deleted!"
-            end
-          end
-        end
+        configure
+        do_commit_action
       end
 
+      ################
+      # Action: readd
+      ################
       desc "readd", "Add files to svn that have been added to git."
-      def readd()
-        on_local_branch do
-          command = "svn status --ignore-externals"
-          svn_status = `#{command}`
-          raise SvnError.new("Failed to get the svn status. I'm not sure why. Check for any errors above.") if ! $?.success?
-          files_to_add = []
-          using_stderr do
-            svn_status.each_line do |line|
-              case line.strip!
-              when /^X/, /\.git/, /\.swp$/
-              when /^\?\s+(\S.+)/
-                filename = $1
-                file_in_git = `git ls-files #{filename}`
-                raise GitError.new("Failed to list git files. I'm not sure why. Check for any errors above.") unless $?.success?
-                if not file_in_git.empty?
-                  files_to_add << filename if file_in_git
-                  say filename
-                end
-              end
-            end
-          end
-          if files_to_add.empty?
-            notice_message "There are no files to add."
-            return
-          end
-          using_stderr do
-            if yes? "Do you want to add the above files to svn? [y/N] ", :green
-              command = "svn add " + files_to_add.join(' ')
-              run_command(command)
-              success_message "Added files to svn that had been added to git."
-            end
-          end
-        end
-      end
-
-      desc "blame <FILE>", "Alias for svn blame."
-      def blame(*args)
-        on_local_branch do
-          command = "svn blame " + args.join(' ')
-          run_command(command)
-        end
+      def readd
+        configure
+        do_readd_action
       end
 
+      ################
+      # Action: init
+      ################
       desc "init", "Initializes git-si in this directory with a gitignore and creates a special mirror branch."
       def init
-        on_local_branch do
-          # check for svn repo
-          `svn info`
-          raise SvnError.new("No svn repository was found here. Maybe you're in the wrong directory?") unless $?.success?
-          make_a_commit = false
-
-          # check for existing .git repo
-          if File.exist? '.git'
-            notice_message "Looks like a git repository already exists here."
-          else
-            notice_message "Initializing git repository"
-            `git init`
-            raise GitError.new("Failed to initialize git repository. I'm not sure why. Check for any errors above.") unless $?.success?
-            make_a_commit = true
-          end
-
-          # check for existing .gitingore
-          gitignore = [".svn", "*.sw?", ".config", "*.err", "*.pid", "*.log", "svn-commit.*", "*.orig"]
-          command = "svn status --ignore-externals "
-          svn_status = `#{command}`
-          raise SvnError.new("Failed to get the svn status. I'm not sure why. Check for any errors above.") if ! $?.success?
-          externals = []
-          svn_status.each_line do |line|
-            externals << $1 if line.strip.match(/^X\s+(\S.+)/)
-          end
-          gitignore += externals
-          gitignore = gitignore.join("\n")
-
-          if File.exist? '.gitignore'
-            notice_message "Looks like a gitignore file already exists here."
-            error_message "Be SURE that the gitignore contains the following:\n#{gitignore}"
-          else
-            notice_message "Creating gitignore file."
-            create_file('.gitignore', gitignore)
-            run_command("git add .gitignore")
-            make_a_commit = true
-          end
-
-          # make initial commit
-          if make_a_commit
-            notice_message "Making initial commit."
-            run_command("git add .")
-            run_command("git commit -am 'initial commit by git-si'")
-          end
-
-          # check for exiting mirror branch
-          `git show-ref refs/heads/#{@@mirror_branch}`
-          if $?.success?
-            notice_message "Looks like the mirror branch already exists here."
-          else
-            notice_message "Creating mirror branch '#{@@mirror_branch}'."
-            run_command("git branch '#{@@mirror_branch}'")
-          end
-
-          success_message "init complete!"
-        end
-      end
-
-
-      private
-
-      def get_svn_version
-        svn_info = `svn info`
-        results = svn_info.match(/^Revision:\s+(\d+)/)
-        return results[1] if results
-        return nil
-      end
-
-      def get_svn_root
-        svn_info = `svn info`
-        results = svn_info.match(/Root Path:\s+(.+)/)
-        return results[1] if results
-        return nil
-      end
-
-      def get_local_branch
-        git_branches = `git branch`
-        results = git_branches.match(/^\*\s+(\S+)/)
-        local_branch = results[1] if results
-        raise 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
-        raise SvnError.new("Could not find the svn root directory.") unless root_dir
-        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 GitSiError => err
-          error_message err
-          exit false
-        end
-      end
-
-      def on_mirror_branch(&block)
-        local_branch = get_local_branch()
-        run_command("git checkout #{@@mirror_branch}")
-        begin
-          in_svn_root do
-            yield
-          end
-        rescue GitSiError => err
-          error_message err
-          exit false
-        ensure
-          run_command("git checkout #{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
-      end
-
-      def error_message(message)
-        $stderr.puts set_color message, :red
-      end
-
-      def run_command(command, options={})
-        if STDOUT.tty? and not @silent
-          run(command, options)
-        else
-          run(command, options.update(verbose: false, capture: true))
-        end
-        raise ShellError.new("There was an error while trying to run the command: #{command}. Look above for any errors.") unless $?.success?
-      end
-
-      def print_colordiff(diff)
-        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
+        configure
+        do_init_action
       end
 
     end