capita_git 0.1.3 → 0.1.4

data/README.rdoc

@@ -14,6 +14,10 @@
 
   $ gitc close ([source_branch])
 
+  $ gitc backport ([branch])
+
+  $ gitc install_autocompletion
+
 === DESCRIPTION 
 
 *gitc* is a git automation tool used by CAPITA Unternehmensberatung GmbH which comes
@@ -37,6 +41,8 @@ return your correct name and email address.
 
   $ gem install capita_git
 
+  $ gitc install_autocomplete
+
 === COMMANDS
 
 For detailed explanation of the various commands, please use *gitc help <command>*.
@@ -62,5 +68,11 @@ Available commands currently are:
   * <close>:
     Closes a feature branch by updating the source branch, rebasing it onto your feature
     branch and then merging into the source branch.
+
+  * <backport>:
+    Merges changes from a fix branch into master
+
+  * <install_autocomplete>:
+    Installs/updates and loads gitc autocompletion bash extension
     
 

data/lib/bash_completion.txt

@@ -0,0 +1,23 @@
+_gitc()
+{
+        local cur prev tags base
+        COMPREPLY=()
+        cur="${COMP_WORDS[COMP_CWORD]}"
+        prev="${COMP_WORDS[COMP_CWORD-1]}"
+        local tags="create update close check backport publish"
+
+        case "${prev}" in
+                update|close|publish)
+                        local user=`git config user.name | awk '{split($0,a," "); print tolower(substr(a[1],0,1)substr(a[2],0,1))}'`
+                        state=`git branch 2>&1 > /dev/null`
+                        if [ $? == "0" ]; then
+                            local running=$(for x in `git branch | sed s/\*/' '/ | awk '{ print $1 }' | grep ^${user}_`; do echo ${x} ; done )
+                            COMPREPLY=($(compgen -W "${running}" ${cur}))
+                            return 0
+                        fi
+                        ;;
+        esac
+
+        COMPREPLY=($(compgen -W "${tags}" ${cur}))
+}
+complete -F _gitc gitc

data/lib/capita_git/cli.rb

@@ -33,7 +33,12 @@ module CapitaGit
 
       manpages = %w(
               gitc
-              gitc-check)
+              gitc-check
+              gitc-create
+              gitc-update
+              gitc-close
+              gitc-backport
+              gitc-install_autocomplete)
 
       if manpages.include?(command)
         root = File.expand_path("../man", __FILE__)
@@ -53,6 +58,7 @@ module CapitaGit
 
     method_option 'remote', :type => :string
     desc "check", "Generates a Gemfile into the current working directory"
+
     def check
       opts = options.dup
       log :debug, "[DEBUG] Starting action 'check'"
@@ -99,6 +105,7 @@ module CapitaGit
     end
 
     desc "create", "Creates a new feature branch with the given name and optional source branch"
+
     def create(name, source_branch=nil)
       repo = CapitaGit::Repository.open(Dir.pwd)
       source_branch = source_branch.nil? ? repo.current_branch.to_s : source_branch
@@ -109,6 +116,7 @@ module CapitaGit
     end
 
     desc "update", "Updates a feature branch your currently on or specified by name"
+
     def update(feature_branch=nil)
       repo = CapitaGit::Repository.open(Dir.pwd)
       feature_branch = feature_branch.nil? ? repo.current_branch : feature_branch
@@ -119,6 +127,7 @@ module CapitaGit
     end
 
     desc "close", "Closes a feature branch your currently on or specified by name onto the source branch"
+
     def close(feature_branch=nil)
       repo = CapitaGit::Repository.open(Dir.pwd)
       feature_branch = feature_branch.nil? ? repo.current_branch : feature_branch
@@ -128,6 +137,7 @@ module CapitaGit
     end
 
     desc "backport", "Merges changes from a fixbranch into master"
+
     def backport(fix_branch=nil)
       repo = CapitaGit::Repository.open(Dir.pwd)
       fix_branch = fix_branch.nil? ? repo.current_branch : fix_branch
@@ -136,6 +146,24 @@ module CapitaGit
       repo.merge_fixbranch(fix_branch)
     end
 
