toolshed 0.0.9 → 1.0.0

data/lib/toolshed/ticket_tracking/jira.rb

@@ -0,0 +1,106 @@
+module Toolshed
+  module TicketTracking
+    class Jira
+      extend TicketTracking
+      include HTTParty
+
+      USE_PROJECT_NAME = true
+
+      attr_accessor :project, :client, :owner, :ticket
+
+      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.client = JIRA::Client.new({
+          username:     username,
+          password:     password,
+          site:         "https://#{self.owner}.atlassian.net",
+          context_path: '',
+          auth_type:    :basic,
+          use_ssl:      true,
+        })
+
+        self.project = self.client.Project.find(options[:project])
+        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 })
+      end
+
+      def update_ticket_status(status, options={})
+        available_statuses
+
+        transition = self.ticket.transitions.build
+        transition.save({ 'transition' => { "id" => transition_status_id_by_status(status) } })
+      end
+
+      def available_statuses
+        self.client.Transition.all(issue: self.ticket)
+      end
+
+      def transition_status_id_by_status(status)
+        self.available_statuses.each do |transition_status|
+          if (status == transition_status.name)
+            return transition_status.id
+          end
+        end
+
+        raise "Unable to find available status"
+      end
+
+      def title
+        self.ticket.summary
+      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
+
+      def self.password
+        return Toolshed::Client::ticket_tracker_password unless Toolshed::Client::ticket_tracker_password.nil?
+
+        # prompt to ask for password
+        system "stty -echo"
+        puts "Jira password? "
+        password = $stdin.gets.chomp.strip
+        system "stty echo"
+      end
+
+      def self.create_instance(options={})
+        unless (options.has_key?(:project))
+          raise 'Unable to use Jira as project name was not supplied'
+        end
+
+        unless (options.has_key?(:ticket_id))
+          raise 'Unable to use Jira as ticket id was not supplied'
+        end
+
+        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

@@ -7,7 +7,7 @@ module Toolshed
       DEFAULT_COMPLETED_STATUS = 'finished'
       USE_PROJECT_ID = true
 
-      attr_accessor :project_id, :token
+      attr_accessor :project_id, :token, :story
 
       def initialize(options={})
         username = Toolshed::Client::pivotal_tracker_username
@@ -25,21 +25,18 @@ module Toolshed
 
         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)
+        self.story = @pt_project.stories.find(options[:ticket_id])
       end
 
-      #
-      # Instance methods
-      #
-      def story_information(story_id)
-        return @pt_project.stories.find(story_id)
+      def ticket
+        self.story
       end
 
-      def add_note(story_id, note_text)
-        story = @pt_project.stories.find(story_id)
-        results = story.notes.create(text: note_text)
+      def add_note(note_text)
+        results = self.story.notes.create(text: note_text)
       end
 
-      def update_ticket_status(story_id, current_state, options={})
+      def update_ticket_status(current_state, options={})
         options.merge!({
           :headers => {
               "X-TrackerToken"  => self.token,
@@ -51,7 +48,7 @@ module Toolshed
           }.to_json
         })
 
-        response = HTTParty.put("#{Toolshed::Client::PIVOTAL_TRACKER_BASE_API_URL}projects/#{self.project_id}/stories/#{story_id}", options).response
+        response = HTTParty.put("#{Toolshed::Client::PIVOTAL_TRACKER_BASE_API_URL}projects/#{self.project_id}/stories/#{self.story.id}", options).response
         response = JSON.parse(response.body)
 
         if (response["error"].nil?)
@@ -61,50 +58,55 @@ module Toolshed
         end
       end
 
-      #
-      # Class methods
-      #
-      def self.story_id_from_branch_name(branch_name)
-        story_id = branch_name.split("_")[0]
+      def title
+        self.clean(self.story.name)
       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
+      def url(ticket_id)
+        self.story.url
       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
+      class << self
+        def username
+          username = Toolshed::Client::pivotal_tracker_username
+          if (username.nil?)
+            # prompt to ask for username
+            puts "PivotalTracker username? "
+            username = $stdin.gets.chomp.strip
+          end
 
-      #
-      # Get the pivotal tracker object based off of the project_id
-      #
-      def self.create_instance(options={})
-        unless (options.has_key?(:project_id))
-          raise 'Unable to use PivotalTracker as project id was not supplied'
+          return username
         end
 
