twstats 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f34d4ba10054132e2b0cddb54033e418979735a7ea7c5e3d487f40eb2c5472e7
-  data.tar.gz: 1017e1b74d4cf8da667b634ea71285952f9f9c44a7b297cb2c8c31c21f884406
+  metadata.gz: '0589a754ec65039304f94cd58dc6339829ee2485bf7a2e782de8ca3e9186ba9a'
+  data.tar.gz: 689f96336353325219a3ed14317e3de8206de93dc975e230afd7feebf0a844aa
 SHA512:
-  metadata.gz: 21bff3055a10fd3fafb6d92647a2537afb908024e053e7bfca171532e4e7ad55e3eb7758656e8a35895411b520184d526f07b631e1ad9989d1f53855ed257182
-  data.tar.gz: 128b0efb50ae73c9b7b598b841ebdfeb66fb38b4ce510d2fe2a8e1b1f290cd23bfccddabb37dc4bd8fa8bee495b7fda6b0f8cd5e377b142a395aaf644170763a
+  metadata.gz: b1a24c4cffc2df2f36ecaabbe5873966664dd94f40be6dbfba5d2f9a8de04876a139edc0ac6912a65de4b0a38102b26dceb2ebbe2ec5e1b72c407c786410f218
+  data.tar.gz: 3c09c2ead64c69a666f1da1c7ae2d2ea6971c1c3c45ebc2509aa026cfb237f601d9cd2592b61df53ec845f2e7bbc7ae36573787895ba8aa6fba2c7141d95fae3

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    twstats (0.2.3.pre.2.pre.g8db668b)
+    twstats (0.2.4.pre.6.pre.g29c9d57)
+      descriptive-statistics (>= 2.2.0)
       rainbow (~> 3.0)
       tty-prompt (~> 0.17)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    descriptive-statistics (2.2.0)
     diff-lcs (1.3)
     equatable (0.5.0)
     hitimes (1.3.0)

data/lib/twstats.rb

@@ -2,6 +2,7 @@ require_relative 'twstats/extensions'
 require_relative 'twstats/version'
 require_relative 'twstats/tw_log'
 require_relative 'twstats/csv_reader'
+require_relative 'twstats/descriptive_stats'
 require_relative 'twstats/timesheet_export'
 require_relative 'twstats/runner'
 
@@ -14,6 +15,7 @@ module Twstats
       {name: 'Projects', value: :projects},
       {name: 'People', value: :people},
       {name: 'Tags', value: :tags},
+      {name: 'Tasks', value: :tasks},
       {name: 'Full stats', value: :fullstats},
       {name: 'Weekly', value: :weekly},
       {name: 'Back', value: :back}

data/lib/twstats/csv_reader.rb

@@ -32,14 +32,6 @@ module Twstats
       logs.inject(0) {|sum, log| sum + log.decimal_time }.to_f/logs.size
     end
 
-    def mean_time_per_task
-      time_per_task = []
-      tasks.each do |task|
-        time_per_task << logs.select{|ll| ll.task == task}.inject(0){|sum, ll| sum + ll.decimal_time}
-      end
-      time_per_task.inject(0){|sum, x| sum + x}/time_per_task.size
-    end
-
     def get_total_time(object, element, filter_billable)
       billable = 0
       non_billable = 0
@@ -62,8 +54,9 @@ module Twstats
         else
           return -99999
       end
+      puts "bill: #{billable}, nonbill: #{non_billable}"
       if filter_billable
-        return billable, non_billable
+        return [billable, non_billable]
       else
         return billable + non_billable
       end

data/lib/twstats/descriptive_stats.rb

@@ -0,0 +1,23 @@
+require 'descriptive-statistics' # Small gem with descriptive statistics functionalities
+module Twstats
+  class LogStats
+    attr_reader :logs
+    # This class analyzes a give set of data and is used to extract information from times logged
+    def initialize(logs)
+      @logs = logs
+    end
+
+    def mean_log_time
+      map = logs.map{|l| l.decimal_time}
+      DescriptiveStatistics::Stats.new(map).mean
+    end
+
+    def mean_task_time(tasks)
+      time_per_task = []
+      tasks.each do |task|
+        time_per_task << logs.select{|ll| ll.task == task}.inject(0){|sum, ll| sum + ll.decimal_time}
+      end
+      DescriptiveStatistics::Stats.new(time_per_task).mean
+    end
+  end
+end

data/lib/twstats/runner.rb

@@ -40,7 +40,7 @@ module Twstats
       loop do
         option = @prompt.select("Select what time logging stats you want to see", Twstats::STATS_MENU_CHOICES, cycle: true)
         case option
-          when :projects, :people, :tags
+          when :projects, :people, :tags, :tasks
             show_stats option
           when :fullstats
             show_full_stats