+    desc "install_autocomplete", "asd"
+
+    def install_autocomplete
+      root = File.expand_path("../../", __FILE__)
+      system "cp #{root}/bash_completion.txt ~/.gitc_completion"
+      system "if grep -q 'gitc_completion' ~/.bashrc; then echo 'Done'; else echo '. .gitc_completion' >> ~/.bashrc; . ~/.gitc_completion; fi"
+    end
+
+    desc "publish", "Published a local branch to origin"
+
+    def publish(branch_name=nil)
+      repo = CapitaGit::Repository.open(Dir.pwd)
+      branch_name = branch_name.nil? ? repo.current_branch : branch_name
+
+      log :confirm, "--> Publishing '#{branch_name}' to 'origin"
+      repo.publish_branch(branch_name)
+    end
+
     desc "runner", "Generates a Gemfile into the current working directory"
 
     def runner(command)

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.3" "GITC Manual"
+.TH "GITC" "5" "February 2011" "GITC 0.1.4" "GITC Manual"
 .
 .SH "NAME"
 \fBgitc\fR \- git helper for CAPITA Unternehmensberatung GmbH
@@ -28,6 +28,9 @@
 \fBgitc\fR backport [branch]
 .
 .br
+\fBgitc\fR install_autocomplete
+.
+.br
 .
 .SH "DESCRIPTION"
 \fBgitc\fR is a git automation tool used by CAPITA Unternehmensberatung GmbH\.
@@ -75,4 +78,8 @@ closes a feature branch by updating and merging into the source branch
 .TP
 \fIbackport\fR
 merges changes from a fix branch into master
+.
+.TP
+\fIinstall_autocomplete\fR
+installs/updates and loads gitc autocompletion bash extension
 

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.3" "GITC Manual"
+.TH "GITC\-BACKPORT" "1" "February 2011" "GITC 0.1.4" "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.3			 February 2011		      GITC-BACKPORT(1)
+GITC 0.1.4			 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.3" "GITC Manual"
+.TH "GITC\-CHECK" "1" "February 2011" "GITC 0.1.4" "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.3			 February 2011			 GITC-CHECK(1)
+GITC 0.1.4			 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.3" "GITC Manual"
+.TH "GITC\-CLOSE" "1" "February 2011" "GITC 0.1.4" "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.3			 February 2011			 GITC-CLOSE(1)
+GITC 0.1.4			 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.3" "GITC Manual"
+.TH "GITC\-CREATE" "1" "February 2011" "GITC 0.1.4" "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.3			 February 2011			GITC-CREATE(1)
+GITC 0.1.4			 February 2011			GITC-CREATE(1)

data/lib/capita_git/man/gitc-install_autocomplete

@@ -0,0 +1,15 @@
+.\" 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.4" "GITC Manual"
+.
+.SH "NAME"
+\fBgitc\-install_autocomplete\fR \- Installs gitc autocompletion
+.
+.SH "SYNOPSIS"
+\fBgitc\fR install_autocomplete
+.
+.br
+.
+.SH "DESCRIPTION"
+\fBgitc autocomplete\fR installs a script in ~/\.gitc_autocomplete, appends inclusion in ~/\.bashrc and sources into current shell\.

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

@@ -0,0 +1,17 @@
+GITC-INSTALL_AUTOCOMPLETE(1)	  GITC Manual	  GITC-INSTALL_AUTOCOMPLETE(1)
+
+
+
+NAME
+       gitc-install_autocomplete - Installs gitc autocompletion
+
+SYNOPSIS
+       gitc install_autocomplete
+
+DESCRIPTION
+       gitc  autocomplete  installs  a script in ~/.gitc_autocomplete, appends
+       inclusion in ~/.bashrc and sources into current shell.
+
+
+
+GITC 0.1.4			 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.3" "GITC Manual"
+.TH "GITC\-UPDATE" "1" "February 2011" "GITC 0.1.4" "GITC Manual"
 .
 .SH "NAME"
 \fBgitc\-update\fR \- Update a feature branch

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

@@ -36,4 +36,4 @@ EXAMPLES
 
 
 
-GITC 0.1.3			 February 2011			GITC-UPDATE(1)
+GITC 0.1.4			 February 2011			GITC-UPDATE(1)

data/lib/capita_git/man/gitc.txt

