logtime 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 803c1f947737fec034e52bd6fb27a21db22150c4
-  data.tar.gz: d0a72ce3030c062b4ffd90bfb65d371ac93e92b2
+  metadata.gz: 3129507c9ca507033f03a09c38d1e6dd7ac2b3d5
+  data.tar.gz: 4a81907eaf2942548b182ab3cfcb9470c9c674e0
 SHA512:
-  metadata.gz: ef463ffdeaf7df8785a7911f72b1e06b9e16c5f6b52df650081eada9144cc91868ca5e3cb22027b36c594cca99103969c82f9a48c7cdadda4880217b85e7b9ec
-  data.tar.gz: d9cb61ad887354ff65cca0b3be23eecc4ba442c9f245682fb1cfeb9b024aa5865fc949cc7f2c43cbe481b08eb28fc3165e631dd1175a94172957fc461ed8a842
+  metadata.gz: 70e85f85ae1c29229182a2526e3684e87b2d93d90bd89dd72f0d38202190241020979fea2f81f58e30948e44c795322c9f825ed45a2e66ac469e5510d7e02746
+  data.tar.gz: 026cdef8e50e28daf4bdefa3348da8b18e5e03097f9af141acefeee921838f298f89c668940f44b129a02c72072d74fe97f797937ac19d1944340a391deb2d11

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
 gem "thor", "~> 0.19.1"
-gem "activerecord", "~> 4.2.1"
+gem "activerecord", "~> 4.2.2"
 gem "sqlite3", "~> 1.3.9"
-gem "chronic_duration", "0.10.6"
+gem "chronic_duration", "0.10.6"

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.2)
+      activemodel (= 4.2.2)
+      activesupport (= 4.2.2)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -32,7 +32,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
-  chronic_duration
-  sqlite3
-  thor
+  activerecord (~> 4.2.2)
+  chronic_duration (= 0.10.6)
+  sqlite3 (~> 1.3.9)
+  thor (~> 0.19.1)

data/UPDATES.md

@@ -1,9 +1,19 @@
 Releases
 =======
 
+## 0.2.1 (23rd June 2015)
+
+* Fixed deprecation warning on schema create
+* Normalised output space before and after output
+* Added error if no tags exist on `tags ls`
+* Added error if unable to destroy a record
+* Updated activerecord to 4.2.2
+* Added makefile with gem build and temporary test script
+
+
 ## 0.2.0 (15th June 2015)
 
-* Renamed --active option to --all for `list`
+* Renamed --active option to --all for `ls`
 * Added ability to search series by log name, e,g; `series ls logname`
 * Fixed debug output in `series ls`
 * Fixed log name not displaying in `series ls`

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/config/schema.rb

@@ -1,41 +1,41 @@
 ActiveRecord::Schema.define do
-
     #
     # Logs
     #
-    create_table :logs do |table|
-        table.column :name, :string
-        table.column :active, :string, default: false
-        table.column :estimation, :decimal
-        table.timestamps
-    end unless ActiveRecord::Base.connection.table_exists? 'logs'
 
+    create_table :logs do |t|
+        t.string :name
+        t.string :active, default: false
+        t.decimal :estimation
+        t.timestamps null: false
+    end unless ActiveRecord::Base.connection.table_exists? 'logs'
 
     #
     # Logs Tags
     #
-    create_table :logs_tags do |table|
-        table.column :log_id, :integer
-        table.column :tag_id, :integer
-    end unless ActiveRecord::Base.connection.table_exists? 'logs_tags'
 
+    create_table :logs_tags do |t|
+        t.integer :log_id
+        t.integer :tag_id
+    end unless ActiveRecord::Base.connection.table_exists? 'logs_tags'
 
     #
     # Tags
     #
-    create_table :tags do |table|
-        table.column :tag, :string
-        table.timestamps
+
+    create_table :tags do |t|
+        t.string :tag
+        t.timestamps null: false
     end unless ActiveRecord::Base.connection.table_exists? 'tags'
 
     #
     # Series
     #
-    create_table :series do |table|
-        table.column :log_id, :integer
-        table.column :start, :timestamp, null: true
-        table.column :end, :timestamp, null: true
-        table.timestamps
-    end unless ActiveRecord::Base.connection.table_exists? 'series'
 
+    create_table :series do |t|
+        t.integer :log_id
+        t.timestamp :start, null: true
+        t.timestamp :end, null: true
+        t.timestamps null: false
+    end unless ActiveRecord::Base.connection.table_exists? 'series'
 end unless File.exists?(File.join($logtime_path, 'database.db'))

data/lib/commands/add.rb

@@ -13,7 +13,9 @@ module Commands
 					if options[:estimate]
 						estimation = ChronicDuration.parse(options[:estimate]) if !estimation
 						if !estimation
-							say "could not parse estimation time: " + options[:estimate], :red
+							output do
+								say "could not parse estimation time: " + options[:estimate], :red
+							end
 							exit
 						end
 						log.estimation = estimation
