myworklog 1.1.1 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 694b96c440effe98b20dea018f6bf98f2eff3c93efaa57733a8e2db001531225
-  data.tar.gz: cdf1f7fd2db0bed741c68bb3c99ed2af1dd99b7c12793c35c68974cd5fa7a2c5
+  metadata.gz: 6fc3e032e7220ac9749c9644ee0f1f238e0492043f89288afdf7c443aacc5fcc
+  data.tar.gz: 9ceac43973316b614a5939b04918e12b8a3295af91e328f6a1ea5588e51a6edc
 SHA512:
-  metadata.gz: 41dcf2cd09f51b0667e32b6137aaf360b3aaa975f1f4809f1cebb81a66f336c997c02b13489f71da0fa705053cb74c88bd5e80ef8a1b19288c79be468cf058d2
-  data.tar.gz: 857ffa80fbdc6bb05d2a73d4de1c15ba751085a22d776312243c848b49757ff623990f0bae2ad85001aa2c8051834f0387cd8f2fc23a62869e48a0d157226699
+  metadata.gz: 07b24c7a42117bc3e0f00c65ac1f5443a1785584a24583538570c0a585353bd2c18d365917a17780e874277ed938a73d0999d9bda54aadc66152447ab3cb3a71
+  data.tar.gz: 430bab758bd15ba3efcabadbf69a287bc6ead53a27be26e3ac000850ba7e3cd347c5dff7baf64e1bfa17ef2806e6377041b429b44c0917ab383f3235615456c1

data/bin/myworklog

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require 'worklog_cli'
+require 'work_log_cli'
 WorkLogCli.start(ARGV)

data/lib/list_strategy.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'work_log_controller'
+
+class ListStrategy
+  attr_reader :date, :month, :year
+
+  def initialize(date, month, year)
+    @date = date
+    @month = month
+    @year = year
+  end
+
+  def execute
+    return list_by_month_and_year if @month && @year
+    return list_by_month_current_year if @month && @year.nil?
+    return list_by_year if @month.nil? && @year
+
+    list_by_date
+  end
+
+  private
+
+  def list_by_date
+    WorkLogController.new.list(@date)
+  end
+
+  def list_by_month_and_year
+    WorkLogController.new.find_by_month_and_year(@month, @year)
+  end
+
+  def list_by_month_current_year
+    WorkLogController.new.find_by_month_and_year(@month, Date.today.year)
+  end
+
+  def list_by_year
+    WorkLogController.new.find_by_year(@year)
+  end
+end

data/lib/printer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Printer
+  def print(work_log_list)
+    puts ''
+    if work_log_list.empty?
+      puts 'Work log(s) not found'
+    else
+      work_log_list.each do |work_log|
+        puts "#{work_log.id} | #{work_log}"
+      end
+    end
+    puts ''
+  end
+end

data/lib/{worklog_cli.rb → work_log_cli.rb}

@@ -3,7 +3,9 @@
 require 'thor'
 require 'date'
 require 'rubygems'
-require_relative 'work_log_controller'
+require 'work_log_controller'
+require 'list_strategy'
+require 'printer'
 
 DATE_FORMAT = 'DD/MM/YYYY'
 
@@ -25,39 +27,36 @@ class WorkLogCli < Thor
 
         Availble options:
 
+          with [DATE], prints the work logged for the given date in DD/MM/YYYY
+
           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
 
+          With --all option, prints all the work logs from the database
+
           Usage examples:
 
-            `myworklog -m 2`           Will print all the work logs logged in Februrary of the current year
+            `myworklog 10/10/2019`     Will print all the work logs for the given date
+
+            `myworklog -m 2`           Will print all the work logs loggedi n 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
 
+            `myworklog --all`
+
   LONGDESC
   options m: :numeric
   options y: :numeric
+  options all: :string
   def 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'
+    return print(WorkLogController.new.list_all) if options[:all]
 
-  def list_all
-    print(WorkLogController.new.list_all)
+    print(ListStrategy.new(date, options[:m], options[:y]).execute)
   end
 
   desc 'delete [ID]', 'Deletes the work log by ID. You can use the `list` command to retrieve the ID'
@@ -65,7 +64,7 @@ class WorkLogCli < Thor
   def delete(id)
     WorkLogController.new.delete(id)
     puts "Work log with #{id} ID has been deleted!"
-  rescue Exception => e
+  rescue ArgumentError => e
     puts e
   end
 
@@ -78,15 +77,19 @@ class WorkLogCli < Thor
 
   private
 
+  def list_by_year(year)
+    print(WorkLogController.new.find_by_year(year))
+  end
+
+  def list_by_month(month)
+    print(WorkLogController.new.find_by_month_and_year(month, Date.today.year))
+  end
+
+  def list_by_month_and_year(month, year)
+    print(WorkLogController.new.find_by_month_and_year(month, year))
+  end
+
   def print(work_log_list)
-    puts ''
-    if work_log_list.empty?
-      puts 'Work log(s) not found'
-    else
-      work_log_list.each do |work_log|
-        puts "#{work_log.id} | #{work_log}"
-      end
-    end
-    puts ''
+    Printer.new.print(work_log_list)
   end
 end

data/lib/work_log_controller.rb

@@ -7,15 +7,19 @@ require_relative 'work_log'
 
 class WorkLogController
   def add_work_log(date, description)
+    if description.nil? || description.empty?
+      raise ArgumentError, 'Description must not be empty'
+    end
+
     WorkLogFileDao.new.save(create_work_log(date, description))
   end
 
   def list(date)
-    WorkLogFileDao.new.list(parse_date(date))
+    sort_by_date(WorkLogFileDao.new.list(parse_date(date)))
   end
 
   def list_all
-    WorkLogFileDao.new.list_all
+    sort_by_date(WorkLogFileDao.new.list_all)
   end
 
   def delete(id)
@@ -23,11 +27,11 @@ class WorkLogController
   end
 
   def find_by_month_and_year(month, year)
-    WorkLogFileDao.new.find_by_month_and_year(month, year)
+    sort_by_date(WorkLogFileDao.new.find_by_month_and_year(month, year))
   end
 
   def find_by_year(year)
-    WorkLogFileDao.new.find_by_year(year)
+    sort_by_date(WorkLogFileDao.new.find_by_year(year))
   end
 
   private
@@ -45,4 +49,8 @@ class WorkLogController
       Date.strptime(date, '%d/%m/%Y')
     end
   end
+
+  def sort_by_date(work_log_list)
+    work_log_list.sort_by(&:date)
+  end
 end

data/lib/work_log_file_dao.rb

@@ -39,7 +39,7 @@ class WorkLogFileDao
 
   def delete(id)
     PStore.new(FULL_DB_FILE_PATH).transaction do |store|
-      raise Exception, "Id #{id} not found" if store[id].nil?
+      raise ArgumentError, "Id #{id} not found" if store[id].nil?
 
       store.delete(id)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myworklog
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.5
 platform: ruby
 authors:
 - Gyowanny Queiroz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies: []
 description: Log your work from cmd and keep track of what you have done... just in
   case your boss ask
@@ -20,10 +20,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/myworklog
+- lib/list_strategy.rb
+- lib/printer.rb
 - lib/work_log.rb
+- lib/work_log_cli.rb
 - lib/work_log_controller.rb
 - lib/work_log_file_dao.rb
-- lib/worklog_cli.rb
 homepage: http://rubygems.org/gems/myworklog
 licenses:
 - MIT