capita_git 0.1.5 → 0.1.6

data/.gitignore

@@ -4,3 +4,4 @@ pkg/*
 .idea
 lib/capita_git/man
 tmp/*
+coverage

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capita_git (0.1.4)
+    capita_git (0.1.5)
       git (>= 1.2.5)
       thor (>= 0.14.6)
 
@@ -18,6 +18,9 @@ GEM
       mustache (>= 0.7.0)
       rdiscount (>= 1.5.8)
     shoulda (2.11.3)
+    simplecov (0.3.9)
+      simplecov-html (>= 0.3.7)
+    simplecov-html (0.3.9)
     thor (0.14.6)
 
 PLATFORMS
@@ -25,6 +28,9 @@ PLATFORMS
 
 DEPENDENCIES
   capita_git!
+  git (>= 1.2.5)
   open4
   ronn (>= 0.7.3)
   shoulda (>= 2.11.0)
+  simplecov
+  thor (>= 0.14.6)

data/bin/gitc

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'capita_git'
+require File.join(File.dirname(__FILE__), '../lib/capita_git')
 
 begin
   CapitaGit::CLI.start

data/capita_git.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('ronn', ">= 0.7.3")
   s.add_development_dependency('shoulda', ">= 2.11.0")
   s.add_development_dependency('open4')
+  s.add_development_dependency('simplecov')
 end

data/lib/capita_git/cli.rb

@@ -12,7 +12,11 @@ module CapitaGit
       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...'
+          log :warn, 'You called a git command from gitc...'
+          3.downto(1) do |i|
+            log :warn, "Executing in #{i}"
+            sleep 1
+          end
           system "git #{cmd} #{args}"
         end
       end

data/lib/capita_git/man/gitc

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GITC" "5" "February 2011" "GITC 0.1.5" "GITC Manual"
+.TH "GITC" "5" "February 2011" "GITC 0.1.6" "GITC Manual"
 .
 .SH "NAME"
 \fBgitc\fR \- git helper for CAPITA Unternehmensberatung GmbH

data/lib/capita_git/man/gitc-backport

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GITC\-BACKPORT" "1" "February 2011" "GITC 0.1.5" "GITC Manual"
+.TH "GITC\-BACKPORT" "1" "February 2011" "GITC 0.1.6" "GITC Manual"
 .
 .SH "NAME"
 \fBgitc\-backport\fR \- Ports changes from a fix branch into master

data/lib/capita_git/man/gitc-backport.txt

@@ -21,4 +21,4 @@ EXAMPLES
 
 
 
-GITC 0.1.5			 February 2011		      GITC-BACKPORT(1)
+GITC 0.1.6			 February 2011		      GITC-BACKPORT(1)

data/lib/capita_git/man/gitc-check

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GITC\-CHECK" "1" "February 2011" "GITC 0.1.5" "GITC Manual"
+.TH "GITC\-CHECK" "1" "February 2011" "GITC 0.1.6" "GITC Manual"
 .
 .SH "NAME"
 \fBgitc\-check\fR \- Check for releases and create branches

data/lib/capita_git/man/gitc-check.txt

@@ -34,4 +34,4 @@ DESCRIPTION
 
 
 
-GITC 0.1.5			 February 2011			 GITC-CHECK(1)
+GITC 0.1.6			 February 2011			 GITC-CHECK(1)

data/lib/capita_git/man/gitc-close

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GITC\-CLOSE" "1" "February 2011" "GITC 0.1.5" "GITC Manual"
+.TH "GITC\-CLOSE" "1" "February 2011" "GITC 0.1.6" "GITC Manual"
 .
 .SH "NAME"
 \fBgitc\-close\fR \- Closes a feature branch

data/lib/capita_git/man/gitc-close.txt

@@ -35,4 +35,4 @@ EXAMPLES
 
 
 
-GITC 0.1.5			 February 2011			 GITC-CLOSE(1)
+GITC 0.1.6			 February 2011			 GITC-CLOSE(1)

data/lib/capita_git/man/gitc-create

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GITC\-CREATE" "1" "February 2011" "GITC 0.1.5" "GITC Manual"
+.TH "GITC\-CREATE" "1" "February 2011" "GITC 0.1.6" "GITC Manual"
 .
 .SH "NAME"
 \fBgitc\-create\fR \- Creates a feature branch

data/lib/capita_git/man/gitc-create.txt

@@ -33,4 +33,4 @@ EXAMPLES
 
 
 
-GITC 0.1.5			 February 2011			GITC-CREATE(1)
+GITC 0.1.6			 February 2011			GITC-CREATE(1)

data/lib/capita_git/man/gitc-install_autocomplete

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GITC\-INSTALL_AUTOCOMPLETE" "1" "February 2011" "GITC 0.1.5" "GITC Manual"
+.TH "GITC\-INSTALL_AUTOCOMPLETE" "1" "February 2011" "GITC 0.1.6" "GITC Manual"
 .
 .SH "NAME"
 \fBgitc\-install_autocomplete\fR \- Installs gitc autocompletion

data/lib/capita_git/man/gitc-install_autocomplete.txt

@@ -14,4 +14,4 @@ DESCRIPTION
 
 
 
-GITC 0.1.5			 February 2011	  GITC-INSTALL_AUTOCOMPLETE(1)
+GITC 0.1.6			 February 2011	  GITC-INSTALL_AUTOCOMPLETE(1)

data/lib/capita_git/man/gitc-update

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GITC\-UPDATE" "1" "February 2011" "GITC 0.1.5" "GITC Manual"
+.TH "GITC\-UPDATE" "1" "February 2011" "GITC 0.1.6" "GITC Manual"
 .
 .SH "NAME"
 \fBgitc\-update\fR \- Update a feature branch

data/lib/capita_git/man/gitc-update.txt

@@ -15,25 +15,25 @@ DESCRIPTION
        branch is checked out and updated via git pull and the  feature	branch
        gets  rebased with any new changeset from the source branch. In case of
        an unsuccessful rebase, the user  needs	to  proceed  as  normal  (e.g.
-       resolving conflicts, issuing 'git add .' and 'git rebase --continue').
+       resolving  conflicts, issuing 'git add .' and 'git rebase --continue').
 
-       Gitc  will  fail  if  the  source  branch doesn't exist or is a feature
+       Gitc will fail if the source branch  doesn't  exist  or	is  a  feature
        branch itself!
 
 EXAMPLES
        'gitc update'
-	      called out of the feature  branch  'jd_master_my-feature'  would
+	      called  out  of  the feature branch 'jd_master_my-feature' would
 	      result in updating 'master' and doing a rebase
-	      (git  checkout  master  &&  git  pull  &&  git  checkout jd_mas-
+	      (git checkout  master  &&  git  pull  &&	git  checkout  jd_mas-
 	      ter_my-feature && git rebase master)
 
        'gitc update'
-	      called out of the feature branch	'jd_2.0-fix_my-feature'  would
+	      called  out  of the feature branch 'jd_2.0-fix_my-feature' would
 	      result in updating '2.0-fix' and doing a rebase
-	      (git   checkout	2.0-fix   &&   git   pull   &&	 git  checkout
+	      (git  checkout   2.0-fix	 &&   git   pull   &&	git   checkout
 	      jd_2.0-fix_my-feature && git rebase 2.0-fix)
 
 
 
 
-GITC 0.1.5			 February 2011			GITC-UPDATE(1)
+GITC 0.1.6			 February 2011			GITC-UPDATE(1)

data/lib/capita_git/man/gitc.txt

@@ -18,14 +18,14 @@ SYNOPSIS
 DESCRIPTION
        gitc is a git automation tool used by CAPITA Unternehmensberatung GmbH.
 
-       It's  main  purpose is to automate repetivite tasks as spawing new fea-
-       ture branches, updating and rebasing from the source branch of a  given
-       feature	branch,  as  well as closing/merging feature branchs back into
+       It's main purpose is to automate repetivite tasks as spawing  new  fea-
+       ture  branches, updating and rebasing from the source branch of a given
+       feature branch, as well as closing/merging feature  branchs  back  into
        their originating timeline.
 
-       gict uses a strict naming  convention  for  creating,  idenfitying  and
-       maintaining  local  and remote branches and depends on the users's name
-       being set in the git configuration of your local cloned copy or in  the
+       gict  uses  a  strict  naming  convention for creating, idenfitying and
+       maintaining local and remote branches and depends on the  users's  name
+       being  set in the git configuration of your local cloned copy or in the
        global settings.
 
        Please make sure that both
@@ -34,20 +34,20 @@ DESCRIPTION
        return your correct name and email address.
 
 COMMANDS
-       For  detailed explanation of the various commands, please use gitc help
+       For detailed explanation of the various commands, please use gitc  help
        command.
 
        Available commands currently are:
 
-       check  performs a basic check of your repository, as well as  maintains
+       check  performs	a basic check of your repository, as well as maintains
 	      fixbranches for major release tags both locally and remotely
 
        create creates a feature branch
 
-       update updates  the feature branch's source branch and rebases the fea-
+       update updates the feature branch's source branch and rebases the  fea-
 	      ture branch
 
-       close  closes a feature branch by updating and merging into the	source
+       close  closes  a feature branch by updating and merging into the source
 	      branch
 
        backport
@@ -57,9 +57,9 @@ COMMANDS
 	      installs/updates and loads gitc autocompletion bash extension
 
 GIT-PASSTHROUGH
-       If  gitc is called with a default git-command it will pass on both com-
+       If gitc is called with a default git-command it will pass on both  com-
        mand and arguments to git after displaying a short warning
 
 
 
-GITC 0.1.5			 February 2011			       GITC(5)
+GITC 0.1.6			 February 2011			       GITC(5)

data/lib/capita_git/repository.rb

@@ -163,11 +163,11 @@ module CapitaGit
     end
 
     def user_name
-      @repository.config('user.name')
+      @user_name ||= `git config --get user.name`.strip.chomp
     end
 
     def user_email
-      @repository.config('user.email')
+      @user_email ||= `git config --get user.email`.strip.chomp
     end
 
     def user_shortcut

data/lib/capita_git/version.rb

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

data/test/cli_test.rb

@@ -6,8 +6,6 @@ class CliTest < Test::Unit::TestCase
       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'
@@ -37,17 +35,60 @@ class CliTest < Test::Unit::TestCase
                 should_have_file 'fixfile', :in => 'local_checkout_1'
               end
             end
-
           end
         end
       end
 
-      gitc 'create my_feature' do
-        should "be on branch USER_master_my_feature" do
-          user = CapitaGit::Repository.open('.').user_shortcut
-          assert_equal "#{user}_master_my_feature", repo.current_branch
+      context 'being on the fix-branch' do
+        setup do
+          assert_command 'gitc check'
+          assert_command 'git checkout 1.0-fix'
+        end
+        should_be_on_branch '1.0-fix'
+
+        context 'create my-feature' do
+          setup { assert_command 'gitc create my-feature' }
+            should_be_on_user_branch "1.0-fix_my-feature"
+
+          context 'after creating a fix' do
+            setup do
+              assert_command 'echo "foo" > fixfile2'
+              assert_command 'git add . && git commit -m "fixfile2"'
+            end
+            should_be_on_user_branch "1.0-fix_my-feature"
+            should_have_file 'fixfile2', :in => 'local_checkout_1'
+
+            context 'and closing it' do
+              setup do
+                assert_command 'gitc close'
+              end
+              should_be_on_branch "1.0-fix"
+              should_have_file 'fixfile2', :in => 'local_checkout_1'
+
+              context 'and backporting it' do
+                setup do
+                  assert_command 'gitc backport'
+                  assert_command 'git push'
+                end
+                should_be_on_branch "master"
+
+                context "after pull and checkout of master in checkout 2" do
+                  setup do
+                    in_dir 'local_checkout_2' do
+                      assert_command 'git checkout master'
+                      assert_command 'git pull'
+                    end
+                  end
+                  should_have_file 'fixfile2', :in => 'local_checkout_2'
+                end
+              end
+            end
+          end
         end
+      end
 
+      gitc 'create my_feature' do
+        should_be_on_user_branch "master_my_feature"
         should_not_have_file 'awesome_feature', :in => 'local_checkout_1'
 
         should "break trying to create another feature branch from existing feature branch" do
@@ -72,18 +113,6 @@ class CliTest < Test::Unit::TestCase
             should_have_file 'master_2_update', :in => 'local_checkout_1'
           end
 
-#          context "while having the same file changed in origin" do
-#            setup do
-#              in_dir 'local_checkout_1' do
-#                assert_command 'echo "foo" > master_2_update'
-#                assert_command 'git add . && git commit -m "master 2 update"'
-#              end
-#            end
-#
-#            should "crash on invoking 'gitc update'" do
-#              assert_command_fail("#{ShouldaMacros::BIN_PATH} update")
-#            end
-#          end
         end
 
         # Committing a fix and closing branch

data/test/shoulda_macros.rb

@@ -1,5 +1,7 @@
+require 'digest/sha1'
+
 module ShouldaMacros
-  TEMP_DIR = File.expand_path('/tmp/capita_git_tmp')
+  TEMP_DIR = File.expand_path("/tmp/capita_git_tmp-#{Digest::SHA1.hexdigest("#{Time.now}#{rand(99999)}")}")
   BIN_PATH = File.expand_path(File.join(File.dirname(__FILE__), '..', 'bin/gitc'))
 
   # Test method level helpers
@@ -91,7 +93,9 @@ module ShouldaMacros
 
         # Make sure the temporary directory is purged after every run
         teardown do
-          FileUtils.rm_rf(temp_dir)
+          Dir.chdir('/tmp') do
+            FileUtils.rm_rf(ShouldaMacros::TEMP_DIR)
+          end
         end
       end
     end
@@ -129,6 +133,17 @@ module ShouldaMacros
       end
     end
 
+    def should_be_on_branch(name, user=false)
+      should "be on branch '#{name}'" do
+        branch = user ? "#{CapitaGit::Repository.open('.').user_shortcut}_#{name}" : name
+        assert_equal branch, CapitaGit::Repository.open('.').current_branch
+      end
+    end
+
+    def should_be_on_user_branch(name)
+      should_be_on_branch(name, true)
+    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

data/test/test_helper.rb

@@ -1,11 +1,17 @@
 require 'rubygems'
 require 'bundler/setup'
+require 'simplecov'
+SimpleCov.start do
+  add_filter "/test/"
+end
+
+
 require 'capita_git'
 require 'git'
 
+# Test-related libraries
 require 'test/unit'
 require 'shoulda'
-
 require 'fileutils'
 require "open4" # See http://tech.natemurray.com/2007/03/ruby-shell-commands.html
 require 'shoulda_macros'

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: capita_git
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Sebastian Georgi
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 +01:00
+date: 2011-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 2
@@ -43,7 +41,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
         - 0
         - 14
@@ -59,7 +56,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 7
@@ -75,7 +71,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 35
         segments: 
         - 2
         - 11
@@ -91,12 +86,24 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Git-automation tool for quick handling of common patterns for feature and fix branches
 email: 
 - sgeorgi@capita.de
@@ -132,19 +139,19 @@ files:
 - test/shoulda_macros.rb
 - test/test_helper.rb
 - lib/capita_git/man/gitc
-- lib/capita_git/man/gitc-install_autocomplete
+- lib/capita_git/man/gitc-backport
+- lib/capita_git/man/gitc-backport.txt
 - lib/capita_git/man/gitc-check
+- lib/capita_git/man/gitc-check.txt
 - lib/capita_git/man/gitc-close
-- lib/capita_git/man/gitc-update
-- lib/capita_git/man/gitc-install_autocomplete.txt
+- lib/capita_git/man/gitc-close.txt
+- lib/capita_git/man/gitc-create
 - lib/capita_git/man/gitc-create.txt
-- lib/capita_git/man/gitc-backport.txt
-- lib/capita_git/man/gitc-check.txt
+- lib/capita_git/man/gitc-install_autocomplete
+- lib/capita_git/man/gitc-install_autocomplete.txt
+- lib/capita_git/man/gitc-update
 - lib/capita_git/man/gitc-update.txt
 - lib/capita_git/man/gitc.txt
-- lib/capita_git/man/gitc-close.txt
-- lib/capita_git/man/gitc-create
-- lib/capita_git/man/gitc-backport
 has_rdoc: true
 homepage: https://github.com/capita/capita_git
 licenses: []
@@ -159,7 +166,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -168,14 +174,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: capita_git
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Git-automation tool for quick handling of common patterns for feature and fix branches