-        pivotal_tracker = Toolshed::TicketTracking::PivotalTracker.new({ project_id: options[:project_id], username: Toolshed::TicketTracking::PivotalTracker.username, password: Toolshed::TicketTracking::PivotalTracker.password })
-      end
+        def 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
 
-      def self.clean(title)
-        title.gsub("'", "").gsub("\"", "")
+        def create_instance(options={})
+          unless (options.has_key?(:project_id))
+            raise 'Unable to use PivotalTracker as project id was not supplied'
+          end
+
+          unless (options.has_key?(:ticket_id))
+            raise 'Unable to use PivotalTracker as story id was not supplied'
+          end
+
+          Toolshed::TicketTracking::PivotalTracker.new({
+            project_id: options[:project_id],
+            username:   Toolshed::TicketTracking::PivotalTracker.username,
+            password:   Toolshed::TicketTracking::PivotalTracker.password,
+            ticket_id:   options[:ticket_id],
+          })
+        end
       end
     end
   end

data/lib/toolshed/ticket_tracking/ticket_tracking.rb

@@ -2,5 +2,15 @@ module Toolshed
   module TicketTracking
     def initialize(options={})
     end
+
+    class << self
+      def story_id_from_branch_name(branch_name)
+        branch_name.split("_")[0]
+      end
+
+      def clean(title)
+        title.gsub("'", "").gsub("\"", "")
+      end
+    end
   end
 end

data/lib/toolshed/time_tracking/harvest.rb

@@ -26,37 +26,27 @@ module Toolshed
         end
 
         self.harvest_client = ::Harvest.client(owner, username, password)
-        self.project_id = self.get_project_id
+        self.project_id = options[:project_id] unless !options.has_key?(:project_id)
 
         # setup formatting
         formatter(options)
       end
 
-      def previous(days_ago=1, options={})
+      def previous_time_entries(days_ago, options={})
+        entries = self.harvest_client.time.all((DateTime.now - days_ago), self.project_id)
 
-        notes = "Previous:#{self.line_break}"
-
-        time_entries = self.harvest_client.time.all((DateTime.now - days_ago), self.project_id)
-        if (time_entries.size > 0 || days_ago == Toolshed::TimeTracking::Harvest::MAX_ATTEMPTS)
-          notes = "#{notes}#{self.start_unorder_list}"
-          time_entries.each do |time_entry|
-            notes = "#{notes}#{self.start_list_item}#{time_entry.notes}#{self.end_list_item}"
-            if (self.end_list_item == '')
-              notes = "#{notes}#{self.line_break}"
-            end
-          end
-          notes = "#{notes}#{self.end_unorder_list}"
+        if (entries.size > 0 || days_ago == Toolshed::TimeTracking::Harvest::MAX_ATTEMPTS)
+          entries
         else
-          notes = self.previous(days_ago + 1)
+          entries = self.previous_time_entries(days_ago + 1)
         end
-
-        notes
       end
 
-      def today
-        notes = "Today:#{self.line_break}"
+      def previous_notes(days_ago=1, options={})
+        notes = "Previous:#{self.line_break}"
+
+        time_entries = previous_time_entries(days_ago, options)
 
-        time_entries = self.harvest_client.time.all(Time.now, self.project_id)
         notes = "#{notes}#{self.start_unorder_list}"
         time_entries.each do |time_entry|
           notes = "#{notes}#{self.start_list_item}#{time_entry.notes}#{self.end_list_item}"
@@ -69,14 +59,22 @@ module Toolshed
         notes
       end
 
-      def get_project_id
-        print "Project ID (Default: #{Toolshed::Client.time_tracking_default_project_id})? "
-        project_id = $stdin.gets.chomp.strip
-        if (project_id == '')
-          project_id = Toolshed::Client.time_tracking_default_project_id
+      def todays_time_entries
+        self.harvest_client.time.all(Time.now, self.project_id)
+      end
+
+      def todays_notes
+        notes = "Today:#{self.line_break}"
+        notes = "#{notes}#{self.start_unorder_list}"
+        self.todays_time_entries.each do |time_entry|
+          notes = "#{notes}#{self.start_list_item}#{time_entry.notes}#{self.end_list_item}"
+          if (self.end_list_item == '')
+            notes = "#{notes}#{self.line_break}"
+          end
         end
