herodot 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6c56f76d186ec1df50f95f5883ed9dddbc783a2b
-  data.tar.gz: 5c4a6ee9098fcdbaba1f5c9177e3097323cacbfd
+SHA256:
+  metadata.gz: 67bf83f2d851943bf0d40e5e292e09a522bceb8d38f73bc331db415694de94b1
+  data.tar.gz: f81ee485d789a866badc55c385a77daffeba0217fcc03fa0a5656c09c5c2827e
 SHA512:
-  metadata.gz: 32b26214e6083a539be512c1de6873da6b487c2442b37b0a03d08a99972e89f4b2e6039a28dd983c3b77af25b6dccc4fa76a47dc2fd8442510e15d378054abb3
-  data.tar.gz: bff391404a04784f6b839d8881cee04f288c600c604290009dd3edf1513b690ad486efcb7fea4ba0c6844279cc42a31e6aea051d1d7b5b43a30cdfc436a35fa9
+  metadata.gz: 9412778f3a13fc66db849c373e11504dcc7033ba0cdd3728b7a52ab587183773563f59cd7d8fdb1b048a88d5f32d3c88d1964c213e8912f49bbbd1fb822c1bc1
+  data.tar.gz: 67baebca6ca6db82a8a1deae38a69f9321088e8ca9ff565af4dd0cd08b143c8389970abe9faa518af52b17fddc19da55814b1ef6006ca8d8d8d2b75bdc933af6

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -3,6 +3,10 @@ inherit_gem:
     - .rubocop.yml
     - .rubocop-rspec.yml
 
+AllCops:
+  Exclude:
+    - 'pkg/**/*'
+
 Rails:
   Enabled: false
 

data/.travis.yml

@@ -1,6 +1,22 @@
 sudo: false
 language: ruby
+
 rvm:
-  - 2.0.0
-  - 2.3.3
-before_install: gem install bundler -v 1.14.4
+  - 2.1.0
+  - 2.3.5
+  - 2.4.2
+
+before_install:
+  - gem install bundler -v 1.14.6
+
+install:
+  - gem update --system
+  - bundle install --jobs=3 --retry=3
+
+cache:
+  bundler: true
+  directories:
+    - vendor/bundle
+
+script:
+  - bin/ci

data/Gemfile.lock

