herodot 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 889ec3c6c65c2052c4171a48b30b2768094defc6
-  data.tar.gz: fce17954a730070afbd210ba3fd6838edacb520b
+  metadata.gz: 6c56f76d186ec1df50f95f5883ed9dddbc783a2b
+  data.tar.gz: 5c4a6ee9098fcdbaba1f5c9177e3097323cacbfd
 SHA512:
-  metadata.gz: 885dfbdfe82891872825f646e3c3ef6267d90fd8b07d31876afc73f3b5f2a18b0a0c2001686cb86150e934d8c476194b1da42179e62c89c80c53399ac8eaa0c3
-  data.tar.gz: 8cbb20433cc8af7f2fa1361ebb8b05d373fd17cb5a60f6d8a95e59eb87f5453d32e7f4113a2fcbc4c6fd8f6bf78957c2d184a8bf8764bcdc2f4c2402f6b5c02f
+  metadata.gz: 32b26214e6083a539be512c1de6873da6b487c2442b37b0a03d08a99972e89f4b2e6039a28dd983c3b77af25b6dccc4fa76a47dc2fd8442510e15d378054abb3
+  data.tar.gz: bff391404a04784f6b839d8881cee04f288c600c604290009dd3edf1513b690ad486efcb7fea4ba0c6844279cc42a31e6aea051d1d7b5b43a30cdfc436a35fa9

data/lib/herodot/commands.rb

@@ -1,12 +1,10 @@
+require 'date'
 require 'chronic'
 require 'fileutils'
 
 class Herodot::Commands
-  SCRIPT = "#!/bin/bash\n"\
-           "echo 'Logging into worklog'\n"\
-           "project=$(pwd)\n"\
-           "branch=$(git rev-parse --abbrev-ref HEAD)\n"\
-           'echo "$(date);$project;$branch" >> ~/worklog'.freeze
+  SCRIPT = "#!/bin/sh\nherodot track $(pwd)".freeze
+
   DEFAULT_RANGE = 'this week'.freeze
 
   def self.show(args, config, opts = {})
@@ -19,7 +17,7 @@ class Herodot::Commands
     puts output
   end
 
-  def self.track(path, config)
+  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"
@@ -31,6 +29,16 @@ class Herodot::Commands
     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)
+    end
+  end
+
   def self.link(path)
     path = '.' if path.nil?
     choose do |menu|

data/lib/herodot/configuration.rb

@@ -12,7 +12,7 @@ class Herodot::Configuration
     }
   }.freeze
 
-  def initialize(worklog_file = '~/worklog')
+  def initialize(worklog_file = '~/.worklog')
     @worklog_file = worklog_file
     if File.exist?(CONFIG_FILE)
       @config = load_configuration

data/lib/herodot/parser.rb

@@ -2,7 +2,7 @@ require 'csv'
 
 class Herodot::Parser
   NO_SUCH_FILE = Rainbow('Worklog missing.').red +
-                 ' Use `herodot track` to track a git repository'\
+                 ' Use `herodot init` to start tracking a git repository'\
                  ' or `herodot help` to open the man page.'.freeze
   class << self
     def parse(range, config)

data/lib/herodot/version.rb

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

data/lib/herodot.rb

@@ -18,6 +18,7 @@ class Herodot::Application
     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)
@@ -25,14 +26,28 @@ class Herodot::Application
     run!
   end
 
-  TRACK_DESCRIPTION = 'This command sets up post commit and post checkout hooks'\
+  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)
+      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 = 'Start tracking a repository'
+      c.syntax = 'herodot track <repository path>'
+      c.summary = 'Record git activity in a repository (used internally)'
       c.description = TRACK_DESCRIPTION
-      c.example 'Start tracking current repository', 'herodot track'
+      c.example 'Record the latest branch name etc. to the worklog', 'herodot track .'
       c.action do |args, _|
         Herodot::Commands.track(args[0], config)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herodot
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - bitcrowd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -180,7 +180,6 @@ files:
 - lib/herodot/project_link.rb
 - lib/herodot/version.rb
 - lib/herodot/worklog.rb
-- post-checkout
 homepage: https://github.com/bitcrowd/herodot
 licenses:
 - MIT
@@ -201,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Track your work with your git activity.

data/post-checkout

@@ -1,6 +0,0 @@
-#!/bin/bash
-echo 'Logging into worklog'
-project=$(pwd)
-branch=$(git rev-parse --abbrev-ref HEAD)
-
-echo "$(date);$project;$branch" >> ~/worklog