toolshed 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b797dd6cddae38cc2f9e8c1f7916108727dac003
-  data.tar.gz: 1a39f45e8b150de27a7c6eecbc5fdf9668644b8f
+  metadata.gz: f9ed47a186308cf9eaa0043e8ab0abc7fefead11
+  data.tar.gz: 4f4fddd482621ccd255da4219db9583811dee03c
 SHA512:
-  metadata.gz: 09b0e55117a1bc5bc9d62464a26b576576040ef8be4ecf3b6e6b44e3f5d847aebaf9784437f0b125957fae55b07880bf7eeec2ec292d93c5ef08ec999f68eb40
-  data.tar.gz: f5782e3a4ebbb447f45b83544e962c101e2cb6991e737d9b7c5fc081de15a7f2300bb6af34392e9b547539ed8518b29dc494877ef181c69d3baf38aea225756c
+  metadata.gz: 2962ad0d0d636de5a53416f2ed47b41bc3a3a73a20962681f1a0b15de4c0f452ddd5e8729be7bb78f208c1864bc82994ff53c83aa64cdffa1dfda43a2aa93096
+  data.tar.gz: 1a20ab52725da3253f40f840b7d42ae5c7cb4c46bc35a20ef53b3a9a039e62484f4de8a52c8bf496f5f411b84eaa472758881331a5ca077da52476c66810277a

data/.travis.yml

@@ -0,0 +1,14 @@
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq freetds-dev
+  - rm -f Gemfile.lock
+before_script:
+  - git config --global user.email "wallerjake@gmail.com"
+  - git config --global user.name "wallerjake"
+  - rm -r -f test/remote
+  - rm -r -f test/tmp
+language: ruby
+rvm:
+- 2.0.0
+env:
+  - RUNNING_ON_CI=true

data/Rakefile

@@ -1 +1,12 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+require File.expand_path(File.dirname(__FILE__)) + "/test/config"
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/**/*_test.rb']
+end
+
+desc "Run tests"
+task default: :test

data/bin/toolshed.rb

@@ -16,18 +16,27 @@ be found at https://github.com/wallerjake/toolshed
 Before using this tool you should create a file called .toolshedrc in your projects directory or home directory if you want to use the settings globally.
 Note that it will only read one file which ever file is closest to the directory you are in. Then and add the following to that file:
 
-  use_pivotal_tracker: true (required)
+  ticket_tracking_tool: 'pivotal_tracker' (required)
   pivotal_tracker_username: [pivotal_tracker_username] (optional)
   pivotal_tracker_password: [pivotal_tracker_password] (optional)
   default_pivotal_tracker_project_id: [project_id] (optional)
+
   github_username: [github_username] (optional)
   github_password: [github_password] (optional)
-  branched_from_remote_name: [branched_from_remote_name] (required)
-  branched_from_user: [branched_from_username] (required)
-  branched_from_repo_name: [branched_from_repo_name] (required)
-  push_from_user: [push_from_yourself] (required)
-  push_to_myself: [push_to_yourself] (required)
-  use_git_submodules: false (optional)
+  git_tool: github (optional default `github`)
+  use_git_submodules: false (optional default `false`)
+  pull_from_remote_name: [pull_from_remote_name] (required)
+  pull_from_repository_user: [pull_from_repository_username] (required)
+  pull_from_repository_name: [pull_from_repository_name] (required)
+  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)
+
+  time_tracking_username: [username] (optional)
+  time_tracking_password: [password] (optional)
+  time_tracking_owner: [owner] (optional)
+  time_tracking_default_project_id: [project_id] (optional)
+  time_tracking_tool: [tool] (optional)
 
 == Commands
 
@@ -36,13 +45,34 @@ All commands are executed as toolshed [options] command [command-options] args
 The following commands are available:
 
 help                                    # show this usage
-create_github_pull_request              # create a github pull request based on the branch you currently have checked out
+create_pull_request [                   # create a github pull request based on the branch you currently have checked out
+  --tool "github",                      # Optionally pass in your specific tool this can also be set in your config as git_tool
+  --ticket-system "pivotal_tracker"     # Optionally pass in your ticket system this can also be set in your config as ticket_tracking_tool
+  --use-defaults "true"                 # use defaults instead of getting prompts if you don't want to edit your body or title
+  --title "Pull Request Title"          # Title you want to use with the pull request
+  --body "Pull Request Body"            # Body you want to use with the pull request
+]
 get_pivotal_tracker_story_information   # Get the ticket information from a PivotalTracker story based on project_id and story_id
 create_pivotal_tracker_note             # Create a note for a specific PivotalTracker story based on project_id and story_id
 update_pivotal_tracker_story_status     # Update the status of PivotalTracker story
