myworklog 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d37f3cfd48fb7dd15e989b814f76f6617abb1ae2f273af94c9fba0d7e752f8
-  data.tar.gz: 1fd15183fb9a7f391c37414dac5bc34d65a1f8fcf0021b52c4b56286f99f63dd
+  metadata.gz: bdd92d2d822c08464ccc93918c903303973f5e1f958fc9ac166e483877338178
+  data.tar.gz: f49931374165a57565bbd2c3faba90194b1b7ac6ce4bdcb7afbbb4a3b42dc8ab
 SHA512:
-  metadata.gz: 11608be11f9dbad29af5bd6f8210102fecac722c7bb507c4f8f361edf6c8360b3bb0dbe9730d7bc6befb4375df72c7da8ab6b4a0e784e0d0809e73b22e2abf2b
-  data.tar.gz: 8cccbf75521a73924aaa347871b19b3c5e9eff01ce6e962dc9928499188430669e50f576950dee644db73f35b751ed2624b2041b49472fc1d3a8d44b8215590d
+  metadata.gz: 65ceb6290ef9a952f1167f6dd5241d155a871945de1ef4784761c2afd0da7ccab85b95f8be2ff0d1da40fdc2948745dce584317db41c745734827e7e4567b809
+  data.tar.gz: 2e72b7c4523afe01315125b4a3031b71052587a5b8034429b6bd34ea08101812160a1bbae7f6495bb4d75558dccd397292ed2bfbeae3770d614221700994c564

data/lib/work_log_controller.rb

@@ -21,6 +21,14 @@ class WorkLogController
         WorkLogFileDao.new.delete(id)
     end
 
+    def find_by_month_and_year(month, year)
+        WorkLogFileDao.new.find_by_month_and_year(month, year)
+    end
+
+    def find_by_year(year)
+        WorkLogFileDao.new.find_by_year(year)
+    end
+
     private 
 
     def create_work_log(date, description)

data/lib/work_log_file_dao.rb

@@ -39,4 +39,24 @@ class WorkLogFileDao
             store.delete(id) 
         end
     end
+
+    def find_by_month_and_year(month, year)
+        store = PStore.new(FULL_DB_FILE_PATH)
+        list = []
+        store.transaction(true) do 
+          store.roots
+            .map { |root| list << store[root] if store[root].date.month == month && store[root].date.year == year }
+        end
+        list
+    end
+
+    def find_by_year(year)
+        store = PStore.new(FULL_DB_FILE_PATH)
+        list = []
+        store.transaction(true) do 
+          store.roots
+            .map { |root| list << store[root] if store[root].date.year == year }
+        end
+        list
+    end
 end

data/lib/worklog_cli.rb

@@ -16,10 +16,39 @@ class WorkLogCli < Thor
         end
     end
 
-    desc 'list [DATE]', "prints work logs limited by DATE. Use 'today' or leave it empty for current day. Date format #{DATE_FORMAT}"
+    desc 'list', "Prints work logs for the current date. Date format #{DATE_FORMAT}"
+    long_desc <<-LONGDESC
+        Prints work logs for the current date if no option specified.
+        
+        Availble options:
 
+          With -m option, prints all the work logs for the specified month, assumes the current year
+
+          With -m and -y options, prints all the work logs for the specified month and year
+
+          With -y option, prints all the work logs for the specified year
+
+          Usage examples:
+
+            `myworklog -m 2`           Will print all the work logs logged in Februrary of the current year
+
+            `myworklog -m 2 -y 2019`   Will print all the work logs logged in Februrary of 2019
+
+            `myworklog -y 2020`        Will print all the work logs logged in 2020
+
+    LONGDESC
+    options :m => :numeric
+    options :y => :numeric
     def list(date='')
-        print(WorkLogController.new.list(date))
+        if options[:m] && options[:y]
+            print(WorkLogController.new.find_by_month_and_year(options[:m], options[:y]))
+        elsif options[:m] && options[:y] == nil
+            print(WorkLogController.new.find_by_month_and_year(options[:m], Date.today.year))
+        elsif options[:m] == nil && options[:y]
+            print(WorkLogController.new.find_by_year(options[:y]))
+        else
+            print(WorkLogController.new.list(date))
+        end
     end
 
     desc 'list_all', "prints all the work logs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myworklog
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Gyowanny Queiroz