toolshed 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ba93e5a10749583bb6eaf60cbca9fba6b511514
-  data.tar.gz: a02953709a3fee4e24755aaf6a5011b6ed74dfb4
+  metadata.gz: 9bdfea21a3da3ced44701c4030023a41dffd6f24
+  data.tar.gz: 0e1abc6ed334b5e07390c356242f7e9de3033f54
 SHA512:
-  metadata.gz: 30b6e833386c13ff5806389dbe8b704e99979f1b4dae0af54de61bfb6c341bed85fff197ce42ce66f33461118e76fab4daf746593dc200f41f167fe5f0118192
-  data.tar.gz: bb95e2a36220f302baa4ce1c08c80558283d2d279fe661e41ce508846eb1f0a353f742094ceae6dcfc2116361c03be16000766b734e2e3a227bfb20654dec937
+  metadata.gz: 669886428374a6dfe17cbdfecf5e06b51594cc31d913bc92c526c797b1e8611cfb5fab7ac4bf1e10a6079e7e17d0dd758441679deff0f19f2175cfca74152da8
+  data.tar.gz: d1876a1cd4ee6d45347210254f206ee1ea12fece621139195c43170b006a0ca0c9d936225d0d2e00f11a751ccd325c1be08a281fd4abcbbdd6b4b6b5301a9c2c

data/README.md

@@ -3,7 +3,7 @@
 
 # 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.
+Toolshed is a utility gem. The purpose of toolshed is to make small to complex command line tasks easier. This includes tasks related to Git like creating a pull request or creating a branch. It also includes tasks like ticket tracking. Currently only a limited set of products is supported but this can be expanded over time as needed.
 
 ## Installation
 
@@ -21,7 +21,7 @@ Or install it yourself as:
 
 ## Usage
 
-After install the gem run toolshed for help menu. It will list the available commands.
+After installing the gem run toolshed from the command line for help menu. It will list the available commands.
 
 ## Contributing
 

data/bin/toolshed.rb

@@ -33,6 +33,7 @@ Note that it will only read one file which ever file is closest to the directory
   push_to_repository_user: [push_to_repository_user] (required)
   push_to_repository_name: [push_to_repository_name] (required)
   push_to_remote_name: [push_to_remote_name] (required)
+  default_pull_request_title_format: [id] - [summary] (optional)
 
   time_tracking_username: [username] (optional)
   time_tracking_password: [password] (optional)

data/lib/toolshed/cli.rb

@@ -39,6 +39,7 @@ module Toolshed
   end
 end
 
+require 'toolshed/commands/base'
 require 'toolshed/commands/create_pull_request'
 require 'toolshed/commands/create_pivotal_tracker_note'
 require 'toolshed/commands/ticket_information'

data/lib/toolshed/client.rb

@@ -188,6 +188,14 @@ module Toolshed
       @ticket_status_for_complete = status
     end
 
+    def self.default_pull_request_title_format
+      @default_pull_request_title_format
+    end
+
+    def self.default_pull_request_title_format=(default_pull_request_title_format)
+      @default_pull_request_title_format = default_pull_request_title_format
+    end
+
     # time tracking configuration
 
     def self.time_tracking_tool
@@ -266,6 +274,7 @@ module Toolshed
       self.time_tracking_tool                 ||= credentials['time_tracking_tool']
       self.git_quiet                          ||= (credentials['git_quiet']) ? '&> /dev/null' : ''
       self.use_defaults                       ||= credentials['use_defaults']
+      self.default_pull_request_title_format  ||= credentials['default_pull_request_title_format']
       @credentials_loaded = true
     end
 

data/lib/toolshed/commands/base.rb

