Move current_branch into Base class

lib/commands/base.rb

@@ -6,16 +6,16 @@ module Commands
   class Base
 
     attr_accessor :input, :output, :options
-  
+
     def initialize(input=STDIN, output=STDOUT, *args)
       @input = input
       @output = output
       @options = {}
-      
+
       parse_gitconfig
       parse_argv(*args)
     end
-  
+
     def put(string, newline=true)
       @output.print(newline ? string + "\n" : string) unless options[:quiet]
     end
@@ -29,20 +29,24 @@ def get(cmd)
       put cmd if options[:verbose]
       `#{cmd}`
     end
-    
+
     def run!
       unless options[:api_token] && options[:project_id]
         put "Pivotal Tracker API Token and Project ID are required"
         return 1
       end
-      
+
       PivotalTracker::Client.token = options[:api_token]
-      
+
       return 0
     end
 
   protected
 
+    def current_branch
+      @current_branch ||= get('git symbolic-ref HEAD').chomp.split('/').last
+    end
+
     def project
       @project ||= PivotalTracker::Project.find(options[:project_id])
     end

lib/commands/finish.rb

@@ -2,10 +2,10 @@
 
 module Commands
   class Finish < Base
-  
+
     def run!
       super
-      
+
       unless story_id
         put "Branch name must contain a Pivotal Tracker story id"
         return 1
@@ -23,13 +23,13 @@ def run!
         return 0
       else
         put "Unable to mark Story #{story_id} as finished"
-        
+
         return 1
       end
     end
 
   protected
-  
+
     def finished_state
       if story.story_type == "chore"
         "accepted"
@@ -38,10 +38,6 @@ def finished_state
       end
     end
 
-    def current_branch
-      @current_branch ||= get('git symbolic-ref HEAD').chomp.split('/').last
-    end
-
     def story_id
       current_branch[/\d+/].to_i
     end

lib/commands/info.rb

@@ -20,10 +20,6 @@ def run!
 
   protected
 
-    def current_branch
-      @current_branch ||= get('git symbolic-ref HEAD').chomp.split('/').last
-    end
-
     def story_id
       current_branch[/\d+/].to_i
     end