punched 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d977bf420412857af8b4b497b7eea7bcf68a102c3ce82bc6d7bac251ffb3753
-  data.tar.gz: 0c2e123a93f7dc608eb3feaf63501b1f2de35f43f61110b5cc98db314083aa2a
+  metadata.gz: 9fdd61f9eabb988d556bbd57326f7e3183ab0e06bc89ad0793b7b6b10297d674
+  data.tar.gz: 0b01c0843ef8b1fdb35db945499abe6471eb02ddd9cd235d3a2573b1c62397ec
 SHA512:
-  metadata.gz: 9656f8be00bd6cb0768982eb9671f58544d12260453d943fcbdfa5f097215599b6281f0bb2984f450ed258c3af7a9aae470d0fb228fac21418c4aaa243c7cba5
-  data.tar.gz: 22f015763eb98da0de64fcf742a7f1907d81ab66a8b2a4c82092697e568c6728eafb38d5eaf2827c845685264c5960fca1540539738b22dc91d53adf667a72c6
+  metadata.gz: ab670118039f178ccd2d2c86d73dbbffbeefd5143db78f8f8b4ac96fa978e07c41860260fd8501af17140786cd9816ce595b60c3348b20eb16d7e8584adef6c5
+  data.tar.gz: 882f24d878d733bc45bb38e94553968fad541e36a2eb08a29c5278d05f57de473e9ae3afcb312771b8594eeabf711d82e762ac991307c442e953e937a2471af2

data/bin/punched

@@ -1,7 +1,14 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.push File.expand_path('lib', __dir__)
+# frozen_string_literal: true
+
+THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
+
+begin
+  require File.expand_path(File.dirname(THIS_FILE) + '/../lib/punchcard')
+rescue LoadError
+  require 'punchcard'
+end
 
-require 'punchcard.rb'
 require 'csv'
 require 'markdown-tables'
 require 'date'
@@ -14,7 +21,13 @@ class UnknownActionError < StandardError; end
 #
 
 def available_actions
-  PunchCard.new(nil).public_methods(false).reject { |item| item.to_s.end_with?('=') || item.to_s == 'project' }.concat([:all]).sort
+  PunchCard.new(nil).public_methods(false).reject { |item|
+    item.to_s.end_with?('=') || item.to_s == 'project'
+  }.concat(global_available_actions).sort
+end
+
+def global_available_actions
+  [:all, :totalsum]
 end
 
 def action_available?(action)
@@ -37,11 +50,11 @@ def all(action)
   end
 
   labels = ['project', 'status', 'last active on', 'total duration', 'hourly rate', 'earnings']
-  data = Dir[PunchCard::SETTINGS_DIR + '/*'].map do |file|
-    data = CSV.parse(call_punchcard('csv', File.basename(file)))[0]
-    last_activity = !data[2].empty? ? DateTime.parse(data[2]).to_time.to_i : 0
-    data.push(last_activity)
-    data
+  data = call_punchcards_by_pattern('*', 'csv').map do |csv_string|
+    csv_data = CSV.parse(csv_string)[0]
+    last_activity = !csv_data[2].empty? ? DateTime.parse(csv_data[2]).to_time.to_i : 0
+    csv_data.push(last_activity)
+    csv_data
   end.sort_by(&:last).reverse.map do |row|
     row[0...-1]
   end
@@ -81,6 +94,13 @@ def call_punchcard(selected_action, project_name)
   end
 end
 
+def call_punchcards_by_pattern(pattern, action)
+  Dir["#{PunchCard::SETTINGS_DIR}/#{pattern}"].map do |file|
+    project_name = File.basename(file)
+    call_punchcard(action, project_name)
+  end
+end
+
 if ['-h', '--help', 'help'].include?(ARGV.first)
   puts(usage)
   exit
@@ -93,6 +113,11 @@ if selected_action
   begin
     if selected_action == 'all'
       all(ARGV[1] || 'plain')
+    elsif selected_action == 'totalsum'
+      pattern = ARGV[1] || '*'
+      puts PunchCard.humanize_duration(
+        call_punchcards_by_pattern(pattern, 'total').reduce(&:+)
+      )
     else
       result = call_punchcard(selected_action, project_name)
       if result.is_a?(Hash)
@@ -104,6 +129,6 @@ if selected_action
   rescue PunchCardError => e
     exit_with_error! "Error: #{e.message}"
   rescue UnknownActionError => e
-    exit_with_error! "Unrecognized action '#{selected_action || ''}'\n#{usage}"
+    exit_with_error! "Unrecognized action '#{selected_action || e.message}'\n#{usage}"
   end
 end

data/lib/punchcard.rb

@@ -11,7 +11,7 @@ class PunchCard
   HOURLY_RATE_PATTERN = /^\s*(\d+)([^\d]+)*\s*/i.freeze
   TIME_POINT_PATTERN  = /^((\d+|.+?\s[\+\-]\d{4}?\s*)(\-)*(\d+|\s.+\d?)*)$/.freeze
   META_KEY_PATTERN    = /^([a-zA-Z0-9]+)\:\s*(.*)$/.freeze
-  VERSION             = '1.1.0'.freeze
+  VERSION             = '1.1.1'.freeze
 
   attr_accessor :project
 
@@ -167,6 +167,21 @@ class PunchCard
     datetime.strftime('%F %T')
   end
 
+  def self.humanize_duration(duration)
+    hours   = duration / (60 * 60)
+    minutes = (duration / 60) % 60
+    seconds = duration % 60
+    "#{decimal_digits(hours)}:#{decimal_digits(minutes)}:#{decimal_digits(seconds)}"
+  end
+
+  def self.decimal_digits(digit)
+    if digit.to_i < 10
+      "0#{digit}"
+    else
+      digit.to_s
+    end
+  end
+
   private
 
   def hourly_rate
@@ -192,29 +207,14 @@ class PunchCard
   end
 
   def humanized_total
-    humanize_duration total
+    self.class.humanize_duration total
   end
 
   def duration(starttime, endtime)
     if starttime
-      humanize_duration endtime - starttime
+      self.class.humanize_duration endtime - starttime
     else
-      humanize_duration 0
-    end
-  end
-
-  def humanize_duration(duration)
-    hours   = duration / (60 * 60)
-    minutes = (duration / 60) % 60
-    seconds = duration % 60
-    "#{decimal_digits(hours)}:#{decimal_digits(minutes)}:#{decimal_digits(seconds)}"
-  end
-
-  def decimal_digits(digit)
-    if digit.to_i < 10
-      "0#{digit}"
-    else
-      digit.to_s
+      self.class.humanize_duration 0
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punched
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Philipp Staender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-09 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: markdown-tables