@@ -22,16 +24,22 @@ module Commands
 					# save log
 					if !log.save
 						log.errors.full_messages.each do |error|
-							say error, :red
+							output do
+								say error, :red
+							end
 						end
 						exit
 					end
 
 					# start option
 					if options[:start] and log.start!
-						say name.to_s + " added and started", :green
+						output do
+							say name.to_s + " added and started", :green
+						end
 					else
-						say name.to_s + " added", :green
+						output do
+							say name.to_s + " added", :green
+						end
 					end
 				end
 			end

data/lib/commands/list.rb

@@ -60,17 +60,20 @@ module Commands
                     end
 
                     if logs.count == 0
-                        puts ""
-                        say "No logs found", :red
-                        puts ""
+                        output do
+                            say "No logs found", :red
+                        end
                         exit
                     else
-                        puts ""
-                        print_table table
-                        puts ""
-                        say [logs.count.to_s, "logs out of", Log.count.to_s].join(' '), :cyan
-                        say [creep_stats.count, "estimations"].join(' '), :cyan
-                        say [creep_stats.mean.round(2), "percent mean creep"].join(' '), :cyan
+                        output do
+                            print_table table
+
+                            output_spacer
+
+                            say [logs.count.to_s, "logs out of", Log.count.to_s].join(' '), :cyan
+                            say [creep_stats.count, "estimations"].join(' '), :cyan
+                            say [creep_stats.mean.round(2), "percent mean creep"].join(' '), :cyan
+                        end
                     end
                 end
             end

data/lib/commands/rm.rb

@@ -9,13 +9,17 @@ module Commands
 
 		            # log exists?
 		            if !log
-		                say "#{name} log not found", :red
+		            	output do
+			                say "#{name} log not found", :red
+			            end
 		                exit
 		            end
 
 		            # make sure user confirmed
 		            if !options[:confirm]
-		                say "You must --confirm before removing #{name} log", :red
+		            	output do
+			                say "You must --confirm before removing #{name} log", :red
+			            end
 		                exit
 		            end
 
@@ -25,8 +29,13 @@ module Commands
 		            end
 
 		            # destroy log!
-		            destroyed = log.destroy
-		            say "#{name} has been destroyed", :green
+		            output do
+		            	if log.destroy
+				            say "#{name} has been destroyed", :green
+				        else
+				        	say "#{name} could not be destroyed", :red
+				        end
+			        end
 		        end
 			end
 		end

data/lib/commands/start.rb

@@ -8,23 +8,30 @@ module Commands
 
 					# not found
 					if !log
-						say "#{name} not found", :red
+						output do
+							say "#{name} not found", :red
+						end
 						exit
 					end
 
 					# already active?
 					if log.active?
-						say "#{name} already active", :red
+						output do
+							say "#{name} already active", :red
+						end
 						exit
 					end
 
 					# begin new series, activate log
-					# Series.start!(log_id: log.id)
 					if log.start!
 						started_at = time_display(Time.now)
-						say "#{name} started at #{started_at}", :green
+						output do
+							say "#{name} started at #{started_at}", :green
+						end
 					else
-						say "#{name} failed to start", :red
+						output do
+							say "#{name} failed to start", :red
+						end
 					end
 				end
 			end

data/lib/commands/stop.rb

@@ -8,28 +8,36 @@ module Commands
 
                     # not found
                     if !log
-                        say name.to_s + " not found", :red
+                        output do
+                            say name.to_s + " not found", :red
+                        end
                         exit
                     end
 
                     # log not active
                     if log.inactive?
-                        say "#{name} not active", :red
+                        output do
+                            say "#{name} not active", :red
+                        end
                         exit
                     end
 
                     # stop log
                     if log.stop!
-                        say "#{name} stopped!", :green
+                        output do
+                            say "#{name} stopped!", :green
 
-                        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
+                            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
+                        end
                     else
-                        say "#{name} failed to stop", :red
+                        output do
+                            say "#{name} failed to stop", :red
+                        end
                     end
                 end
             end

data/lib/helpers/output.rb

@@ -0,0 +1,17 @@
+module OutputHelper
+	def output(cout=nil)
+		output_spacer
+		if block_given?
+			yield
+		else
+			puts cout unless cout.nil?
+		end
+		output_spacer
+	end
+
+	def output_spacer(times=1)
+		times.times do
+			puts ""
+		end
+	end
+end

data/lib/subcommands/series.rb

@@ -12,9 +12,9 @@ module SubCommands
                 if log
                     series = ::Series.where(log: log).order(options[:order].to_sym => :desc)
                 else
-                    puts ""
-                    say "Could not find #{search}!", :red
-                    puts ""
+                    output do
+                        say "Could not find #{search}!", :red
+                    end
                     exit
                 end
             end
@@ -45,12 +45,14 @@ module SubCommands
                     (timer/3600).round(2).to_s] # row
             end
 