@@ -114,12 +114,24 @@ module Twstats
       to_bill = @prompt.yes? 'Do you want to calculate the billed amount?'
       if to_bill
         amount_per_hour = @prompt.ask 'What is the hourly rate?', default: 46
+        if @prompt.yes? 'Was it a closed quote?', default: true
+          quoted_price = @prompt.ask 'What was the quoted price for this project?', convert: :float
+        end
       end
       section "Total time spent"
       puts " - Billable      ".bright.blue + " | " + billable.round(2).to_s
       puts " - Non-billable  ".bright.blue + " | " + non_billable.round(2).to_s
       if to_bill
-        puts " - Billed amount ".bright.blue + " | " + (billable*amount_per_hour).round(2).to_s + " € "
+        price = billable*amount_per_hour
+        puts " - Billed amount ".bright.blue + " | " + price.round(2).to_s + " € "
+        if quoted_price
+          diff = quoted_price-price
+          if diff >= 0
+            puts " - Project over estimated: #{diff.round(2)} €, #{diff/price}".bright.green
+          else diff < 0
+            puts " - Project under estimated: #{diff.round(2)} €, #{(diff*100/price).round(2)}%".bright.red
+          end
+        end
       end
       section "People involved"
       show_stats :people, true
@@ -149,14 +161,14 @@ module Twstats
 
     def section(text)
       puts ""
-      puts (" "+text+" ").center(70,"*").bright
+      puts (" "+text+" ").center(70,"*").bright.orange
     end
 
     def show_metrics
-      mean = @csv.logs.inject(0) {|sum, log| sum + log.decimal_time }.to_f/@csv.logs.size
-      mean_per_task = @csv.mean_time_per_task
-      puts " - Mean time logged:   ".bright.blue + mean.round(2).to_s
-      puts " - Mean time per task: ".bright.blue + mean_per_task.round(2).to_s
+      stats = LogStats.new(@csv.logs)
+      puts " - Mean time logged:   ".bright.blue + stats.mean_log_time.round(2).to_s
+      puts " - Mean time per task: ".bright.blue + stats.mean_task_time(@csv.tasks).round(2).to_s
+      puts "     - With a total of #{@csv.tasks.size} tasks"
     end
 
     def show_weekly_report

data/lib/twstats/timesheet_export.rb

@@ -7,7 +7,7 @@ module Twstats
       @prompt = prompt
       @rows = []
       # Filter by billable and not billed
-      csv.logs.select{|x| x.billable && !x.invoiced}.sort_by{|x| x.date}.each do |log|
+      csv.logs.select{|x| x.billable && !x.invoiced}.sort_by{|x| x.start_date}.each do |log|
         @rows << {
           date: log.date.strftime('%m/%d/%Y'),
           who: public_name(log.who),

data/lib/twstats/tw_log.rb

@@ -11,6 +11,7 @@ module Twstats
     attr_reader :task
     attr_reader :billable
     attr_reader :invoiced
+    attr_reader :start_date
 
     # Class use to store the information needed form a given log
     def initialize(row)
@@ -19,12 +20,13 @@ module Twstats
       @decimal_time = row["Decimal Hours"].to_f
       @time = (DateTime.parse(row["End Date/Time"]) - DateTime.parse(row["Date/Time"]))*24
       @description = row["Description"]
-      @tags = row['Tags'].nil? ? [] : row["Tags"].split(',')
+      @tags = row['Tags'].nil? ? [] : row["Tags"].split(',').map{|x| x.strip}
       @project = row["Project"]
       @task = row["Task"]
       @billable = !row["Is it Billable?"].to_i.zero?
       @invoiced = !row['Invoice Number']
       @date = DateTime.parse(row['Date'])
+      @start_date = DateTime.parse(row["Date/Time"])
     end
   end
 end

data/twstats.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_runtime_dependency "tty-prompt", "~> 0.17"
   spec.add_runtime_dependency "rainbow", "~> 3.0"
+  spec.add_runtime_dependency "descriptive-statistics", ">=2.2.0"
 
   spec.required_ruby_version = '~> 2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twstats
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - J.P. Araque
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: descriptive-statistics
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 description: Teamwork allows to log time for all tasks within a project but the stats
   capabilities do not allow for a quick overview of time loggin stats. TWStats produces
   useful stats from a CSV file exported from Teamwork
@@ -104,6 +118,7 @@ files:
 - exe/twstats
 - lib/twstats.rb
 - lib/twstats/csv_reader.rb
+- lib/twstats/descriptive_stats.rb
 - lib/twstats/extensions.rb
 - lib/twstats/runner.rb
 - lib/twstats/timesheet_export.rb