toolshed 0.0.5 → 0.0.6

data/toolshed.gemspec

@@ -22,7 +22,15 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty"
   spec.add_dependency "json"
   spec.add_dependency "pivotal-tracker"
+  spec.add_dependency "harvested"
+  spec.add_dependency "veto"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   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 'ci_reporter'
+  spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toolshed
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - test
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -52,6 +52,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: harvested
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: veto
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +108,90 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  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: faker
+  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: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.5
+- !ruby/object:Gem::Dependency
+  name: debugger
+  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: ci_reporter
+  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: simplecov
+  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:
@@ -90,6 +202,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,17 +213,35 @@ files:
 - lib/toolshed/base.rb
 - lib/toolshed/cli.rb
 - lib/toolshed/client.rb
-- lib/toolshed/commands/checkout_git_branch.rb
-- lib/toolshed/commands/create_git_branch.rb
-- lib/toolshed/commands/create_github_pull_request.rb
+- lib/toolshed/commands/checkout_branch.rb
+- lib/toolshed/commands/create_branch.rb
 - lib/toolshed/commands/create_pivotal_tracker_note.rb
+- lib/toolshed/commands/create_pull_request.rb
+- lib/toolshed/commands/delete_branch.rb
+- lib/toolshed/commands/get_daily_time_update.rb
 - lib/toolshed/commands/get_pivotal_tracker_story_information.rb
-- lib/toolshed/commands/push_git_branch.rb
+- lib/toolshed/commands/list_branches.rb
+- lib/toolshed/commands/push_branch.rb
 - lib/toolshed/commands/update_pivotal_tracker_story_status.rb
 - lib/toolshed/error.rb
-- lib/toolshed/github.rb
-- lib/toolshed/pivotal_tracker.rb
+- lib/toolshed/git/git.rb
+- lib/toolshed/git/github.rb
+- lib/toolshed/ticket_tracking/pivotal_tracker.rb
+- lib/toolshed/ticket_tracking/ticket_tracking.rb
+- lib/toolshed/time_tracking/harvest.rb
+- lib/toolshed/time_tracking/time_tracking.rb
 - lib/toolshed/version.rb
+- test/commands/checkout_branch_test.rb
+- test/commands/commands_helper.rb
+- test/commands/create_branch_test.rb
+- test/commands/create_pull_request_test.rb
+- test/commands/delete_branch_test.rb
+- test/commands/push_branch_test.rb
+- test/config.rb
+- test/git/git_helper.rb
+- test/git/git_test.rb
+- test/git/github_test.rb
+- test/helper.rb
 - toolshed.gemspec
 homepage: ''
 licenses:
@@ -137,4 +268,15 @@ signing_key:
 specification_version: 4
 summary: Create a Github pull request with minimal work. Will automatically read ticket
   information from pivotal tracker if you use that.
-test_files: []
+test_files:
+- test/commands/checkout_branch_test.rb
+- test/commands/commands_helper.rb
+- test/commands/create_branch_test.rb
+- test/commands/create_pull_request_test.rb
+- test/commands/delete_branch_test.rb
+- test/commands/push_branch_test.rb
+- test/config.rb
+- test/git/git_helper.rb
+- test/git/git_test.rb
+- test/git/github_test.rb
+- test/helper.rb

data/lib/toolshed/commands/checkout_git_branch.rb

@@ -1,23 +0,0 @@
-module Toolshed
-  module Commands
-    class CheckoutGitBranch
-      def execute(args, options = {})
-        print "Ticket ID or Branch Name? "
-        ticket_id = $stdin.gets.chomp
-
-        branch_name = `git branch | grep \"#{ticket_id}\"`.gsub("*", "").strip
-
-        git_submodule_command = ''
-        if (Toolshed::Client.use_git_submodules)
-          print "Update Submodules (y/n)? "
-          update_submodules = $stdin.gets.chomp
-          if (update_submodules == 'y')
-            git_submodule_command = "git submodule update --init;"
-          end
-        end
-
-        system("git checkout #{branch_name}; #{git_submodule_command}")
-      end
-    end
-  end
-end

data/lib/toolshed/commands/create_git_branch.rb

