dude-cli 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 319efa8b53b8ca61b34a665a566a8d01f40ea89e
-  data.tar.gz: 5de5fc6b10a6c3221de627d99ed647e8ea06d353
+  metadata.gz: f1b1363a91b57a06932df8d4b80be8b7a709e694
+  data.tar.gz: 9e65b6ffa950cfd5c4a14e53872040385cb06a88
 SHA512:
-  metadata.gz: '069c31f407392c712dbc799f0fc192b6a43259e641c779bfce81db4a22563db77d23dab823609d43003cacdafd58cd02bf5b7fbd1800c5c7ecd17d01372cac21'
-  data.tar.gz: 10852b3cada4229f153c818cd74668a14c5cca749a23b4137c04bc198fa6d14c3fa3e10795e0618b8a73ba4c3b50cd23a570355696f9be1a1ae186b92023922d
+  metadata.gz: 54999e8a1a98d83a94fb3442bc98d06101a54836426b0e5f22e1b3eed4dcfc1035568920b921ddd60b81b00fecfd36763e35b55cb8006653342e91cb56fa15f3
+  data.tar.gz: f65cb5832180d149fde8d9af81a24468c2fdf747c7174c6ce55ab0f80ce39d9091efbf1ee919975822ca5a9b8aecdcd642d6b6720e50a62c0e3e7e267315eeac

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dude-cli (0.2.3)
+    dude-cli (0.2.4)
       colorize (~> 0.8)
       git (~> 1.3)
       gitlab (~> 4.2)

data/lib/dude/cli.rb

@@ -22,18 +22,14 @@ module Dude
 
     desc 'checkout [ISSUE_ID]', 'checkout to branch with name "ID-issue-title"'
     def checkout(issue_id, project_title = folder_name)
-      issue_title = Gitlab.new(
-        issue_id: issue_id, project_title: project_title
-      ).call
+      issue_title = get_issue_title(issue_id, project_title)
       Git.new(branch_name: git_branch_name(issue_title, issue_id)).call
     end
 
-    desc 'start [ISSUE_ID]', 'start task in Toggl with issue title and checkout to branch'
+    desc 'start [ISSUE_ID]', 'start task in Toggl with issue title, checkout to branch and estimate time if it is needed'
     def start(issue_id, project_title = folder_name)
       checkout(issue_id, project_title)
-      issue_title = Gitlab.new(
-        issue_id: issue_id, project_title: project_title
-      ).call
+      issue_title = get_issue_title(issue_id, project_title)
       Toggl.new(title: "##{issue_id} #{issue_title}", project_title: project_title).start_time_entry
       puts "Starting Toggl task"
     end
@@ -44,17 +40,36 @@ module Dude
       Interface.new.issues_list(issues)
     end
 
+    desc 'estimate [DURATION] [ISSUE_ID]', 'estimate time'
+    def estimate(duration, issue_id = current_issue_id, project_title = folder_name)
+      Gitlab.new(issue_id: issue_id, project_title: project_title).estimate_time(duration)
+    end
+
     desc 'stop', 'stop current time entry in Toggl'
     def stop
       Toggl.new.stop_current_time_entry
     end
 
+    desc 'issue', 'Information about issue'
+    def issue(issue_id = current_issue_id, project_title = folder_name)
+      Gitlab.new(issue_id: issue_id, project_title: project_title).issue_info
+    end
+
     desc 'stats', 'display your stats from Toggl'
     def stats
       Toggl.new.report
     end
+
     private
 
+    def current_issue_id
+      Git.new.current_branch_name.chomp.split('-').first
+    end
+
+    def get_issue_title(issue_id, project_title)
+      Gitlab.new(issue_id: issue_id, project_title: project_title).call
+    end
+
     def duderc_file_content
       "TOGGL_EMAIL=\nTOGGL_TOKEN=\nTOGGL_WORKSPACE_ID=\n" \
         "GITLAB_ENDPOINT=https://gitlab.yoursite.com/api/v4/\n" \

