Legit-the-Git 0.0.2 → 0.0.3

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) <year> <copyright holders>
+Copyright (c) 2011 Grayson Manley
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/legit-the-git.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name                = "Legit-the-Git"
-  s.version             = "0.0.2"
+  s.version             = "0.0.3"
 
   s.summary             = "Git accurev bridge"
   s.description         = "Git hooks to help keep accurev and git in sync"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
     "lib/accuhook/command_line.rb",
     "lib/accuhook/commit.rb",
     "lib/accuhook/hooks/post-commit",
-    "lib/accuhook/hooks/pre-commit"
+    "lib/accuhook/hooks/post-receive"
   ]
   s.add_runtime_dependency("grit", ["~> 2.3.0"])
 end

data/lib/accuhook/command_line.rb

@@ -1,6 +1,8 @@
 # Copyright (c) 2011 Grayson Manley
 # Licensed under the MIT license: http://www.opensource.org/licenses/mit-license
 
+require 'rubygems'
+require 'accuhook'
 require 'optparse'
 require 'ostruct'
 require 'fileutils'
@@ -16,7 +18,7 @@ module AccuHook
         ret_val = AccuHook::Installation.new(options.path)
         exit 0
       when :version
-        puts 'Version 0.0.1'
+        puts 'Version 0.0.3'
         exit 0
       end
     end
@@ -46,12 +48,21 @@ module AccuHook
       install(repo)
     end
 
-    def install(repo)
-      repo_hooks_dir = File.join(repo, '.git', 'hooks')
-      FileUtils.mkdir repo_hooks_dir unless File.exist? repo_hooks_dir
+    def install(repo_path)
+      repository = Grit::Repo.new(repo_path)
 
-      FileUtils.install(File.join(File.dirname(__FILE__), "hooks", "post-commit"), repo_hooks_dir, :mode => 0755)
-      FileUtils.install(File.join(File.dirname(__FILE__), "hooks", "pre-commit"), repo_hooks_dir, :mode => 0755)
+      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')
+
+      repository.fork_bare(accurev_repo, :shared => false, :mirror => true)
+      repository.remote_add("accurev", accurev_repo)
+
+      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", "post-receive"), accurev_hooks, :mode => 0755)
     end
   end
 end

data/lib/accuhook/commit.rb

@@ -6,28 +6,30 @@ module AccuHook
     class Commit
       require File.dirname(__FILE__) + "/command"
 
-      def initialize(repository)
+      def initialize(repository, commit_object)
         @command = AccuHook::Accurev::Command.new
-        last_git_commit = repository.commits.first
-        commit(last_git_commit)
+        puts commit_object.inspect
+        commit!(commit_object, repository)
       end
 
-      def commit(last_git_commit)
-        last_git_commit.show.each do |diff|
-          case
-          when diff.new_file # Accurev add, then keep
-            @command.add(diff.a_path)
-            @command.keep(diff.a_path, last_git_commit.message)
-          when diff.deleted_file # accurev defunct
-            @command.defunct(diff.a_path, last_git_commit.message)
-          when diff.renamed_file # accurev defunct a_path, then add b_path (then keep)
-            puts "Renamed file detected"
-            @command.defunct(diff.a_path, last_git_commit.message)
-            @command.add(diff.b_path)
-            @command.keep(diff.b_path, last_git_commit.message)
-          else # Accurev regular keep
-            puts "Modified file detected"
-            @command.keep(diff.a_path, last_git_commit.message)
+      def commit!(commit_object, repository)
+        commit_object.each do |commit|
+          commit.show.each do |diff|
+            case
+            when diff.new_file # Accurev add, then keep
+              @command.add("#{repository.working_dir}/#{diff.a_path}")
+              @command.keep("#{repository.working_dir}/#{diff.a_path}", commit.message)
+            when diff.deleted_file # accurev defunct
+              @command.defunct("#{repository.working_dir}/#{diff.a_path}", commit.message)
+            when diff.renamed_file # accurev defunct a_path, then add b_path (then keep)
+              puts "Renamed file detected"
+              @command.defunct("#{repository.working_dir}/#{diff.a_path}", commit.message)
+              @command.add("#{repository.working_dir}/#{diff.b_path}")
+              @command.keep("#{repository.working_dir}/#{diff.b_path}", commit.message)
+            else # Accurev regular keep
+              puts "Modified file detected"
+              @command.keep("#{repository.working_dir}/#{diff.a_path}", commit.message)
+            end
           end
         end
       end

data/lib/accuhook/hooks/post-commit

@@ -3,14 +3,8 @@
 # Copyright (c) 2011 Grayson Manley
 # Licensed under the MIT license: http://www.opensource.org/licenses/mit-license
 
-DEVELOPMENT_DIR = "/Users/tukaiz/projects/accurev_git_hooks"
-
-begin
-  require 'rubygems'
-  require 'accuhook'
-rescue LoadError => e
-  require File.join(DEVELOPMENT_DIR, "lib", "accuhook")
+def logged_in?
+  system("accurev secinfo > /dev/null 2>&1")
 end
 
-repository = Grit::Repo.new(File.join(File.dirname(__FILE__), "..", ".."))
-AccuHook::Accurev::Commit.new(repository)
+puts "Remember to login before you push to accurev! (`accurev login`)" unless logged_in?

data/lib/accuhook/hooks/post-receive

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+# Copyright (c) 2011 Grayson Manley
+# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license
+input = $stdin.gets
+args = input.split(" ")
+old_head_ref = args[0]
+new_head_ref = args[1]
+
+require 'rubygems'
+require 'accuhook'
+
+repository = Grit::Repo.new(File.join(File.dirname(__FILE__), "..", "..", ".."))
+
+@commits = []
+repository.commit_deltas_from(repository, old_head_ref, new_head_ref).each do |commit|
+  @commits << commit
+end
+
+AccuHook::Accurev::Commit.new(repository, @commits.reverse)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Legit-the-Git
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Grayson Manley
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -06:00
+date: 2011-01-12 00:00:00 -06:00
 default_executable: accuhook
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ files:
 - lib/accuhook/command_line.rb
 - lib/accuhook/commit.rb
 - lib/accuhook/hooks/post-commit
-- lib/accuhook/hooks/pre-commit
+- lib/accuhook/hooks/post-receive
 has_rdoc: true
 homepage: http://github.com/gmanley/Legit-the-Git
 licenses: 

data/lib/accuhook/hooks/pre-commit

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-# Copyright (c) 2011 Grayson Manley
-# Licensed under the MIT license: http://www.opensource.org/licenses/mit-license
-
-def logged_in?
-  system("accurev secinfo > /dev/null 2>&1")
-end
-
-raise "Please Login! (`accurev login`)" unless logged_in?