legit-the-git 0.0.4 → 0.0.5

data/bin/legit-the-git

@@ -6,4 +6,4 @@
 require 'rubygems'
 require 'legit-the-git'
 
-LegitGit::CommandLine.execute(ARGV)
+LegitGit::CommandLine.execute(ARGV[0])

data/legit-the-git.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name                = "legit-the-git"
-  s.version             = "0.0.4"
+  s.version             = "0.0.5"
 
   s.summary             = "Git accurev bridge"
   s.description         = "Git hooks to help keep accurev and git in sync"

data/lib/legit-the-git/command.rb

@@ -6,32 +6,29 @@ module LegitGit
     class Command
       require "shellwords"
 
+      def add(file_path)
+        if File.directory?(file_path) # Recursively add directory (`accurev add -x -R {Dir}`)
+          execute("add -x -R \"#{file_path}\"")
+        else  # Add single file (`accurev add {File}`)
+          execute("add \"#{file_path}\"")
+        end
+      end
+
+      def keep(file_path, message)
+        execute("keep -c \"#{message}\" \"#{file_path}\"")
+      end
+
+      def defunct(file_path, message)
+        execute("defunct -c \"#{message}\" \"#{file_path}\"")
+      end
+
       private
       def execute(command)
         args = Shellwords.split(command)
         escaped_args = args.map {|arg| Shellwords.escape(arg)}
         sub_command = Shellwords.join(escaped_args)
-        #puts "Running accurev #{sub_command}"
         system("accurev #{sub_command}")
       end
-
-      class << self
-        def add(file_path)
-          if File.directory?(file_path) # Recursively add directory (`accurev add -x -R {Dir}`)
-            execute("add -x -R \"#{file_path}\"")
-          else  # Add single file (`accurev add {File}`)
-            execute("add \"#{file_path}\"")
-          end
-        end
-
-        def keep(file_path, message)
-          execute("keep -c \"#{message}\" \"#{file_path}\"")
-        end
-
-        def defunct(file_path, message)
-          execute("defunct -c \"#{@last_commit_message}\" \"#{diff.a_path}\"")
-        end
-      end
     end
   end
 end

data/lib/legit-the-git/command_line.rb

@@ -3,65 +3,78 @@
 
 require 'rubygems'
 require 'legit-the-git'
-require 'optparse'
-require 'ostruct'
 require 'fileutils'
 
 module LegitGit
   class CommandLine
+
     # Parse command line options and execute
     def self.execute(args)
-      options = parse_options(args)
 
-      case options.command
-      when :install
-        ret_val = LegitGit::Installation.new(options.path)
+      help = <<-EOS
+Usage #{File.basename $0} [--version] [--help] <command>
+
+Commands:
+  install      Install the Accurev Git hook into the current directory
+  uninstall    Remove legit-the-git from the current repo
+
+Workflow:
+  Once installed commit your changes like usual. When you would like to push
+  those changes to accurev, just run `git push accurev`. This will sync new
+  commits from the current branch to the accurev server. Just make sure you
+  are logged into accurev!
+
+EOS
+
+      case args
+      when "install"
+        installation = LegitGit::Installation.new(Dir.pwd)
+        installation.install
+        puts 'Successfully installed!'
+        puts "Run #{File.basename $0} --help for usage."
         exit 0
-      when :version
-        puts 'Version 0.0.4'
+      when "uninstall"
+        installation = LegitGit::Installation.new(Dir.pwd)
+        installation.uninstall
+        puts 'Successfully uninstalled!'
         exit 0
+      when "--version"
+        puts "0.0.5"
+        exit 0
+      else
+        puts help
       end
     end
-
-    private
-    def self.parse_options(args)
-      options = OpenStruct.new
-      options.command = :help
-      options.path = Dir.pwd
-
-      opts = OptionParser.new do |opts|
-        opts.banner = "Usage #{File.basename $0} [options]"
-        opts.on_head("-i","--install", "Install Accurev Git hook in current dir") { options.command = :install }
-        opts.on("-p","--path=[path]", "Install Accurev Git hook to specified path") { |path| options.path = path }
-        opts.on_tail("--version", "Print current version and exit") {options.command = :version }
-        opts.on_tail("-h","--help", "Print help message")
-      end
-      opts.parse!(args)
-      (puts opts and exit 0) if options.command == :help
-      options
-    end
   end
 
   class Installation
+    # Refactor!
+
+    def initialize(repo_path)
+      @repository = Grit::Repo.new(repo_path)
+      @accurev_repo = File.join(repo_path, '.git', 'accurev.git')
 
-    def initialize(repo)
-      install(repo)
+      @accurev_hooks = File.join(repo_path, '.git', 'accurev.git', 'hooks')
+      @repo_hooks = File.join(repo_path, '.git', 'accurev.git', 'hooks')
     end
 
-    def install(repo_path)
-      repository = Grit::Repo.new(repo_path)
-      repo_hooks = File.join(repo_path, '.git', 'hooks')
-      accurev_repo = File.join(repo_path, '.git', 'accurev.git')
-      accurev_hooks = File.join(repo_path, '.git', 'accurev.git', 'hooks')
+    def install
+      @repository.fork_bare(@accurev_repo, :shared => false, :mirror => true)
+      @repository.remote_add("accurev", @accurev_repo)
 
-      repository.fork_bare(accurev_repo, :shared => false, :mirror => true)
-      repository.remote_add("accurev", accurev_repo)
+      FileUtils.mkdir_p([@accurev_hooks, @repo_hooks])
 
-      FileUtils.mkdir accurev_hooks unless File.exist? accurev_hooks
-      FileUtils.mkdir repo_hooks unless File.exist? repo_hooks
+      FileUtils.install(File.join(File.dirname(__FILE__), "hooks", "post-commit"), @repo_hooks, :mode => 0755)
+      FileUtils.install(File.join(File.dirname(__FILE__), "hooks", "pre-receive"), @accurev_hooks, :mode => 0755)
+    end
+
+    def uninstall
+      unless @repository.remotes.select {|r| r.name =~ /accurev/}.empty?
+        git = Grit::Git.new(File.expand_path(File.join(Dir.pwd, '.git/')))
+        git.native(:remote, {}, 'rm', 'accurev')
+      end
 
-      FileUtils.install(File.join(File.dirname(__FILE__), "hooks", "post-commit"), repo_hooks, :mode => 0755)
-      FileUtils.install(File.join(File.dirname(__FILE__), "hooks", "pre-receive"), accurev_hooks, :mode => 0755)
+      FileUtils.rm_rf([@accurev_repo, File.join(@repo_hooks, "hooks", "post-commit")])
     end
   end
 end

data/lib/legit-the-git/commit.rb

@@ -7,12 +7,13 @@ module LegitGit
       require File.dirname(__FILE__) + "/command"
 
       def initialize(repository, commit_object)
-        @command = LegitGit::Accurev::Command.new
+        @command = Command.new
         commit!(commit_object, repository)
       end
 
       def commit!(commit_object, repository)
         commit_object.each do |commit|
+          $stdout.puts "\e[\033[0;36mSyncing Commit \e[\033[0;32m#{commit.id_abbrev}\e[0m\n\e[\033[0;33m#{commit.message}\e[0m"
           commit.show.each do |diff|
             case
             when diff.new_file # Accurev add, then keep

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: legit-the-git
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Grayson Manley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -06:00
+date: 2011-02-22 00:00:00 -06:00
 default_executable: legit-the-git
 dependencies: 
 - !ruby/object:Gem::Dependency