-create_git_branch                       # Create a git branch and push it to your local repository
-checkout_git_branch                     # Checkout a git branch and update the submodules if you use them
-push_git_branch                         # Push your current working branch to your own repository
+create_branch [                         # Create a branch default (git) and push it to your local repository
+  --branch-name "123_test"              # The branch name standard it [ticket_id]_description
+  --branch-from "master"                # What branch do you want to branch from
+]
+checkout_branch [                       # Checkout a branch [default git] and update the submodules if true
+  --branch-name "123"                   # Branch name or part of the branch name you want to checkout
+]
+push_branch [                           # Push your current working branch to your own repository
+  --force                               # Push your current working branch up with --force after
+  --branch-name "another"               # Push this specific branch up instead of your current working branch
+]
+get_daily_time_update                   # Get a daily update from your time tracking toolset currently harvest is supported
+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
+]
+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
+]
 EOF
 end
 
@@ -50,16 +80,16 @@ if $0.split("/").last == 'toolshed'
   options = {}
 
   global = OptionParser.new do |opts|
-    opts.on("-u", "--github_username [ARG]") do |username|
+    opts.on("-u", "--github-username [ARG]") do |username|
       Toolshed::Client.github_username = username
     end
-    opts.on("-p", "--github_password [ARG]") do |password|
+    opts.on("-p", "--github-password [ARG]") do |password|
       Toolshed::Client.github_password = password
     end
-    opts.on("-u", "--pivotal_tracker_username [ARG]") do |username|
+    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|
+    opts.on("-p", "--pivotal-tracker-password [ARG]") do |password|
       Toolshed::Client.pivotal_tracker_password = password
     end
     opts.on("-d", "--debug [ARG]") do
@@ -70,7 +100,56 @@ if $0.split("/").last == 'toolshed'
     end
   end
 
-  subcommands = {}
+  subcommands = {
+    'create_pull_request' => OptionParser.new do |opts|
+      opts.on("--tool [ARG]") do |opt|
+        Toolshed::Client.git_tool = opt.downcase
+      end
+      opts.on("--ticket-system [ARG]") do |opt|
+        Toolshed::Client.ticket_tracking_tool = opt.downcase
+      end
+      opts.on("--use-defaults [ARG]") do |opt|
+        Toolshed::Client.use_defaults = opt
+      end
+      opts.on("--title [ARG]") do |opt|
+        options[:title] = opt
+      end
+      opts.on("--body [ARG]") do |opt|
+        options[:body] = opt
+      end
+    end,
+    'create_branch' => OptionParser.new do |opts|
+      opts.on("--branch-name [ARG]") do |opt|
+        options[:branch_name] = opt
+      end
+      opts.on("--branch-from [ARG]") do |opt|
+        options[:branch_from] = opt
+      end
+    end,
+    'push_branch' => OptionParser.new do |opts|
+      opts.on("--force [ARG]") do |opt|
+        options[:force_command] = true
+      end
+      opts.on("--branch-name [ARG]") do |opt|
+        options[:branch_name] = opt
+      end
+    end,
+    'list_branches' => OptionParser.new do |opts|
+      opts.on("--repository-name [ARG]") do |opt|
+        Toolshed::Client.pull_from_repository_name = opt
+      end
+    end,
+    'checkout_branch' => OptionParser.new do |opts|
+      opts.on("--branch-name [ARG]") do |opt|
+        options[:branch_name] = opt
+      end
+    end,
+    'delete_branch' => OptionParser.new do |opts|
+      opts.on("--branch-name [ARG]") do |opt|
+        options[:branch_name] = opt
+      end
+    end,
+  }
 
   global.order!
   command = ARGV.shift

data/lib/toolshed/base.rb

@@ -3,3 +3,10 @@ module Toolshed
     # implement base methods here
   end
 end
+
+String.class_eval do
+  def camel_case
+    return self if self !~ /_/ && self =~ /[A-Z]+.*/
+    split('_').map{|e| e.capitalize}.join
+  end
+end

data/lib/toolshed/cli.rb

