toolshed 1.0.2 → 1.0.3

data/lib/toolshed/commands/get_daily_time_update.rb

@@ -1,11 +1,28 @@
 module Toolshed
   module Commands
     class GetDailyTimeUpdate
+      def self.cli_options
+        {
+          banner: 'Usage: get_daily_time_update [options]',
+          options: {
+            format: {
+              short_on: '-f',
+            },
+            use_defaults: {
+              short_on: '-d'
+            },
+            project_id: {
+              short_on: '-p',
+            }
+          }
+        }
+      end
+
       def execute(args, options = {})
         begin
-          time_tracking_class =  Object.const_get("Toolshed::TimeTracking::#{Toolshed::Client.time_tracking_tool.camel_case}")
+          time_tracking_class =  Object.const_get("Toolshed::TimeTracking::#{Toolshed::Client.instance.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 }))
+          time_tracking_project_id = read_user_input_project_id("Project ID (Default: #{Toolshed::Client.instance.time_tracking_default_project_id}):", options.merge!({ default: Toolshed::Client.instance.time_tracking_default_project_id }))
           options.merge!({ project_id: time_tracking_project_id })
           time_tracker = time_tracking_class.create_instance(options)
 
@@ -19,7 +36,7 @@ module Toolshed
 
       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)
+        return options[:default] if (Toolshed::Client.instance.use_defaults)
 
         puts message
         value = $stdin.gets.chomp

data/lib/toolshed/commands/list_branches.rb

@@ -1,12 +1,23 @@
+require 'toolshed/git'
+
 module Toolshed
   module Commands
     class ListBranches
+      def self.cli_options
+        {
+          banner: 'Usage: list_branches [options]',
+          options: {
+            repository_name: {
+              short_on: '-r',
+            },
+          }
+        }
+      end
+
       def execute(args, options = {})
-        git = Toolshed::Git::Github.new
-        branches = git.list_branches
-        branches.each do |branch|
-          puts branch['name']
-        end
+        branch = Toolshed::Git::Branch.new
+        branch.list
+        Toolshed.die
       end
     end
   end

data/lib/toolshed/commands/push_branch.rb

@@ -1,11 +1,30 @@
-module Toolshed
-  module Commands
-    class PushBranch
-      def execute(args, options = {})
-        branch_name = Toolshed::Git::Base.push(options)
-        puts "#{branch_name} has been pushed"
-        return
-      end
-    end
+require 'toolshed/commands/base'
+require 'toolshed/git'
+
+class Toolshed::Commands::PushBranch < Toolshed::Commands::Base
+  def initialize(options = {})
+    super(options)
+  end
+
+  def self.cli_options
+    {
+      banner: 'Usage: push_branch [options]',
+      options: {
+        force_command: {
+          short_on: '-f',
+          default: true
+        },
+        branch_name: {
+          short_on: '-b'
+        }
+      }
+    }
+  end
+
+  def execute(args, options = {})
+    Toolshed.logger.info "Running toolshed push_branch with #{options.inspect}"
+    branch = Toolshed::Git::Branch.new(options)
+    branch.push
+    Toolshed.die
   end
 end

data/lib/toolshed/commands/rename_branch.rb

@@ -0,0 +1,29 @@
+require 'toolshed/commands/base'
+require 'toolshed/git/branch'
+
+class Toolshed::Commands::RenameBranch < Toolshed::Commands::Base
+  def self.cli_options
+    {
+      banner: 'Usage: rename_branch [options]',
+      options: {
+        branch_name: {
+          short_on: '-b'
+        },
+        new_branch_name: {
+          short_on: '-n'
+        }
+      }
+    }
+  end
+
+  def execute(args, options = {})
+    Toolshed.logger.info "Running toolshed rename_branch with #{options.inspect}"
+
+    options[:branch_name] = options[:branch_name] || read_user_input('Branch name?', required: true)
+    new_branch_name = options[:new_branch_name] || read_user_input('New Branch name?', required: true)
+
+    branch = Toolshed::Git::Branch.new(options)
+    branch.rename(new_branch_name)
+    Toolshed.die
+  end
+end

data/lib/toolshed/commands/ssh.rb

@@ -1,14 +1,55 @@
+require 'toolshed/server_administration/ssh'
+
 module Toolshed
   module Commands
     class SSH
+      def self.cli_options
+        {
+          banner: 'Usage: ssh [options]',
+          options: {
+            use_sudo: {
+              short_on: '-e'
+            },
+            host: {
+              short_on: '-o'
+            },
+            connection_string_options: {
+              short_on: '-n'
+            },
+            commands: {
+              short_on: '-c'
+            },
+            password: {
+              short_on: '-p'
+            },
+            prompt_for_password: {
+              short_on: '-r'
+            },
+            user: {
+              short_on: '-u'
+            },
+            keys: {
+              short_on: '-k'
+            },
+            sudo_password: {
+              short_on: '-s'
+            },
+            verbose_output: {
+              short_on: '-v'
+            }
+          }
+        }
+      end
+
       def execute(args, options = {})
