logtime 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ac03824d4a2dbe1375dd8e56f22f2af21eb696
-  data.tar.gz: 7f501f03833e8df2e86726f57d185294dabec9f8
+  metadata.gz: 9322d0f14a4b772705e7289e0d05d55432212dfa
+  data.tar.gz: 38c810feb097ec77117048e944c3e787a34843a2
 SHA512:
-  metadata.gz: 2d47a4be6bd4297fc27b24c658cdd21a365e8e4e6023527368009a7b14c74c625126dc168bfa64a70bcebd02a266ad19d3550f6693be14edb3fa017e0ea99588
-  data.tar.gz: 317788fe8cc68ff84d519f0c658701830a4658930d47a3c3b616b88a4613777971ea916c424aef477dd24d8da10293fb612a84fae633bd9440159fdcc4886b1d
+  metadata.gz: ab428f98cba504aa37ba07eaa77734aa4dcad4f73bf60bb341f084750249a0bd2c3fa8f2efefbd871a2e7bce01d2580a024ef723e4e4c6a31456b237fcbecdaa
+  data.tar.gz: a01dbf14f7a9a224778e70982cc10b748929ae6d1f40f7e52fde03d3028aa962e16e10efdf13ef6dfbe387a3eea759149659d20c5c3a6285cc99412571a0a9c8

data/Gemfile.lock

@@ -16,12 +16,11 @@ GEM
       tzinfo (~> 1.1)
     arel (5.0.1.20140414130214)
     builder (3.2.2)