@@ -21,22 +21,29 @@ module Toolshed
 
     def commands
       {
-        'create_github_pull_request'            => Toolshed::Commands::CreateGithubPullRequest,
+        'create_pull_request'                   => Toolshed::Commands::CreatePullRequest,
         'create_pivotal_tracker_note'           => Toolshed::Commands::CreatePivotalTrackerNote,
         'get_pivotal_tracker_story_information' => Toolshed::Commands::GetPivotalTrackerStoryInformation,
         'update_pivotal_tracker_story_status'   => Toolshed::Commands::UpdatePivotalTrackerStoryStatus,
-        'create_git_branch'                     => Toolshed::Commands::CreateGitBranch,
-        'checkout_git_branch'                   => Toolshed::Commands::CheckoutGitBranch,
+        'create_branch'                         => Toolshed::Commands::CreateBranch,
+        'checkout_branch'                       => Toolshed::Commands::CheckoutBranch,
         'push_git_branch'                       => Toolshed::Commands::PushGitBranch,
+        'get_daily_time_update'                 => Toolshed::Commands::GetDailyTimeUpdate,
+        'list_branches'                         => Toolshed::Commands::ListBranches,
+        'delete_branch'                         => Toolshed::Commands::DeleteBranch,
       }
     end
   end
 end
 
-require 'toolshed/commands/create_github_pull_request'
+require 'toolshed/commands/create_pull_request'
 require 'toolshed/commands/create_pivotal_tracker_note'
 require 'toolshed/commands/get_pivotal_tracker_story_information'
 require 'toolshed/commands/update_pivotal_tracker_story_status'
-require 'toolshed/commands/create_git_branch'
-require 'toolshed/commands/checkout_git_branch'
+require 'toolshed/commands/create_branch'
+require 'toolshed/commands/checkout_branch'
 require 'toolshed/commands/push_git_branch'
+require 'toolshed/commands/get_daily_time_update'
+require 'toolshed/commands/get_daily_time_update'
+require 'toolshed/commands/list_branches'
+require 'toolshed/commands/delete_branch'

data/lib/toolshed/client.rb

@@ -6,6 +6,7 @@ module Toolshed
     GITHUB_BASE_API_URL  = "https://api.github.com/"
     PIVOTAL_TRACKER_BASE_API_URL = "https://www.pivotaltracker.com/services/v5/"
 
+    # debugging options
     def self.debug?
       @debug
     end
@@ -14,6 +15,22 @@ module Toolshed
       @debug = debug
     end
 
+    def self.git_quiet
+      @git_quiet
+    end
+
+    def self.git_quiet=(git_quiet)
+      @git_quiet = git_quiet
+    end
+
+    def self.use_defaults
+      @use_defaults
+    end
+
+    def self.use_defaults=(use_defaults)
+      @use_defaults = use_defaults
+    end
+
 
     # github config settings
     def self.github_username
@@ -32,44 +49,44 @@ module Toolshed
       @github_password = password
     end
 
-    def self.branched_from_remote_name
-      @branched_from_remote_name
+    def self.pull_from_remote_name
+      @pull_from_remote_name
     end
 
-    def self.branched_from_remote_name=(branched_from_remote_name)
-      @branched_from_remote_name = branched_from_remote_name 
+    def self.pull_from_remote_name=(pull_from_remote_name)
+      @pull_from_remote_name = pull_from_remote_name
     end
 
-    def self.branched_from_user
-      @branched_from_user
+    def self.pull_from_repository_user
+      @pull_from_repository_user
     end
 
-    def self.branched_from_user=(branched_from_user)
-      @branched_from_user = branched_from_user 
+    def self.pull_from_repository_user=(pull_from_repository_user)
+      @pull_from_repository_user = pull_from_repository_user
     end
 
-    def self.branched_from_repo_name
-      @branched_from_repo_name
+    def self.pull_from_repository_name
+      @pull_from_repository_name
     end
 
-    def self.branched_from_repo_name=(branched_from_repo_name)
-      @branched_from_repo_name = branched_from_repo_name 
+    def self.pull_from_repository_name=(pull_from_repository_name)
+      @pull_from_repository_name = pull_from_repository_name
     end
 
-    def self.push_from_user
-      @push_from_user
+    def self.push_to_repository_user
+      @push_to_repository_user
     end
 
-    def self.push_from_user=(push_from_user)
-      @push_from_user = push_from_user 
+    def self.push_to_repository_user=(push_to_repository_user)
+      @push_to_repository_user = push_to_repository_user
     end
 
-    def self.push_to_myself
-      @push_to_myself
+    def self.push_to_remote_name
+      @push_to_remote_name
     end
 
-    def self.push_to_myself=(push_to_myself)
-      @push_to_myself = push_to_myself 
+    def self.push_to_remote_name=(push_to_remote_name)
+      @push_to_remote_name = push_to_remote_name
     end
 
     def self.use_git_submodules
