capita_git 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capita_git (0.1.1)
+    capita_git (0.1.4)
       git (>= 1.2.5)
       thor (>= 0.14.6)
 
@@ -25,8 +25,6 @@ PLATFORMS
 
 DEPENDENCIES
   capita_git!
-  git (>= 1.2.5)
   open4
   ronn (>= 0.7.3)
   shoulda (>= 2.11.0)
-  thor (>= 0.14.6)

data/capita_git.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/capita/capita_git"
   s.summary = %q{Git-automation tool for quick handling of common patterns for feature and fix branches}
   s.description = %q{Git-automation tool for quick handling of common patterns for feature and fix branches}
-
+  s.post_install_message = %Q{Installed/Updated *gitc*, please issue *gitc install_autocomplete* to install/update bash-completion}
   s.rubyforge_project = "capita_git"
 
   man_files = Dir.glob("lib/capita_git/man/**/*")

data/lib/capita_git/cli.rb

@@ -8,6 +8,16 @@ module CapitaGit
   class CLI < Thor
     include Thor::Actions
 
+    ['checkout', 'push', 'pull', 'fetch', 'add', 'rm', 'status', 'diff', 'commit', 'rebase'].each do |cmd|
+      class_eval do
+        desc "#{cmd}", "Passes #{cmd} to git"
+        define_method cmd.to_sym do |*args|
+          log :warn, 'You called a git command from gitc, passing it along for now...'
+          system "git #{cmd} #{args}"
+        end
+      end
+    end
+
     def initialize(*)
       super
       the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)

data/lib/capita_git/version.rb

@@ -1,3 +1,3 @@
 module CapitaGit
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/man/gitc-install_autocomplete.ronn

@@ -7,4 +7,4 @@ gitc-install_autocomplete(1) -- Installs gitc autocompletion
 
 ## DESCRIPTION
 
-**gitc autocomplete** installs a script in ~/.gitc_autocomplete, appends inclusion in ~/.bashrc and sources into current shell.
+**gitc install_autocomplete** installs a script in ~/.gitc_autocompletion, appends inclusion in ~/.bashrc and sources into current shell.

data/man/gitc.ronn

@@ -53,3 +53,8 @@ Available commands currently are:
 
   * <install_autocomplete>:
     installs/updates and loads gitc autocompletion bash extension
+
+## GIT-PASSTHROUGH
+
+If **gitc** is called with a default git-command it will pass on both command and arguments to git after displaying
+a short warning

data/test/cli_test.rb

@@ -5,6 +5,10 @@ class CliTest < Test::Unit::TestCase
     in_dir 'local_checkout_1' do
       after('git pull') { should_have_tag '1.0' }
 
+      should('respond to git-cmd #status') { assert_command_match 'gitc status', "nothing to commit" }
+      should('respond to git-cmd #pull') { assert_command_match 'gitc pull', "Already up-to-date" }
+      should('respond to git-cmd #push') { assert_command_match 'gitc push', "Everything up-to-date" }
+
       gitc 'check' do
         should_have_branch '1.0-fix'
 

data/test/shoulda_macros.rb

@@ -1,7 +1,7 @@
 module ShouldaMacros
   TEMP_DIR = File.expand_path('/tmp/capita_git_tmp')
   BIN_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin/gitc'))
-  
+
   # Test method level helpers
   module InstanceMethods
     # Returns the path to the temporary directory, with the optional subdirectory
@@ -20,21 +20,28 @@ module ShouldaMacros
         yield
       end
     end
-    
+
     # Runs the specified command and asserts it's exit status should be 0
     def assert_command(cmd)
-      Open4.popen4(cmd) { |pid, stdin, stdout, stderr|  }
+      Open4.popen4(cmd) { |pid, stdin, stdout, stderr|}
       #puts `#{cmd}`
       assert_equal 0, $?.exitstatus, "Expected exit status of 0 for command '#{cmd}'"
     end
 
+    # Runs the specified command and asserts it's output matches given string
+    def assert_command_match(cmd, match)
+      pid, stdin, stdout, stderr = Open4.popen4(cmd)
+      stdin.close
+      assert stdout.read.match Regexp.new(match)
+    end
+
     # Runs the specified command and asserts it's exit status should be 1
     def assert_command_fail(cmd)
-      Open4.popen4(cmd) { |pid, stdin, stdout, stderr|  }
+      Open4.popen4(cmd) { |pid, stdin, stdout, stderr|}
       #puts `#{cmd}`
       assert_equal 1, $?.exitstatus, "Expected exit status of 1 for command '#{cmd}'"
     end
