gitty 0.3.7 → 0.4.2

data/README.textile

@@ -13,9 +13,49 @@ Missing features:
 
 * Only receive hooks from trusted publishers. (currently when gitty is activated on a repository, any hook published to origin is automatically installed)
 * It's very young and might break
+* Remote repository must be named origin for shared hooks to work.  This is currently not configurable.
 
 h2. Documentation
 
+h3. Initialization
+
+To use gitty with a git repository, you need to install the basic gitty hooks.
+
+<pre>
+git hook init
+</pre>
+
+* Any existing hooks will be preserved. They are moved to .git/hooks/local/<hook-name>.d/original
+
+h3. Enabling sharing
+
+By default, it's turned off (security reasons). To enable it:
+
+<pre>
+git hook init --enable-sharing
+</pre>
+
+h3. Adding hooks
+
+To see available hooks:
+
+<pre>
+git hook list
+</pre>
+
+To install one:
+
+<pre>
+git hook install <hook-name>
+</pre>
+
+To share one:
+
+<pre>
+git hook share <hook-name>
+git hook publish -m "added <hook-name>"
+</pre>
+
 Read the cucumber features for an idea of how it works and what it does
 
 h2. Issues

data/assets/helpers/hookd_wrapper

@@ -2,17 +2,7 @@
 dirname=$(dirname $0)
 hooktype=$(basename $0)
 
-# Check for updates.  Since there is no post-fetch hook, we check before we're about to run a hook.
-remote_branch=$(git show-ref origin/--hooks--)
-[ -n "$remote_branch" ] && (
-  cd ${dirname}/shared > /dev/null
-  local_rev=$(GIT_OBJECT_DIRECTORY="../../objects" git rev-parse HEAD)
-  [ "${remote_branch%% *}" != "$local_rev" ] && (
-    echo "Hook updates were applied:" 1>&2
-    GIT_OBJECT_DIRECTORY=../../objects git branch origin/--hooks-- ${remote_branch%% *} -f 1>&2
-    GIT_OBJECT_DIRECTORY=../../objects git merge ${remote_branch%% *} 1>&2
-  )
-)
+[ -x "$dirname/gitty/update-shared-hooks" ] && . "$dirname/gitty/update-shared-hooks"
   
 for base_dir in "${dirname}"/{shared,local}; do
   [ -d "${base_dir}/${hooktype}.d" ] || continue

data/assets/helpers/update-shared-hooks

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Check for updates.  Since there is no post-fetch hook, we check before we're about to run a hook.
+remote_branch=$(git show-ref origin/--hooks--)
+[ -n "$remote_branch" ] && (
+  cd ${dirname}/shared > /dev/null
+  local_rev=$(GIT_OBJECT_DIRECTORY="../../objects" git rev-parse HEAD)
+  [ "${remote_branch%% *}" != "$local_rev" ] && (
+    echo "Hook updates were applied:" 1>&2
+    GIT_OBJECT_DIRECTORY=../../objects git branch origin/--hooks-- ${remote_branch%% *} -f 1>&2
+    # This is a bit of a hack. If we're in the middle of commit, we need to borrow the index.  But don't worry, we'll put it back!
+    if [ -f ../../index.lock ]; then
+      mv ../../index.lock ../../index.lock_ 1>&2
+      mv ../../index ../../index_ 1>&2
+    fi
+    GIT_OBJECT_DIRECTORY=../../objects git reset HEAD 1>&2
+    GIT_OBJECT_DIRECTORY=../../objects git reset --hard origin/--hooks-- 1>&2
+    if [ -f ../../index.lock_ ]; then
+      mv ../../index.lock_ ../../index.lock 1>&2
+      mv ../../index_ ../../index 1>&2
+    fi
+  )
+)

data/assets/hooks/auto-submodules

@@ -8,7 +8,7 @@
 #   - If a submodule has been removed from the branch you move to, it alerts you
 #   - If a submodule has been added on the branch you move to, it alerts you
 #   - Otherwise, it checks out the revision for you
-# version: 0.2
+# version: 0.3
 # targets: ["pre-rebase", "post-applypatch", "post-checkout", "post-merge"]
 
 # this is a bit of a hack: when a rebase is ran, we don't want to have the initial checkout update submodules
@@ -23,6 +23,7 @@ if File.exist?(".git/queue-rebase-run")
   exit 0
 end
 
+# Not pretty... but well tested!!  Refactor me.
 module GitMethods
   def chdir_parent
     Dir.chdir('..') until File.directory?('.git') || Dir.pwd == '/'
@@ -97,12 +98,12 @@ previous_submodules = list_submodules('HEAD@{1}')
         end
       end
       if ref.match(/^refs\/heads/)
-        system("git checkout -q '#{File.basename(ref)}'")
+        output = %x(git checkout '#{File.basename(ref)}' 2>&1)
         if $? == 0 
-          STDERR.puts "Checked out #{File.basename(ref)}"
+          STDERR.puts "Switched to branch #{File.basename(ref)}"
           exit 0 
         else