@@ -13,6 +13,7 @@ SYNOPSIS
        gitc update [branch]
        gitc close [branch]
        gitc backport [branch]
+       gitc install_autocomplete
 
 DESCRIPTION
        gitc is a git automation tool used by CAPITA Unternehmensberatung GmbH.
@@ -52,7 +53,10 @@ COMMANDS
        backport
 	      merges changes from a fix branch into master
 
+       install_autocomplete
+	      installs/updates and loads gitc autocompletion bash extension
 
 
 
-GITC 0.1.3			 February 2011			       GITC(5)
+
+GITC 0.1.4			 February 2011			       GITC(5)

data/lib/capita_git/repository.rb

@@ -92,8 +92,21 @@ module CapitaGit
       system "git merge -m 'Backporting changes of fix branch \'#{branch}\' into master' #{branch}"
     end
 
+    def publish_branch(branch)
+      raise "Can't publish '#{branch}' since it doesn't exist!" unless has_local_branch?(branch)
+      raise "'#{remote_name(branch)}' already exists remotely!" if has_remote_branch?(remote_name(branch))
+      push_local_branch_to_remote('origin', branch, remote_name(branch))
+      create_local_branch(remote_name(branch), "origin/#{remote_name(branch)}", true)
+      checkout_local_branch remote_name(branch)
+      system "git branch -D #{branch}"
+    end
+
     def has_local_branch?(name)
-      !@repository.branches.local.detect { |b| b.full =~ /#{name.gsub('/', '\/')}/ }.nil?
+      !@repository.branches.local.detect { |b| b.full =~ /^#{name}.*/ }.nil?
+    end
+
+    def has_remote_branch?(name)
+      !@repository.branches.remote.detect { |b| b.full =~ /^#{name}.*/ }.nil?
     end
 
     def is_local_feature_branch?(name)
@@ -165,6 +178,10 @@ module CapitaGit
       name.split('_')[1]
     end
 
+    def remote_name(name)
+      name.gsub(/#{user_shortcut}_/, '').gsub(/_/,'-')
+    end
+
     private
 
     def log(message)

data/lib/capita_git/version.rb

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

data/lib/capita_git.rb

@@ -24,3 +24,7 @@ module CapitaGit
   class RepositoryError < StandardError
   end
 end
+
+Gem.post_install do |installer|
+  puts "!!! #{installer.spec.full_name} INSTALLED !!!"
+end

data/man/gitc-install_autocomplete.ronn

@@ -0,0 +1,10 @@
+gitc-install_autocomplete(1) -- Installs gitc autocompletion
+=======================================================
+
+## SYNOPSIS
+
+`gitc` install_autocomplete<br>
+
+## DESCRIPTION
+
+**gitc autocomplete** installs a script in ~/.gitc_autocomplete, appends inclusion in ~/.bashrc and sources into current shell.

data/man/gitc.ronn

@@ -10,6 +10,7 @@ gitc(5) -- git helper for CAPITA Unternehmensberatung GmbH
 `gitc` update [branch]<br>
 `gitc` close [branch]<br>
 `gitc` backport [branch]<br>
+`gitc` install_autocomplete<br>
 
 ## DESCRIPTION
 
@@ -49,3 +50,6 @@ Available commands currently are:
 
   * <backport>:
     merges changes from a fix branch into master
+
+  * <install_autocomplete>:
+    installs/updates and loads gitc autocompletion bash extension

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capita_git
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sebastian Georgi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +01:00
+date: 2011-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,6 +115,7 @@ files:
 - Rakefile
 - bin/gitc
 - capita_git.gemspec
+- lib/bash_completion.txt
 - lib/capita_git.rb
 - lib/capita_git/cli.rb
 - lib/capita_git/repository.rb
@@ -124,15 +125,18 @@ files:
 - man/gitc-check.ronn
 - man/gitc-close.ronn
 - man/gitc-create.ronn
+- man/gitc-install_autocomplete.ronn
 - man/gitc-update.ronn
 - man/gitc.ronn
 - test/cli_test.rb
 - 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-check
 - 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-create.txt
 - lib/capita_git/man/gitc-backport.txt
 - lib/capita_git/man/gitc-check.txt