data/lib/dude/git.rb

@@ -6,10 +6,15 @@ module Dude
 
     def initialize(options = {})
       @options = options
+      @git = ::Git.init
     end
 
     def call
-      ::Git.init.branch(options[:branch_name]).checkout if options[:branch_name]
+      @git.branch(options[:branch_name]).checkout if options[:branch_name]
+    end
+
+    def current_branch_name
+      %x(git rev-parse --abbrev-ref HEAD)
     end
   end
 end

data/lib/dude/gitlab.rb

@@ -1,5 +1,7 @@
 require 'gitlab'
+require 'rest-client'
 require_relative 'settings'
+require_relative 'interface'
 
 module Dude
   class Gitlab
@@ -26,8 +28,25 @@ module Dude
       ::Gitlab.issues(project_id).select.map {|a| [a.iid, a.title, a.labels]}
     end
 
+    def estimate_time(duration)
+      issue_resource['time_estimate'].post duration: duration
+    end
+
+    def issue_info
+      issue_info = JSON.parse(issue_resource.get.body)
+      Interface.new.draw_issue_info(issue_info)
+    end
+
     private
 
+    def issue_link
+      @issue_link ||= ::Gitlab.issue(project_id, options[:issue_id])._links.self.gsub(/http/, 'https')
+    end
+
+    def issue_resource
+      @issue_resource ||= RestClient::Resource.new(issue_link, headers: { 'PRIVATE-TOKEN': settings['GITLAB_TOKEN'] })
+    end
+
     def project_id
       @project_id ||= ::Gitlab.project_search(options[:project_title])[0].id
     end

data/lib/dude/interface.rb

@@ -5,10 +5,34 @@ module Dude
   class Interface
     include Settings
 
-    def report(worked_week, worked_today)
-      report_weekly(worked_week)
+    def draw_report(report)
+      @report = report
+      report_weekly
       puts ''
-      report_daily(worked_today, worked_week)
+      report_daily
+    end
+    
+    def draw_issue_info(info)
+      issue_label = info['labels'].find do |label|
+        ['To Do', 'Doing', 'To Verify'].include? label
+      end
+
+      issue_color = case issue_label
+      when 'To Do'
+        :yellow
+      when 'Doing'
+        :green
+      when 'To Verify'
+        :blue
+      end
+
+      puts "#{info['title']} ##{info['iid']}".colorize(issue_color).bold
+      puts "Status: ".colorize(:yellow) + "#{issue_label}"
+      puts "Estimated time: ".colorize(:yellow) +
+        "#{info['time_stats']['human_time_estimate']}"
+      puts "Spent time: ".colorize(:yellow) +
+        "#{info['time_stats']['human_total_time_spent'] || '0h'}"
+      puts "Link: ".colorize(:yellow) + "#{info['web_url']}"
     end
 
     def issues_list(issues)
@@ -28,22 +52,26 @@ module Dude
 
     private
 
-    def report_weekly(worked_week)
-      puts "Week".center(15).colorize(:green).bold
-      puts '-' * 15
-      puts "Worked:".colorize(:yellow).bold +
-        " #{seconds_to_time(worked_week)} / #{settings['HOURS_PER_WEEK']}:00:00 (#{worked_week * 100 / 144000}%)"
-      puts "Time left:".colorize(:yellow).bold +
-        " #{seconds_to_time(144000 - worked_week)}"
+    def report_weekly
+      puts "Week".colorize(:green).bold
+      # puts '-' * 15
+      puts "  Worked:".colorize(:yellow).bold +
+        " #{seconds_to_time(@report.week_time_worked)} / " \
+        "#{@report.hours_without_weekends}:00:00 " \
+        "(#{@report.week_time_worked * 100 / 144000}%)"
+      puts "  Time left:".colorize(:yellow).bold +
+        " #{seconds_to_time(144000 - @report.week_time_worked)}"
     end
 