@@ -1,28 +0,0 @@
-module Toolshed
-  module Commands
-    class CreateGitBranch
-      def execute(args, options = {})
-          print "Branch text? "
-          branch_name = $stdin.gets.chomp
-
-          print "Branch from? "
-          branch_from = $stdin.gets.chomp
-
-          git_submodule_command = ''
-          if (Toolshed::Client.use_git_submodules)
-            print "Update Submodules (y/n)? "
-            update_submodules = $stdin.gets.chomp
-            if (update_submodules == 'y')
-              git_submodule_command = "git submodule update --init;"
-            end
-          end
-
-          branch_name = branch_name.strip.downcase.tr(" ", "_").gsub("-", "").gsub("&", "").gsub("/", "_").gsub(".", "_").gsub("'", "").gsub("__", "_").gsub(":", "")
-          output_text = "git remote update; git checkout -b #{branch_name} #{Toolshed::Client.branched_from_remote_name}/#{branch_from}; #{git_submodule_command} git push #{Toolshed::Client.push_to_myself} #{branch_name}"
-
-          puts "Creating branch.."
-          system(output_text)
-      end
-    end
-  end
-end

data/lib/toolshed/commands/create_github_pull_request.rb

@@ -1,77 +0,0 @@
-module Toolshed
-  module Commands
-    class CreateGithubPullRequest
-      def execute(args, options = {})
-        pivotal_tracker = nil
-        if (Toolshed::Client.use_pivotal_tracker)
-          # load up the project information for pivotal tracker
-          print "Project ID (Default: #{Toolshed::Client.default_pivotal_tracker_project_id})? "
-          project_id = $stdin.gets.chomp.strip
-          if (project_id == '')
-            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 })
-        end
-
-        github = Toolshed::Github.new({ username: Toolshed::Github.username, password: Toolshed::Github.password })
-
-        # see what branch is checked out and where we are branched from
-        puts "Current Branch: #{github.branch_name}"
-        puts "Branched From: #{github.branched_from}"
-
-        pt_ticket_title = ''
-        if (Toolshed::Client.use_pivotal_tracker)
-          # load up the story information from PivotalTracker
-          default_story_id = Toolshed::PivotalTracker::story_id_from_branch_name(github.branch_name)
-          print "Story ID (Default: #{default_story_id})? "
-          story_id = $stdin.gets.chomp.strip
-          if (story_id == '')
-            story_id = default_story_id
-          end
-
-          pivotal_tracker_result = pivotal_tracker.story_information(story_id)
-
-          pt_ticket_title = pivotal_tracker_result.name
-          pt_ticket_title = pt_ticket_title.gsub("'", "").gsub("\"", "")
-        end
-
-        # github pull request fields
-        print "Github Pull Request Title (Default: #{pt_ticket_title})? "
-        github_pull_request_title = $stdin.gets.chomp.strip
-        if (github_pull_request_title == '')
-          github_pull_request_title = pt_ticket_title
-        end
-
-        github_pull_request_default_body = ''
-        if (Toolshed::Client.use_pivotal_tracker)
-          github_pull_request_default_body = pivotal_tracker_result.url
-        end
-        print "Body (Default: #{github_pull_request_default_body})? "
-        github_pull_request_body = $stdin.gets.chomp.strip
-        if (github_pull_request_body == '')
-          github_pull_request_body = github_pull_request_default_body
-        end
-
-        # create the pull request
-        begin
-          puts "Running Github Pull Request"
-          github_pull_request_result = github.create_pull_request(github_pull_request_title, github_pull_request_body)
-          puts "Github Pull Request URL: #{github_pull_request_result["html_url"]}"
-
-          if (Toolshed::Client.use_pivotal_tracker)
-            print "Would you like to add a note to PivotalTracker with the pull request URL(y/n)? "
-            update_pt_info = $stdin.gets.chomp.strip
-
-            if (update_pt_info == 'y')
-              result = pivotal_tracker.add_note(story_id, github_pull_request_result["html_url"])
-              result = pivotal_tracker.update_story_state(story_id, Toolshed::PivotalTracker::STORY_STATUS_DEFAULT)
-            end
-          end
-        rescue => e
-          puts e.message
-          exit
-        end
-      end
-    end
-  end
-end

data/lib/toolshed/commands/push_git_branch.rb

@@ -1,10 +0,0 @@
-module Toolshed
-  module Commands
-    class PushGitBranch
-      def execute(args, options = {})
-          branch_name = `git rev-parse --abbrev-ref HEAD`
-          system("git push #{Toolshed::Client.push_to_myself} #{branch_name}")
-      end
-    end
-  end
-end

data/lib/toolshed/github.rb