@@ -80,6 +97,13 @@ module Toolshed
       @use_git_submodules = use_git_submodules
     end
 
+    def self.git_tool
+      (@git_tool.nil?) ? Toolshed::Git::DEFAULT_GIT_TOOL : @git_tool
+    end
+
+    def self.git_tool=(git_tool)
+      @git_tool = git_tool
+    end
 
 
     # pivotal tracker config
@@ -107,23 +131,61 @@ module Toolshed
       @default_pivotal_tracker_project_id = default_pivotal_tracker_project_id
     end
 
-    def self.use_pivotal_tracker
-      @use_pivotal_tracker
+
+    # ticket tracking configuration
+
+    def self.ticket_tracking_tool
+      @ticket_tracking_tool
+    end
+
+    def self.ticket_tracking_tool=(ticket_tracking_tool)
+      @ticket_tracking_tool = ticket_tracking_tool
     end
 
-    def self.use_pivotal_tracker=(use_pivotal_tracker)
-      @use_pivotal_tracker = use_pivotal_tracker
+    # time tracking configuration
+
+    def self.time_tracking_tool
+      @time_tracking_tool
     end
 
+    def self.time_tracking_tool=(time_tracking_tool)
+      @time_tracking_tool = time_tracking_tool
+    end
 
-    def self.http_proxy
-      @http_proxy
+    def self.time_tracking_username
+      @time_tracking_username
     end
 
-    def self.http_proxy=(http_proxy)
-      @http_proxy = http_proxy
+    def self.time_tracking_username=(time_tracking_username)
+      @time_tracking_username = time_tracking_username
     end
 
+    def self.time_tracking_password
+      @time_tracking_password
+    end
+
+    def self.time_tracking_password=(time_tracking_password)
+      @time_tracking_password = time_tracking_password
+    end
+
+    def self.time_tracking_owner
+      @time_tracking_owner
+    end
+
+    def self.time_tracking_owner=(time_tracking_owner)
+      @time_tracking_owner = time_tracking_owner
+    end
+
+    def self.time_tracking_default_project_id
+      @time_tracking_default_project_id
+    end
+
+    def self.time_tracking_default_project_id=(time_tracking_default_project_id)
+      @time_tracking_default_project_id = time_tracking_default_project_id
+    end
+
+
+
     def self.load_credentials_if_necessary
       load_credentials unless credentials_loaded?
     end
@@ -154,13 +216,21 @@ module Toolshed
         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.branched_from_remote_name          ||= credentials['branched_from_remote_name']
-        self.branched_from_user                 ||= credentials['branched_from_user']
-        self.branched_from_repo_name            ||= credentials['branched_from_repo_name']
-        self.push_from_user                     ||= credentials['push_from_user']
-        self.push_to_myself                     ||= credentials['push_to_myself']
-        self.use_pivotal_tracker                ||= credentials['use_pivotal_tracker']
+        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']
+        self.push_to_repository_user            ||= credentials['push_to_repository_user']
+        self.push_to_remote_name                ||= credentials['push_to_remote_name']
+        self.ticket_tracking_tool               ||= credentials['ticket_tracking_tool']
         self.use_git_submodules                 ||= credentials['use_git_submodules']
+        self.git_tool                           ||= credentials['git_tool']
+        self.time_tracking_username             ||= credentials['time_tracking_username']
+        self.time_tracking_password             ||= credentials['time_tracking_password']
+        self.time_tracking_owner                ||= credentials['time_tracking_owner']
+        self.time_tracking_default_project_id   ||= credentials['time_tracking_default_project_id']
+        self.time_tracking_tool                 ||= credentials['time_tracking_tool']
+        self.git_quiet                          ||= (credentials['git_quiet']) ? '&> /dev/null' : ''
+        self.use_defaults                       ||= credentials['use_defaults']
         @credentials_loaded = true
         puts "Credentials loaded from #{File.absolute_path(loaded_from_path)}"
       rescue => error
@@ -170,55 +240,7 @@ module Toolshed
     end
 
     def self.credentials_loaded?
