capita_git 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capita_git (0.1.0)
+    capita_git (0.1.1)
       git (>= 1.2.5)
       thor (>= 0.14.6)
 

data/bin/gitc

@@ -1,18 +1,28 @@
 #!/usr/bin/env ruby
 require 'capita_git'
-require 'capita_git/cli'
 
 begin
   CapitaGit::CLI.start
 rescue CapitaGit::UncleanError => e
-  CapitaGit.ui.error e.message
-  system 'git status'
+  CapitaGit.ui.error "-- ERROR DETECTED ----------------------------------------"
+  CapitaGit.ui.error "   #{e.message}"
+  CapitaGit.ui.error `git status --short`
+  exit 1
+  rescue CapitaGit::RepositoryError => e
+  CapitaGit.ui.error "-- ERROR DETECTED ----------------------------------------"
+  CapitaGit.ui.error "   #{e.message}"
+  CapitaGit.ui.debug "-- BACKTRACE ---------------------------------------------"
+  e.backtrace.each { |bt| CapitaGit.ui.debug "-  #{bt}"}
+  exit 1
 rescue => e
-  CapitaGit.ui.error e.message
-  CapitaGit.ui.debug e.backtrace.join("\n")
+  CapitaGit.ui.error "-- ERROR DETECTED ----------------------------------------"
+  CapitaGit.ui.error "   #{e.class}: #{e.message}"
+  CapitaGit.ui.debug "-- BACKTRACE ---------------------------------------------"
+  e.backtrace.each { |bt| CapitaGit.ui.debug "-  #{bt}"}
   exit 1
 rescue Interrupt => e
-  CapitaGit.ui.error "\nQuitting..."
-  CapitaGit.ui.debug e.backtrace.join("\n")
+  CapitaGit.ui.error "\n-- Received interrupt, quitting ---------------------------\n"
+  CapitaGit.ui.debug "-- BACKTRACE ---------------------------------------------"
+  e.backtrace.each { |bt| CapitaGit.ui.debug "-  #{bt}"}
   exit 1
 end

data/lib/capita_git/cli.rb

@@ -1,4 +1,3 @@
-$:.unshift File.expand_path(__FILE__)
 require 'thor'
 require 'thor/actions'
 require 'rubygems/config_file'
@@ -12,9 +11,9 @@ module CapitaGit
     def initialize(*)
       super
       the_shell = (options["no-color"] ? Thor::Shell::Basic.new : shell)
-      CapitaGit.ui = UI::Shell.new(the_shell)
+      CapitaGit.ui = CapitaGit::UI::Shell.new(the_shell)
       CapitaGit.ui.debug! if options["verbose"]
-      Gem::DefaultUserInteraction.ui = UI::RGProxy.new(CapitaGit.ui)
+      Gem::DefaultUserInteraction.ui = CapitaGit::UI::RGProxy.new(CapitaGit.ui)
     end
 
     check_unknown_options! unless ARGV.include?("exec") || ARGV.include?("config")
@@ -52,91 +51,95 @@ module CapitaGit
       end
     end
 
+    method_option 'remote', :type => :string
     desc "check", "Generates a Gemfile into the current working directory"
-
     def check
-      repo = Repository.open(Dir.pwd)
-      CapitaGit.ui.info "-- Starting to check repository '#{repo.dir.to_s}' --------"
-      CapitaGit.ui.confirm "-> Active user   : '#{repo.user_name} <#{repo.user_email}>'"
-      CapitaGit.ui.confirm "-> User shortcut : '#{repo.user_shortcut}'"
-      CapitaGit.ui.info '-----------------------------------------------------------'
-      CapitaGit.ui.info ''
-
-      CapitaGit.ui.info '-- Fetching changes from remote \'origin\' ------------------'
-      repo.update_from_remote
+      opts = options.dup
+      log :debug, "[DEBUG] Starting action 'check'"
+
+      repo = CapitaGit::Repository.open(Dir.pwd, CapitaGit.ui)
+      repo.git_remote = opts[:remote] if opts[:remote]
+      log :debug, "[DEBUG] Repository remote set to '#{repo.git_remote}'"
+
+      log :info, "-- Starting to check repository '#{repo.name}'"
+      log :confirm, "-> Active user   : '#{repo.user_name} <#{repo.user_email}>'"
+      log :confirm, "-> User shortcut : '#{repo.user_shortcut}'"
+      log :info, "\n"
+
+      log :info, "-- Checking for latest changes on \'#{repo.remote}\'"
+      repo.fetch_remote_changes
       latest_major_release_tag = repo.latest_major_release_tag
       latest_minor_release_tag = repo.latest_minor_release_tag
