toolshed 1.0.2 → 1.0.3

data/test/server_administration/ssh_test.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'toolshed/server_administration/ssh'
 
 class SSHTest < Test::Unit::TestCase
   def test_setting_ssh_options

data/test/ticket_tracking/jira_test.rb

@@ -1,11 +1,13 @@
 require 'helper'
+require 'toolshed/ticket_tracking/ticket_tracking'
+require 'toolshed/ticket_tracking/jira'
 
 class JiraTest < Test::Unit::TestCase
   def self.startup
-    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]'
+    Toolshed::Client.instance.ticket_tracker_username = 'sample'
+    Toolshed::Client.instance.ticket_tracker_password = 'sample'
+    Toolshed::Client.instance.ticket_tracker_owner = 'sample'
+    Toolshed::Client.instance.default_pull_request_title_format = '[id] - [summary]'
   end
 
   def test_add_note
@@ -120,15 +122,15 @@ class JiraTest < Test::Unit::TestCase
       '11'
     )
 
-    assert_equal("https://#{Toolshed::Client::ticket_tracker_owner}.atlassian.net/browse/11", @jira.url)
+    assert_equal("https://#{Toolshed::Client.instance.ticket_tracker_owner}.atlassian.net/browse/11", @jira.url)
   end
 
   def test_username
-    assert_equal(Toolshed::TicketTracking::Jira.username, Toolshed::Client::ticket_tracker_username)
+    assert_equal(Toolshed::TicketTracking::Jira.username, Toolshed::Client.instance.ticket_tracker_username)
   end
 
   def test_password
-    assert_equal(Toolshed::TicketTracking::Jira.password, Toolshed::Client::ticket_tracker_password)
+    assert_equal(Toolshed::TicketTracking::Jira.password, Toolshed::Client.instance.ticket_tracker_password)
   end
 
   def test_create_instance_raise_project_name
@@ -158,9 +160,9 @@ class JiraTest < Test::Unit::TestCase
 
     def jira_init
       @jira = Toolshed::TicketTracking::Jira.create_instance({
-        username: Toolshed::Client::ticket_tracker_username,
-        password: Toolshed::Client::ticket_tracker_password,
-        owner:    Toolshed::Client::ticket_tracker_owner,
+        username: Toolshed::Client.instance.ticket_tracker_username,
+        password: Toolshed::Client.instance.ticket_tracker_password,
+        owner:    Toolshed::Client.instance.ticket_tracker_owner,
         project:  'project',
         ticket_id: '11',
       })
