logtime 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eb41b46956a8c59dd13349aabbd04f0fa72eea7
-  data.tar.gz: 91e48aeeaecfffbca6f8e4c256359013cece71af
+  metadata.gz: 803c1f947737fec034e52bd6fb27a21db22150c4
+  data.tar.gz: d0a72ce3030c062b4ffd90bfb65d371ac93e92b2
 SHA512:
-  metadata.gz: a09dcd74c5a093a40e8ec7375f0ba96f782d444f14b0cf332fbeca1f1766c1c99e3e122b7273855e69b02e019647db1d93b1f180945205033c8bbfb530d7ca80
-  data.tar.gz: c6625adb4bc2865ddd8260a433f163b1afff5dfa94b18762222a63c06789d2830dce8451f1c7d55959f6990201fca0f4aa5291b7d3e345d11b8811acdc850bf1
+  metadata.gz: ef463ffdeaf7df8785a7911f72b1e06b9e16c5f6b52df650081eada9144cc91868ca5e3cb22027b36c594cca99103969c82f9a48c7cdadda4880217b85e7b9ec
+  data.tar.gz: d9cb61ad887354ff65cca0b3be23eecc4ba442c9f245682fb1cfeb9b024aa5865fc949cc7f2c43cbe481b08eb28fc3165e631dd1175a94172957fc461ed8a842

data/Gemfile

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

data/Gemfile.lock

@@ -1,20 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.1.10)
-      activesupport (= 4.1.10)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.10)
-      activemodel (= 4.1.10)
-      activesupport (= 4.1.10)
-      arel (~> 5.0.0)
-    activesupport (4.1.10)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0)
     builder (3.2.2)
     chronic_duration (0.10.6)
       numerizer (~> 0.1.1)
@@ -32,7 +32,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 4.1.6)
-  chronic_duration (= 0.10.6)
-  sqlite3 (~> 1.3.9)
-  thor (~> 0.19.1)
+  activerecord
+  chronic_duration
+  sqlite3
+  thor

data/UPDATES.md

@@ -0,0 +1,11 @@
+Releases
+=======
+
+## 0.2.0 (15th June 2015)
+
+* Renamed --active option to --all for `list`
+* 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`
+* Formatted `tags ls` to be more similar to other tables
+* Updated activerecord to 4.2.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/commands/list.rb

@@ -2,11 +2,16 @@ module Commands
     module List
         def self.included(thor)
             thor.class_eval do
-                option :active, :type => :boolean, :default => true
+                option :all, :type => :boolean, :default => false
                 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)
+                    if options[:all]
+                        logs = Log.all
+                    else
+                        logs = Log.where(active: true)
+                    end
+                    logs = logs.includes(:series).includes(:tags)
                     logs = logs.order(options[:order].to_sym => :desc)
                     logs = logs.tagged(search) if !search.blank?
 

data/lib/subcommands/series.rb

@@ -1,9 +1,23 @@
 module SubCommands
     class Series < Thor
-        desc "ls", "List all series"
+        desc "ls [LOG]", "List all series"
         option :order, :type => :string, :default => "updated_at"
-        def ls
-            series = ::Series.all.order(options[:order].to_sym => :desc)
+        def ls(search=nil)
+
+            if search.nil?
+                series = ::Series.all.order(options[:order].to_sym => :desc)
+            else
+                log = Log.find_by_name(search)
+
+                if log
+                    series = ::Series.where(log: log).order(options[:order].to_sym => :desc)
+                else
+                    puts ""
+                    say "Could not find #{search}!", :red
+                    puts ""
+                    exit
+                end
+            end
 
             series_stats = Statistics.new
             table = [['#', 'log', 'start', 'end', 'hours']] # header
@@ -22,8 +36,7 @@ module SubCommands
 
                 # name
                 name = ''
-                p s.log.inspect
-                # name = s.log.name if !s.log.name.empty?
+                name = s.log.name if !s.log.name.empty?
 
                 table << [s.id,
                     name || '',

data/lib/subcommands/tags.rb

@@ -31,7 +31,9 @@ module SubCommands
             tags.each do |tag|
                 table << [tag.id, tag.tag, tag.logs.count] # row
             end
+            p ''
             print_table table
+            p ''
         end
     end
 end

data/logtime.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification.new do |s|
-    s.date          = '2015-06-10'
+    s.date          = '2015-06-15'
     s.version       = `cat VERSION`.strip
     s.license       = 'MIT'
     s.name          = 'logtime'
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
     s.authors       = ['Paperback']
     s.homepage      = 'https://github.com/Paperback/Logtime.git'
     s.description   = <<-EOF
-    Tag, record and estimate your time.
+    Tag, record and estimate your time in the shell.
     Get better at time estimation with statistics.
     EOF
 
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
     # runtime dependencies
     s.add_runtime_dependency "thor", ["~> 0.19"]
-    s.add_runtime_dependency "activerecord", ["~> 4.1"]
+    s.add_runtime_dependency "activerecord", ["~> 4.2"]
     s.add_runtime_dependency "sqlite3", ["~> 1.3"]
     s.add_runtime_dependency "chronic_duration", ["~> 0.10"]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logtime
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Paperback
@@ -30,7 +30,7 @@ cert_chain:
   2/luIWFCIDih/t3xy/BezkXJLXfRZF2Xd6/Ax9+zEVss6iUJ6kcxwaZ/J5r28EDI
   KS3vMuAGgck=
   -----END CERTIFICATE-----
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,14 +52,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.10'
 description: |2
-      Tag, record and estimate your time.
+      Tag, record and estimate your time in the shell.
       Get better at time estimation with statistics.
 email: sam@samwhat.com
 executables:
@@ -103,6 +103,7 @@ files:
 - Gemfile.lock
 - LICENSE.md
 - README.md
+- UPDATES.md
 - VERSION
 - bin/logtime
 - bin/lt