-      CapitaGit.ui.confirm "-> Latest major release tag is: #{latest_major_release_tag || '---'}"
-      CapitaGit.ui.confirm "-> Latest minor release tag is: #{latest_minor_release_tag || '---'}"
-      CapitaGit.ui.info '-----------------------------------------------------------'
-      CapitaGit.ui.info ''
+      log :confirm, "-> Latest major release tag is: #{latest_major_release_tag || '---'}"
+      log :confirm, "-> Latest minor release tag is: #{latest_minor_release_tag || '---'}"
+      log :info, "\n"
 
       if latest_major_release_tag.nil?
-        CapitaGit.ui.warn 'No major release tag found, exiting!'
+        log :warn, 'No major release tag found, exiting!'
         exit 0
       end
 
-      CapitaGit.ui.info '-- Checking for presence of major release fixbranch -------'
+      log :info, '-- Checking for presence of major release fixbranch'
       local_fixbranch = repo.local_fixbranch_for_version?(latest_major_release_tag)
       remote_fixbranch = repo.remote_fixbranch_for_version?(latest_major_release_tag)
-      CapitaGit.ui.confirm "-> Local  : #{local_fixbranch.nil? ? '---' : local_fixbranch.full }"
-      CapitaGit.ui.confirm "-> Remote : #{remote_fixbranch.nil? ? '---' : remote_fixbranch.full }"
+      log :confirm, "-> Local  : #{local_fixbranch.nil? ? '---' : local_fixbranch.full }"
+      log :confirm, "-> Remote : #{remote_fixbranch.nil? ? '---' : remote_fixbranch.full }"
 
       if not repo.has_remote_fixbranch_for_version?(latest_major_release_tag)
-        CapitaGit.ui.info "--> Creating remote fixbranch #{latest_major_release_tag}-fix"
+        log :info, "--> Creating remote fixbranch #{latest_major_release_tag}-fix"
         repo.create_remote_fixbranch_for_version(latest_major_release_tag)
       end
 
       if not repo.has_local_fixbranch_for_version?(latest_major_release_tag)
-        CapitaGit.ui.info "--> Creating tracking local fixbranch #{latest_major_release_tag}-fix from remote fixbranch"
+        log :info, "--> Creating tracking local fixbranch #{latest_major_release_tag}-fix from remote fixbranch"
         repo.create_local_fixbranch_for_version(latest_major_release_tag)
       end
 
-      CapitaGit.ui.info '-----------------------------------------------------------'
+      log :info, "\n-- Done!\n"
     end
 
     desc "create", "Creates a new feature branch with the given name and optional source branch"
-    def create(name, source=nil)
-      repo = Repository.open(Dir.pwd)
-      source = source.nil? ? repo.current_branch : source
-      raise "Source branch '#{source}' does not exist" unless repo.has_local_branch?(source)
-      raise "Source branch '#{source}' is a feature branch, can't branch from that!" if repo.is_local_feature_branch?(source)
-
-      CapitaGit.ui.confirm "--> Creating and switching to feature branch '#{repo.user_shortcut}_#{source}_#{name}'"
-      repo.create_local_branch_from_source("#{repo.user_shortcut}_#{source}_#{name}", source)
-      repo.checkout_local_branch("#{repo.user_shortcut}_#{source}_#{name}")
+    def create(name, source_branch=nil)
+      repo = CapitaGit::Repository.open(Dir.pwd)
+      source_branch = source_branch.nil? ? repo.current_branch.to_s : source_branch
+      new_branch = "#{repo.user_shortcut}_#{source_branch}_#{name}"
+      log :confirm, "--> Creating and switching to feature branch '#{new_branch}'"
+      repo.create_local_branch(new_branch, source_branch)
+      repo.checkout_local_branch(new_branch)
     end
 
     desc "update", "Updates a feature branch your currently on or specified by name"