@@ -0,0 +1,66 @@
+PATH
+  remote: .
+  specs:
+    herodot (0.2.1)
+      chronic
+      commander
+      rainbow
+      terminal-table
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.0)
+    chronic (0.10.2)
+    commander (4.4.3)
+      highline (~> 1.7.2)
+    diff-lcs (1.3)
+    highline (1.7.8)
+    parallel (1.12.1)
+    parser (2.5.0.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.1)
+    rainbow (3.0.0)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.52.1)
+      parallel (~> 1.10)
+      parser (>= 2.4.0.2, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    rubocop-bitcrowd (1.2.0)
+    rubocop-rspec (1.22.2)
+      rubocop (>= 0.52.1)
+    ruby-progressbar (1.9.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.14)
+  herodot!
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  rubocop
+  rubocop-bitcrowd
+  rubocop-rspec
+
+BUNDLED WITH
+   1.16.1

data/README.md

@@ -12,6 +12,8 @@ Install with:
 
     $ gem install herodot
 
+Make sure you have installed at least ruby 2.1 or any newer ruby version.
+
 ## Usage
 
 Track a git repository:
@@ -50,6 +52,7 @@ Show Help:
     $ herodot help show
 
 ## Linking to issue trackers
+
 If you use https://github.com/bitcrowd/tickety-tick or otherwise have branch names, that contain
 the issue number, you can link a tracked herodot repository with your issue tracker, so it
 will print urls of issues it recognizes under the branch name.

data/bin/ci

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'English'
+
+module TravisRunner
+  def self.execute(title, command)
+    puts "== Running #{title} =="
+    system command
+    yield if block_given?
+    raise "#{title} failed" unless $CHILD_STATUS.success?
+  end
+end
+
+system 'mkdir -p tmp'
+
+TravisRunner.execute 'Rubocop', 'bundle exec rubocop'
+TravisRunner.execute 'Rspec', 'bundle exec rspec --exclude-pattern "spec/features/**/*"'

data/herodot.gemspec

@@ -1,8 +1,9 @@
-# coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'herodot/version'
 
+# rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
   spec.name          = 'herodot'
   spec.version       = Herodot::VERSION
@@ -19,17 +20,18 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = 'exe'
-  spec.executables   = %w(herodot)
-  spec.require_paths = %w(lib)
+  spec.executables   = %w[herodot]
+  spec.require_paths = %w[lib]
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'rubocop-bitcrowd'
-  spec.add_dependency 'rainbow'
-  spec.add_dependency 'terminal-table'
+  spec.add_development_dependency 'rubocop-rspec'
   spec.add_dependency 'chronic'
   spec.add_dependency 'commander'
+  spec.add_dependency 'rainbow'
+  spec.add_dependency 'terminal-table'
 end
+# rubocop:enable Metrics/BlockLength

data/lib/herodot/commands.rb

@@ -2,74 +2,76 @@ require 'date'
 require 'chronic'
 require 'fileutils'
 
-class Herodot::Commands
-  SCRIPT = "#!/bin/sh\nherodot track $(pwd)".freeze
+module Herodot
+  class Commands
+    SCRIPT = "#!/bin/sh\nherodot track $(pwd)".freeze
 
-  DEFAULT_RANGE = 'this week'.freeze
+    DEFAULT_RANGE = 'this week'.freeze
 
-  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)
-    decorated_worklog = Herodot::ProjectLink.new(worklog)
-    output = Herodot::Output.print(decorated_worklog.totals, opts)
-    puts output
-  end
+    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 = Parser.parse(range, config)
+      decorated_worklog = ProjectLink.new(worklog)
+      output = Output.print(decorated_worklog.totals, opts)
+      puts output
+    end
 
-  def self.init(path, config)
-    path = '.' if path.nil?
-    puts "Start tracking of `#{File.expand_path(path)}` into `#{config.worklog_file}`."
-    hooks = "#{path}/.git/hooks"
-    abort('Path is not a git repository.') unless File.exist?(hooks)
-    %w(post-checkout post-commit).each do |name|
-      File.open("#{hooks}/#{name}", 'w') { |file| file.write(SCRIPT) }
-      File.chmod(0o755, "#{hooks}/#{name}")
-      FileUtils.touch(config.worklog_file)
+    def self.init(path, config)
+      path = '.' if path.nil?
+      puts "Start tracking of `#{File.expand_path(path)}` into `#{config.worklog_file}`."
+      hooks = "#{path}/.git/hooks"
+      abort('Path is not a git repository.') unless File.exist?(hooks)
+      %w[post-checkout post-commit].each do |name|
+        File.open("#{hooks}/#{name}", 'w') { |file| file.write(SCRIPT) }
+        File.chmod(0o755, "#{hooks}/#{name}")
+        FileUtils.touch(config.worklog_file)
+      end
     end
-  end
 
-  def self.track(path, config)
-    puts 'Logging into worklog'
-    File.open(config.worklog_file, 'a') do |worklog|
-      datestr = DateTime.now.strftime("%a %b %e %H:%M:%S %z %Y")
-      branch = `(cd #{path} && git rev-parse --abbrev-ref HEAD)`.strip
-      line = [datestr, path, branch].join(";")
-      worklog.puts(line)
+    def self.track(path, config)
+      puts 'Logging into worklog'
+      File.open(config.worklog_file, 'a') do |worklog|
+        datestr = Time.now.strftime('%a %b %e %H:%M:%S %z %Y')
+        branch = `(cd #{path} && git rev-parse --abbrev-ref HEAD)`.strip
+        line = [datestr, path, branch].join(';')
+        worklog.puts(line)
+      end
     end
-  end
 
