lib/commands/base.rb in git-pivotal-0.2.2 vs lib/commands/base.rb in git-pivotal-0.2.3

@@ -33,31 +33,51 @@
         put "Pivotal Tracker API Token and Project ID are required"
         return 1
       end
     end
 
+  protected
+
+    def project
+      @project ||= api.projects.find(:id => options[:project_id])
+    end
+
+    def api
+      @api ||= Pivotal::Api.new(:api_token => options[:api_token])
+    end
+
+    def integration_branch
+      options[:integration_branch] || "master"
+    end
+
   private
 
     def parse_gitconfig
-      token = get("git config --get pivotal.api-token").strip
-      id    = get("git config --get pivotal.project-id").strip
-      name  = get("git config --get pivotal.full-name").strip
+      token              = get("git config --get pivotal.api-token").strip
+      id                 = get("git config --get pivotal.project-id").strip
+      name               = get("git config --get pivotal.full-name").strip
+      integration_branch = get("git config --get pivotal.integration-branch").strip
+      only_mine          = get("git config --get pivotal.only-mine").strip
 
-      options[:api_token] = token unless token == ""
-      options[:project_id] = id unless id == ""
-      options[:full_name] = name unless name == ""
+      options[:api_token]          = token              unless token == ""
+      options[:project_id]         = id                 unless id == ""
+      options[:full_name]          = name               unless name == ""
+      options[:integration_branch] = integration_branch unless integration_branch == ""
+      options[:only_mine]          = (only_mine != "")  unless name == ""
     end
 
     def parse_argv(*args)
       OptionParser.new do |opts|
         opts.banner = "Usage: git pick [options]"
         opts.on("-k", "--api-key=", "Pivotal Tracker API key") { |k| options[:api_token] = k }
         opts.on("-p", "--project-id=", "Pivotal Trakcer project id") { |p| options[:project_id] = p }
         opts.on("-n", "--full-name=", "Pivotal Trakcer full name") { |n| options[:full_name] = n }
+        opts.on("-b", "--integration-branch=", "The branch to merge finished stories back down onto") { |b| options[:integration_branch] = b }
+        opts.on("-m", "--only-mine", "Only select Pivotal Tracker stories assigned to you") { |m| options[:only_mine] = m }
         opts.on("-q", "--quiet", "Quiet, no-interaction mode") { |q| options[:quiet] = q }
         opts.on("-v", "--[no-]verbose", "Run verbosely") { |v| options[:verbose] = v }
-        opts.on_tail("-h", "--help", "This usage guide") { put opts; exit 0 }
+        opts.on_tail("-h", "--help", "This usage guide") { put opts.to_s; exit 0 }
       end.parse!(args)
     end
 
   end
-end
\ No newline at end of file
+end