punched 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c11e735e75e510009cdd02e3966362587174661a
-  data.tar.gz: 73395dc375aced17abbaad5698b26eb384ad3675
+SHA256:
+  metadata.gz: d45242bb8b8cbb631b9a5c933d404ca960c54912c21f7d5d67709785252e9fc1
+  data.tar.gz: 8da01d442a353abdba95f800c2f34b3f231ca51ee315b54e6405b3c71bc96935
 SHA512:
-  metadata.gz: 5ab915be0d34843bb5a588b49b88e9921ebfc21892d6bb3ab5350a1ce7f382935bff00393493956f049b434b507a5c59f722f6c61ef53d73a0cf175ba100e288
-  data.tar.gz: 51a5575c46bd9cc2e7e731de35fd0bdfdcf5408aa08c5108dafa3503791e553f05effa61da3c986aa776f2a6d95d46ed107eeedddc95ad52cc66722206c4caaa
+  metadata.gz: a590849b3b356ae0e1ed80cf77e5415f25c125662964b718d45688497d3f227cab309bd59f251aaf83c2f0634305f4f62a242430c008919df3ac76b0a830118f
+  data.tar.gz: c8749fa2a658eeb19db42d03ca6266bef9177eb9e601c5c80864abe937ba5c8fd564ea049a2d485855bc811a2907e99c04b5eda6d527f7252a60455a2d3681f3

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
-  - 2.0
   - 2.1
   - 2.2
-  - 2.3.0
+  - 2.3
+  - 2.4
+  - 2.5
   - ruby-head
 script: bundle exec rspec
 matrix:

data/Gemfile

@@ -1,2 +1,3 @@
 source 'https://rubygems.org'
 gem "rspec"
+gem "markdown-tables", "~> 1.0.2"

data/README.md

@@ -1,7 +1,7 @@
 # Punchcard
 ## Minimal time tracking tool for cli
 