-        puts "running ssh command with options #{options.inspect}" unless options[:verbose_output].blank?
+        Toolshed.logger.info "Running ssh command with options #{options.inspect}" unless options[:verbose_output].nil? || options[:verbose_output].empty? # rubocop:disable Metrics/LineLength
         begin
           ssh = Toolshed::ServerAdministration::SSH.new(options)
           ssh.execute
         rescue => e
-          puts e.inspect
-          puts "Unable to connect to #{options[:host]}"
+          Toolshed.logger.fatal e.message
+          Toolshed.logger.fatal "Unable to connect to #{options[:host]}"
+          Toolshed.die
         end
       end
     end

data/lib/toolshed/commands/ticket_information.rb

@@ -1,23 +1,49 @@
+require 'toolshed/git'
+
 module Toolshed
   module Commands
     class TicketInformation
+      def self.cli_options
+        {
+          banner: 'Usage: ticket_information [options]',
+          options: {
+            use_defaults: {
+              short_on: '-d'
+            },
+            clipboard: {
+              short_on: '-c'
+            },
+            field: {
+              short_on: '-f'
+            },
+            formatted_string: {
+              short_on: '-fs'
+            }
+          }
+        }
+      end
+
+      def branch
+        @branch ||= Toolshed::Git::Branch.new
+      end
+
       def execute(args, options = {})
         begin