@@ -0,0 +1,67 @@
+module Toolshed
+  module Commands
+    class Base
+      def initialize(options={})
+      end
+
+      def read_user_input(message, options={})
+        return options[:default] if Toolshed::Client.use_defaults
+        prompt_user_input(message, options)
+      end
+
+      def read_user_input_title(message, options={})
+        return options[:title] if options.has_key?(:title)
+        read_user_input(message, options)
+      end
+
+      def read_user_input_body(message, options={})
+        return options[:body] if options.has_key?(:body)
+        read_user_input(message, options)
+      end
+
+      def use_ticket_tracker_project_id(options)
+        options
+        options.merge!({
+          ticket_tracker_const: 'USE_PROJECT_ID',
+          type: :project_id,
+          default_method: 'default_pivotal_tracker_project_id',
+          default_message: "Project ID (Default: #{Toolshed::Client.default_pivotal_tracker_project_id}):",
+        })
+        options = use_ticket_tracker_by_type(options)
+      end
+
+      def use_ticket_tracker_project_name(options)
+        options.merge!({
+          ticket_tracker_const: 'USE_PROJECT_NAME',
+          type: :project,
+          default_method: 'default_ticket_tracker_project',
+          default_message: "Project Name (Default: #{Toolshed::Client.default_ticket_tracker_project}):",
+        })
+        use_ticket_tracker_by_type(options)
+      end
+
+      def use_ticket_tracker_by_type(options)
+        use_field = Object.const_get("#{ticket_tracker_class}::#{options[:ticket_tracker_const]}") rescue false
+        if use_field
+          ticket_tracker_response = read_user_input(options[:default_message],
+            options.merge!({ default: Toolshed::Client.send(options[:default_method]) })
+          )
+          options.merge!({ options[:type] => ticket_tracker_response })
+        end
+        options
+      end
+
+      def use_project_id
+        Object.const_get("#{ticket_tracker_class}::USE_PROJECT_ID") rescue false
+      end
+
+      private
+
+        def prompt_user_input(message, options)
+          puts message
+          value = $stdin.gets.chomp
+          value.empty? ? options[:default] : value
+        end
+    end
+  end
+end

data/lib/toolshed/commands/create_pull_request.rb

@@ -1,182 +1,159 @@
+require 'toolshed/commands/base'
+
 module Toolshed
   module Commands
-    class CreatePullRequest
-      def execute(args, options = {})
-        # see what branch is checked out and where we are branched from
-        puts "Current Branch: #{Toolshed::Git::Base.branch_name}"
-        puts "Branched From: #{Toolshed::Git::Base.branched_from}"
-        puts "Using Defaults: #{(Toolshed::Client.use_defaults.nil?) ? 'No' : 'Yes'}"
+    class CreatePullRequest < Base
+      attr_accessor :ticket_tracking_url, :ticket_tracking_title,
+                    :ticket_id, :ticket_tracker,
+                    :ticket_tracker_class, :ticket_tracker_project_id,
+                    :pull_request_url, :git_tool,
+                    :pull_request_title, :pull_request_body
+
+      def initialize(options={})
+        super(options)
+        self.ticket_tracker_class = nil
+        self.pull_request_url = ''
+      end
 
-        unless (Toolshed::Client.ticket_tracking_tool.nil? || Toolshed::Client.ticket_tracking_tool.empty?)
-          ticket_tracking_url = ''
-          ticket_tracking_title = ''
-          ticket_id = ''
+      def execute(args, options = {})
+        output_begining_messages
+        options = execute_ticket_tracking(options)
+        options = execute_pull_request(options) unless options.nil?
+      end
 
-          begin
-            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
+      private
 
-            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
+        def read_user_input_add_note_to_ticket(message)
+          return true if Toolshed::Client.use_defaults
 
-            # @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::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,
-            })
+          puts message
+          value = $stdin.gets.chomp
 
-            ticket_tracker = ticket_tracker_class.create_instance(options)
+          until %w(y n).include?(value.downcase)
+            puts "Value must be Y or N"
+            puts message
+            value = $stdin.gets.chomp
+          end
 
-            ticket_tracking_url = ticket_tracker.url
-            ticket_tracking_title = ticket_tracker.title
-            ticket_id = ticket_id
+          (value == 'y') ? true : false
+        end
 
-            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
+        def read_user_input_ticket_tracker_ticket_id(message, options)
+          read_user_input(message, options)
         end
 
-        pull_request_url = ''
-        begin
-          git_tool_class = Object.const_get("Toolshed::Git::#{Toolshed::Client.git_tool.camel_case}")
-          git_tool = git_tool_class.create_instance
+        def output_begining_messages
+          puts "Current Branch: #{Toolshed::Git::Base.branch_name}"
+          puts "Branched From: #{Toolshed::Git::Base.branched_from}"
+          puts "Using Defaults: #{(Toolshed::Client.use_defaults.nil?) ? 'No' : 'Yes'}"
+        end
 
