gitty 0.4.2 → 0.4.3

data/Rakefile

@@ -10,7 +10,7 @@ begin
     gem.email = "timcharper@gmail.com"
     gem.homepage = "http://github.com/timcharper/gitty"
     gem.authors = ["Tim Harper"]
-    gem.files = Dir['lib/**/*.rb'] + Dir['assets/**/*'] + Dir['bin/*'] + Dir['cucumber/**/*'] + Dir['spec/**/*'] + %w[cucumber.yml Rakefile README.textile LICENSE]
+    gem.files = Dir['lib/**/*.rb'] + Dir['assets/**/*'] + ['bin/git-hook'] + Dir['cucumber/**/*'] + Dir['spec/**/*'] + %w[cucumber.yml Rakefile README.textile LICENSE]
     # gem.executables << 'git-hook'/
   end
   Jeweler::GemcutterTasks.new

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.3
+# version: 0.5
 # 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
@@ -57,7 +57,6 @@ HELPERS = File.expand_path(ENV['HELPERS'], Dir.pwd)
 chdir_parent
 current_submodules = list_submodules('HEAD')
 previous_submodules = list_submodules('HEAD@{1}')
-
 (current_submodules.keys + previous_submodules.keys).uniq.sort.each do |path|
   rev = submodule_current_rev(path)
   case
@@ -84,27 +83,26 @@ previous_submodules = list_submodules('HEAD@{1}')
       system("(git show '#{current_submodules[path]}' 2> /dev/null 1> /dev/null) || git fetch")
 
       current_rev = current_submodules[path]
-      rev, ref_kind, ref = %x{git for-each-ref}.split("\n").map { |l| l.split(" ") }.detect {|l| l.first == current_rev }
+      rev, ref_kind, ref = %x{git for-each-ref}.split("\n").
+                                                map { |l| l.split(" ") }.
+                                                detect {|rev, ref_kind, ref| rev == current_rev && (! ref.include?("HEAD")) }
 
       if ref.nil?
         system("git checkout -q #{current_rev}")
         if $? == 0
           STDERR.puts "Submodule HEAD was detached. The following branches contain the new HEAD:"
           system("git branch --contains #{current_rev} -a | egrep -v 'no branch|HEAD' 1>&2")
-          exit 0
         else
           STDERR.puts "Couldn't update submodule."
-          exit $?
         end
+        next
       end
       if ref.match(/^refs\/heads/)
         output = %x(git checkout '#{File.basename(ref)}' 2>&1)
         if $? == 0 
           STDERR.puts "Switched to branch #{File.basename(ref)}"
-          exit 0 
         else
           STDERR.puts "Couldn't update submodule: #{output}"
-          exit $?
         end
       end
 
@@ -120,7 +118,7 @@ previous_submodules = list_submodules('HEAD@{1}')
           else
             system("git branch -f #{local_ref} #{ref}")
           end
-          exec("git checkout #{local_ref}")
+          system("git checkout #{local_ref}")
         end
       end
     end

data/bin/cucumber

@@ -0,0 +1 @@
+exec bundle exec cucumber "$*"

data/bin/spec

@@ -0,0 +1 @@
+exec bundle exec spec "$*"

data/lib/gitty/commands/list.rb

@@ -23,18 +23,18 @@ class Gitty::HookCommand::List < Gitty::Runner
   end
 
   def show_local_or_shared_hooks(which)
-    hook_names = all_hooks.select { |h| h.install_kind == which.to_sym }.map(&:name)
-    puts "#{which}:\n#{listify(hook_names)}\n\n"
+    hooks = all_hooks.select { |h| h.install_kind == which.to_sym }
+    puts "#{which}:\n#{listify(hooks)}\n\n"
   end
 
   def listify(hooks)
-    hooks.map { |h| "- #{h}" }.join("\n")
+    hooks.map { |h| "- #{h.name} #{h.inspect}" }.join("\n")
   end
 
   def show_uninstalled_hooks
-    available_hook_names = all_hooks.select { |h| ! h.installed? }.map(&:name)
-    installed_hook_names = all_hooks.select { |h| h.installed? }.map(&:name)
-    uninstalled_hooks = (available_hook_names - installed_hook_names).sort
+    available_hooks = all_hooks.select { |h| ! h.installed? }
+    installed_hooks = all_hooks.select { |h| h.installed? }
+    uninstalled_hooks = available_hooks.reject { |h| installed_hooks.name == h.name }
     puts "uninstalled:\n#{listify(uninstalled_hooks)}\n\n"
   end
 

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require File.dirname(__FILE__) + "/../lib/gitty"
 require 'rubygems'
+require 'bundler'
+Bundler.setup
+require File.dirname(__FILE__) + "/../lib/gitty"
 require "spec"
 SPEC_PATH = Pathname.new(File.dirname(__FILE__))
 require SPEC_PATH + "../features/support/sandbox_world.rb"

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gitty
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  hash: 9
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Tim Harper
@@ -9,14 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-12 00:00:00 -07:00
-default_executable: git-hook
+date: 2010-05-19 00:00:00 -06:00
+default_executable: 
 dependencies: []
 
 description: Unobtrusively extend git
 email: timcharper@gmail.com
 executables: 
+- cucumber
 - git-hook
+- spec
 extensions: []
 
 extra_rdoc_files: 
@@ -59,6 +67,8 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/constants.rb
+- bin/cucumber
+- bin/spec
 has_rdoc: true
 homepage: http://github.com/timcharper/gitty
 licenses: []
@@ -69,21 +79,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Unobtrusively extend git