-          ticket_tracker_class =  Object.const_get("Toolshed::TicketTracking::#{Toolshed::Client.ticket_tracking_tool.camel_case}")
+          ticket_tracker_class =  Object.const_get("Toolshed::TicketTracking::#{Toolshed::Client.instance.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 }))
+            ticket_tracker_project_id = read_user_input_project("Project ID (Default: #{Toolshed::Client.instance.default_pivotal_tracker_project_id}):", options.merge!({ default: Toolshed::Client.instance.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 }))
+            ticket_tracker_project_name = read_user_input_project("Project Name (Default: #{Toolshed::Client.instance.default_ticket_tracker_project}):", options.merge!({ default: Toolshed::Client.instance.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)
+          default_ticket_id = Toolshed::TicketTracking::story_id_from_branch_name(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 })
 

data/lib/toolshed/commands/update_pivotal_tracker_story_status.rb

@@ -1,13 +1,19 @@
+require 'toolshed/git'
+
 module Toolshed
   module Commands
     class UpdatePivotalTrackerStoryStatus
       STORY_STATUS_DEFAULT = 'finished'
 
+      def branch
+        @branch ||= Toolshed::Git::Branch.new
+      end
+
       def execute(args, options = {})
-        print "Project ID (Default: #{Toolshed::Client.default_pivotal_tracker_project_id})? "
+        print "Project ID (Default: #{Toolshed::Client.instance.default_pivotal_tracker_project_id})? "
         project_id = $stdin.gets.chomp.strip
         if (project_id == '')
-          project_id = Toolshed::Client.default_pivotal_tracker_project_id
+          project_id = Toolshed::Client.instance.default_pivotal_tracker_project_id
         end
 
         pivotal_tracker = Toolshed::TicketTracking::PivotalTracker.new({
@@ -16,7 +22,7 @@ module Toolshed
             password: Toolshed::TicketTracking::PivotalTracker.password,
         })
 
-        default_story_id = Toolshed::TicketTracking::PivotalTracker::story_id_from_branch_name(Toolshed::Git::Base.branch_name)
+        default_story_id = Toolshed::TicketTracking::PivotalTracker::story_id_from_branch_name(branch.name)
         print "Story ID (Default: #{default_story_id})? "
         story_id = $stdin.gets.chomp.strip
         if (story_id == '')

data/lib/toolshed/commands/update_ticket_status.rb

@@ -1,6 +1,12 @@
+require 'toolshed/git'
+
 module Toolshed
   module Commands
     class UpdateTicketStatus
+      def branch
+        @branch ||= Toolshed::Git::Branch.new
+      end
+
       def execute(args, options = {})
         ticket_tracker_class =  Object.const_get("Toolshed::TicketTracking::#{Toolshed::Client.ticket_tracking_tool.camel_case}")
 
@@ -16,7 +22,7 @@ module Toolshed
           options.merge!({ project: ticket_tracker_project_name })
         end
 
-        default_ticket_id = Toolshed::TicketTracking::story_id_from_branch_name(Toolshed::Git::Base.branch_name)
+        default_ticket_id = Toolshed::TicketTracking::story_id_from_branch_name(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 })
 
@@ -63,7 +69,7 @@ module Toolshed
         puts message
         value = $stdin.gets.chomp
 
-        until (!value.blank?)
+        until !value.nil? && !value.empty?
           puts "Status must be passed in"
           puts message
           value = $stdin.gets.chomp

data/lib/toolshed/entry_point.rb

@@ -0,0 +1,89 @@
+require 'toolshed'
+require 'toolshed/cli'
+require 'toolshed/base'
+require 'toolshed/commands/base'
+require 'optparse'
+require 'singleton'
+
+class EntryPoint
+  include Singleton
+
+  attr_accessor :cli
+
+  def initialize
+    self.cli = Toolshed::CLI.new
+  end
+
+  def execute
+    if $0.split("/").last == 'toolshed'
+      options = {}
+
+      # @TODO - clean this up as it should really be part of the command it's being used in not globally.
+      global = OptionParser.new do |opts|
+        opts.on("-u", "--github-username [ARG]") do |username|
+          Toolshed::Client.github_username = username
+        end
+        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
+        opts.on("-p", "--pivotal-tracker-password [ARG]") do |password|
+          Toolshed::Client.pivotal_tracker_password = password
+        end
+        opts.on("-d", "--debug [ARG]") do
+          Toolshed::Client.debug = true
+        end
+        opts.on('-v', '--version', 'Version') do
+          Toolshed::Version.banner
+        end
+      end
+
+      global.order!
+      command = ARGV.shift
+      if command.nil?
+        usage
+      elsif command == 'version'
+        Toolshed::Version.banner
+        Toolshed.die
+      else
+        command_class = nil
+        command_class_name = command.camel_case
+        begin
+          require "toolshed/commands/#{command.to_s}"
+          command_class = "Toolshed::Commands::#{command_class_name}".split('::').inject(Object) { |o,c| o.const_get c }
+        rescue NameError
+          command_class = "Toolshed::Commands::#{command_class_name.upcase}".split('::').inject(Object) { |o,c| o.const_get c }
+        end
+        Toolshed::Commands::Base.parse(command, command_class.cli_options)
+      end
+    end
+  end
+
+  def usage
+    $stdout.puts <<EOF
+Please see toolshedrc.sample to create your toolshedrc settings file.
+
+Available Commands:
+
+  checkout_branch
+  create_branch
+  create_pivotal_tracker_note
+  create_pull_request
+  create_ticket_comment
+  delete_branch
+  get_daily_time_update
+  list_branches
+  push_branch
+  rename_branch
+  ssh
+  ticket_information
+  update_pivotal_tracker_story_status
+  update_ticket_status
+EOF
+  end
+end

data/lib/toolshed/git.rb

@@ -0,0 +1,59 @@
+require 'toolshed/base'
+require 'toolshed/git/validator'
+require 'highline/import'
+
+module Toolshed
+  class Git
+    require 'toolshed/git/branch'
+
+    DEFAULT_GIT_TOOL    = 'github'
+    DEFAULT_BRANCH_FROM = 'master'
+
+    attr_accessor :from_remote_name, :from_remote_branch_name, :to_remote_name, :to_remote_branch_name, :validator, :passed_branch_name, :force
+
+    def initialize(options = {})
+      # options with defaults
+      self.from_remote_name = Toolshed::Client.instance.pull_from_remote_name
+      unless (options[:from_remote_name].nil?)
+        self.from_remote_name  = options[:from_remote_name]
+      end
+
+      self.to_remote_name = Toolshed::Client.instance.push_to_remote_name
+      unless (options[:to_remote_name].nil?)
+        self.to_remote_name = options[:to_remote_name]
+      end
+
+      # options that do not have a default
+      unless (options[:from_remote_branch_name].nil?)
+        self.from_remote_branch_name = options[:from_remote_branch_name]
+      end
+
+      unless (options[:to_remote_branch_name].nil?)
+        self.to_remote_branch_name = options[:to_remote_branch_name]
+      end
+
+      self.validator = ::Toolshed::Git::Validator.new
+      self.passed_branch_name = options[:branch_name] || ''
+      self.force = (options.key?(:force_command)) ? '--force' : ''
+    end
+
+    class << self
+      def git_submodule_command
+        git_submodule_command = ''
+        git_submodule_command = "git submodule update #{Toolshed::Client.instance.git_quiet}" if Toolshed::Client.instance.use_git_submodules
+        git_submodule_command
+      end
+
+      def clean_branch_name(branch_name)
+        branch_name.strip.downcase.tr(' ', '_').gsub('&', '').gsub('.', '_').gsub("'", '').gsub(':', '').gsub(',', '').gsub('>', '').gsub('__', '_')
+      end
+    end
+
+    def remote_update
+      results = Toolshed::Base.wait_for_command("git remote update #{Toolshed::Client.instance.git_quiet}")
+      results[:all].each do |out|
+        Toolshed.logger.info out
+      end
+    end
+  end
+end