+        notes = "#{notes}#{self.end_unorder_list}"
 
-        project_id
+        notes
       end
 
       def brought_to_you_by_message
@@ -100,6 +98,29 @@ module Toolshed
           self.end_unorder_list = ""
         end
       end
+
+      def display
+        notes = self.previous_notes
+        notes = "#{notes}#{self.line_break}#{self.line_break}#{self.todays_notes}"
+        notes = "#{notes}#{self.brought_to_you_by_message}"
+
+        if (self.format == 'html')
+          FileUtils.rm_rf(Toolshed::TimeTracking::Harvest::GENERATED_HTML_FILE_LOCATION)
+          File.open(Toolshed::TimeTracking::Harvest::GENERATED_HTML_FILE_LOCATION, 'w') {|f| f.write(notes) }
+          Launchy.open( Toolshed::TimeTracking::Harvest::GENERATED_HTML_FILE_LOCATION ) do |exception|
+            puts "Attempted to open #{uri} and failed because #{exception}"
+          end
+          puts "Checkout out your default or open browser!"
+        else
+          puts notes
+        end
+
+        return
+      end
+
+      def self.create_instance(options={})
+        Toolshed::TimeTracking::Harvest.new(options)
+      end
     end
   end
 end

data/lib/toolshed/version.rb

@@ -1,3 +1,3 @@
 module Toolshed
-  VERSION = "0.0.9"
+  VERSION = "1.0.0"
 end

data/lib/toolshed.rb

@@ -1,6 +1,7 @@
 require "toolshed/version"
 require 'httparty'
 require 'pivotal-tracker'
+require 'jira'
 require 'harvested'
 require 'veto'
 require 'launchy'
@@ -28,6 +29,7 @@ require 'toolshed/git/git'
 require 'toolshed/git/github'
 require 'toolshed/ticket_tracking/ticket_tracking'
 require 'toolshed/ticket_tracking/pivotal_tracker'
+require 'toolshed/ticket_tracking/jira'
 require 'toolshed/time_tracking/time_tracking'
 require 'toolshed/time_tracking/harvest'
 require 'toolshed/error'

data/test/commands/create_branch_test.rb

@@ -41,4 +41,24 @@ class CreateBranchTest < Test::Unit::TestCase
     Toolshed::Git::Base.checkout(current_branch)
     delete_branch(new_branch_name)
   end
+
+  def test_create_new_branch_without_passing_in_branch_from
+    Toolshed::Client.pull_from_remote_name = 'origin'
+    Toolshed::Client.push_to_remote_name = 'origin'
+
+    current_branch = Toolshed::Git::Base.branch_name
+    new_branch_name = ::Faker::Lorem.word.downcase
+
+    # stub the possible input
+    Toolshed::Commands::CreateBranch.any_instance.stubs(:read_user_input_branch_name).returns(new_branch_name)
+
+    output = capture_stdout { Toolshed::Commands::CreateBranch.new.execute({}, { branch_name: new_branch_name }) }
+
+    assert_match /Branch #{new_branch_name} has been created/, output
+    assert_equal new_branch_name, Toolshed::Git::Base.branch_name
+    assert_equal 'master', Toolshed::Git::Base.branched_from
+
+    Toolshed::Git::Base.checkout(current_branch)
+    delete_branch(new_branch_name)
+  end
 end

data/test/commands/create_pull_request_test.rb

@@ -86,7 +86,6 @@ class CreatePullRequestTest < Test::Unit::TestCase
       with("#{Toolshed::Client::GITHUB_BASE_API_URL}repos/#{Toolshed::Client.pull_from_repository_user}/#{Toolshed::Client.pull_from_repository_name}/pulls", github_default_options).
       returns(http_party_mock)
 
-
     # mock up the pivotal_tracker stuff
     PivotalTracker::Client.expects(:token).
     with(Toolshed::TicketTracking::PivotalTracker.username, Toolshed::TicketTracking::PivotalTracker.password).