-          # 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
-            })
+        def get_ticket_id(options)
+          self.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: self.ticket_id,
+          })
+          options
+        end
 
-          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"]
-
-          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
+        def output_ticket_information
+          puts "Ticket Tracking URL: #{ticket_tracking_url}"
+          puts "Ticket Tracking title: #{ticket_tracking_title}"
+          puts "Ticket ID: #{ticket_id}"
+        end
 
-              result = ticket_tracker.update_ticket_status(default_completed_status)
+        def execute_ticket_tracking(options)
+          unless Toolshed::Client.ticket_tracking_tool.nil? || Toolshed::Client.ticket_tracking_tool.empty?
+            begin
+              self.ticket_tracker_class =  Object.const_get("Toolshed::TicketTracking::#{Toolshed::Client.ticket_tracking_tool.camel_case}")
+              options = get_ticket_project_information(options)
+              initialize_ticket_tracker_properties(options)
+
+              output_ticket_information
+            rescue Exception => e
+              puts e.inspect
+              puts e.backtrace
+              puts "Ticket tracking tool is not supported at this time"
+              return
             end
+            options
           end
-
-          puts "Created Pull Request: #{pull_request_url}"
-        rescue => e
-          puts e.message
-          exit
+          options
         end
-      end
-
-      def read_user_input_add_note_to_ticket(message)
-        return true if (Toolshed::Client.use_defaults)
-
-        puts message
-        value = $stdin.gets.chomp
 
-        until (%w(y n).include?(value.downcase))
-          puts "Value must be Y or N"
-          puts message
-          value = $stdin.gets.chomp
+        def add_note_to_ticket
+          add_note_to_ticket_response = read_user_input_add_note_to_ticket(
+            "Would you like to add a note with the pull request url?"
+          )
+          if add_note_to_ticket_response
+            result = self.ticket_tracker.add_note(pull_request_url)
+            default_completed_status = Object.const_get("#{ticket_tracker_class}::DEFAULT_COMPLETED_STATUS") rescue false
+            default_completed_status = Toolshed::Client.ticket_status_for_complete unless default_completed_status
+            ticket_tracker.update_ticket_status(default_completed_status)
+          end
         end
 
-        (value == 'y') ? true : false
-      end
-
-      def read_user_input_pull_request_title(message, options)
-        return options[:title] if (options.has_key?(:title))
-        return options[:default] if (Toolshed::Client.use_defaults)
-
-        puts message
-        value = $stdin.gets.chomp
-        if (value.empty?)
-          value = options[:default]
+        def pull_request_created_message
+          puts "Created Pull Request: #{pull_request_url}"
         end
 
-        value
-      end
-
-      def read_user_input_pull_request_body(message, options)
-        return options[:body] if (options.has_key?(:body))
-        return options[:default] if (Toolshed::Client.use_defaults)
-
-        puts message
-        value = $stdin.gets.chomp
-
-        if (value.empty?)
-          value = options[:default]
+        def execute_pull_request(options)
+          begin
+            self.git_tool = Object.const_get("Toolshed::Git::#{Toolshed::Client.git_tool.camel_case}").create_instance
+
+            options = set_pull_request_title(options)
+            options = set_pull_request_body(options)
+            send_pull_request
+            add_note_to_ticket unless ticket_tracker_class.nil?
+            pull_request_created_message
+          rescue => e
+            puts e.message
+            exit
+          end
         end
 
-        value
-      end
-
-      def read_user_input_project(message, options)
-        return options[:default] if (Toolshed::Client.use_defaults)
-
-        puts message
-        value = $stdin.gets.chomp
-
-        if (value.empty?)
-          value = options[:default]
+        def set_pull_request_title(options)
+          self.pull_request_title = read_user_input_title(
+            "Pull request title (Default: #{self.ticket_tracking_title}):",
+            options.merge!({
+              default: self.ticket_tracking_title,
+            })
+          )
+          options
         end
 
-        value
-      end
-
-      def read_user_input_ticket_tracker_ticket_id(message, options)
-        return options[:default] if (Toolshed::Client.use_defaults)
+        def set_pull_request_body(options)
+          self.pull_request_body = read_user_input_body(
+            "Pull request body (Default: #{self.ticket_tracking_url}):",
+            options.merge!({
+              default: self.ticket_tracking_url
+            })
+          )
+          options
+        end
 