@@ -1,89 +0,0 @@
-module Toolshed
-  class Github
-    include HTTParty
-
-    def initialize(options={})
-      username = Toolshed::Client::github_username
-      password = Toolshed::Client::github_password
-
-      unless (options[:username].nil?)
-        username = options[:username]
-      end
-
-      unless (options[:password].nil?)
-         password = options[:password]
-      end
-
-      @auth = { username: username, password: password }
-      @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"
-        },
-        basic_auth: @auth,
-      }
-    end
-
-    def create_pull_request(title, body, options={})
-      options.merge!(@default_options)
-      options.merge!({
-        body: {
-          title: title,
-           body: body,
-           head: "#{Toolshed::Client.github_username}:#{self.branch_name}",
-           base: self.branched_from
-        }.to_json
-      })
-
-      response = HTTParty.post("#{Toolshed::Client::GITHUB_BASE_API_URL}repos/#{Toolshed::Client.branched_from_user}/#{Toolshed::Client.branched_from_repo_name}/pulls", options).response
-      response = JSON.parse(response.body)
-
-      if (response["errors"].nil?)
-        response
-      else
-        raise "validation errors #{response.inspect}"
-      end
-    end
-
-    def list_branches(options={})
-      options.merge!(@default_options)
-
-      response = HTTParty.get("#{Toolshed::Client::GITHUB_BASE_API_URL}repos/#{Toolshed::Client.github_username}/toolshed/branches", options).response
-      JSON.parse(response.body).each do |branch|
-        puts branch.inspect
-      end
-    end
-
-    def branch_name
-      # branch information
-      branch_name = `git rev-parse --abbrev-ref HEAD`.strip
-    end
-
-    def branched_from
-      branched_from = `git rev-parse --abbrev-ref --symbolic-full-name @{u}`.split('/')[-1].strip
-    end
-
-    def self.username
-      username = Toolshed::Client::github_username
-      if (username.nil?)
-        # prompt to ask for username
-        puts "Github username? "
-        username = $stdin.gets.chomp.strip
-      end
-
-      return username
-    end
-
-    def self.password
-      password = Toolshed::Client::github_password
-      if (password.nil?)
-        # prompt to ask for password
-        system "stty -echo"
-        puts "Github password? "
-        password = $stdin.gets.chomp.strip
-        system "stty echo"
-      end
-
-      return password
-    end
-  end
-end

data/lib/toolshed/pivotal_tracker.rb

@@ -1,87 +0,0 @@
-module Toolshed
-  class PivotalTracker
-    include HTTParty
-
-    STORY_STATUS_DEFAULT = 'finished'
-
-    attr_accessor :project_id, :token
-
-    def initialize(options={})
-      username = Toolshed::Client::pivotal_tracker_username
-      password = Toolshed::Client::pivotal_tracker_password
-
-      unless (options[:username].nil?)
-        username = options[:username]
-      end
-
-      unless (options[:password].nil?)
-         password = options[:password]
-      end
-
-
-      self.token = ::PivotalTracker::Client.token(username, password)
-
-      self.project_id = (options[:project_id].nil?) ? Toolshed::Client.default_pivotal_tracker_project_id : options[:project_id]
-      @pt_project = ::PivotalTracker::Project.find(self.project_id)
-    end
-
-    def self.story_id_from_branch_name(branch_name)
-      story_id = branch_name.split("_")[0]
-    end
-
-    def story_information(story_id)
-      return @pt_project.stories.find(story_id)
-    end
-
-    def add_note(story_id, note_text)
-      story = @pt_project.stories.find(story_id)
-      results = story.notes.create(text: note_text)
-    end
-
-    def update_story_state(story_id, current_state, options={})
-      options.merge!({
-        :headers => {
-            "X-TrackerToken"  => self.token,
-            "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",
-            "Content-Type"    => "application/json",
-        },
-        body: {
-          current_state: current_state
-        }.to_json
-      })
-
-      response = HTTParty.put("#{Toolshed::Client::PIVOTAL_TRACKER_BASE_API_URL}projects/#{self.project_id}/stories/#{story_id}", options).response
-      response = JSON.parse(response.body)
-
-      if (response["error"].nil?)
-        response
-      else
-        raise "validation errors #{response.inspect}"
-      end
-    end
-
-    def self.username
-      username = Toolshed::Client::pivotal_tracker_username
-      if (username.nil?)
-        # prompt to ask for username
-        puts "PivotalTracker username? "
-        username = $stdin.gets.chomp.strip
-      end
-
-      return username
-    end
-
-    def self.password
-      password = Toolshed::Client::pivotal_tracker_password
-      if (password.nil?)
-        # prompt to ask for password
-        system "stty -echo"
-        puts "PivotalTracker password? "
-        password = $stdin.gets.chomp.strip
-        system "stty echo"
-      end
-
-      return password
-    end
-  end
-end