toolshed 0.0.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2735e0a05ef49646976753969a095916a4f00324
-  data.tar.gz: aa781e23427a9534108d1d0727ea3b27fa90f142
+  metadata.gz: 54a3e26a9cf4670879ed25c97435e8561787c511
+  data.tar.gz: b8f2a24202d44ad03349477e54d2ce1216ebfe61
 SHA512:
-  metadata.gz: aae5bc491f329b09cf07dd0768ae979b8f7883b5b67e3db2a57c26a11419ccb3da8538f8b8907a0b30627c30a6973bf16a357ba3855c7dd7c45cbc7b164def0d
-  data.tar.gz: 473ce7fb64bf9394874fc726fe5b8730297c3604d7a6ebdc8e761f06f6d790905cf1e536bd6e00337c157aa6f2e8301958cfb5cc7f218f2ec40d694cca6ea81a
+  metadata.gz: cf484481408ec9dbac5b35d93e19e3dc39f907aec6c5e6fe5f908135b794a401498cd5e9353b6556aeab016a02bf6b32bf1e515de1e9f2e58f8d5a4aff16ca04
+  data.tar.gz: 1b4833ba97542589fb44a81a358f250eaafe730d80e49b9c3339cee24b7df171dadb3f5bad726723df62984a6a176e4ee86565b053384aa87bc875c802ba0252

data/.travis.yml

@@ -10,5 +10,8 @@ before_script:
 language: ruby
 rvm:
 - 2.0.0
+addons:
+  code_climate:
+    repo_token: c94c0c00c0b1bf210f41515822ea072c639ccdb86b7debabc9c60572ce4f39f0
 env:
   - RUNNING_ON_CI=true

data/README.md