-        puts message
-        value = $stdin.gets.chomp
+        def send_pull_request
+          puts "Pull request being created"
+          git_pull_request_result = self.git_tool.create_pull_request(pull_request_title, pull_request_body)
+          self.pull_request_url = git_pull_request_result["html_url"]
+        end
 
-        if (value.empty?)
-          value = options[:default]
+        def get_ticket_project_information(options)
+          options = use_ticket_tracker_project_id(options)
+          options = use_ticket_tracker_project_name(options)
+          options = get_ticket_id(options)
+          options
         end
 
-        value
-      end
+        def initialize_ticket_tracker_properties(options)
+          self.ticket_tracker = ticket_tracker_class.create_instance(options)
+          self.ticket_tracking_url = ticket_tracker.url
+          self.ticket_tracking_title = ticket_tracker.default_title
+        end
     end
   end
 end

data/lib/toolshed/commands/create_ticket_comment.rb

@@ -1,42 +1,26 @@
+require 'toolshed/commands/base'
+
 module Toolshed
   module Commands
-    class CreateTicketComment
+    class CreateTicketComment < Base
+
+      def initialize(options={})
+        super(options)
+      end
+
       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
+        options = use_ticket_tracker_project_id(options)
+        options = use_ticket_tracker_project_name(options)
 
         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 }))