-    chronic (0.10.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
     i18n (0.7.0)
-    json (1.8.2)
-    minitest (5.6.1)
+    json (1.8.3)
+    minitest (5.7.0)
     numerizer (0.1.1)
     sqlite3 (1.3.10)
     thor (0.19.1)
@@ -34,7 +33,6 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord (~> 4.1.6)
-  chronic (= 0.10.2)
   chronic_duration (= 0.10.6)
   sqlite3 (~> 1.3.9)
   thor (~> 0.19.1)

data/README.md

@@ -3,30 +3,32 @@ Logtime
 
 Log your time. Get better at time estimation with statistics.
 
+[![Gem Version](https://badge.fury.io/rb/logtime.svg)](https://rubygems.org/gems/logtime)
+
 ## Install
 
 `gem install logtime`
 
-## Database
-
-The first time you run Logtime, it will take a few seconds to setup and save a new database.
-
-By default, Logtime saves a sqlite database file to `~/.logtime/database.db`.
+The first time you run Logtime, it will take a few seconds to setup and save a new database; by default it saves the database file to `~/.logtime/database.db`.
 
 ## Getting help
 
-`logtime help` will show all commands, and `logtime help command` will tell you more about the specified command.
+`lt help` will show all commands, and `lt help command` will tell you more about the specified command.
+
+`lt add logname` **Add log**
 
-`logtime add logname` **Add log**
+`lt add project --start false` **Add log with out starting it**
 
-`logtime add project --start false` **Do not start on add**
+`lt add '13 James st' --tag construction,work` **Tag log**
 
-`logtime add 'house 5b' --tag construction,work` **Use tags**
+`lt add 'new design' --estimate '2 hours and 25 minutes'` **Provide estimates**
 
-`logtime add 'new design' --estimate '2 hours and 25 minutes'` **Provide estimates**
+`lt start name` **Start log**
 
-`logtime start name` **start**
+`lt stop name` **Stop log** 
 
-`logtime stop name` **stop** 
+`lt ls work` **List only specifically tagged logs**
 
+`lt ls --order name` **List logs alphabetically**
 
+`lt ls --order created_at` **List logs by create date**

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/lt

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'logtime'
+LogTime.start(ARGV)

data/config/application.rb

@@ -1,6 +1,8 @@
 # Application configutation
 I18n.config.enforce_available_locales = true
-Time.zone = 'Brisbane'
 ActiveRecord::Base.default_timezone = :local
 ActiveRecord::Base.logger = Logger.new(STDERR)
-ActiveRecord::Base.logger.level = 1
+ActiveRecord::Base.logger.level = 1
+
+$logtime_path = File.join(File.expand_path('~'), '.logtime')
+$time_display = "%Y-%m-%d %H:%M:%S"

data/config/database.rb

@@ -1,4 +1,4 @@
 ActiveRecord::Base.establish_connection(
     :adapter => "sqlite3",
-    :database  => File.join($config_path, 'database.db') # or otherwise ":memory:"
+    :database  => File.join($logtime_path, 'database.db') # or otherwise ":memory:"
 )

data/config/initialisation.rb

@@ -2,7 +2,6 @@ require 'thor'
 require 'active_record'
 require 'sqlite3'
 require 'chronic_duration'
-$config_path = File.join(File.expand_path('~'), '.logtime')
-require_relative 'database.rb'
 require_relative 'application.rb'
+require_relative 'database.rb'
 require_relative 'schema.rb'

data/config/schema.rb

@@ -38,4 +38,4 @@ ActiveRecord::Schema.define do
         table.timestamps
     end unless ActiveRecord::Base.connection.table_exists? 'series'
 
-end unless File.exists?(File.join($config_path, 'database.db'))
+end unless File.exists?(File.join($logtime_path, 'database.db'))

data/lib/commands/add.rb

@@ -5,7 +5,7 @@ module Commands
 				option :tag, :type => :string, :alias => '-t', default: ""
 				option :estimate, :type => :string, :alias => '-e', default: false
 				option :start, :type => :boolean, default: true
-				desc "add [NAME]", "create new log"
+				desc "add [NAME]", "Create new log"
 				def add(name)
 					log = Log.new(name: name).tag(options[:tag])
 
@@ -28,8 +28,7 @@ module Commands
 					end
 
 					# start option
-					if options[:start]
-						log.activate if Series.begin(log_id: log.id)
+					if options[:start] and log.start!
 						say name.to_s + " added and started", :green
 					else
 						say name.to_s + " added", :green

data/lib/commands/list.rb

@@ -3,46 +3,53 @@ module Commands
         def self.included(thor)
             thor.class_eval do
                 option :active, :type => :boolean, :default => true
-                #option :tag, :type => :string, :alias => '-t'
-                desc "ls", "list time series"
-                def ls(tag='')
+                option :order, :type => :string, :default => "updated_at"
+                desc "ls", "List time series"
+                def ls(search='')
                     logs = Log.where(active: options[:active]).includes(:series).includes(:tags)
-                    logs = logs.tagged(tag) if !tag.blank?
+                    logs = logs.order(options[:order].to_sym => :desc)
+                    logs = logs.tagged(search) if !search.blank?
 
                     creep_stats = Statistics.new
-                    table = [['#', 'name', 'active', 'tags', 'series', 'time', 'estimate', 'creep %']] # header
+                    table = [['#', 'name', '', 'tags', 'series', 'time', 'start', 'stop', 'estimate', 'creep %']] # header
                     logs.each do |log|
 
                         # tags
                         tags = log.tags.map do |t|
                             t.tag
                         end
-
-                        # only show logs with tag, if selected
-                        # if !tag.blank?
-                        #     next unless tags.include? tag
-                        # end
+                        tags = tags.join ' '
 
                         # active text
                         active = "ACTIVE" if log.active == "t"
 
                         # total counter
-                        total_time = (log.total/3600).round(2)
+                        total_time = (log.total_time/3600).round(2) # to hours
+                        total_time = "#{total_time} hours"
+
+                        # first start time
+                        start = time_display(log.series.first.start) if log.series.first
+
+                        # last stop time
+                        stop = time_display(log.series.last.end) if log.series.last
 
-                        # estimation creep
+                        # estimation and creep
                         if log.estimation
-                            creep = (total_time/log.estimation)*100
+                            creep = log.creep # creep %
                             creep_stats << creep
-                            creep = creep.round(3)
-                            estimation = (log.estimation/3600).round(3) # log estimation to hours
+                            creep = creep.round(2) # round perecentage
+                            estimation = (log.estimation/3600).round(2) # estimation to hours
                         end
 
+                        # table
                         table << [log.id,
                             log.name,
                             active || '',
                             tags,
                             log.series.count || '',
                             total_time || '',
+                            start || '',
+                            stop || '',
                             estimation || '',
                             creep || '']
                     end

data/lib/commands/start.rb

@@ -2,25 +2,30 @@ module Commands
 	module Start
 		def self.included(thor)
 		    thor.class_eval do
-				desc "start [NAME]", "start new timer"
+				desc "start [NAME]", "Start new timer"
 				def start(name)
+					log = Log.find_by(name: name)
 
 					# not found
-					if Log.where(name: name).count == 0
-						say name.to_s + " not found", :red
+					if !log
+						say "#{name} not found", :red
 						exit
 					end
 
-					log = Log.find_by(name: name)
-
 					# already active?
-					if log.active == "t"
-						say name.to_s + " already active", :red
+					if log.active?
+						say "#{name} already active", :red
 						exit
 					end
 
 					# begin new series, activate log
-					series = Series.begin(log_id: log.id) and log.activate
+					# Series.start!(log_id: log.id)
+					if log.start!
+						started_at = time_display(Time.now)
+						say "#{name} started at #{started_at}", :green
+					else
+						say "#{name} failed to start", :red
+					end
 				end
 			end
 		end

data/lib/commands/stop.rb

@@ -2,25 +2,34 @@ module Commands
     module Stop
         def self.included(thor)
             thor.class_eval do
-                desc "stop [NAME]", "stop active timer"
+                desc "stop [NAME]", "Stop active timer"
                 def stop(name)
-                    if Log.where(name: name).count == 0
+                    log = Log.find_by(name: name)
+
+                    # not found
+                    if !log
                         say name.to_s + " not found", :red
                         exit
                     end
 
-                    log = Log.find_by(name: name)
-                    if log.active == "f"
-                        say name.to_s + " not active", :red
+                    # log not active
+                    if log.inactive?
+                        say "#{name} not active", :red
                         exit
                     end
 
-                    series = log.series.last
-                    if series.stop and log.deactivate
-                        say name + " stopped!", :green
+                    # stop log
+                    if log.stop!
+                        say "#{name} stopped!", :green
 
-                        # this_series = log.series.last
-                        say (series.total/3600).round(3).to_s + " hours out of " + (log.total/3600).round(3).to_s, :cyan
+                        time_total = log.total_time/3600
+                        time_total = time_total.round(2)
+                        time_last = Series.find(log.series.last.id).total_time/3600
+                        time_last = time_last.round(2)
+                        # time_start =
+                        say "#{time_last} hours out of #{time_total}", :cyan
+                    else
+                        say "#{name} failed to stop", :red
                     end
                 end
             end

data/lib/helpers/time_display.rb

@@ -1,5 +1,5 @@
 module TimeDisplayHelper
-	def display_time(time)
-		time.strftime("%H:%M:%S %d/%m/%y") if time.is_a? Time
+	def time_display(time)
+		time.strftime($time_display || "%Y-%m-%d %H:%M:%S") if time.is_a? Time
 	end
 end

data/lib/models/log.rb

@@ -10,7 +10,10 @@ class Log < ActiveRecord::Base
 
 	validates :name, uniqueness: true
 
-	has_many :series
+	#
+	# Tags
+	#
+
 	has_and_belongs_to_many :tags
 
 	def tag(tags)
@@ -21,27 +24,97 @@ class Log < ActiveRecord::Base
 		return self
 	end
 
-	def tagged(tag)
+	#
+	# Series
+	#
+
+	has_many :series
+
+	#
+	# Stop
+	#
+
+	def stop
+		self.deactivate
+		self.series.last.stop!
+	end
 
+	def stop!
+		self.stop
+		self.save!
 	end
 
+	#
+	# Start
+	#
+
+	def start(options={})
+		self.activate
+
+		attributes = {
+			start: Time.now
+		}.merge! options
+
+		self.series << Series.new(attributes)
+	end
+
+	def start!(options={})
+		self.start(options)
+		self.save!
+	end
+
+	#
+	# Activate
+	#
+
 	def activate
 		self.active = true
-		self.save
 	end
 
+	def activate!
+		self.activate
+		self.save!
+	end
+
+	def active?
+		self.active == "t"
+	end
+
+	#
+	# Deactivate
+	#
+
 	def deactivate
 		self.active = false
-		self.save
 	end
 
-	def total
+	def deactivate!
+		self.active = false
+		self.save!
+	end
+
+	def inactive?
+		self.active == "f"
+	end
+
+	#
+	# Total time
+	#
+
+	def total_time
 		difference = 0
 		self.series.each do |s|
 			ending = s.end || Time.now
-			# next unless s.start and s.end
 			difference = difference + s.start.difference(ending)
 		end
 		difference
 	end
+
+	#
+	# Creep
+	#
+
+	def creep
+		self.total_time/self.estimation
+	end
 end

data/lib/models/series.rb

@@ -5,7 +5,7 @@
 class Series < ActiveRecord::Base
 	belongs_to :log
 
-	def self.begin(options = {})
+	def self.start!(options = {})
 		attributes = {
 			start: Time.now
 		}.merge! options
@@ -13,12 +13,12 @@ class Series < ActiveRecord::Base
 		create(attributes)
 	end
 
-	def begin
+	def start!
 		self.start = Time.now
 		self.save
 	end
 
-	def stop
+	def stop!
 		self.end = Time.now
 		self.save
 	end
@@ -27,9 +27,8 @@ class Series < ActiveRecord::Base
 		!self.end.blank?
 	end
 
-	def total
-		return false if self.end.blank? or self.start.blank?
+	def total_time
 
-		self.start.difference(self.end)
+		self.start.difference(self.end || Time.now)
 	end
 end

data/lib/subcommands/series.rb

@@ -1,6 +1,6 @@
 module SubCommands
     class Series < Thor
-        desc "ls", "list series"
+        desc "ls", "List all series"
         option :order, :type => :string, :default => "updated_at"
         def ls
             series = ::Series.all.order(options[:order].to_sym => :desc)
@@ -16,13 +16,14 @@ module SubCommands
                 # total time
                 series_stats << timer = start.difference(finish || Time.now)
 
-                start = display_time(start) if start
-                finish = display_time(finish) if finish
+                start = time_display(start) if start
+                finish = time_display(finish) if finish
 
                 table << [s.id,
-                    Log.find(s.log_id).name,
-                    start, finish || "active",
-                     (timer/3600).round(2).to_s] # row
+                    s.log.name,
+                    start,
+                    finish || "active",
+                    (timer/3600).round(2).to_s] # row
             end
 
             puts ''
@@ -33,27 +34,27 @@ module SubCommands
             say [(series_stats.mean/3600).round(2), " hours avg"].join(' '), :cyan
         end
 
-        desc "rm [ID]", "remove series"
+        desc "rm [ID]", "Destroy series"
         option :confirm, :type => :boolean, :default => false, :alias => '-y'
         def rm(id)
-            if ::Series.where(id: id).count == 0
-                say "Series #" + id.to_s + " not found", :red
+            series = ::Series.find(id)
+
+            if !series
+                say "Series ##{id} not found", :red
                 exit
             end
 
-            series = ::Series.find(id)
-
             if !options[:confirm]
-                say "You must --confirm before removing this series", :red
+                say "You must --confirm before removing series", :red
                 exit
             end
 
             if !series.finished?
-                series.log.deactivate
+                series.log.deactivate!
             end
 
             destroyed = series.destroy
-            say "Series #" + id.to_s + " has been destroyed", :green
+            say "Series ##{id} has been destroyed", :green
         end
     end
 end

data/lib/subcommands/tags.rb

@@ -1,6 +1,6 @@
 module SubCommands
     class Tags < Thor
-        desc "add", "create new tag"
+        desc "add", "Create new tag"
         def add(tag)
             tag = ::Tag.new(tag: tag.strip)
 
@@ -14,7 +14,7 @@ module SubCommands
             say tag.tag + " added!", :green
         end
 
-        desc "rm", "remove tag"
+        desc "rm", "Destroy tag"
         # option :prune, :type => :boolean, :alias => '-p', :default => false not implemented yet
         def rm(tag)
             tag = ::Tag.find_by!(tag: tag)
@@ -22,7 +22,7 @@ module SubCommands
             say ["Tag", tag.tag, "destroyed forever"].join(' '), :green
         end
 
-        desc "ls", "list all tags"
+        desc "ls", "List all tags"
         option :order, :type => :string, :default => "created_at"
         def ls
             tags = ::Tag.order(options[:order].to_sym => :desc)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logtime
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Paperback
@@ -94,6 +94,7 @@ description: |2
 email: sam@samwhat.com
 executables:
 - logtime
+- lt
 extensions: []
 extra_rdoc_files: []
 files:
@@ -104,31 +105,17 @@ files:
 - README.md
 - VERSION
 - bin/logtime
+- bin/lt
 - certs/paperback.pem
 - config/application.rb
 - config/database.rb
 - config/initialisation.rb
 - config/schema.rb
-- lib/app/commands/add.rb
-- lib/app/commands/list.rb
-- lib/app/commands/start.rb
-- lib/app/commands/stop.rb
-- lib/app/helpers/estimate.rb
-- lib/app/helpers/statistics.rb
-- lib/app/helpers/time_to_words.rb
-- lib/app/logtime.rb
-- lib/app/models/log.rb
-- lib/app/models/series.rb
-- lib/app/models/tag.rb
-- lib/app/subcommands/keyword.rb
-- lib/app/subcommands/series.rb
-- lib/app/subcommands/tags.rb
 - lib/commands/add.rb
 - lib/commands/list.rb
 - lib/commands/start.rb
 - lib/commands/stop.rb
 - lib/commands/version.rb
-- lib/helpers/estimate.rb
 - lib/helpers/statistics.rb
 - lib/helpers/time_difference.rb
 - lib/helpers/time_display.rb
@@ -137,7 +124,6 @@ files:
 - lib/models/log.rb
 - lib/models/series.rb
 - lib/models/tag.rb
-- lib/subcommands/keyword.rb
 - lib/subcommands/series.rb
 - lib/subcommands/tags.rb
 - logtime.gemspec

data/lib/app/commands/add.rb

@@ -1,41 +0,0 @@
-module Commands
-	module Add
-		def self.included(thor)
-		    thor.class_eval do
-				option :tag, :type => :string, :alias => '-t', default: ""
-				option :estimate, :type => :string, :alias => '-e', default: false
-				option :start, :type => :boolean, default: true
-				desc "add [NAME]", "create new log"
-				def add(name)
-					log = Log.new(name: name).tag(options[:tag])
-
-					# estimate option
-					if options[:estimate]
-						estimation = ChronicDuration.parse(options[:estimate]) if !estimation
-						if !estimation
-							say "could not parse estimation time: " + options[:estimate], :red
-							exit
-						end
-						log.estimation = estimation
-					end
-
-					# save log
-					if !log.save
-						log.errors.full_messages.each do |error|
-							say error, :red
-						end
-						exit
-					end
-
-					# start option
-					if options[:start]
-						log.activate if Series.begin(log_id: log.id)
-						say name.to_s + " added and started", :green
-					else
-						say name.to_s + " added", :green
-					end
-				end
-			end
-		end
-	end
-end