-  def self.link(path)
-    path = '.' if path.nil?
-    choose do |menu|
-      menu.prompt = 'What tracker do you want to link to?'
-      menu.choice(:jira) { link_jira(path) }
-      menu.choice(:github) { link_github(path) }
-      menu.choice(:gitlab) { link_gitlab(path) }
-      menu.choices(:other) { link_other(path) }
-      menu.default = :other
+    def self.link(path)
+      path = '.' if path.nil?
+      choose do |menu|
+        menu.prompt = 'What tracker do you want to link to?'
+        menu.choice(:jira) { link_jira(path) }
+        menu.choice(:github) { link_github(path) }
+        menu.choice(:gitlab) { link_gitlab(path) }
+        menu.choices(:other) { link_other(path) }
+        menu.default = :other
+      end
     end
-  end
 
-  def self.link_jira(path)
-    prefix = ask('Jira URL prefix (something for https://something.atlassian.net)?')
-    pattern = ask('Ticket prefix (ABCD for tickets like ABCD-123)')
-    Herodot::ProjectLink.link(path, "http://#{prefix}.atlassian.net/browse/", "#{pattern}-\\d+")
-  end
+    def self.link_jira(path)
+      prefix = ask('Jira URL prefix (something for https://something.atlassian.net)?')
+      pattern = ask('Ticket prefix (ABCD for tickets like ABCD-123)')
+      ProjectLink.link(path, "http://#{prefix}.atlassian.net/browse/", "#{pattern}-\\d+")
+    end
 
-  def self.link_github(path)
-    handle = ask('Github handle (something/something for https://github.com/something/something)?')
-    Herodot::ProjectLink.link(path, "https://github.com/#{handle}/issues/", '\\d+')
-  end
+    def self.link_github(path)
+      handle = ask('Github handle (something/something for https://github.com/something/something)?')
+      ProjectLink.link(path, "https://github.com/#{handle}/issues/", '\\d+')
+    end
 
-  def self.link_gitlab(path)
-    handle = ask('GitLab handle (something/something for https://gitlab.com/something/something)?')
-    Herodot::ProjectLink.link(path, "https://gitlab.com/#{handle}/issues/", '\\d+')
-  end
+    def self.link_gitlab(path)
+      handle = ask('GitLab handle (something/something for https://gitlab.com/something/something)?')
+      ProjectLink.link(path, "https://gitlab.com/#{handle}/issues/", '\\d+')
+    end
 
-  def self.link_other(path)
-    url = ask('URL to issue tracker:')
-    pattern = ask('Ticket regex pattern (ruby):')
-    Herodot::ProjectLink.link(path, url, pattern)
+    def self.link_other(path)
+      url = ask('URL to issue tracker:')
+      pattern = ask('Ticket regex pattern (ruby):')
+      ProjectLink.link(path, url, pattern)
+    end
   end
 end

data/lib/herodot/configuration.rb

@@ -1,44 +1,47 @@
 require 'yaml'
 
-class Herodot::Configuration
-  CONFIG_FILE = File.expand_path('~/.herodot.yml').freeze
-  DEFAULT_CONFIGURATION = {
-    'projects_directory' => '~',
-    'work_times' => {
-      'work_start' => '9:30',
-      'lunch_break_start' => '13:00',
-      'lunch_break_end' => '13:30',
-      'work_end' => '18:00'
-    }
-  }.freeze
+module Herodot
+  class Configuration
+    CONFIG_FILE = File.expand_path('~/.herodot.yml').freeze
+    DEFAULT_CONFIGURATION = {
+      'projects_directory' => '~',
+      'work_times' => {
+        'work_start' => '9:30',
+        'lunch_break_start' => '13:00',
+        'lunch_break_end' => '13:30',
+        'work_end' => '18:00'
+      }
+    }.freeze
 
-  def initialize(worklog_file = '~/.worklog')
-    @worklog_file = worklog_file
-    if File.exist?(CONFIG_FILE)
-      @config = load_configuration
-    else
-      @config = DEFAULT_CONFIGURATION
-      save_configuration
+    def initialize(worklog_file = '~/.worklog')
+      @worklog_file = worklog_file
+      if File.exist?(CONFIG_FILE)
+        @config = load_configuration
+      else
+        @config = DEFAULT_CONFIGURATION
+        save_configuration
+      end
     end
