herodot 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01a3b43aff308c8da024870cb12c96fb19b1dbb7
-  data.tar.gz: 534a1faf059dada2df482fcc3a7a8f7ea28e1ea9
+  metadata.gz: 29a451b50c5b14cc6e2f1acf802439ce7755932f
+  data.tar.gz: 510e67c25f443cfe889fc5f8b754d3c519dd0b42
 SHA512:
-  metadata.gz: 1fd244e8f79a85020fbfcc7809acefeb17b7ddd3af8918e89719a960b3d60b6d041b4250036630353c19a9879242db09d2930255c3aaee8c9aeb532eed0d6a22
-  data.tar.gz: 6789ce7512930e6deefb6f9484de39ae52cd658b64bd1f64b042ddcdbe56a5ce3713aa0727d48380d0203ad481e7101c3db9d472c8dd08a1eca75c7d0987df23
+  metadata.gz: c3040f3a6f6f29870e5a7f0ceb4993f644919be1e81774b6822a51d7187dd829510763a159bc9096c28390bc51960c1c2e021cbb3ee46922753cabb1251a9270
+  data.tar.gz: 76cd7068583335589940f231424fefe727439cea68073e46bf49961a1bb35259e34da07483666fe4a2ca0e5faf82ffe38726f025d31d354942a8eb3ce24087fa

data/.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.0.0
   - 2.3.3
 before_install: gem install bundler -v 1.14.4

data/README.md

@@ -1,5 +1,7 @@
 # Herodot
 
+[![Build Status](https://travis-ci.org/bitcrowd/herodot.svg?branch=master)](https://travis-ci.org/bitcrowd/herodot)
+
 Tracks your work based on git branch checkouts and commits. With herodot every time you switch branches or commit into a branch,
 the brach name, time and project is logged into a worklog file. Herodot can then parse that worklog file and show you a *rough
 estimate* on which branch in which folder you worked on and how long. This can aid you with your personal time tracking.
@@ -35,6 +37,11 @@ Show worklogs from 19-12-2016
 
 Herodot uses Chronic (https://github.com/mojombo/chronic) under the hood so you can enter anything that chronic supports.
 
+Instead of a terminal table you can also output into the `json` format:
+
+    $ herodot show -f json
+    $ herodot show -f json last week
+    $ herodot show --format json last week
 
 Show Help:
 

data/lib/herodot.rb

@@ -5,7 +5,7 @@ require_relative 'herodot/configuration'
 require_relative 'herodot/worklog'
 require_relative 'herodot/parser'
 require_relative 'herodot/commands'
-require_relative 'herodot/table'
+require_relative 'herodot/output'
 
 class Herodot::Application
   include Commander::Methods
@@ -45,9 +45,10 @@ class Herodot::Application
       c.syntax = 'herodot show [<time range>]'
       c.summary = 'Shows worklogs'
       c.description = SHOW_DESCRIPTION
+      c.option '--format FORMAT', String, 'Uses specific output format (Supported: json)'
       show_command_examples(c)
-      c.action do |args, _options|
-        Herodot::Commands.show(args, config)
+      c.action do |args, options|
+        Herodot::Commands.show(args, config, options)
       end
     end
   end
@@ -57,5 +58,7 @@ class Herodot::Application
     c.example 'Shows last weeks worklogs', 'herodot show last week'
     c.example 'Shows worklogs for last monday', 'herodot show monday'
     c.example 'Shows worklogs for 12-12-2016', 'herodot show 12-12-2016'
+    c.example 'Shows last weeks worklogs as json', 'herodot show --format json last week'
+    c.example 'Shows last weeks worklogs as json (short)', 'herodot show -f json last week'
   end
 end

data/lib/herodot/commands.rb

@@ -9,12 +9,12 @@ class Herodot::Commands
            'echo "$(date);$project;$branch" >> ~/worklog'.freeze
   DEFAULT_RANGE = 'this week'.freeze
 
-  def self.show(args, config)
+  def self.show(args, config, opts = {})
     subject = args.empty? ? DEFAULT_RANGE : args.join(' ')
     range = Chronic.parse(subject, guess: false, context: :past)
     abort "Date not parsable: #{args.join(' ')}" unless range
     worklog = Herodot::Parser.parse(range, config)
-    output = Herodot::Table.print(worklog.totals)
+    output = Herodot::Output.print(worklog.totals, opts)
     puts output
   end
 

data/lib/herodot/{table.rb → output.rb}

@@ -1,6 +1,7 @@
 require 'terminal-table'
+require 'json'
 
-class Herodot::Table
+class Herodot::Output
   HEADERS = %w(Project Branch Time).freeze
   EMPTY_WORKLOG_MESSAGE = Rainbow('Not enough entries in the worklog.').red +
                           ' On a tracked repository `git checkout`'\
@@ -16,7 +17,19 @@ class Herodot::Table
       "#{hours}:#{minutes.to_s.rjust(2, '0')}:#{seconds.to_s.rjust(2, '0')}"
     end
 
-    def print(worklogs_totals_per_day)
+    def print(worklogs_totals_per_day, opts)
+      return convert_format(worklogs_totals_per_day, opts.format) if opts.format
+      print_table(worklogs_totals_per_day)
+    end
+
+    def convert_format(worklogs_totals_per_day, format)
+      case format
+      when 'json'
+        worklogs_totals_per_day.to_json
+      end
+    end
+
+    def print_table(worklogs_totals_per_day)
       abort EMPTY_WORKLOG_MESSAGE if worklogs_totals_per_day.empty?
       Terminal::Table.new(headings: HEADERS) do |table|
         worklogs_totals_per_day.each do |date, times|

data/lib/herodot/parser.rb

@@ -8,11 +8,7 @@ class Herodot::Parser
     def parse(range, config)
       worklog = Herodot::Worklog.new(config)
       from, to = from_to_from_range(range)
-      CSV.foreach(config.worklog_file, col_sep: ';') do |row|
-        next if row[2] == 'HEAD'
-        time = Time.parse(row[0])
-        worklog.add_entry(time, row[1], row[2]) if time >= from && time <= to
-      end
+      parse_into_worklog(worklog, config.worklog_file, from, to)
       worklog
     rescue Errno::ENOENT
       abort NO_SUCH_FILE
@@ -22,5 +18,15 @@ class Herodot::Parser
       return [range, Time.now] unless range.respond_to?(:begin) && range.respond_to?(:end)
       [range.begin, range.end + 3600]
     end
+
+    private
+
+    def parse_into_worklog(worklog, file, from, to)
+      CSV.foreach(file, col_sep: ';') do |row|
+        next if row[2] == 'HEAD'
+        time = Time.parse(row[0])
+        worklog.add_entry(time, row[1], row[2]) if time >= from && time <= to
+      end
+    end
   end
 end

data/lib/herodot/version.rb

@@ -1,3 +1,3 @@
 module Herodot
-  VERSION = '0.1.7'.freeze
+  VERSION = '0.1.8'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herodot
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - bitcrowd
@@ -174,8 +174,8 @@ files:
 - lib/herodot.rb
 - lib/herodot/commands.rb
 - lib/herodot/configuration.rb
+- lib/herodot/output.rb
 - lib/herodot/parser.rb
-- lib/herodot/table.rb
 - lib/herodot/version.rb
 - lib/herodot/worklog.rb
 - post-checkout