@@ -180,9 +182,9 @@ class JiraTest < Test::Unit::TestCase
 
       JIRA::Client.expects(:new).
       with({
-        username: Toolshed::Client::ticket_tracker_username,
-        password: Toolshed::Client::ticket_tracker_password,
-        site: "https://#{Toolshed::Client::ticket_tracker_owner}.atlassian.net",
+        username: Toolshed::Client.instance.ticket_tracker_username,
+        password: Toolshed::Client.instance.ticket_tracker_password,
+        site: "https://#{Toolshed::Client.instance.ticket_tracker_owner}.atlassian.net",
         context_path: '',
         auth_type: :basic,
         use_ssl: true
@@ -233,9 +235,9 @@ class JiraTest < Test::Unit::TestCase
     def jira_http_mock_attributes
       {
         options: {
-          username:         Toolshed::Client::ticket_tracker_username,
-          password:         Toolshed::Client::ticket_tracker_password,
-          site:             "https://#{Toolshed::Client::ticket_tracker_owner}.atlassian.net",
+          username:         Toolshed::Client.instance.ticket_tracker_username,
+          password:         Toolshed::Client.instance.ticket_tracker_password,
+          site:             "https://#{Toolshed::Client.instance.ticket_tracker_owner}.atlassian.net",
           context_path:     "",
           rest_base_path:   "/rest/api/2",
           ssl_verify_mode:  1,

data/test/time_tracking/harvest_test.rb

@@ -1,15 +1,17 @@
 require 'helper'
+require 'toolshed/time_tracking/time_tracking'
+require 'toolshed/time_tracking/harvest'
 
 class HarvestTest < Test::Unit::TestCase
   def self.startup
-    Toolshed::Client.time_tracking_tool               = 'harvest'
-    Toolshed::Client.time_tracking_default_project_id = '1234'
-    Toolshed::Client.time_tracking_username           = 'sample_username'
-    Toolshed::Client.time_tracking_password           = 'sample1234'
-    Toolshed::Client.time_tracking_owner              = 'me'
+    Toolshed::Client.instance.time_tracking_tool               = 'harvest'
+    Toolshed::Client.instance.time_tracking_default_project_id = '1234'
+    Toolshed::Client.instance.time_tracking_username           = 'sample_username'
+    Toolshed::Client.instance.time_tracking_password           = 'sample1234'
+    Toolshed::Client.instance.time_tracking_owner              = 'me'
 
     ::Harvest.expects(:client).
-    with(subdomain: Toolshed::Client.time_tracking_owner, username: Toolshed::Client.time_tracking_username, password: Toolshed::Client.time_tracking_password).
+    with(subdomain: Toolshed::Client.instance.time_tracking_owner, username: Toolshed::Client.instance.time_tracking_username, password: Toolshed::Client.instance.time_tracking_password).
     returns('')
   end
 

data/toolshed.gemspec

@@ -4,33 +4,34 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'toolshed/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "toolshed"
+  spec.name          = 'toolshed'
   spec.version       = Toolshed::VERSION
-  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      = ""
-  spec.license       = "MIT"
+  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} # rubocop:disable Metrics/LineLength
+  spec.summary       = %q{Create a Github pull request with minimal work. Will automatically read ticket information from pivotal tracker if you use that.} # rubocop:disable Metrics/LineLength
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
-  #spec.executables   = ["toolshed"]
+  #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.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "httparty"
-  spec.add_dependency "json"
-  spec.add_dependency "pivotal-tracker"
-  spec.add_dependency "harvested"
-  spec.add_dependency "veto"
-  spec.add_dependency "launchy"
-  spec.add_dependency "clipboard"
-  spec.add_dependency "jira-ruby"
-  spec.add_dependency "net-ssh"
+  spec.add_dependency 'httparty', '0.13.5'
+  spec.add_dependency 'pivotal-tracker', '0.5.13'
+  spec.add_dependency 'harvested', '3.1.1'
+  spec.add_dependency 'veto'
+  spec.add_dependency 'launchy', '2.4.3'
+  spec.add_dependency 'clipboard', '1.0.6'
+  spec.add_dependency 'jira-ruby', '0.1.14'
+  spec.add_dependency 'net-ssh', '2.9.2'
+  spec.add_dependency 'term-ansicolor', '1.3.0'
+  spec.add_dependency 'highline', '1.7.2'
 
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
+  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'
@@ -38,4 +39,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'ci_reporter'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'awesome_print'
 end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: toolshed
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Jake Waller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.5
 - !ruby/object:Gem::Dependency
-  name: json
+  name: pivotal-tracker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.13
 - !ruby/object:Gem::Dependency
-  name: pivotal-tracker
+  name: harvested
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
-  name: harvested
+  name: veto
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,75 +67,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: veto
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: clipboard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
-  name: clipboard
+  name: jira-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.14
 - !ruby/object:Gem::Dependency
-  name: jira-ruby
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -262,24 +276,52 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Utility that will automate simple daily tasks developers perform like
   creating a Github pull request
 email:
 - wallerjake@gmail.com
 executables:
 - toolshed
-- toolshed.rb
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".toolshedrc.sample"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/toolshed
-- bin/toolshed.rb
 - lib/toolshed.rb
 - lib/toolshed/base.rb
 - lib/toolshed/cli.rb
@@ -294,13 +336,18 @@ files:
 - lib/toolshed/commands/get_daily_time_update.rb
 - lib/toolshed/commands/list_branches.rb
 - lib/toolshed/commands/push_branch.rb
+- lib/toolshed/commands/rename_branch.rb
 - lib/toolshed/commands/ssh.rb
 - lib/toolshed/commands/ticket_information.rb
 - lib/toolshed/commands/update_pivotal_tracker_story_status.rb
 - lib/toolshed/commands/update_ticket_status.rb
+- lib/toolshed/entry_point.rb
 - lib/toolshed/error.rb
-- lib/toolshed/git/git.rb
+- lib/toolshed/git.rb
+- lib/toolshed/git/branch.rb
 - lib/toolshed/git/github.rb
+- lib/toolshed/git/validator.rb
+- lib/toolshed/logger.rb
 - lib/toolshed/password.rb
 - lib/toolshed/server_administration/ssh.rb
 - lib/toolshed/ticket_tracking/jira.rb
@@ -317,6 +364,7 @@ files:
 - test/commands/delete_branch_test.rb
 - test/commands/get_daily_time_update_test.rb
 - test/commands/push_branch_test.rb
+- test/commands/rename_branch_test.rb
 - test/config.rb
 - test/git/git_helper.rb
 - test/git/git_test.rb
@@ -347,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Create a Github pull request with minimal work. Will automatically read ticket
@@ -361,6 +409,7 @@ test_files:
 - test/commands/delete_branch_test.rb
 - test/commands/get_daily_time_update_test.rb
 - test/commands/push_branch_test.rb
+- test/commands/rename_branch_test.rb
 - test/config.rb
 - test/git/git_helper.rb
 - test/git/git_test.rb