-[![Build Status](https://travis-ci.org/pstaender/punchcard.svg?branch=master)](https://travis-ci.org/pstaender/punchcard)
+[![Build Status](https://img.shields.io/travis/pstaender/punched.svg?branch=v1.0.0&style=flat-square)](https://travis-ci.org/pstaender/punched)
 
 ### Requirements
 

data/bin/punched

@@ -1,13 +1,17 @@
 #!/usr/bin/env ruby
 $:.push File.expand_path("../lib", __FILE__)
+
 require 'punchcard'
+require 'csv'
+require 'markdown-tables'
+require 'date'
 
 #
 # CLI Wrapper
 #
 
 def available_actions
-  PunchCard.new(nil).public_methods(false).reject { |item| item.to_s.end_with?('=') || item.to_s == 'project' }.sort
+  PunchCard.new(nil).public_methods(false).reject { |item| item.to_s.end_with?('=') || item.to_s == 'project' }.concat([:all]).sort
 end
 
 def action_available? action
@@ -24,11 +28,13 @@ def usage
 end
 
 def all action
-  require 'csv'
-  require 'date'
-  puts ["project","status","last active on","total duration","hourly rate","earnings"].to_csv if action == 'csv'
-  puts Dir[PunchCard::SETTINGS_DIR+'/*'].map { |file|
-    data = CSV.parse(`ruby #{__FILE__} #{action} '#{File.basename(file)}'`).first
+  available_formats = %w(csv plain md)
+  unless available_formats.include?(action)
+    raise "Format #{action} is not supported. Possible formats are: #{available_formats.join(',')}"
+  end
+  labels = ["project","status","last active on","total duration","hourly rate","earnings"]
+  data = Dir[PunchCard::SETTINGS_DIR+'/*'].map { |file|
+    data = CSV.parse(`ruby #{__FILE__} csv '#{File.basename(file)}'`).first
     last_activity = !data[2].empty? ? DateTime.parse(data[2]).to_time.to_i : 0
     data.push(last_activity)
     data
@@ -36,11 +42,22 @@ def all action
     a.last <=> b.last
   }.reverse.map { |row|
     row[0...-1]
-  }.map(&:to_csv).join
+  }
+
+  case action
+  when 'md'
+    puts MarkdownTables.make_table(labels, data, is_rows: true, align: ['l'])
+  when 'csv'
+    puts labels.to_csv
+    puts data.map(&:to_csv).join
+  when 'plain'
+    table = MarkdownTables.make_table(labels, data, is_rows: true, align: ['l'])
+    puts MarkdownTables.plain_text(table)
+  end
 end
 
 if ARGV.first == 'all'
-  all ARGV[1] ? ARGV[1] : 'csv'
+  all ARGV[1] || 'plain'
   exit
 elsif ARGV.first && ['-h', '--help', 'help'].include?(ARGV.first)
   puts usage

data/lib/punchcard.rb

@@ -1,17 +1,18 @@
 # (c) 2017-2018 by philipp staender
 
 require 'date'
+require 'time'
 
-class PunchCardError < StandardError;
+class PunchCardError < StandardError
 end
 
 class PunchCard
 
   SETTINGS_DIR        = ENV['PUNCHCARD_DIR'] || File.expand_path('~/.punchcard')
   HOURLY_RATE_PATTERN = /^\s*(\d+)([^\d]+)*\s*/i
-  TIME_POINT_PATTERN  = /^(\d+)((\-)(\d+))*$/
+  TIME_POINT_PATTERN  = /^((\d+|.+?\s[\+\-]\d{4}?\s*)(\-)*(\d+|\s.+\d?)*)$/
   META_KEY_PATTERN    = /^([a-zA-Z0-9]+)\:\s*(.*)$/
-  VERSION             = '0.2.0'
+  VERSION             = '1.0.0'
 
   attr_accessor :project
 
@@ -220,11 +221,11 @@ class PunchCard
   end
 
   def start_time= time
-    append_new_line time
+    append_new_line timestamp_to_time(time)
   end
 
   def end_time= time
-    replace_last_line "#{start_time}-#{time}"
+    replace_last_line "#{timestamp_to_time(start_time)} - #{timestamp_to_time(time)}"
   end
 
   def end_time
@@ -237,7 +238,23 @@ class PunchCard
 
   def line_to_time_points line
     matches = line.match(TIME_POINT_PATTERN)
-    matches ? [matches[1].to_i, matches[4] ? matches[4].to_i : nil] : nil
+    
+    time_points = matches ? [string_to_timestamp(matches[2]), string_to_timestamp(matches[4])] : nil
+    if time_points && time_points.reject(&:nil?).empty?
+      nil
+    else
+      time_points
+    end
+
+  end
+
+  def string_to_timestamp(str)
+    return str if str.nil?
+    str.strip!
+    # This is some legacy... previous versions stored timestamp,
+    # but now punched stores date-time strings for better readability.
+    # So we have to convert timestamp and date-time format into timestamp here
+    str =~ /^\d+$/ ? str.to_i : (str =~ /^\d{4}\-\d/ ? Time.parse(str).to_i : nil)
   end
 
   def last_entry
@@ -248,6 +265,10 @@ class PunchCard
     Time.now.to_i
   end
 
+  def timestamp_to_time(timestamp)
+    Time.at(timestamp)
+  end
+
   def read_project_data
     title      = nil
     meta_data  = []

data/spec/punchcard_spec.rb

@@ -55,10 +55,9 @@ describe PunchCard do
   end
 
   it 'should track a project time' do
-    timestamp = Time.now.to_i
     start_and_stop
     expect(my_project_file.lines.first.strip).to eq('My Project')
-    expect(my_project_file.lines.last.strip).to match('^'+timestamp.to_s[0..-3]+'\\d{2}\\-'+timestamp.to_s[0..-3]+'\\d{2}+$')
+    expect(my_project_file.lines.last.strip).to match(/^\d+-\d+-\d+ .+? - \d+-\d+-\d+ /)
   end
 
   it 'should calculate tracked total time' do
@@ -116,7 +115,7 @@ describe PunchCard do
     project_a.stop
     sleep 2
     project_b.stop
-    expect(project_b.total.to_i - project_a.total.to_i).to be_between(2,3)
+    expect(project_b.total.to_i - project_a.total.to_i).to be_between(2,4)
   end
 
   it 'should load latest project by wildcard' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punched
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Philipp Staender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies: []
 description: Minimal time tracking tool for cli
 email:
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: punched
-rubygems_version: 2.5.2
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Punchcard Timetracker