-            puts ''
-            print_table table
-            puts ''
+            output do
+                print_table table
 
-            say [series.count.to_s, "series out of", ::Series.count].join(' '), :cyan
-            say [(series_stats.mean/3600).round(2), "hours avg"].join(' '), :cyan
+                output_spacer
+
+                say [series.count.to_s, "series out of", ::Series.count].join(' '), :cyan
+                say [(series_stats.mean/3600).round(2), "hours avg"].join(' '), :cyan
+            end
         end
 
         desc "rm [ID]", "Destroy series"
@@ -59,12 +61,16 @@ module SubCommands
             series = ::Series.find(id)
 
             if !series
-                say "Series ##{id} not found", :red
+                output do
+                    say "Series ##{id} not found", :red
+                end
                 exit
             end
 
             if !options[:confirm]
-                say "You must --confirm before removing series", :red
+                output do
+                    say "You must --confirm before removing series", :red
+                end
                 exit
             end
 
@@ -73,7 +79,9 @@ module SubCommands
             end
 
             destroyed = series.destroy
-            say "Series ##{id} has been destroyed", :green
+            output do
+                say "Series ##{id} has been destroyed", :green
+            end
         end
     end
 end

data/lib/subcommands/tags.rb

@@ -5,21 +5,31 @@ module SubCommands
             tag = ::Tag.new(tag: tag.strip)
 
             if !tag.save
-                tag.errors.full_messages.each do |error|
-                    say error, :red
+                output do
+                    tag.errors.full_messages.each do |error|
+                        say error, :red
+                    end
                 end
-                exit 1
+                exit
             end
 
-            say tag.tag + " added!", :green
+            output do
+                say tag.tag + " added!", :green
+            end
         end
 
         desc "rm", "Destroy tag"
         # option :prune, :type => :boolean, :alias => '-p', :default => false not implemented yet
         def rm(tag)
             tag = ::Tag.find_by!(tag: tag)
-            tag.destroy
-            say ["Tag", tag.tag, "destroyed forever"].join(' '), :green
+
+            output do
+                if tag.destroy
+                    say "Tag #{tag.tag} destroyed forever", :green
+                else
+                    say "Tag #{tag.tag} could not be destroyed", :red
+                end
+            end
         end
 
         desc "ls", "List all tags"
@@ -27,13 +37,20 @@ module SubCommands
         def ls
             tags = ::Tag.order(options[:order].to_sym => :desc)
 
+            if tags.size == 0
+                output do
+                    say "No tags found", :red
+                end
+            end
+
             table = [['#', 'name', 'logs']] # header
             tags.each do |tag|
                 table << [tag.id, tag.tag, tag.logs.count] # row
             end
-            p ''
-            print_table table
-            p ''
+
+            output do
+                print_table table
+            end
         end
     end
 end

data/logtime.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification.new do |s|
-    s.date          = '2015-06-15'
+    s.date          = '2015-06-23'
     s.version       = `cat VERSION`.strip
     s.license       = 'MIT'
     s.name          = 'logtime'

data/makefile

@@ -0,0 +1,29 @@
+build:
+	gem uninstall logtime && \
+	gem build logtime.gemspec && \
+	gem install logtime && \
+	which logtime && \
+	logtime version
+
+test:
+	-rm -r ${HOME}/.logtime
+	logtime ls
+	logtime ls --all
+	logtime add test --estimate '5 hours 5 minutes and 5 seconds' --tag woah,wow && sleep 1
+	logtime add test && sleep 1
+	logtime stop test && sleep 1
+	logtime start test && sleep 1
+	logtime rm test && sleep 1
+	logtime add test2 && sleep 1
+	logtime stop test2 && sleep 1
+	logtime start test2 && sleep 1
+	logtime rm test2 --confirm && sleep 1
+	logtime tags ls
+	logtime tags rm wow
+	logtime tags ls
+	logtime series ls
+	lt ls
+	lt ls --all
+
+backup:
+	-cp ${HOME}/.logtime/* ${HOME}/.logtime-backup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logtime
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Paperback
@@ -30,7 +30,7 @@ cert_chain:
   2/luIWFCIDih/t3xy/BezkXJLXfRZF2Xd6/Ax9+zEVss6iUJ6kcxwaZ/J5r28EDI
   KS3vMuAGgck=
   -----END CERTIFICATE-----
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -118,6 +118,7 @@ files:
 - lib/commands/start.rb
 - lib/commands/stop.rb
 - lib/commands/version.rb
+- lib/helpers/output.rb
 - lib/helpers/statistics.rb
 - lib/helpers/time_difference.rb
 - lib/helpers/time_display.rb
@@ -129,6 +130,7 @@ files:
 - lib/subcommands/series.rb
 - lib/subcommands/tags.rb
 - logtime.gemspec
+- makefile
 homepage: https://github.com/Paperback/Logtime.git
 licenses:
 - MIT