-      (@credentials_loaded ||= false) or (github_username and github_password and pivotal_tracker_username and pivotal_tracker_password)
-    end
-
-    def self.base_options
-      options = {
-        :format => :json,
-        :headers => { 'Accept' => 'application/json', 'User-Agent' => "toolshed-ruby/#{Toolshed::VERSION}" },
-      }
-
-      if http_proxy
-        options.merge!(
-          :http_proxyaddr => self.http_proxy[:addr],
-          :http_proxyport => self.http_proxy[:port]
-        )
-      end
-
-      if password
-        options[:basic_auth] = { :username => username, :password => password }
-      else
-        raise Error, 'A password is required for all API requests.'
-      end
-
-      options
-    end
-
-    def self.get(path, options = {})
-      request :get, path, options
-    end
-
-    def self.post(path, options = {})
-      request :post, path, options
-    end
-
-    def self.put(path, options = {})
-      request :put, path, options
-    end
-
-    def self.delete(path, options = {})
-      request :delete, path, options
-    end
-
-    def self.request(method, path, options)
-      response = HTTParty.send(method, "#{base_uri}#{path}", base_options.merge(options))
-
-      if response.code == 401
-        raise AuthenticationFailed
-      end
-
-      response
+      (@credentials_loaded ||= false)
     end
   end
 end

data/lib/toolshed/commands/checkout_branch.rb

@@ -0,0 +1,26 @@
+module Toolshed
+  module Commands
+    class CheckoutBranch
+      def execute(args, options = {})
+        branch_name = read_user_input("Ticket ID or Branch Name:", options)
+        branch_name = Toolshed::Git::Base.checkout(branch_name)
+        puts "Switched to '#{branch_name}'"
+      end
+
+      def read_user_input(message, options)
+        return options[:branch_name] if (options.has_key?(:branch_name))
+
+        puts message
+        value = $stdin.gets.chomp
+
+        until (!value.empty?)
+          puts "Branch name cannot be empty"
+          puts message
+          value = $stdin.gets.chomp
+        end
+
+        value
+      end
+    end
+  end
+end

data/lib/toolshed/commands/create_branch.rb

@@ -0,0 +1,60 @@
+module Toolshed
+  module Commands
+    class CreateBranch
+      def execute(args, options = {})
+        begin
+          branch_name = read_user_input_branch_name("Branch name:", options)
+          branch_from = read_user_input_branch_from("Branch from:", options)
+
+          puts "Branch name: #{branch_name}"
+          puts "Branching from: #{branch_from}"
+
+          git = Toolshed::Git::Base.new({
+            from_remote_branch_name: branch_from,
+            to_remote_branch_name: branch_name,
+          })
+          git.create_branch
+
+          puts "Branch #{branch_name} has been created"
+          return
+        rescue Veto::InvalidEntity => e
+          puts "Unable to create branch due to the following errors"
+          e.message.each do |key, value|
+            puts "#{key}: #{value}"
+          end
+          return
+        end
+      end
+
+      def read_user_input_branch_name(message, options)
+        return options[:branch_name] if (options.has_key?(:branch_name))
+
+        puts message
+        value = $stdin.gets.chomp
+
+        until (!value.empty?)
+          puts "Branch name cannot be empty"
+          puts message
+          value = $stdin.gets.chomp
+        end
+
+        value
+      end
+
+      def read_user_input_branch_from(message, options)
+        return options[:branch_from] if (options.has_key?(:branch_from))
+
+        puts message
+        value = $stdin.gets.chomp
+
+        until (!value.empty?)
+          puts "Branch from cannot be empty"
+          puts message
+          value = $stdin.gets.chomp
+        end
+
+        value
+      end
+    end
+  end
+end

data/lib/toolshed/commands/create_pivotal_tracker_note.rb

@@ -8,10 +8,13 @@ module Toolshed
           project_id = Toolshed::Client.default_pivotal_tracker_project_id
         end
 
-        pivotal_tracker = Toolshed::PivotalTracker.new({ project_id: project_id, username: Toolshed::PivotalTracker.username, password: Toolshed::PivotalTracker.password })
-        github = Toolshed::Github.new
+        pivotal_tracker = Toolshed::TicketTracking::PivotalTracker.new({
+            project_id: project_id,
+            username: Toolshed::TicketTracking::PivotalTracker.username,
+            password: Toolshed::TicketTracking::PivotalTracker.password,
+        })
 
-        default_story_id = Toolshed::PivotalTracker::story_id_from_branch_name(github.branch_name)
+        default_story_id = Toolshed::TicketTracking::PivotalTracker::story_id_from_branch_name(Toolshed::Git::Base.branch_name)
         print "Story ID (Default: #{default_story_id})? "
         story_id = $stdin.gets.chomp.strip
         if (story_id == '')
@@ -23,7 +26,9 @@ module Toolshed
 
         begin
           result = pivotal_tracker.add_note(story_id, note_text)
-          puts result.inspect
+          result.instance_variables.each do |name, value|
+            puts "#{name}: #{result.instance_variable_get(name).inspect}"
+          end
         rescue => e
           puts e.message
           exit