+        ticket_id = read_user_input("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 Project: #{ticket_tracker_project_id}" if use_project_id
         puts "Using Ticket: #{ticket_id}"
 
         puts "Note? "
@@ -54,32 +38,6 @@ module Toolshed
           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/ticket_tracking/jira.rb

@@ -1,18 +1,18 @@
 module Toolshed
   module TicketTracking
-    class Jira
-      extend TicketTracking
+    class Jira < Base
       include HTTParty
 
       USE_PROJECT_NAME = true
 
-      attr_accessor :project, :client, :owner, :ticket
+      attr_accessor :project, :client, :owner, :ticket, :default_pull_request_title_format
 
       def initialize(options={})
         username = (options[:username].nil?) ? Toolshed::Client::ticket_tracker_username : options[:username]
         password = (options[:password].nil?) ? Toolshed::Client::ticket_tracker_password : options[:password]
 
-        self.owner      = Toolshed::Client::ticket_tracker_owner
+        self.owner      = Toolshed::Client.ticket_tracker_owner
+        self.default_pull_request_title_format = Toolshed::Client.default_pull_request_title_format ||= "[summary]"
 
         self.client = JIRA::Client.new({
           username:     username,
@@ -27,9 +27,6 @@ module Toolshed
         self.ticket = self.client.Issue.find(options[:ticket_id])
       end
 
-      #
-      # Instance methods
-      #
       def add_note(note_text)
         issue = self.ticket.comments.build
         issue.save({ 'body' => note_text })
@@ -56,50 +53,52 @@ module Toolshed
         raise "Unable to find available status"
       end
 
-      def title
-        self.ticket.summary
+      def default_title
+        default_title_text = self.default_pull_request_title_format
+        self.default_pull_request_title_format.scan(/(\[\w*\])/).each do |replacement_element|
+          default_title_text = default_title_text.gsub(replacement_element.first.to_s, self.send(replacement_element.first.to_s.gsub("[", "").gsub("]", "")))
+        end
+        default_title_text
+      end
+
+      def attribute_value(attribute)
+        self.ticket.send(attribute)
       end
 
       def url
         "https://#{self.owner}.atlassian.net/browse/#{self.ticket.key}"
       end
 
-      #
-      # Class methods
-      #
-      def self.username
-        return Toolshed::Client::ticket_tracker_username unless Toolshed::Client::ticket_tracker_username.nil?
-
-        # prompt to ask for username
-        puts "Jira username? "
-        username = $stdin.gets.chomp.strip
-      end
+      class << self
+        def username
+          return Toolshed::Client::ticket_tracker_username unless Toolshed::Client::ticket_tracker_username.nil?
 
-      def self.password
-        return Toolshed::Client::ticket_tracker_password unless Toolshed::Client::ticket_tracker_password.nil?
+          # prompt to ask for username
+          puts "Jira username? "
+          username = $stdin.gets.chomp.strip
+        end
 
-        # prompt to ask for password
-        system "stty -echo"
-        puts "Jira password? "
-        password = $stdin.gets.chomp.strip
-        system "stty echo"
-      end
+        def password
+          return Toolshed::Client::ticket_tracker_password unless Toolshed::Client::ticket_tracker_password.nil?
 
-      def self.create_instance(options={})
-        unless (options.has_key?(:project))
-          raise 'Unable to use Jira as project name was not supplied'
+          # prompt to ask for password
+          system "stty -echo"
+          puts "Jira password? "
+          password = $stdin.gets.chomp.strip
+          system "stty echo"
         end
 
-        unless (options.has_key?(:ticket_id))
-          raise 'Unable to use Jira as ticket id was not supplied'
-        end
+        def create_instance(options={})
+          raise 'Unable to use Jira as project name was not supplied' unless (options.has_key?(:project))
+          raise 'Unable to use Jira as ticket id was not supplied' unless (options.has_key?(:ticket_id))
 
-        jira = Toolshed::TicketTracking::Jira.new({
-          project:    options[:project],
-          username:   Toolshed::TicketTracking::Jira.username,
-          password:   Toolshed::TicketTracking::Jira.password,
-          ticket_id:  options[:ticket_id]
-        })
+          jira = Toolshed::TicketTracking::Jira.new({
+            project:    options[:project],
+            username:   Toolshed::TicketTracking::Jira.username,
+            password:   Toolshed::TicketTracking::Jira.password,
+            ticket_id:  options[:ticket_id]
+          })
+        end
       end
     end
   end

data/lib/toolshed/ticket_tracking/pivotal_tracker.rb

@@ -1,17 +1,17 @@
 module Toolshed
   module TicketTracking
-    class PivotalTracker
-      extend TicketTracking
+    class PivotalTracker < Base
       include HTTParty
 
       DEFAULT_COMPLETED_STATUS = 'finished'
       USE_PROJECT_ID = true
 
-      attr_accessor :project_id, :token, :story
+      attr_accessor :project_id, :token, :story, :default_pull_request_title_format
 
       def initialize(options={})
         username = Toolshed::Client::pivotal_tracker_username
         password = Toolshed::Client::pivotal_tracker_password
+        self.default_pull_request_title_format = Toolshed::Client.default_pull_request_title_format ||= "[title]"
 
         unless (options[:username].nil?)
           username = options[:username]
@@ -58,12 +58,18 @@ module Toolshed
         end
       end
 
-      def title
-        self.clean(self.story.name)
+      def default_title
+        default_title_text = self.default_pull_request_title_format
+        self.default_pull_request_title_format.scan(/(\[\w*\])/).each do |replacement_element|
+          default_title_text = default_title_text.gsub(replacement_element.first.to_s, self.send(replacement_element.first.to_s.gsub("[", "").gsub("]", "")))
+        end
+        default_title_text
       end
 
-      def url(ticket_id)
-        self.story.url
+      def attribute_value(attribute)
+        value = self.story.send(attribute)
+        self.clean(value) if attribute == 'title'
+        value
       end
 
       class << self

data/lib/toolshed/ticket_tracking/ticket_tracking.rb

@@ -1,6 +1,13 @@
 module Toolshed
   module TicketTracking
-    def initialize(options={})
+    class Base
+      def initialize(options={})
+      end
+
+      def method_missing(name, *args)
+        string_name = name.to_s
+        attribute_value(string_name)
+      end
     end
 
     class << self

data/lib/toolshed/time_tracking/harvest.rb

@@ -25,7 +25,7 @@ module Toolshed
            owner = options[:sub_domain]
         end
 
-        self.harvest_client = ::Harvest.client(owner, username, password)
+        self.harvest_client = ::Harvest.client(subdomain: owner, username: username, password: password)
         self.project_id = options[:project_id] unless !options.has_key?(:project_id)
 
         # setup formatting

data/lib/toolshed/version.rb

@@ -1,3 +1,3 @@
 module Toolshed
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/commands/get_daily_time_update_test.rb

@@ -12,7 +12,7 @@ class GetDailyTimeUpdateTest < Test::Unit::TestCase
 
   def test_get_daily_time_update_with_defaults
     ::Harvest.expects(:client).
-    with(Toolshed::Client.time_tracking_owner, Toolshed::Client.time_tracking_username, Toolshed::Client.time_tracking_password).
+    with(subdomain: Toolshed::Client.time_tracking_owner, username: Toolshed::Client.time_tracking_username, password: Toolshed::Client.time_tracking_password).
     returns('')
 
     harvest_mock = mock('Harvest::TimeEntry')
@@ -36,7 +36,7 @@ class GetDailyTimeUpdateTest < Test::Unit::TestCase
     Toolshed::Client.use_defaults                     = true
 
     ::Harvest.expects(:client).
-    with(Toolshed::Client.time_tracking_owner, Toolshed::Client.time_tracking_username, Toolshed::Client.time_tracking_password).
+    with(subdomain: Toolshed::Client.time_tracking_owner, username: Toolshed::Client.time_tracking_username, password: Toolshed::Client.time_tracking_password).
     returns('')
 
     harvest_mock = mock('Harvest::TimeEntry')

data/test/ticket_tracking/jira_test.rb

@@ -5,6 +5,7 @@ class JiraTest < Test::Unit::TestCase
     Toolshed::Client::ticket_tracker_username = 'sample'
     Toolshed::Client::ticket_tracker_password = 'sample'
     Toolshed::Client::ticket_tracker_owner = 'sample'
+    Toolshed::Client::default_pull_request_title_format = '[id] - [summary]'
   end
 
   def test_add_note
@@ -138,6 +139,21 @@ class JiraTest < Test::Unit::TestCase
     assert_raise('Unable to use Jira as ticket id was not supplied') { Toolshed::TicketTracking::Jira.create_instance({ project: 11 }) }
   end
 
+  def test_default_pull_request_format_is_correct
+    mock_init
+    jira_init
+
+    @jira_issue_mock.expects(:id).returns(
+      '10'
+    )
+
+    @jira_issue_mock.expects(:summary).returns(
+      'testing this out'
+    )
+
+    assert_equal "10 - testing this out", @jira.default_title
+  end
+
   private
 
     def jira_init

data/test/time_tracking/harvest_test.rb

@@ -9,7 +9,7 @@ class HarvestTest < Test::Unit::TestCase
     Toolshed::Client.time_tracking_owner              = 'me'
 
     ::Harvest.expects(:client).
-    with(Toolshed::Client.time_tracking_owner, Toolshed::Client.time_tracking_username, Toolshed::Client.time_tracking_password).
+    with(subdomain: Toolshed::Client.time_tracking_owner, username: Toolshed::Client.time_tracking_username, password: Toolshed::Client.time_tracking_password).
     returns('')
   end
 

data/toolshed.gemspec

@@ -6,8 +6,8 @@ require 'toolshed/version'
 Gem::Specification.new do |spec|
   spec.name          = "toolshed"
   spec.version       = Toolshed::VERSION
-  spec.authors       = ["test"]
-  spec.email         = ["test@gmail.com"]
+  spec.authors       = ["Jake Waller"]
+  spec.email         = ["wallerjake@gmail.com"]
   spec.description   = %q{Utility that will automate simple daily tasks developers perform like creating a Github pull request}
   spec.summary       = %q{Create a Github pull request with minimal work. Will automatically read ticket information from pivotal tracker if you use that.}
   spec.homepage      = ""
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   #spec.executables   = ["toolshed"]
   spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
   spec.add_dependency "httparty"
@@ -29,12 +29,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "jira-ruby"
   spec.add_dependency "net-ssh"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'faker'
-  spec.add_development_dependency 'test-unit', '~> 2.5.5'
-  spec.add_development_dependency 'debugger'
+  spec.add_development_dependency 'test-unit'
+  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'ci_reporter'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'codeclimate-test-reporter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolshed
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
-- test
+- Jake Waller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -140,16 +140,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -196,18 +196,18 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -265,7 +265,7 @@ dependencies:
 description: Utility that will automate simple daily tasks developers perform like
   creating a Github pull request
 email:
-- test@gmail.com
+- wallerjake@gmail.com
 executables:
 - toolshed
 - toolshed.rb
@@ -284,6 +284,7 @@ files:
 - lib/toolshed/base.rb
 - lib/toolshed/cli.rb
 - lib/toolshed/client.rb
+- lib/toolshed/commands/base.rb
 - lib/toolshed/commands/checkout_branch.rb
 - lib/toolshed/commands/create_branch.rb
 - lib/toolshed/commands/create_pivotal_tracker_note.rb