-    
+
     # Opens a Git ruby lib instance for current working dir and returns it
     def repo
       Git.open(Dir.getwd)
@@ -43,7 +50,7 @@ module ShouldaMacros
 
   # Context and should block helpers  
   module ClassMethods
-    
+
     #
     # Creates a repository with a remote in temp_dir
     #
@@ -53,11 +60,11 @@ module ShouldaMacros
           ENV["GIT_WORK_TREE"] = nil
           ENV['GIT_DIR'] = nil
           ENV['GIT_INDEX_FILE'] = nil
-          
+
           in_dir 'origin' do
             assert_command 'git init --bare'
           end
-          
+
           in_dir "initial_commit" do
             assert_command 'git init'
             assert_command "echo 'foo bar commit' > README"
@@ -65,13 +72,13 @@ module ShouldaMacros
             assert_command "git remote add origin #{temp_dir('origin')}"
             assert_command 'git push origin master'
           end
-          
+
           in_dir "local_checkout_1" do
             assert_command "git clone #{temp_dir('origin')} ."
             assert_command 'git push origin master'
             assert_command 'git pull origin master'
           end
-          
+
           in_dir "local_checkout_2" do
             assert_command "git clone #{temp_dir('origin')} ."
             assert_command 'git tag -a 1.0 -m "First release"'
@@ -79,16 +86,16 @@ module ShouldaMacros
             assert_command 'git pull origin master'
           end
         end
-        
+
         yield
-        
+
         # Make sure the temporary directory is purged after every run
         teardown do
           FileUtils.rm_rf(temp_dir)
         end
       end
     end
-    
+
     def in_dir(name)
       context "in dir '#{name}'" do
         setup do
@@ -96,15 +103,15 @@ module ShouldaMacros
           @original_wd[name] = Dir.getwd
           Dir.chdir(temp_dir(name))
         end
-        
+
         yield
-        
+
         teardown do
           Dir.chdir(@original_wd[name]) if @original_wd
         end
       end
     end
-    
+
     # Invokes the gitc binary with given arguments and yields after the setup
     def gitc(args)
       context "after invoking 'gitc #{args}'" do
@@ -112,7 +119,7 @@ module ShouldaMacros
         yield
       end
     end
-    
+
     def after(command)
       context "after '#{command}'" do
         setup do
@@ -121,31 +128,31 @@ module ShouldaMacros
         yield
       end
     end
-    
+
     def should_have_branch(name)
       should "have branch '#{name}'" do
         assert repo.branches.map(&:name).include?(name), "Found in #{Dir.getwd}: " + repo.branches.map(&:name).inspect
       end
     end
-    
+
     def should_not_have_branch(name)
       should "NOT have branch '#{name}'" do
         assert !repo.branches.map(&:name).include?(name), "Found in #{Dir.getwd}: " + repo.branches.map(&:name).inspect
       end
     end
-    
+
     def should_have_tag(name)
       should "have tag '#{name}'" do
         assert repo.tags.map(&:name).include?(name), repo.tags.map(&:name).inspect
       end
     end
-    
+
     def should_not_have_tag(name)
       should "NOT have tag '#{name}'" do
         assert !repo.tags.map(&:name).include?(name), repo.tags.map(&:name).inspect
       end
     end
-    
+
     def should_have_file(name, options)
       raise "Usage: should_have_file 'filename', :in => 'tempdirname' (or %w(dir1 dir2))" unless options[:in]
       [options[:in]].flatten.each do |dir|
@@ -154,7 +161,7 @@ module ShouldaMacros
         end
       end
     end
-    
+
     def should_not_have_file(name, options)
       raise "Usage: should_not_have_file 'filename', :in => 'tempdirname' (or %w(dir1 dir2))" unless options[:in]
       [options[:in]].flatten.each do |dir|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capita_git
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Sebastian Georgi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +01:00
+date: 2011-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -149,7 +149,7 @@ has_rdoc: true
 homepage: https://github.com/capita/capita_git
 licenses: []
 
-post_install_message: 
+post_install_message: Installed/Updated *gitc*, please issue *gitc install_autocomplete* to install/update bash-completion
 rdoc_options: []
 
 require_paths: 
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capita_git
-rubygems_version: 1.4.1
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Git-automation tool for quick handling of common patterns for feature and fix branches