-    def update(name=nil)
-      repo = Repository.open(Dir.pwd)
-      name = name.nil? ? repo.current_branch : name
-      raise "Source branch '#{name}' does not exist" unless repo.has_local_branch?(name)
-      raise "Source branch '#{name}' is not a feature branch, can't update!" unless repo.is_local_feature_branch?(name)
-
-      CapitaGit.ui.confirm "--> Updating feature branch '#{name}' from '#{repo.source_branch(name)}'"
-      repo.rebase_local_branch(name)
+    def update(feature_branch=nil)
+      repo = CapitaGit::Repository.open(Dir.pwd)
+      feature_branch = feature_branch.nil? ? repo.current_branch : feature_branch
+      raise "Source branch '#{feature_branch}' is not a feature branch, can't update!" unless repo.is_local_feature_branch?(feature_branch)
+
+      log :confirm, "--> Updating feature branch '#{feature_branch}' from '#{repo.source_branch(feature_branch)}'"
+      repo.rebase_local_branch(feature_branch)
     end
 
     desc "close", "Closes a feature branch your currently on or specified by name onto the source branch"
-    def close(name=nil)
-      repo = Repository.open(Dir.pwd)
-      name = name.nil? ? repo.current_branch : name
-      raise "Source branch '#{name}' does not exist" unless repo.has_local_branch?(name)
-      raise "Source branch '#{name}' is not a feature branch, can't close!" unless repo.is_local_feature_branch?(name)
-
-      CapitaGit.ui.confirm "--> Closing feature branch '#{name}' onto '#{repo.source_branch(name)}'"
-      repo.close_local_branch(name)
+    def close(feature_branch=nil)
+      repo = CapitaGit::Repository.open(Dir.pwd)
+      feature_branch = feature_branch.nil? ? repo.current_branch : feature_branch
+
+      log :confirm, "--> Closing feature branch '#{feature_branch}' onto '#{repo.source_branch(feature_branch)}'"
+      repo.close_local_branch(feature_branch)
     end
 
     desc "runner", "Generates a Gemfile into the current working directory"
+
     def runner(command)
-      repo = Repository.open(Dir.pwd)
+      repo = CapitaGit::Repository.open(Dir.pwd)
       puts repo.send("#{command}")
     end
 
     private
 
+    def log(level, message)
+      CapitaGit.ui.send(level, message)
+    end
+
     def have_groff?
       !(`which groff` rescue '').empty?
     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" "January 2011" "GITC 0.1.1" "GITC Manual"
+.TH "GITC" "5" "January 2011" "GITC 0.1.2" "GITC Manual"
 .
 .SH "NAME"
 \fBgitc\fR \- git helper for CAPITA Unternehmensberatung GmbH

data/lib/capita_git/man/gitc-check

@@ -1,5 +1,5 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GITC\-CHECK" "" "January 2011" "GITC 0.1.1" "GITC Manual"
+.TH "GITC\-CHECK" "" "January 2011" "GITC 0.1.2" "GITC Manual"
 

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

@@ -2,4 +2,4 @@ GITC-CHECK()			  GITC Manual			  GITC-CHECK()
 
 
 
-GITC 0.1.1			 January 2011			  GITC-CHECK()
+GITC 0.1.2			 January 2011			  GITC-CHECK()

data/lib/capita_git/man/gitc.txt

@@ -50,4 +50,4 @@ COMMANDS
 
 
 
-GITC 0.1.1			 January 2011			       GITC(5)
+GITC 0.1.2			 January 2011			       GITC(5)

data/lib/capita_git/repository.rb

@@ -2,42 +2,54 @@ require 'git'
 
 module CapitaGit
   class Repository
-    def self.open(path)
-      new(path)
+    attr_accessor :git_remote
+    attr_reader :logger
+
+    def self.open(path, cli=nil)
+      new(path, cli)
     end
 
     def method_missing(m, *args)
       @repository.send m, *args
     end
 
-    def initialize(path)
-      @repository = Git.open path
-      check_for_changes
+    def initialize(path, cli)
+      @logger = cli
+
+      begin
+        log 'Opening repository'
+        @repository = Git.open path
+      rescue => e
+        raise CapitaGit::RepositoryError.new 'Can\'t access repository: ' + e.message
+      end
+
+      @git_remote = 'origin'
+      raise CapitaGit::UncleanError.new "Pending changes found!" if has_changes?
     end
 