-  end
 
-  def worklog_file
-    File.expand_path(@worklog_file)
-  end
+    def worklog_file
+      File.expand_path(@worklog_file)
+    end
 
-  def projects_directory
-    File.expand_path(@config['projects_directory'])
-  end
+    def projects_directory
+      File.expand_path(@config['projects_directory'] || DEFAULT_CONFIGURATION['projects_directory'])
+    end
 
-  def work_times
-    @config['work_times'].map { |k, v| [k.to_sym, v.split(':').map(&:to_i)] }
-  end
+    def work_times
+      (@config['work_times'] || DEFAULT_CONFIGURATION['work_times'])
+        .map { |k, v| [k.to_sym, v.split(':').map(&:to_i)] }
+    end
 
-  def save_configuration
-    File.open(CONFIG_FILE, 'w') { |f| YAML.dump(@config, f) }
-  end
+    def save_configuration
+      File.open(CONFIG_FILE, 'w') { |f| YAML.dump(@config, f) }
+    end
 
-  def load_configuration
-    File.open(CONFIG_FILE) { |f| YAML.load(f) }
+    def load_configuration
+      File.open(CONFIG_FILE) { |f| YAML.load(f) }
+    end
   end
 end

data/lib/herodot/output.rb

@@ -1,58 +1,64 @@
 require 'terminal-table'
 require 'json'
 