@@ -104,10 +103,19 @@ class CreatePullRequestTest < Test::Unit::TestCase
     pivotal_tracker_story_mock = mock('PivotalTracker::Story')
     pivotal_tracker_story_mock.stubs(:url => 'http://www.example.com', :id => '1', :name => "Test Title")
 
-    Toolshed::TicketTracking::PivotalTracker.any_instance.expects(:story_information).
+    pivotal_tracker_mock.expects(:stories).
+    returns(pivotal_tracker_story_mock)
+
+    pivotal_tracker_story_mock.expects(:find).
     with('1').
     returns(pivotal_tracker_story_mock)
 
+    Toolshed::TicketTracking::PivotalTracker.any_instance.expects(:title).
+    returns("Sample")
+
+    Toolshed::TicketTracking::PivotalTracker.any_instance.expects(:url).
+    returns("github.com/pulls/1")
+
     # stub the possible input
     Toolshed::Commands::CreatePullRequest.any_instance.stubs(:read_user_input_ticket_tracker_ticket_id).returns('1')
     Toolshed::Commands::CreatePullRequest.any_instance.stubs(:read_user_input_add_note_to_ticket).returns(false)

data/test/commands/get_daily_time_update_test.rb

@@ -0,0 +1,60 @@
+require 'commands/commands_helper'
+require 'toolshed/commands/get_daily_time_update'
+
+class GetDailyTimeUpdateTest < 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'
+  end
+
+  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).
+    returns('')
+
+    harvest_mock = mock('Harvest::TimeEntry')
+    harvest_mock.stubs(:notes => 'Worked on this yesterday')
+
+    Toolshed::TimeTracking::Harvest.any_instance.stubs(:previous_time_entries).
+    returns([harvest_mock])
+
+    harvest_mock = mock('Harvest::TimeEntry')
+    harvest_mock.stubs(:notes => 'Worked on this')
+
+    Toolshed::TimeTracking::Harvest.any_instance.stubs(:todays_time_entries).
+    returns([harvest_mock])
+
+    output = capture_stdout { Toolshed::Commands::GetDailyTimeUpdate.new.execute({}, { project_id: '1111' }) }
+    assert_match /Worked on this yesterday/, output
+    assert_match /Worked on this/, output
+  end
+
+  def test_get_daily_time_update_with_use_defaults_on
+    Toolshed::Client.use_defaults                     = true
+
+    ::Harvest.expects(:client).
+    with(Toolshed::Client.time_tracking_owner, Toolshed::Client.time_tracking_username, Toolshed::Client.time_tracking_password).
+    returns('')
+
+    harvest_mock = mock('Harvest::TimeEntry')
+    harvest_mock.stubs(:notes => 'Worked on this yesterday')
+
+    Toolshed::TimeTracking::Harvest.any_instance.stubs(:previous_time_entries).
+    returns([harvest_mock])
+
+    harvest_mock = mock('Harvest::TimeEntry')
+    harvest_mock.stubs(:notes => 'Worked on this')
+
+    Toolshed::TimeTracking::Harvest.any_instance.stubs(:todays_time_entries).
+    returns([harvest_mock])
+
+    output = capture_stdout { Toolshed::Commands::GetDailyTimeUpdate.new.execute({}, {}) }
+    assert_match /Previous:/, output
+    assert_match /Today:/, output   
+    assert_match /Worked on this yesterday/, output
+    assert_match /Worked on this/, output
+  end
+end

data/test/git/git_helper.rb

@@ -21,7 +21,7 @@ def save_stash
 end
 
 def delete_branch(branch_name)
-  until system("git branch -D #{branch_name} --quiet")
+  until system("git branch -D #{branch_name} #{Toolshed::Client.git_quiet}")
     sleep 1
   end
 end

data/test/helper.rb

@@ -7,6 +7,9 @@ if (ENV["COVERAGE"])
   end
 end
 
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require 'test/unit'
 require 'mocha/test_unit'
 require 'faker'
@@ -19,6 +22,7 @@ require 'toolshed'
 Test::Unit.at_start do
   Toolshed::Client.use_git_submodules = false
   #Toolshed::Client.git_quiet = '&> /dev/null' unless ENV['RUNNING_ON_CI']
+  Toolshed::Client.git_quiet = ''
 
   I18n.config.enforce_available_locales = true