myworklog 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdd92d2d822c08464ccc93918c903303973f5e1f958fc9ac166e483877338178
-  data.tar.gz: f49931374165a57565bbd2c3faba90194b1b7ac6ce4bdcb7afbbb4a3b42dc8ab
+  metadata.gz: 694b96c440effe98b20dea018f6bf98f2eff3c93efaa57733a8e2db001531225
+  data.tar.gz: cdf1f7fd2db0bed741c68bb3c99ed2af1dd99b7c12793c35c68974cd5fa7a2c5
 SHA512:
-  metadata.gz: 65ceb6290ef9a952f1167f6dd5241d155a871945de1ef4784761c2afd0da7ccab85b95f8be2ff0d1da40fdc2948745dce584317db41c745734827e7e4567b809
-  data.tar.gz: 2e72b7c4523afe01315125b4a3031b71052587a5b8034429b6bd34ea08101812160a1bbae7f6495bb4d75558dccd397292ed2bfbeae3770d614221700994c564
+  metadata.gz: 41dcf2cd09f51b0667e32b6137aaf360b3aaa975f1f4809f1cebb81a66f336c997c02b13489f71da0fa705053cb74c88bd5e80ef8a1b19288c79be468cf058d2
+  data.tar.gz: 857ffa80fbdc6bb05d2a73d4de1c15ba751085a22d776312243c848b49757ff623990f0bae2ad85001aa2c8051834f0387cd8f2fc23a62869e48a0d157226699

data/lib/work_log.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 class WorkLog
-    attr_reader :id, :date, :description
+  attr_reader :id, :date, :description
 
-    def initialize(id, date, description)
-        @id = id
-        @date = date
-        @description = description
-    end
+  def initialize(id, date, description)
+    @id = id
+    @date = date
+    @description = description
+  end
 
-    def to_s
-        "#{@date.strftime('%d/%m/%Y')} - #{@description}"
-    end
-end
+  def to_s
+    "#{@date.strftime('%d/%m/%Y')} - #{@description}"
+  end
+end

data/lib/work_log_controller.rb

@@ -1,47 +1,48 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 require 'Date'
 require_relative 'work_log_file_dao'
 require_relative 'work_log'
 
 class WorkLogController
-
-    def add_work_log(date, description)
-        WorkLogFileDao.new.save(create_work_log(date, description))
-    end
-
-    def list(date)
-        WorkLogFileDao.new.list(parse_date(date))
-    end
-
-    def list_all
-        WorkLogFileDao.new.list_all
-    end
-
-    def delete(id)
-        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)
-      WorkLog.new(SecureRandom.uuid, parse_date(date), description)
-    end
-
-    def parse_date(date) 
-        if date.nil? || date.empty? || date.downcase == 'today'
-            Date.today
-        elsif date.downcase == 'yesterday'
-            Date.today.prev_day
-        else 
-            Date::strptime(date, "%d/%m/%Y")
-        end
-    end
-end
+  def add_work_log(date, description)
+    WorkLogFileDao.new.save(create_work_log(date, description))
+  end
+
+  def list(date)
+    WorkLogFileDao.new.list(parse_date(date))
+  end
+
+  def list_all
+    WorkLogFileDao.new.list_all
+  end
+
+  def delete(id)
+    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)
+    WorkLog.new(SecureRandom.uuid, parse_date(date), description)
+  end
+
+  def parse_date(date)
+    if date.nil? || date.empty? || date.downcase == 'today'
+      Date.today
+    elsif date.downcase == 'yesterday'
+      Date.today.prev_day
+    else
+      Date.strptime(date, '%d/%m/%Y')
+    end
+  end
+end

data/lib/work_log_file_dao.rb

@@ -1,62 +1,72 @@
+# frozen_string_literal: true
+
 require 'pstore'
 require 'fileutils'
 
 class WorkLogFileDao
-    DB_FILE_NAME = 'myworklog.pstore'
-    DB_FOLDER = '.myworklog'
-    HOME_FOLDER = File.expand_path('~')
-    FULL_DB_FILE_PATH = "#{HOME_FOLDER}/#{DB_FOLDER}/#{DB_FILE_NAME}"
-    
-    def initialize
-        db_folder_full_path = "#{HOME_FOLDER}/#{DB_FOLDER}"
-        FileUtils.mkdir_p(db_folder_full_path) unless File.directory?(db_folder_full_path)
-    end
+  DB_FILE_NAME = 'myworklog.pstore'
+  DB_FOLDER = '.myworklog'
+  HOME_FOLDER = File.expand_path('~')
+  FULL_DB_FILE_PATH = "#{HOME_FOLDER}/#{DB_FOLDER}/#{DB_FILE_NAME}"
 
-    def save(work_log)
-        PStore.new(FULL_DB_FILE_PATH).transaction { |store| store[work_log.id] = work_log } 
+  def initialize
+    db_folder_full_path = "#{HOME_FOLDER}/#{DB_FOLDER}"
+    unless File.directory?(db_folder_full_path)
+      FileUtils.mkdir_p(db_folder_full_path)
     end
+  end
 