-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`'\
-                          ' and `git commit` will add entries.'.freeze
-  COLORS = %i(green yellow blue magenta cyan aqua silver aliceblue indianred).freeze
-
-  class << self
-    def format_time(time_is_seconds)
-      total_seconds = time_is_seconds.to_i
-      seconds = total_seconds % 60
-      minutes = (total_seconds / 60) % 60
-      hours = total_seconds / (60 * 60)
-      "#{hours}:#{minutes.to_s.rjust(2, '0')}:#{seconds.to_s.rjust(2, '0')}"
-    end
+module Herodot
+  class Output
+    HEADERS = %w[Project Branch Time].freeze
+    EMPTY_WORKLOG_MESSAGE = Rainbow('Not enough entries in the worklog.').red +
+                            ' On a tracked repository `git checkout`'\
+                            ' and `git commit` will add entries.'.freeze
+    COLORS = %i[green yellow blue magenta cyan aqua silver aliceblue indianred].freeze
 
-    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
+    class << self
+      def format_time(time_is_seconds)
+        total_seconds = time_is_seconds.to_i
+        seconds = total_seconds % 60
+        minutes = (total_seconds / 60) % 60
+        hours = total_seconds / (60 * 60)
+        "#{hours}:#{minutes.to_s.rjust(2, '0')}:#{seconds.to_s.rjust(2, '0')}"
+      end
 
-    def convert_format(worklogs_totals_per_day, format)
-      case format
-      when 'json'
-        worklogs_totals_per_day.to_json
+      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
-    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|
-          table.add_separator
-          table << [date]
-          table.add_separator
-          print_day(times).each { |row| table << row }
-          table.add_separator
+      def convert_format(worklogs_totals_per_day, format)
+        case format
+        when 'json'
+          worklogs_totals_per_day.to_json
         end
       end
-    end
 
-    private
+      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|
+            table.add_separator
+            table << [date]
+            table.add_separator
+            print_day(times).each { |row| table << row }
+            table.add_separator
+          end
+        end
+      end
 
-    def colorize(project)
-      Rainbow(project).color(COLORS[project.chars.map(&:ord).reduce(:+) % COLORS.size])
-    end
+      private
+
+      def colorize(project)
+        Rainbow(project).color(COLORS[project.chars.map(&:ord).reduce(:+) % COLORS.size])
+      end
 
-    def print_day(times)
-      times.sort_by { |log| log[:project] }.flat_map do |log|
-        lines = [[colorize(log[:project]), log[:branch], format_time(log[:time])]]
-        lines << ['', Rainbow(log[:link]).color(80, 80, 80), ''] if log[:link]
-        lines
+      def times_by_project_and_branch(times)
+        times.sort_by { |log| [log[:project], log[:branch]] }
+      end
+
+      def print_day(times)
+        times_by_project_and_branch(times).flat_map do |log|
+          lines = [[colorize(log[:project]), log[:branch], format_time(log[:time])]]
+          lines << ['', Rainbow(log[:link]).color(80, 80, 80), ''] if log[:link]
+          lines
+        end
       end
     end
   end

data/lib/herodot/parser.rb

@@ -1,31 +1,33 @@
 require 'csv'
 
-class Herodot::Parser
-  NO_SUCH_FILE = Rainbow('Worklog missing.').red +
-                 ' Use `herodot init` to start tracking a git repository'\
-                 ' or `herodot help` to open the man page.'.freeze
-  class << self
-    def parse(range, config)
-      worklog = Herodot::Worklog.new(config)
-      from, to = from_to_from_range(range)
-      parse_into_worklog(worklog, config.worklog_file, from, to)
-      worklog
-    rescue Errno::ENOENT
-      abort NO_SUCH_FILE
-    end
+module Herodot
+  class Parser
+    NO_SUCH_FILE = Rainbow('Worklog missing.').red +
+                   ' Use `herodot init` to start tracking a git repository'\
+                   ' or `herodot help` to open the man page.'.freeze
+    class << self
+      def parse(range, config)
+        worklog = Worklog.new(config)
+        from, to = from_to_from_range(range)
+        parse_into_worklog(worklog, config.worklog_file, from, to)
+        worklog
+      rescue Errno::ENOENT
+        abort NO_SUCH_FILE
+      end
 
-    def from_to_from_range(range)
-      return [range, Time.now] unless range.respond_to?(:begin) && range.respond_to?(:end)
-      [range.begin, range.end + 3600]
-    end
+      def from_to_from_range(range)
+        return [range, Time.now] unless range.respond_to?(:begin) && range.respond_to?(:end)
+        [range.begin, range.end + 3600]
+      end
 
-    private
+      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
+      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/project_link.rb

@@ -1,52 +1,54 @@
-class Herodot::ProjectLink
-  PROJECT_CONFIG = '.herodot.yml'.freeze
+module Herodot
+  class ProjectLink
+    PROJECT_CONFIG = '.herodot.yml'.freeze
 
-  def self.project_config_file(path)
-    File.join(File.expand_path(path), PROJECT_CONFIG)
-  end
+    def self.project_config_file(path)
+      File.join(File.expand_path(path), PROJECT_CONFIG)
+    end
 
-  def self.link(path, link, pattern)
-    puts "Write link into #{project_config_file(path)}"
-    File.open(project_config_file(path), 'w') do |f|
-      YAML.dump({ link: link, pattern: pattern }, f)
+    def self.link(path, link, pattern)
+      puts "Write link into #{project_config_file(path)}"
+      File.open(project_config_file(path), 'w') do |f|
+        YAML.dump({ link: link, pattern: pattern }, f)
+      end
     end
-  end
 
-  def initialize(worklog)
-    @worklog = worklog
-    @project_configurations = {}
-  end
+    def initialize(worklog)
+      @worklog = worklog
+      @project_configurations = {}
+    end
 
-  def totals
-    @worklog.totals.map do |date, logs|
-      [date, decorated_logs(logs)]
+    def totals
+      @worklog.totals.map do |date, logs|
+        [date, decorated_logs(logs)]
+      end
     end
-  end
 
-  private
+    private
 
-  def decorated_logs(logs)
-    logs.map do |log|
-      decorated_log(log)
+    def decorated_logs(logs)
+      logs.map do |log|
+        decorated_log(log)
+      end
     end
-  end
 
-  def decorated_log(log)
-    link = issue_management_link(log)
-    return log if link.nil?
-    log.merge(link: link)
-  end
+    def decorated_log(log)
+      link = issue_management_link(log)
+      return log if link.nil?
+      log.merge(link: link)
+    end
 
-  def issue_management_link(log)
-    config = @project_configurations.fetch(log[:path], load_project_configuration(log[:path]))
-    return nil unless config.fetch(:link, false)
-    ticket = log[:branch].scan(Regexp.new(config.fetch(:pattern, /$^/)))
-    [config[:link], ticket.first].join if ticket.any?
-  end
+    def issue_management_link(log)
+      config = @project_configurations.fetch(log[:path], load_project_configuration(log[:path]))
+      return nil unless config.fetch(:link, false)
+      ticket = log[:branch].scan(Regexp.new(config.fetch(:pattern, /$^/)))
+      [config[:link], ticket.first].join if ticket.any?
+    end
 
-  def load_project_configuration(path)
-    file = self.class.project_config_file(path)
-    return { link: false } unless File.exist?(file)
-    File.open(file) { |f| YAML.load(f) }
+    def load_project_configuration(path)
+      file = self.class.project_config_file(path)
+      return { link: false } unless File.exist?(file)
+      File.open(file) { |f| YAML.load(f) }
+    end
   end
 end

data/lib/herodot/version.rb

@@ -1,3 +1,3 @@
 module Herodot
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/lib/herodot/worklog.rb

@@ -1,85 +1,88 @@
-class Herodot::Worklog
-  attr_reader :branches
-  END_TRACK_EVENTS = [:work_end, :lunch_break_start, :after_last_dates_end].freeze
-  START_TRACK_EVNETS = [:work_start, :lunch_break_end, :before_first_dates_start].freeze
-  EVENTS = (END_TRACK_EVENTS + START_TRACK_EVNETS).freeze
+module Herodot
+  class Worklog
+    attr_reader :branches
+    END_TRACK_EVENTS = %i[work_end lunch_break_start after_last_dates_end].freeze
+    START_TRACK_EVNETS = %i[work_start lunch_break_end before_first_dates_start].freeze
+    EVENTS = (END_TRACK_EVENTS + START_TRACK_EVNETS).freeze
 
-  def initialize(config)
-    @raw_logs = []
-    @branches = {}
-    @dates = []
-    @config = config
-  end
+    def initialize(config)
+      @raw_logs = []
+      @branches = {}
+      @dates = []
+      @config = config
+    end
 
-  def add_entry(time, project_path, branch)
-    project = project_path.gsub(@config.projects_directory.to_s, '')
-    id = "#{project}:#{branch}"
-    @raw_logs << { time: time, id: id }
-    @branches[id] = { branch: branch, project: project, path: project_path }
-  end
+    def add_entry(time, project_path, branch)
+      return if project_path.nil?
+      project = project_path.gsub(@config.projects_directory.to_s, '')
+      id = "#{project}:#{branch}"
+      @raw_logs << { time: time, id: id }
+      @branches[id] = { branch: branch, project: project, path: project_path }
+    end
 
-  def logs_with_events
-    filtered_logs = @raw_logs.chunk { |x| x[:id] }.map(&:last).map(&:first)
-    filtered_logs += work_time_events
-    filtered_logs << { time: Time.new(0), id: :before_first_dates_start }
-    filtered_logs << { time: Time.now, id: :after_last_dates_end }
-    filtered_logs.sort_by { |log| log[:time] }
-  end
+    def logs_with_events
+      filtered_logs = @raw_logs.chunk { |x| x[:id] }.map(&:last).map(&:first)
+      filtered_logs += work_time_events
+      filtered_logs << { time: Time.new(0), id: :before_first_dates_start }
+      filtered_logs << { time: Time.now, id: :after_last_dates_end }
+      filtered_logs.sort_by { |log| log[:time] }
+    end
 
-  def logs_with_times
-    current_id = nil
-    logs_with_events.each_cons(2).map do |log, following_log|
-      current_id = log[:id] unless EVENTS.include?(log[:id])
-      log.merge id: actual_id(current_id, log[:id]),
-                time: time_between(log, following_log),
-                date: log[:time].to_date
+    def logs_with_times
+      current_id = nil
+      logs_with_events.each_cons(2).map do |log, following_log|
+        current_id = log[:id] unless EVENTS.include?(log[:id])
+        log.merge id: actual_id(current_id, log[:id]),
+                  time: time_between(log, following_log),
+                  date: log[:time].to_date
+      end
     end
-  end
 
-  def logs_with_times_cleaned
-    logs_with_times.reject { |log| EVENTS.include?(log[:id]) }
-  end
+    def logs_with_times_cleaned
+      logs_with_times.reject { |log| EVENTS.include?(log[:id]) }
+    end
 
-  def totals
-    grouped = logs_with_times_cleaned.group_by { |time| time[:date] }
-    dates.map do |date|
-      time_sums = grouped[date].each_with_object({}) do |time, sums|
-        id = time[:id]
-        sums[id] ||= { time: 0, **branch(id) }
-        sums[id][:time] += time[:time]
+    def totals
+      grouped = logs_with_times_cleaned.group_by { |time| time[:date] }
+      dates.map do |date|
+        time_sums = grouped[date].each_with_object({}) do |time, sums|
+          id = time[:id]
+          sums[id] ||= { time: 0, **branch(id) }
+          sums[id][:time] += time[:time]
+        end
+        [date, time_sums.values]
       end
-      [date, time_sums.values]
     end
-  end
 
-  def branch(id)
-    @branches.fetch(id, {})
-  end
+    def branch(id)
+      @branches.fetch(id, {})
+    end
 
-  def dates
-    @raw_logs.map { |log| log[:time].to_date }.uniq.sort
-  end
+    def dates
+      @raw_logs.map { |log| log[:time].to_date }.uniq.sort
+    end
 
-  def work_time_events
-    dates.flat_map do |date|
-      @config.work_times.map { |event, (hour, minute)|
-        time = Time.new(date.year, date.month, date.day, hour, minute)
-        next if time > Time.now
-        { id: event, time: time }
-      }.compact
+    def work_time_events
+      dates.flat_map do |date|
+        @config.work_times.map { |event, (hour, minute)|
+          time = Time.new(date.year, date.month, date.day, hour, minute)
+          next if time > Time.now
+          { id: event, time: time }
+        }.compact
+      end
     end
-  end
 
-  def same_date?(log_entry, other_log_entry)
-    log_entry[:time].to_date == other_log_entry[:time].to_date
-  end
+    def same_date?(log_entry, other_log_entry)
+      log_entry[:time].to_date == other_log_entry[:time].to_date
+    end
 
-  def time_between(log_entry, following_entry)
-    return 0 unless same_date?(log_entry, following_entry)
-    following_entry[:time] - log_entry[:time]
-  end
+    def time_between(log_entry, following_entry)
+      return 0 unless same_date?(log_entry, following_entry)
+      following_entry[:time] - log_entry[:time]
+    end
 
-  def actual_id(current_id, id)
-    END_TRACK_EVENTS.include?(id) ? id : current_id || id
+    def actual_id(current_id, id)
+      END_TRACK_EVENTS.include?(id) ? id : current_id || id
+    end
   end
 end

data/lib/herodot.rb

@@ -8,88 +8,90 @@ require_relative 'herodot/commands'
 require_relative 'herodot/output'
 require_relative 'herodot/project_link'
 
-class Herodot::Application
-  include Commander::Methods
-  USER_HOME = File.expand_path('~').to_s
+module Herodot
+  class Application
+    include Commander::Methods
+    USER_HOME = File.expand_path('~').to_s
 
-  def run
-    program :name, 'herodot'
-    program :version, Herodot::VERSION
-    program :description, 'Tracks your work based on git branch checkouts'
+    def run
+      program :name, 'herodot'
+      program :version, VERSION
+      program :description, 'Tracks your work based on git branch checkouts'
 
-    config = Herodot::Configuration.new
-    init_command(config)
-    track_command(config)
-    show_command(config)
-    link_command(config)
-    default_command :show
-    run!
-  end
+      config = Configuration.new
+      init_command(config)
+      track_command(config)
+      show_command(config)
+      link_command(config)
+      default_command :show
+      run!
+    end
 
-  INIT_DESCRIPTION = 'This command sets up post commit and post checkout hooks'\
-                      ', that will log the current branch into the worklog file.'.freeze
-  def init_command(config)
-    command :init do |c|
-      c.syntax = 'herodot init [<repository path>]'
-      c.summary = 'Start tracking a repository'
-      c.description = INIT_DESCRIPTION
-      c.example 'Start tracking current repository', 'herodot init'
-      c.action do |args, _|
-        Herodot::Commands.init(args[0], config)
+    INIT_DESCRIPTION = 'This command sets up post commit and post checkout hooks'\
+                        ', that will log the current branch into the worklog file.'.freeze
+    def init_command(config)
+      command :init do |c|
+        c.syntax = 'herodot init [<repository path>]'
+        c.summary = 'Start tracking a repository'
+        c.description = INIT_DESCRIPTION
+        c.example 'Start tracking current repository', 'herodot init'
+        c.action do |args, _|
+          Commands.init(args[0], config)
+        end
       end
     end
-  end
 
-  TRACK_DESCRIPTION = 'This command tracks the current branch/commit in a repo '\
-                      'and is called from the git hooks installed via `herodot init`.'.freeze
-  def track_command(config)
-    command :track do |c|
-      c.syntax = 'herodot track <repository path>'
-      c.summary = 'Record git activity in a repository (used internally)'
-      c.description = TRACK_DESCRIPTION
-      c.example 'Record the latest branch name etc. to the worklog', 'herodot track .'
-      c.action do |args, _|
-        Herodot::Commands.track(args[0], config)
+    TRACK_DESCRIPTION = 'This command tracks the current branch/commit in a repo '\
+                        'and is called from the git hooks installed via `herodot init`.'.freeze
+    def track_command(config)
+      command :track do |c|
+        c.syntax = 'herodot track <repository path>'
+        c.summary = 'Record git activity in a repository (used internally)'
+        c.description = TRACK_DESCRIPTION
+        c.example 'Record the latest branch name etc. to the worklog', 'herodot track .'
+        c.action do |args, _|
+          Commands.track(args[0], config)
+        end
       end
     end
-  end
 
-  SHOW_DESCRIPTION = 'This command parses the worklog file and returns the'\
-                     'git branch based worklog according to the'\
-                     'work times specified in the `~/.herodot.yml`.'.freeze
-  def show_command(config)
-    command :show do |c|
-      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, options)
+    SHOW_DESCRIPTION = 'This command parses the worklog file and returns the'\
+                      'git branch based worklog according to the'\
+                      'work times specified in the `~/.herodot.yml`.'.freeze
+    def show_command(config)
+      command :show do |c|
+        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|
+          Commands.show(args, config, options)
+        end
       end
     end
-  end
 
-  LINK_DESCRIPTION = 'This command can link a repository to a project issue tracking tool.'\
-                     ' The commmands writes the settings in `project_path/.herodot.yml`.'.freeze
-  def link_command(_)
-    command :link do |c|
-      c.syntax = 'herodot link [<repository path>]'
-      c.summary = 'Link project with issue tracker'
-      c.description = SHOW_DESCRIPTION
-      c.example 'Link current repository', 'herodot link'
-      c.action do |args, _|
-        Herodot::Commands.link(args[0])
+    LINK_DESCRIPTION = 'This command can link a repository to a project issue tracking tool.'\
+                      ' The commmands writes the settings in `project_path/.herodot.yml`.'.freeze
+    def link_command(_)
+      command :link do |c|
+        c.syntax = 'herodot link [<repository path>]'
+        c.summary = 'Link project with issue tracker'
+        c.description = SHOW_DESCRIPTION
+        c.example 'Link current repository', 'herodot link'
+        c.action do |args, _|
+          Commands.link(args[0])
+        end
       end
     end
-  end
 
-  def show_command_examples(c)
-    c.example 'Shows this weeks worklogs', 'herodot show'
-    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'
+    def show_command_examples(c)
+      c.example 'Shows this weeks worklogs', 'herodot show'
+      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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herodot
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - bitcrowd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2018-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rubocop-bitcrowd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-bitcrowd
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: chronic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chronic
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,9 +165,11 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/ci
 - bin/console
 - bin/setup
 - exe/herodot
@@ -200,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Track your work with your git activity.