@@ -1,3 +1,6 @@
+[![Build Status](https://travis-ci.org/wallerjake/toolshed.svg?branch=master)](https://travis-ci.org/wallerjake/toolshed)
+[![Code Climate](https://codeclimate.com/github/wallerjake/toolshed.png)](https://codeclimate.com/github/wallerjake/toolshed)
+
 # Toolshed
 
 Toolshed is a utility gem meant to make small tasks faster. This includes things like making a pull request up to Github all the way to creating a branch. This gem can be extended to used else where also.

data/bin/toolshed.rb

@@ -20,9 +20,11 @@ Note that it will only read one file which ever file is closest to the directory
   pivotal_tracker_username: [pivotal_tracker_username] (optional)
   pivotal_tracker_password: [pivotal_tracker_password] (optional)
   default_pivotal_tracker_project_id: [project_id] (optional)
+  ticket_status_for_complete: [status] (required (only if using pull requests)) example: "Code Review"
 
-  github_username: [github_username] (optional)
-  github_password: [github_password] (optional)
+  github_username:  [github_username] (optional)
+  github_password:  [github_password] (optional)
+  github_token:     [github_token] (optional) - create the token if your account require two factor you can disable token or enable through Github. See https://github.com/settings/tokens/new for details.
   git_tool: github (optional default `github`)
   use_git_submodules: false (optional default `false`)
   pull_from_remote_name: [pull_from_remote_name] (required)
@@ -36,7 +38,7 @@ Note that it will only read one file which ever file is closest to the directory
   time_tracking_password: [password] (optional)
   time_tracking_owner: [owner] (optional)
   time_tracking_default_project_id: [project_id] (optional)
-  time_tracking_tool: [tool] (optional)
+  time_tracking_tool: [tool] (required unless you are not going to be doing time tracking)
 
 == Commands
 
@@ -73,6 +75,8 @@ push_branch [                           # Push your current working branch to yo
 ]
 get_daily_time_update [                 # Get a daily update from your time tracking toolset currently harvest is supported
   --format="html|text"                  # Format you want if you want html it will open html page in broswer otherwise puts out plain text
+  --use-defaults="true|false"           # If you want to use your default project_id instead of entering it
+  --project-id="1234"                   # If you want to use a project id other than your defaults
 ]
 list_branches [                         # List branches for your remote repository
   --repository-name "depot"             # The repository name you want to list branches for if not passed pull_from_repository_name is used
@@ -80,6 +84,11 @@ list_branches [                         # List branches for your remote reposito
 delete_branch [                         # Delete a branch both locally and to your push to remote
   --branch-name "134_mybranch" | "134"  # Either the full branch name or some unique string in the branch i.e. ticket id
 ]
+create_ticket_comment [                 # Add a comment to a specific ticket
+  --use-defaults "true"                 # use defaults instead of getting prompts if you don't want to supply project name
+]
+update_ticket_status [                  # Update a specific tickets status
+]
 EOF
 end
 
@@ -93,6 +102,9 @@ if $0.split("/").last == 'toolshed'
     opts.on("-p", "--github-password [ARG]") do |password|
       Toolshed::Client.github_password = password
     end
+    opts.on("-t", "--github-token [ARG]") do |token|
+      Toolshed::Client.github_token = token
+    end
     opts.on("-u", "--pivotal-tracker-username [ARG]") do |username|
       Toolshed::Client.pivotal_tracker_username = username
     end
@@ -160,6 +172,12 @@ if $0.split("/").last == 'toolshed'
       opts.on("--format [ARG]") do |opt|
         options[:format] = opt
       end
+      opts.on("--use-defaults [ARG]") do |opt|
+        Toolshed::Client.use_defaults = opt
+      end
+      opts.on("--project-id [ARG]") do |opt|
+        options[:project_id] = opt
+      end
     end,
     'ticket_information' => OptionParser.new do |opts|
       opts.on("--use-defaults [ARG]") do |opt|
@@ -175,6 +193,11 @@ if $0.split("/").last == 'toolshed'
         options[:formatted_string] = opt
       end
     end,
+    'create_ticket_comment' => OptionParser.new do |opts|
+      opts.on("--use-defaults [ARG]") do |opt|
+        Toolshed::Client.use_defaults = opt
+      end
+    end,
   }
 
   global.order!

data/lib/toolshed/cli.rb

@@ -31,6 +31,8 @@ module Toolshed
         'get_daily_time_update'                 => Toolshed::Commands::GetDailyTimeUpdate,
         'list_branches'                         => Toolshed::Commands::ListBranches,
         'delete_branch'                         => Toolshed::Commands::DeleteBranch,
+        'create_ticket_comment'                 => Toolshed::Commands::CreateTicketComment,
+        'update_ticket_status'                  => Toolshed::Commands::UpdateTicketStatus,
       }
     end
   end
@@ -47,3 +49,5 @@ require 'toolshed/commands/get_daily_time_update'
 require 'toolshed/commands/get_daily_time_update'
 require 'toolshed/commands/list_branches'
 require 'toolshed/commands/delete_branch'
+require 'toolshed/commands/create_ticket_comment'
+require 'toolshed/commands/update_ticket_status'

data/lib/toolshed/client.rb

@@ -49,6 +49,14 @@ module Toolshed
       @github_password = password
     end
 
+    def self.github_token
+      @github_token
+    end
+
+    def self.github_token=(token)
+      @github_token = token
+    end
+
     def self.pull_from_remote_name
       @pull_from_remote_name
     end
@@ -106,7 +114,8 @@ module Toolshed
     end
 
 
-    # pivotal tracker config
+    # ticket tracking information
+
     def self.pivotal_tracker_username
       @pivotal_tracker_username
     end
@@ -131,8 +140,29 @@ module Toolshed
       @default_pivotal_tracker_project_id = default_pivotal_tracker_project_id
     end
 
+    def self.ticket_tracker_username
+      @ticket_tracker_username
+    end
+
+    def self.ticket_tracker_username=(username)
+      @ticket_tracker_username = username
+    end
+
+    def self.ticket_tracker_password
+      @ticket_tracker_password
+    end
 
-    # ticket tracking configuration
+    def self.ticket_tracker_password=(password)
+      @ticket_tracker_password = password
+    end
+
+    def self.default_ticket_tracker_project
+      @default_ticket_tracker_project
+    end
+
+    def self.default_ticket_tracker_project=(default_ticket_tracker_project)
+      @default_ticket_tracker_project = default_ticket_tracker_project
+    end
 
     def self.ticket_tracking_tool
       @ticket_tracking_tool
@@ -142,6 +172,22 @@ module Toolshed
       @ticket_tracking_tool = ticket_tracking_tool
     end
 
+    def self.ticket_tracker_owner
+      @ticket_tracker_owner
+    end
+
+    def self.ticket_tracker_owner=(owner)
+      @ticket_tracker_owner = owner
+    end
+
+    def self.ticket_status_for_complete
+      @ticket_status_for_complete
+    end
+
+    def self.ticket_status_for_complete=(status)
+      @ticket_status_for_complete = status
+    end
+
     # time tracking configuration
 
     def self.time_tracking_tool
@@ -213,9 +259,15 @@ module Toolshed
         credentials = YAML.load_file(File.expand_path(loaded_from_path))
         self.github_username                    ||= credentials['github_username']
         self.github_password                    ||= credentials['github_password']
+        self.github_token                       ||= credentials['github_token']
         self.pivotal_tracker_username           ||= credentials['pivotal_tracker_username']
         self.pivotal_tracker_password           ||= credentials['pivotal_tracker_password']
         self.default_pivotal_tracker_project_id ||= credentials['default_pivotal_tracker_project_id']
+        self.ticket_tracker_username            ||= credentials['ticket_tracker_username']
+        self.ticket_tracker_password            ||= credentials['ticket_tracker_password']
+        self.ticket_tracker_owner               ||= credentials['ticket_tracker_owner']
+        self.ticket_status_for_complete         ||= credentials['ticket_status_for_complete']
+        self.default_ticket_tracker_project     ||= credentials['default_ticket_tracker_project']
         self.pull_from_remote_name              ||= credentials['pull_from_remote_name']
         self.pull_from_repository_user          ||= credentials['pull_from_repository_user']
         self.pull_from_repository_name          ||= credentials['pull_from_repository_name']

data/lib/toolshed/commands/create_branch.rb

@@ -44,6 +44,11 @@ module Toolshed
       def read_user_input_branch_from(message, options)
         return options[:branch_from] if (options.has_key?(:branch_from))
 
+        # if branch-name was supplied then default to master if not supplied
+        if (options.has_key?(:branch_name))
+          return Toolshed::Git::DEFAULT_BRANCH_FROM
+        end
+
         puts message
         value = $stdin.gets.chomp
 

data/lib/toolshed/commands/create_pull_request.rb

@@ -7,7 +7,7 @@ module Toolshed
         puts "Branched From: #{Toolshed::Git::Base.branched_from}"
         puts "Using Defaults: #{(Toolshed::Client.use_defaults.nil?) ? 'No' : 'Yes'}"
 
-        unless (Toolshed::Client.ticket_tracking_tool.empty?)
+        unless (Toolshed::Client.ticket_tracking_tool.nil? || Toolshed::Client.ticket_tracking_tool.empty?)
           ticket_tracking_url = ''
           ticket_tracking_title = ''
           ticket_id = ''
@@ -15,25 +15,52 @@ module Toolshed
           begin
             ticket_tracker_class =  Object.const_get("Toolshed::TicketTracking::#{Toolshed::Client.ticket_tracking_tool.camel_case}")
 
-            if Object.const_get("#{ticket_tracker_class}::USE_PROJECT_ID")
-              ticket_tracker_project_id = read_user_input_ticket_tracker_project_id("Project ID (Default: #{Toolshed::Client.default_pivotal_tracker_project_id}):", { default: Toolshed::Client.default_pivotal_tracker_project_id })
-              options.merge!({ project_id: ticket_tracker_project_id })
+            use_project_id = Object.const_get("#{ticket_tracker_class}::USE_PROJECT_ID") rescue false
+            if use_project_id
+              ticket_tracker_project_id = read_user_input_project(
+                "Project ID (Default: #{Toolshed::Client.default_pivotal_tracker_project_id}):",
+                options.merge!({
+                  default: Toolshed::Client.default_pivotal_tracker_project_id,
+                })
+              )
+              options.merge!({
+                project_id: ticket_tracker_project_id,
+              })
             end
 
-            ticket_tracker = ticket_tracker_class.create_instance(options)
+            use_project_name = Object.const_get("#{ticket_tracker_class}::USE_PROJECT_NAME") rescue false
+            if use_project_name
+              ticket_tracker_project_name = read_user_input_project(
+                "Project Name (Default: #{Toolshed::Client.default_ticket_tracker_project}):", options.merge!({
+                  default: Toolshed::Client.default_ticket_tracker_project,
+                })
+              )
+              options.merge!({
+                project: ticket_tracker_project_name,
+              })
+            end
 
             # @TODO - refactor this code into the git module seems more appropriate since it's performing git functions
-            ticket_id = read_user_input_ticket_tracker_ticket_id("Ticket ID (Default: #{Toolshed::TicketTracking::PivotalTracker::story_id_from_branch_name(Toolshed::Git::Base.branch_name)}):", { default: Toolshed::TicketTracking::PivotalTracker::story_id_from_branch_name(Toolshed::Git::Base.branch_name) })
-            ticket_information = ticket_tracker.story_information(ticket_id)
+            ticket_id = read_user_input_ticket_tracker_ticket_id(
+              "Ticket ID (Default: #{Toolshed::TicketTracking::story_id_from_branch_name(Toolshed::Git::Base.branch_name)}):", {
+                default: Toolshed::TicketTracking::story_id_from_branch_name(Toolshed::Git::Base.branch_name),
+              }
+            )
+            options.merge!({
+              ticket_id: ticket_id,
+            })
+
+            ticket_tracker = ticket_tracker_class.create_instance(options)
 
-            ticket_tracking_url = ticket_information.url
-            ticket_tracking_title = ticket_tracker_class.clean(ticket_information.name)
-            ticket_id = ticket_information.id
+            ticket_tracking_url = ticket_tracker.url
+            ticket_tracking_title = ticket_tracker.title
+            ticket_id = ticket_id
 
             puts "Ticket Tracking URL: #{ticket_tracking_url}"
             puts "Ticket Tracking title: #{ticket_tracking_title}"
             puts "Ticket ID: #{ticket_id}"
           rescue Exception => e
+            puts e.inspect
             puts "Ticket tracking tool is not supported at this time"
             return
           end
@@ -45,17 +72,35 @@ module Toolshed
           git_tool = git_tool_class.create_instance
 
           # create the pull request prompt when needed
-          title = read_user_input_pull_request_title("Pull request title (Default: #{ticket_tracking_title}):", options.merge!({ default: ticket_tracking_title }))
-          body = read_user_input_pull_request_body("Pull request body (Default: #{ticket_tracking_url}):", options.merge!({ default: ticket_tracking_url }))
+          title = read_user_input_pull_request_title(
+            "Pull request title (Default: #{ticket_tracking_title}):",
+            options.merge!({
+              default: ticket_tracking_title,
+            })
+          )
+          body = read_user_input_pull_request_body(
+            "Pull request body (Default: #{ticket_tracking_url}):",
+            options.merge!({
+              default: ticket_tracking_url
+            })
+          )
 
           puts "Pull request being created"
           git_pull_request_result = git_tool.create_pull_request(title, body)
           pull_request_url = git_pull_request_result["html_url"]
 
-          add_note_to_ticket = read_user_input_add_note_to_ticket("Would you like to add a note with the pull request url?")
-          if (add_note_to_ticket)
-            result = ticket_tracker.add_note(ticket_id, pull_request_url)
-            result = ticket_tracker.update_ticket_status(ticket_id, Object.const_get("#{ticket_tracker_class}::DEFAULT_COMPLETED_STATUS"))
+          unless (Toolshed::Client.ticket_tracking_tool.nil? || Toolshed::Client.ticket_tracking_tool.empty?)
+            add_note_to_ticket = read_user_input_add_note_to_ticket("Would you like to add a note with the pull request url?")
+            if (add_note_to_ticket)
+              result = ticket_tracker.add_note(pull_request_url)
+
+              default_completed_status = Object.const_get("#{ticket_tracker_class}::DEFAULT_COMPLETED_STATUS") rescue false
+              unless (default_completed_status)
+                default_completed_status = Toolshed::Client.ticket_status_for_complete
+              end
+
+              result = ticket_tracker.update_ticket_status(default_completed_status)
+            end
           end
 
           puts "Created Pull Request: #{pull_request_url}"
@@ -107,7 +152,7 @@ module Toolshed
         value
       end
 
-      def read_user_input_ticket_tracker_project_id(message, options)
+      def read_user_input_project(message, options)
         return options[:default] if (Toolshed::Client.use_defaults)
 
         puts message

data/lib/toolshed/commands/create_ticket_comment.rb

@@ -0,0 +1,85 @@
+module Toolshed
+  module Commands
+    class CreateTicketComment
+      def execute(args, options = {})
+        ticket_tracker_class =  Object.const_get("Toolshed::TicketTracking::#{Toolshed::Client.ticket_tracking_tool.camel_case}")
+
+        use_project_id = Object.const_get("#{ticket_tracker_class}::USE_PROJECT_ID") rescue false
+        if use_project_id
+          ticket_tracker_project_id = read_user_input_project(
+            "Project ID (Default: #{Toolshed::Client.default_pivotal_tracker_project_id}):",
+            options.merge!({
+              default: Toolshed::Client.default_pivotal_tracker_project_id,
+            })
+          )
+          options.merge!({
+            project_id: ticket_tracker_project_id
+          })
+        end
+
+        use_project_name = Object.const_get("#{ticket_tracker_class}::USE_PROJECT_NAME") rescue false
+        if use_project_name
+          ticket_tracker_project_name = read_user_input_project(
+            "Project Name (Default: #{Toolshed::Client.default_ticket_tracker_project}):",
+            options.merge!({ default: Toolshed::Client.default_ticket_tracker_project })
+          )
+          options.merge!({
+            project: ticket_tracker_project_name
+          })
+        end
+
+        default_ticket_id = Toolshed::TicketTracking::story_id_from_branch_name(Toolshed::Git::Base.branch_name)
+        ticket_id = read_user_input_ticket_id("Ticket ID (Default: #{default_ticket_id}):", options.merge!({ default: default_ticket_id }))
+        options.merge!({ ticket_id: ticket_id })
+
+        ticket_tracker = ticket_tracker_class.create_instance(options)
+
+        if use_project_id
+          puts "Using Project: #{ticket_tracker_project_id}"
+        end
+        puts "Using Ticket: #{ticket_id}"
+
+        puts "Note? "
+        note_text = $stdin.gets.chomp.strip
+
+        begin
+          result = ticket_tracker.add_note(note_text)
+          if (result)
+            puts "Comment has been added to ticket"
+          else
+            puts "Unable to add comment #{result.inspect}"
+          end
+        rescue => e
+          puts e.message
+          exit
+        end
+      end
+
+      def read_user_input_project(message, options)
+        return options[:default] if (options.has_key?(:use_defaults))
+
+        puts message
+        value = $stdin.gets.chomp
+
+        if (value.empty?)
+          value = options[:default]
+        end
+
+        value
+      end
+
+      def read_user_input_ticket_id(message, options)
+        return options[:default] if (options.has_key?(:use_defaults))
+
+        puts message
+        value = $stdin.gets.chomp
+
+        if (value.empty?)
+          value = options[:default]
+        end
+
+        value
+      end
+    end
+  end
+end

data/lib/toolshed/commands/get_daily_time_update.rb

@@ -2,29 +2,32 @@ module Toolshed
   module Commands
     class GetDailyTimeUpdate
       def execute(args, options = {})
-        if (Toolshed::Client.time_tracking_tool == 'harvest')
-          harvest = Toolshed::TimeTracking::Harvest.new(options)
+        begin
+          time_tracking_class =  Object.const_get("Toolshed::TimeTracking::#{Toolshed::Client.time_tracking_tool.camel_case}")
+
+          time_tracking_project_id = read_user_input_project_id("Project ID (Default: #{Toolshed::Client.time_tracking_default_project_id}):", options.merge!({ default: Toolshed::Client.time_tracking_default_project_id }))
+          options.merge!({ project_id: time_tracking_project_id })
+          time_tracker = time_tracking_class.create_instance(options)
 
           puts "Getting time entries:"
-          
-          notes = harvest.previous
-          notes = "#{notes}#{harvest.line_break}#{harvest.line_break}#{harvest.today}"
-          notes = "#{notes}#{harvest.brought_to_you_by_message}"
+          time_tracker.display
+        rescue Exception => e
+          puts "Time tracking tool is undefined implementation needed or an error occured #{e.inspect}"
+          return
+        end
+      end
 
-          if (harvest.format == 'html')
-            FileUtils.rm_rf(Toolshed::TimeTracking::Harvest::GENERATED_HTML_FILE_LOCATION)
-            File.open(Toolshed::TimeTracking::Harvest::GENERATED_HTML_FILE_LOCATION, 'w') {|f| f.write(notes) }
-            Launchy.open( Toolshed::TimeTracking::Harvest::GENERATED_HTML_FILE_LOCATION ) do |exception|
-              puts "Attempted to open #{uri} and failed because #{exception}"
-            end
-            puts "Checkout out your default or open browser!"
-          else
-            puts notes
-          end
-        else
-          puts "Time tracking tool is undefined implementation needed"
-          exit
+      def read_user_input_project_id(message, options)
+        return options[:project_id] if (options.has_key?(:project_id))
+        return options[:default] if (Toolshed::Client.use_defaults)
+
+        puts message
+        value = $stdin.gets.chomp
+        if (value.empty?)
+          value = options[:default]
         end
+
+        value
       end
     end
   end

data/lib/toolshed/commands/ticket_information.rb

@@ -5,22 +5,30 @@ module Toolshed
         begin
           ticket_tracker_class =  Object.const_get("Toolshed::TicketTracking::#{Toolshed::Client.ticket_tracking_tool.camel_case}")
 
-          if Object.const_get("#{ticket_tracker_class}::USE_PROJECT_ID")
-            ticket_tracker_project_id = read_user_input_project_id("Project ID (Default: #{Toolshed::Client.default_pivotal_tracker_project_id}):", options.merge!({ default: Toolshed::Client.default_pivotal_tracker_project_id }))
+          use_project_id = Object.const_get("#{ticket_tracker_class}::USE_PROJECT_ID") rescue false
+          if use_project_id
+            ticket_tracker_project_id = read_user_input_project("Project ID (Default: #{Toolshed::Client.default_pivotal_tracker_project_id}):", options.merge!({ default: Toolshed::Client.default_pivotal_tracker_project_id }))
             options.merge!({ project_id: ticket_tracker_project_id })
           end
 
-          ticket_tracker = ticket_tracker_class.create_instance(options)
+          use_project_name = Object.const_get("#{ticket_tracker_class}::USE_PROJECT_NAME") rescue false
+          if use_project_name
+            ticket_tracker_project_name = read_user_input_project("Project Name (Default: #{Toolshed::Client.default_ticket_tracker_project}):", options.merge!({ default: Toolshed::Client.default_ticket_tracker_project }))
+            options.merge!({ project: ticket_tracker_project_name })
+          end
 
-          default_ticket_id = Toolshed::TicketTracking::PivotalTracker::story_id_from_branch_name(Toolshed::Git::Base.branch_name)
+          default_ticket_id = Toolshed::TicketTracking::story_id_from_branch_name(Toolshed::Git::Base.branch_name)
           ticket_id = read_user_input_ticket_id("Story ID (Default: #{default_ticket_id}):", options.merge!({ default: default_ticket_id }))
+          options.merge!({ ticket_id: ticket_id })
+
+          ticket_tracker = ticket_tracker_class.create_instance(options)
 
-          if Object.const_get("#{ticket_tracker_class}::USE_PROJECT_ID")
+          if use_project_id
             puts "Using Project: #{ticket_tracker_project_id}"
           end
           puts "Using Ticket: #{ticket_id}"
 
-          result = ticket_tracker.story_information(ticket_id)
+          result = ticket_tracker.ticket
 
           if (options[:field])
             field_value = result.send(options[:field])
@@ -49,7 +57,7 @@ module Toolshed
         end
       end
 
-      def read_user_input_project_id(message, options)
+      def read_user_input_project(message, options)
         return options[:default] if (options.has_key?(:use_defaults))
 
         puts message

data/lib/toolshed/commands/update_ticket_status.rb

@@ -0,0 +1,74 @@
+module Toolshed
+  module Commands
+    class UpdateTicketStatus
+      def execute(args, options = {})
+        ticket_tracker_class =  Object.const_get("Toolshed::TicketTracking::#{Toolshed::Client.ticket_tracking_tool.camel_case}")
+
+        use_project_id = Object.const_get("#{ticket_tracker_class}::USE_PROJECT_ID") rescue false
+        if use_project_id
+          ticket_tracker_project_id = read_user_input_project("Project ID (Default: #{Toolshed::Client.default_pivotal_tracker_project_id}):", options.merge!({ default: Toolshed::Client.default_pivotal_tracker_project_id }))
+          options.merge!({ project_id: ticket_tracker_project_id })
+        end
+
+        use_project_name = Object.const_get("#{ticket_tracker_class}::USE_PROJECT_NAME") rescue false
+        if use_project_name
+          ticket_tracker_project_name = read_user_input_project("Project Name (Default: #{Toolshed::Client.default_ticket_tracker_project}):", options.merge!({ default: Toolshed::Client.default_ticket_tracker_project }))
+          options.merge!({ project: ticket_tracker_project_name })
+        end
+
+        default_ticket_id = Toolshed::TicketTracking::story_id_from_branch_name(Toolshed::Git::Base.branch_name)
+        ticket_id = read_user_input_ticket_id("Ticket ID (Default: #{default_ticket_id}):", options.merge!({ default: default_ticket_id }))
+        options.merge!({ ticket_id: ticket_id })
+
+        ticket_tracker = ticket_tracker_class.create_instance(options)
+
+        status = read_user_input_status("Status:")
+
+        begin
+          result = ticket_tracker.update_ticket_status(status)
+          puts result
+        rescue => e
+          puts e.message
+          exit
+        end
+      end
+
+      def read_user_input_project(message, options)
+        return options[:default] if (options.has_key?(:use_defaults))
+
+        puts message
+        value = $stdin.gets.chomp
+
+        if (value.empty?)
+          value = options[:default]
+        end
+
+        value
+      end
+
+      def read_user_input_ticket_id(message, options)
+        return options[:default] if (options.has_key?(:use_defaults))
+
+        puts message
+        value = $stdin.gets.chomp
+
+        if (value.empty?)
+          value = options[:default]
+        end
+
+        value
+      end
+
+      def read_user_input_status(message)
+        puts message
+        value = $stdin.gets.chomp
+
+        until (!value.blank?)
+          puts "Status must be passed in"
+          puts message
+          value = $stdin.gets.chomp
+        end
+      end
+    end
+  end
+end

data/lib/toolshed/git/git.rb

@@ -1,6 +1,7 @@
 module Toolshed
   module Git
-    DEFAULT_GIT_TOOL = 'github'
+    DEFAULT_GIT_TOOL    = 'github'
+    DEFAULT_BRANCH_FROM = 'master'
 
     def branch_name
       # branch information
@@ -49,7 +50,7 @@ module Toolshed
     end
 
     def clean_branch_name(branch_name)
-      branch_name.strip.downcase.tr(" ", "_").gsub("-", "").gsub("&", "").gsub("/", "_").gsub(".", "_").gsub("'", "").gsub("__", "_").gsub(":", "")
+      branch_name.strip.downcase.tr(" ", "_").gsub("&", "").gsub("/", "_").gsub(".", "_").gsub("'", "").gsub("__", "_").gsub(":", "").gsub(",", "")
     end
 
     def push(options = {})

data/lib/toolshed/git/github.rb

@@ -9,8 +9,9 @@ module Toolshed
       def initialize(options={})
         super(options)
 
-        username = Toolshed::Client::github_username
-        password = Toolshed::Client::github_password
+        username  = Toolshed::Client::github_username
+        password  = Toolshed::Client::github_password
+        token     = Toolshed::Client::github_token
 
         unless (options[:username].nil?)
           username = options[:username]
@@ -20,10 +21,20 @@ module Toolshed
            password = options[:password]
         end
 
+        unless (token.nil?)
+          username = token
+          password = nil
+        end
+
+        unless (options[:token].nil?)
+          username = options[:token]
+          password = nil
+        end
+
         @auth = { username: username, password: password }
         self.default_options = {
           :headers => {
-              "User-Agent" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1309.0 Safari/537.17"
+              "User-Agent" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1309.0 Safari/537.17",
           },
           basic_auth: @auth,
         }