-          STDERR.puts "Couldn't update submodule."
+          STDERR.puts "Couldn't update submodule: #{output}"
           exit $?
         end
       end
@@ -114,7 +115,11 @@ previous_submodules = list_submodules('HEAD@{1}')
         divergent_commits=%x{git rev-list #{ref}..#{local_ref}}.strip
         if divergent_commits.empty?
           STDERR.puts "fastforwarding #{local_ref} to #{ref}"
-          system("git branch -f #{local_ref} #{ref}")
+          if File.read(".git/HEAD").include?("ref: refs/heads/#{local_ref}")
+            system("git merge #{ref}")
+          else
+            system("git branch -f #{local_ref} #{ref}")
+          end
           exec("git checkout #{local_ref}")
         end
       end

data/lib/gitty/commands/init.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 class Gitty::HookCommand::Init < Gitty::Runner
   include ::Gitty::Helpers
+  include FileUtils
   
   CLIENT_HOOKS = %w[
     applypatch-msg
@@ -17,12 +18,23 @@ class Gitty::HookCommand::Init < Gitty::Runner
   ]
   def run
     puts "Initializing with gitty"
-    FileUtils.mkdir_p(".git/hooks/shared")
-    FileUtils.mkdir_p(".git/hooks/local")
+    # MESSY!
+    mkdir_p(".git/hooks/gitty")
+    mkdir_p(".git/hooks/shared")
+    mkdir_p(".git/hooks/local")
+    cp((ASSETS_PATH + "helpers/hookd_wrapper").to_s, ".git/hooks/gitty/hookd_wrapper")
+    chmod(0755, ".git/hooks/gitty/hookd_wrapper")
+    if options[:sharing]
+      cp((ASSETS_PATH + "helpers/update-shared-hooks").to_s, ".git/hooks/gitty/update-shared-hooks")
+      chmod(0755, ".git/hooks/gitty/update-shared-hooks")
+    end
 
     CLIENT_HOOKS.each do |hook|
-      FileUtils.cp((ASSETS_PATH + "helpers/hookd_wrapper").to_s, ".git/hooks/#{hook}")
-      FileUtils.chmod(0755, ".git/hooks/#{hook}")
+      if File.exist?(".git/hooks/#{hook}")
+        mkdir_p(".git/hooks/local/#{hook}.d")
+        mv(".git/hooks/#{hook}", ".git/hooks/local/#{hook}.d/original")
+      end
+      ln_sf("gitty/hookd_wrapper", ".git/hooks/#{hook}")
     end
     
     hooks_rev = remote_hooks_rev
@@ -43,6 +55,9 @@ class Gitty::HookCommand::Init < Gitty::Runner
   def option_parser
     super.tap do |opts|
       opts.banner = "Usage: git hook init"
+      opts.on("-s", "--enable-sharing", "Enable sharing") do
+        options[:sharing] = true
+      end
     end
   end
   

data/lib/gitty/commands/install.rb

@@ -11,22 +11,13 @@ class Gitty::HookCommand::Install < Gitty::Runner
       stderr.puts "no hook named '#{@hookname}' found."
       exit 1
     end
-
-    hook.install(options[:kind])
-    if options[:kind] == :shared
-      stdout.puts "To propagate this change other developers, run 'git hook publish -m \"added #{hook.name}...\""
-    end
-  end
-
-  def options
-    @options ||= super.update(:kind => :local)
+    hook.install(:local)
+    stdout.puts "#hook #{hook.name} has been installed."
   end
 
   def option_parser
     @option_parser ||= super.tap do |opts|
       opts.banner = "Usage: git hook install [opts] hook-name"
-      opts.on("-l", "--local", "Local hook (default)") { |l| options[:kind] = :local }
-      opts.on("-s", "--shared", "Remote hook") { |l| options[:kind] = :shared }
     end
   end
 end

data/lib/gitty/commands/share.rb

@@ -0,0 +1,34 @@
+class Gitty::HookCommand::Share < Gitty::Runner
+  include FileUtils
+  def initialize(args, stdout = STDOUT, stderr = STDERR)
+    super
+    @hookname = args.shift
+  end
+
+  def run
+    hook = Gitty::Hook.find(@hookname, :install_kind => :local) || Gitty::Hook.find(@hookname, :installed => false)
+    if hook.nil?
+      stderr.puts "no hook named '#{@hookname}' is available"
+      exit 1
+    end
+    if hook.install_kind == :shared
+      stderr.puts "hook #{@hookname} is already installed"
+      exit 1
+    end
+    unless Gitty.sharing_enabled?
+      stderr.puts "WARNING: sharing is disabled on your repository.  Run git hook init --enable-sharing to turn it on."
+    end
+    hook.share!
+    stdout.puts "To propagate this change other developers, run 'git hook publish -m \"added #{hook.name}...\""
+  end
+
+  def options
+    @options ||= super.update(:kind => :local)
+  end
+
+  def option_parser
+    @option_parser ||= super.tap do |opts|
+      opts.banner = "Usage: git hook install [opts] hook-name"
+    end
+  end
+end

data/lib/gitty/hook.rb

@@ -100,28 +100,49 @@ class Gitty::Hook
     @meta_data ||= self.class.extract_meta_data(File.read(path))
   end
 
+protected
+  def copy_to(which = :local)
+    target_hook_path = existing_directory!(self.class.installed_hooks_path(which))
+    target_helper_path = existing_directory!(self.class.installed_helpers_path(which))
+    base_directory = self.class.installed_path(which)
+    cp(path, target_hook_path + name)
+    chmod(0755, target_hook_path + name)
+    meta_data["targets"].each do |target|
+      ln_sf(
+        "../hooks/#{name}",
+        file_with_existing_directory!(base_directory + "#{target}.d" + name)
+      )
+    end
+    (meta_data["helpers"] || []).each do |helper|
+      cp(Gitty.find_asset("helpers/#{helper}"), target_helper_path + helper)
+      chmod(0755, target_helper_path + helper)
+    end
+  end
+
+  def destroy
+    target_hook_path = path
+    base_directory = self.class.installed_path(install_kind)
+    meta_data["targets"].each do |target|
+      targetd_path = base_directory + "#{target}.d"
+      rm_f(targetd_path + name)
+      FileUtils.rmdir(targetd_path) if Dir.glob((targetd_path + "*").to_s).empty?
+    end
+    rm(target_hook_path)
+    # TODO - clean up helpers
+  end
+
   module AvailableHookStrategy
     def install(which = :local)
-      target_hook_path = existing_directory!(self.class.installed_hooks_path(which))
-      target_helper_path = existing_directory!(self.class.installed_helpers_path(which))
-      base_directory = self.class.installed_path(which)
-      cp(path, target_hook_path + name)
-      chmod(0755, target_hook_path + name)
-      meta_data["targets"].each do |target|
-        ln_sf(
-          "../hooks/#{name}",
-          file_with_existing_directory!(base_directory + "#{target}.d" + name)
-        )
-      end
-      (meta_data["helpers"] || []).each do |helper|
-        cp(Gitty.find_asset("helpers/#{helper}"), target_helper_path + helper)
-        chmod(0755, target_helper_path + helper)
-      end
+      copy_to(which)
     end
 
     def uninstall
       # do nothing
     end
+
+    def share!
+      copy_to(:shared)
+    end
   end
 
   module InstalledHookStrategy
@@ -130,15 +151,13 @@ class Gitty::Hook
     end
 
     def uninstall
-      target_hook_path = path
-      base_directory = self.class.installed_path(install_kind)
-      meta_data["targets"].each do |target|
-        targetd_path = base_directory + "#{target}.d"
-        rm_f(targetd_path + name)
-        FileUtils.rmdir(targetd_path) if Dir.glob((targetd_path + "*").to_s).empty?
-      end
-      rm(target_hook_path)
-      # TODO - clean up helpers
+      destroy
+    end
+
+    def share!
+      return nil if install_kind == :shared
+      copy_to(:shared)
+      destroy
     end
   end
 

data/lib/gitty/hook_command.rb

@@ -2,6 +2,7 @@ class Gitty::HookCommand < Gitty::Runner
   COMMANDS = %w[
     init
     list
+    share
     show
     install
     uninstall

data/lib/gitty.rb

@@ -26,6 +26,10 @@ module Gitty
     end
     nil
   end
+
+  def self.sharing_enabled?
+    File.exist?(".git/hooks/gitty/update-shared-hooks")
+  end
 end
 
 require "gitty/runner.rb"

data/spec/gitty/hook_spec.rb

@@ -138,4 +138,19 @@ EOF
       File.directory?(".git/hooks/local/post-merge.d").should be_false
     end
   end
+
+  describe "#share" do
+    it "copies the hook straight to shared when uninstalled" do
+      hook = Gitty::Hook.find("submodule_updater")
+      hook.share!
+      Gitty::Hook.find("submodule_updater", :install_kind => :shared).should_not be_nil
+    end
+
+    it "copies the hook to shared and uninstalls the :local copy" do
+      hook = installed_hook("submodule_updater")
+      hook.share!
+      Gitty::Hook.find("submodule_updater", :install_kind => :local).should be_nil
+      Gitty::Hook.find("submodule_updater", :install_kind => :shared).should_not be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gitty
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.4.2
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -07:00
+date: 2010-03-12 00:00:00 -07:00
 default_executable: git-hook
 dependencies: []
 
@@ -32,6 +32,7 @@ files:
 - assets/helpers/git-trash
 - assets/helpers/git-when-introduced
 - assets/helpers/hookd_wrapper
+- assets/helpers/update-shared-hooks
 - assets/hooks/auto-submodules
 - assets/hooks/clean-patches
 - assets/hooks/git-prevent-messy-rebase
@@ -44,6 +45,7 @@ files:
 - lib/gitty/commands/install.rb
 - lib/gitty/commands/list.rb
 - lib/gitty/commands/publish.rb
+- lib/gitty/commands/share.rb
 - lib/gitty/commands/shell.rb
 - lib/gitty/commands/show.rb
 - lib/gitty/commands/uninstall.rb