-    def report_daily(worked_today, worked_week)
-      puts "Today".center(15).colorize(:green).bold
-      puts '-' * 15
-      puts "Worked:".colorize(:yellow).bold +
-        " #{seconds_to_time(worked_today)} / #{settings['HOURS_PER_DAY']}:00:00 (#{worked_today * 100 / 28800}%)"
-      puts "Time left:".colorize(:yellow).bold +
-        " #{seconds_to_time(seconds_for_today - worked_week)}"
+    def report_daily
+      puts "Today".colorize(:green).bold
+      # puts '-' * 15
+      puts "  Worked:".colorize(:yellow).bold +
+        " #{seconds_to_time(@report.today_time_worked)} / " \
+        " #{settings['HOURS_PER_DAY']}:00:00 " \
+        "(#{@report.today_time_worked * 100 / 28800}%)"
+      puts "  Time left:".colorize(:yellow).bold +
+        " #{seconds_to_time(@report.seconds_for_today - @report.week_time_worked)}"
     end
 
     def seconds_to_time(s)
@@ -51,10 +79,6 @@ module Dude
       "#{sprintf '%02d', hms[0]}:#{sprintf '%02d', hms[1]}:#{sprintf '%02d', hms[2]}"
     end
 
-    def seconds_for_today
-      Time.now.wday * settings['HOURS_PER_DAY'].to_i * 3600
-    end
-
     def term
       term_size = IO.console.winsize
       @terminal = OpenStruct.new(h: term_size[0], w: term_size[1])

data/lib/dude/report.rb

@@ -0,0 +1,38 @@
+require 'date'
+require_relative 'settings'
+
+module Dude
+  class Report
+    include Settings
+    attr_reader :report
+
+    def initialize(report_json)
+      @report = JSON.parse(report_json.body)
+    end
+
+    def week_time_worked
+      @time_worked ||= report['total_grand'] / 1000
+    end
+
+    def today_time_worked
+      @today_time_worked ||= report['week_totals'].map {|a| a.nil? ? 0 : a / 1000}[Time.now.wday - 1]
+    end
+
+    def days_without_weekends
+      @days_without_weekends ||= report['week_totals'][0..Time.now.wday - 1].compact.count
+    end
+
+    def weekends
+      @weekends ||= report['week_totals'][0..Time.now.wday - 1].
+        select { |a| a.nil? }.count
+    end
+
+    def hours_without_weekends
+      @hours_without_weekends ||= settings['HOURS_PER_WEEK'].to_i - weekends * settings['HOURS_PER_DAY'].to_i
+    end
+
+    def seconds_for_today
+      days_without_weekends * settings['HOURS_PER_DAY'].to_i * 3600
+    end
+  end
+end

data/lib/dude/toggl.rb

@@ -1,6 +1,7 @@
 require 'rest-client'
 require 'date'
 require_relative 'settings'
+require_relative 'report'
 
 module Dude
   class Toggl
@@ -12,10 +13,8 @@ module Dude
     end
 
     def report
-      report = toggl_report.get params: report_params
-      time_worked = JSON.parse(report.body)['total_grand'] / 1000
-      today_time_worked = JSON.parse(report.body)['week_totals'].map {|a| a.nil? ? 0 : a / 1000}[Time.now.wday - 1]
-      Interface.new.report(time_worked, today_time_worked)
+      report = Report.new(toggl_report.get params: report_params)
+      Interface.new.draw_report(report)
     end
 
     def start_time_entry

data/lib/dude/version.rb

@@ -1,3 +1,3 @@
 module Dude
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dude-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Nikita Pupko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,6 +161,7 @@ files:
 - lib/dude/git.rb
 - lib/dude/gitlab.rb
 - lib/dude/interface.rb
+- lib/dude/report.rb
 - lib/dude/settings.rb
 - lib/dude/toggl.rb
 - lib/dude/version.rb