utsup 0.1.3 → 0.1.4

data.tar.gz.sig

@@ -1,3 +1,3 @@
-Va�“�$�Vó��Sku��n���}���D7uO��2��?E-ۇ�@mlo��9�#n
-��%q�7&��Ӣ�&����-�d
%}Q�I�@?`
-���i��6��H�Y�yY����
+�N& |4R�}je�c�)m���
+��o�YL	1��6��:��A���ׇ=$�4�F8�Zl����ǒ��œg��`��g4o':(��e_xPf\Y4T���J��="�a>\d�`Q�I��gL�߷�

�����1jzǀ��M�?/���7��V">�������;p�$`�a�c����{�#�(7��ǒM��]���7BDq�\Rc؝�_���~�)�.H��5?E_nFc�
+o(Z3��+�f�

data/Manifest.txt

@@ -5,10 +5,6 @@ PostInstall.txt
 README.rdoc
 Rakefile
 lib/config/utsup.sample
-lib/hooks/post-commit
-lib/hooks/post-checkout
-lib/hooks/post-merge
-lib/hooks/post-receive
 lib/sup.rb
 lib/sup/differ/differ_control.rb
 lib/sup/differ/differ_run.rb

data/lib/sup/base.rb

@@ -1,6 +1,5 @@
 module Sup
-  VERSION = '0.1.3'
-  GIT_HOOKS = %w(post-commit post-receive post-merge post-checkout) #TODO: post-rebase?
+  VERSION = '0.1.4'
   
   GLOBAL_CONFIG_PATH          = '~/.utsup/config.yml'
   GLOBAL_PROJECT_CONFIG_PATH  = '~/.utsup/projects.yml'
@@ -69,6 +68,13 @@ module Sup
     # Init
     # ===========================
     
+    GIT_HOOKS = {
+      "post-checkout" => "sup git checkout $@",
+      "post-commit"   => "sup git commit",
+      "post-merge"    => "sup git merge $@",
+      "post-receive"  => "sup git receive $@"
+    }
+    
     def init(project_title)
       
       # --- project init
@@ -87,20 +93,14 @@ module Sup
       end
       
       # --- write git hooks
-      #TODO: option to manually add hooks if they already have some...
-      GIT_HOOKS.each do |hook|
+      GIT_HOOKS.each do |hook, command|
         path = File.join(Dir.pwd, '.git/hooks/', hook)
-        hook_cmd = File.read(File.join(File.dirname(__FILE__),'hooks',hook))
+        exists = File.exists?(path)
         
-        if File.exists?(path)
-          puts "You already have a git hook here: #{path}"
-          puts "Please make sure it's executable add this to it:"
-          puts hook_cmd + "\n"
-          next
-        end
+        next if exists && File.read(path) =~ /#{Regexp.quote(command)}/
         
-        File.open(path, 'w', 0775) do |f|
-          f.write hook_cmd
+        File.open(path, (exists ? 'a' : 'w'), 0775) do |f|
+          f.puts command
         end
       end
       
@@ -111,12 +111,13 @@ module Sup
     # ===========================
 
     def configure
+      begin
+        global_config = Yamlize.new GLOBAL_CONFIG_PATH
+        project_config = Yamlize.new(File.join(Dir.pwd, PROJECT_CONFIG_PATH)) rescue {}
+        global_project_config = Yamlize.new GLOBAL_PROJECT_CONFIG_PATH
       
-      global_config = Yamlize.new GLOBAL_CONFIG_PATH
-      project_config = Yamlize.new(File.join(Dir.pwd, PROJECT_CONFIG_PATH)) rescue {}
-      global_project_config = Yamlize.new GLOBAL_PROJECT_CONFIG_PATH
-      
-      unless global_config['api_key']
+        raise unless global_config['api_key']
+      rescue 
         setup
         exit 0
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: utsup
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Nick Merwin
@@ -92,10 +92,6 @@ files:
 - README.rdoc
 - Rakefile
 - lib/config/utsup.sample
-- lib/hooks/post-commit
-- lib/hooks/post-checkout
-- lib/hooks/post-merge
-- lib/hooks/post-receive
 - lib/sup.rb
 - lib/sup/differ/differ_control.rb
 - lib/sup/differ/differ_run.rb

metadata.gz.sig

@@ -1,3 +1,2 @@
-�ޯ�t9F����&��'��#12D�O�0����\*c=��M8����~y��8Q;f�0��B��K�U*}���dp�6�}����+�(o���@X�ro�b8�
-,+a�#p`�{�*Gm>:�y7\)�p�wV��L�^���䨛��$�������h�z�X�
-R{��0���f�9=(-=5Y�!�fu�|.�I(� -~����i}�(�U�
+�gV�4�y_�����	�I�ɀ-����_�p�����>N[[/H.�oj���Q�VX�"Z`�|��nc�{J*�CwHzM�}��W�v:�)������p������]]6�����{��\Qݜ���4QDZ?|�H�'�F���h�_[�w-8�d���X�8��b���v<ڶf��7Q�#�2�O�(�����S�
+N�!��)�R��9����w�u�)8�U�4���|��E�g����q��7�q�x�^rO��

data/lib/hooks/post-checkout

@@ -1,2 +0,0 @@
-
-sup git checkout $@

data/lib/hooks/post-commit

@@ -1,2 +0,0 @@
-
-sup git commit 

data/lib/hooks/post-merge

@@ -1,2 +0,0 @@
-
-sup git merge $@

data/lib/hooks/post-receive

@@ -1,2 +0,0 @@
-
-sup git receive $@