-    def update_from_remote
-      @repository.fetch(remote)
+    def name
+      dir.to_s.split(/\//).last
     end
 
-    def current_branch
-      @repository.branches.local.select { |b| b.full == @repository.lib.branch_current }[0]
+    def fetch_remote_changes
+      log 'Fetching remote changes'
+      @repository.fetch(@git_remote)
     end
 
-    def check_for_changes
-      unless @repository.status.untracked.empty? and @repository.status.changed.empty? and @repository.status.deleted.empty? and
-          @repository.status.added.empty?
-        raise CapitaGit::UncleanError.new "Repository is not clean!"
-      end
+    def current_branch
+      @repository.branches.local.select { |b| b.full == @repository.lib.branch_current }[0]
     end
 
-    def create_feature_branch(name)
-      raise "Can't create feature branch from branch #{current_branch} since you already seem to be on one" if current_branch =~ /#{user_shortcut}/
-      system "git checkout -b #{user_shortcut}/#{current_branch}/#{name}"
+    def has_changes?
+      log 'Checking for pending changes'
+      changes = `git status --short`
+      !changes.empty?
     end
 
-    def create_local_branch_from_source(name, source, track=false)
-      raise "Branch '#{name}' already exists!" if has_local_branch?(name)
-      system "git branch #{track ? '--track' : ''} #{name} #{source}"
+    def create_local_branch(new_branch, source_branch, track=false)
+      raise "Branch '#{new_branch}' already exists!" if has_local_branch?(new_branch)
+      raise "Current branch '#{source_branch}' can't be used as a source for branching!" unless on_branchable_branch?(source_branch)
+      system "git branch #{track ? '--track' : ''} #{new_branch} #{source_branch}"
     end
 
     def push_local_branch_to_remote(remote, local_name, remote_name=nil)
@@ -57,19 +69,21 @@ module CapitaGit
       @repository.branch(name).checkout
     end
 
-    def rebase_local_branch(name)
-      raise "Can't update #{name} since it doesn't exist!" unless has_local_branch?(name)
-      checkout_local_branch source_branch(name)
+    def rebase_local_branch(branch)
+      raise "Can't update #{branch} since it doesn't exist!" unless has_local_branch?(branch)
+      checkout_local_branch source_branch(branch)
       system "git pull"
-      checkout_local_branch name
-      system "git rebase #{source_branch(name)}"
+      checkout_local_branch branch
+      system "git rebase #{source_branch(branch)}"
+      raise CapitaGit::UncleanError.new "Rebasing failed, please correct and issue 'git rebase --continue'" if has_changes?
     end
 
-    def close_local_branch(name)
-      rebase_local_branch(name)
-      system "git checkout #{source_branch(name)}"
-      system "git merge #{name}"
-      system "git branch -d #{name}"
+    def close_local_branch(branch)
+      raise "Source branch '#{branch}' is not a feature branch, can't close!" unless is_local_feature_branch?(branch)
+      rebase_local_branch(branch)
+      system "git checkout #{source_branch(branch)}"
+      system "git merge #{branch}"
+      system "git branch -d #{branch}"
     end
 
     def has_local_branch?(name)
@@ -80,14 +94,18 @@ module CapitaGit
       !name.match(/^#{user_shortcut}/).nil?
     end
 
+    def on_branchable_branch?(branch)
+      branch == 'master' or not is_local_feature_branch?(branch)
+    end
+
     def create_remote_fixbranch_for_version(version)
-      create_local_branch_from_source("local_#{version}-fix", version)
+      create_local_branch("local_#{version}-fix", version)
       push_local_branch_to_remote('origin', "local_#{version}-fix", "#{version}-fix")
       delete_local_branch("local_#{version}-fix")
     end
 
     def create_local_fixbranch_for_version(version)
-      create_local_branch_from_source("#{version}-fix", "origin/#{version}-fix", true)
+      create_local_branch("#{version}-fix", "origin/#{version}-fix", true)
     end
 
     def local_fixbranch_for_version?(version)
@@ -139,10 +157,15 @@ module CapitaGit
 
     private
 
-    def remote
-      @repository.remotes.select { |r| r.name == 'origin' }[0]
+    def log(message)
+      @logger.send(:debug, "[DEBUG] #{message}") if @logger
     end
 
+
+#    def remote
+#      @repository.remotes.select { |r| r.name == 'origin' }[0]
+#    end
+
     def major_release_tags
       @repository.tags.map(&:name).select { |tag| tag =~ /^\d+\.\d+$/ }
     end

data/lib/capita_git/ui.rb

@@ -18,7 +18,7 @@ module CapitaGit
     end
 
     class Shell < UI
-      attr_writer :shell
+      attr_accessor :shell
 
       def initialize(shell)
         @shell = shell

data/lib/capita_git/version.rb

@@ -1,3 +1,3 @@
 module CapitaGit
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/capita_git.rb

@@ -1,7 +1,11 @@
-module CapitaGit
-  autoload :UI, 'capita_git/ui'
-  autoload :Repository, 'capita_git/repository'
+$:.unshift File.expand_path(__FILE__)
+require 'rubygems'
+require 'capita_git/cli'
+require 'capita_git/repository'
+require 'capita_git/ui'
+require 'capita_git/version'
 
+module CapitaGit
   class << self
     attr_writer :ui
 
@@ -16,4 +20,7 @@ module CapitaGit
 
   class UncleanError < StandardError
   end
+
+  class RepositoryError < StandardError
+  end
 end

data/test/cli_test.rb

@@ -10,19 +10,19 @@ class CliTest < Test::Unit::TestCase
 
         in_dir 'local_checkout_2' do
           should_not_have_branch '1.0-fix'
-          
+
           gitc 'check' do
             should_have_branch '1.0-fix'
-            
+
             context "after creating a fix" do
               setup do
                 assert_command 'git checkout 1.0-fix'
                 assert_command 'echo "foo" > fixfile'
                 assert_command 'git add . && git commit -m "fixfile" && git push'
               end
-              
+
               should_not_have_file 'fixfile', :in => 'local_checkout_1'
-              
+
               context "after pull and checkout of 1.0-fix in checkout 1" do
                 setup do
                   in_dir 'local_checkout_1' do
@@ -33,19 +33,23 @@ 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.new('.').user_shortcut
+          user = CapitaGit::Repository.open('.').user_shortcut
           assert_equal "#{user}_master_my_feature", repo.current_branch
         end
-        
+
         should_not_have_file 'awesome_feature', :in => 'local_checkout_1'
-        
+
+        should "break trying to create another feature branch from existing feature branch" do
+          assert_command_fail 'gitc create new_feature'
+        end
+
         # Propagating changes on source branch with gitc update
         context "after checkout 2 pushes file master_2_update on master" do
           setup do
@@ -54,17 +58,30 @@ class CliTest < Test::Unit::TestCase
               assert_command 'git add . && git commit -m "master 2 update" && git push'
             end
           end
-          
+
           after 'git pull origin master' do
             should_not_have_file 'awesome_feature', :in => 'local_checkout_1'
           end
-          
+
           context "after invoking 'gitc update'" do
             setup { assert_command("#{ShouldaMacros::BIN_PATH} update") }
             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
         context "after committing a file and gitc close" do
           setup do
@@ -73,28 +90,28 @@ class CliTest < Test::Unit::TestCase
             assert_command("#{ShouldaMacros::BIN_PATH} close")
             assert_command 'git push'
           end
-          
+
           should "be on branch master" do
             assert_equal 'master', repo.current_branch
           end
-          
+
           should "have removed the feature branch" do
-            assert !repo.branches.map(&:name).any? {|n| n =~ /feature/}
+            assert !repo.branches.map(&:name).any? { |n| n =~ /feature/ }
           end
-          
+
           should_have_file 'awesome_feature', :in => 'local_checkout_1'
-          
+
           context "after git pull on local_checkout_2" do
             setup do
               in_dir 'local_checkout_2' do
                 assert_command 'git pull'
               end
             end
-            
+
             should_have_file 'awesome_feature', :in => 'local_checkout_2'
           end
         end
-        
+
       end
     end
   end

data/test/shoulda_macros.rb

@@ -27,6 +27,13 @@ module ShouldaMacros
       #puts `#{cmd}`
       assert_equal 0, $?.exitstatus, "Expected exit status of 0 for command '#{cmd}'"
     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|  }
+      #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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capita_git
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Sebastian Georgi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-02-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,8 +126,8 @@ files:
 - test/shoulda_macros.rb
 - test/test_helper.rb
 - lib/capita_git/man/gitc
-- lib/capita_git/man/gitc-check.txt
 - lib/capita_git/man/gitc-check
+- lib/capita_git/man/gitc-check.txt
 - lib/capita_git/man/gitc.txt
 has_rdoc: true
 homepage: https://github.com/capita/capita_git
@@ -159,9 +159,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capita_git
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Git-automation tool for quick handling of common patterns for feature and fix branches
-test_files: []
-
+test_files: 
+- test/cli_test.rb
+- test/shoulda_macros.rb
+- test/test_helper.rb