-    def list(date)
-        store = PStore.new(FULL_DB_FILE_PATH)
-        list = []
-        store.transaction(true) do 
-          store.roots
-            .map { |root| list << store[root] if store[root].date == date }
-        end
-        list
-    end
+  def save(work_log)
+    PStore.new(FULL_DB_FILE_PATH).transaction { |store| store[work_log.id] = work_log }
+  end
 
-    def list_all
-        store = PStore.new(FULL_DB_FILE_PATH)
-        list = []
-        store.transaction(true) { store.roots.map { |root| list << store[root] } }
-        list
+  def list(date)
+    store = PStore.new(FULL_DB_FILE_PATH)
+    list = []
+    store.transaction(true) do
+      store.roots
+           .map { |root| list << store[root] if store[root].date == date }
     end
+    list
+  end
 
-    def delete(id)
-        PStore.new(FULL_DB_FILE_PATH).transaction do |store|
-            raise Exception.new("Id #{id} not found") if store[id] == nil
-            store.delete(id) 
-        end
+  def list_all
+    store = PStore.new(FULL_DB_FILE_PATH)
+    list = []
+    store.transaction(true) { store.roots.map { |root| list << store[root] } }
+    list
+  end
+
+  def delete(id)
+    PStore.new(FULL_DB_FILE_PATH).transaction do |store|
+      raise Exception, "Id #{id} not found" if store[id].nil?
+
+      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 }
+  def find_by_month_and_year(month, year)
+    store = PStore.new(FULL_DB_FILE_PATH)
+    list = []
+    store.transaction(true) do
+      store.roots.map do |root|
+        if store[root].date.month == month && store[root].date.year == year
+          list << store[root]
         end
-        list
+      end
     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
+  def find_by_year(year)
+    store = PStore.new(FULL_DB_FILE_PATH)
+    list = []
+    store.transaction(true) do
+      store.roots
+           .map do |root|
+        list << store[root] if store[root].date.year == year
+      end
     end
-end
+    list
+  end
+end

data/lib/worklog_cli.rb

@@ -1,25 +1,28 @@
+# frozen_string_literal: true
+
 require 'thor'
 require 'date'
+require 'rubygems'
 require_relative 'work_log_controller'
 
 DATE_FORMAT = 'DD/MM/YYYY'
 
 class WorkLogCli < Thor
-    desc 'add [DESCRIPTION]', "Adds a new work log with today's date as default. Use -d flag to specify a different date (e.g. myworklog add -d 10/10/2010 'I worked'). Date format #{DATE_FORMAT}"
-    options :d => :string
-    def add(description)
-        begin
-            date = options[:d] ? options[:d] : 'today'
-            WorkLogController.new.add_work_log(date, description)
-        rescue ArgumentError => msg
-            puts msg
-        end
-    end
-
-    desc 'list', "Prints work logs for the current date. Date format #{DATE_FORMAT}"
-    long_desc <<-LONGDESC
+  map %w[--version -v] => :__print_version
+
+  desc 'add [DESCRIPTION]', "Adds a new work log with today's date as default. Use -d flag to specify a different date (e.g. myworklog add -d 10/10/2010 'I worked'). Date format #{DATE_FORMAT}"
+  options d: :string
+  def add(description)
+    date = options[:d] || 'today'
+    WorkLogController.new.add_work_log(date, description)
+  rescue ArgumentError => e
+    puts e
+  end
+
+  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
@@ -36,49 +39,54 @@ class WorkLogCli < Thor
 
             `myworklog -y 2020`        Will print all the work logs logged in 2020
 
-    LONGDESC
-    options :m => :numeric
-    options :y => :numeric
-    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
+  LONGDESC
+  options m: :numeric
+  options y: :numeric
+  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"
+  desc 'list_all', 'prints all the work logs'
 
-    def list_all
-        print(WorkLogController.new.list_all)
-    end
+  def list_all
+    print(WorkLogController.new.list_all)
+  end
 
-    desc 'delete [ID]', 'Deletes the work log by ID. You can use the `list` command to retrieve the ID'
+  desc 'delete [ID]', 'Deletes the work log by ID. You can use the `list` command to retrieve the ID'
 
-    def delete(id)
-        begin
-            WorkLogController.new.delete(id)
-            puts "Work log with #{id} ID has been deleted!"
-        rescue Exception => msg
-            puts msg
-        end
-    end
+  def delete(id)
+    WorkLogController.new.delete(id)
+    puts "Work log with #{id} ID has been deleted!"
+  rescue Exception => e
+    puts e
+  end
+
+  desc '--version -v', 'Prints the current version'
+
+  def __print_version
+    spec = Gem::Specification.load('myworklog.gemspec')
+    puts spec.version
+  end
+
+  private
 
-    private
-
-    def print(work_log_list)
-        puts ''
-        if work_log_list.empty?
-            puts 'Work log(s) not found'
-        elsif
-            work_log_list.each do |work_log|
-                puts "#{work_log.id} | #{work_log}"
-            end
-        end
-        puts ''
+  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
-end
+    puts ''
+  end
+end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: myworklog
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Gyowanny Queiroz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-02-24 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 asks
+description: Log your work from cmd and keep track of what you have done... just in
+  case your boss ask
 email:
 - gyowanny@gmail.com
 executables: