working_times 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7930ce97b0d9bf4dfe1701ebd4e3d5ded07667df481b958aed921f2e36308f
-  data.tar.gz: 203cf6b53153ef66075511d5c4dae8ad0c8e4c65021ac11340c3ba95d7c570d4
+  metadata.gz: 5ebd6d054605888087a369c063ff4f6ffefcf927a51f13aaa5b1bde063f188d1
+  data.tar.gz: 65308945212ede538dbfbfb4a6fc7480e647f4bfbbe3ac370b7b0ba084f2e2b1
 SHA512:
-  metadata.gz: fb884f67fb32060175ab4f4822dca3b7978c0d64ada4621caf02e255abc954f3cc9d147365357fa0d1a3da6714c16f6118f86b9ca0b315ec04c535642586b526
-  data.tar.gz: a1dd2d5c5f2ce754b75e2b2d6aeabf98b48fc90ef4d56244098d820011bd296543ea45ab9d159a08df65ebda04171f3b52bd0211e1f4263923dec5b412cd4238
+  metadata.gz: df37380e64a52547a61d3e6cb1ebc7953291d1d691d4bb91c0eb565b52fc984e21f11470516928feef37c56b8e234f59c97cfa5cf7d99c9dce456853fb6cfe13
+  data.tar.gz: 0b68b81226acb8176ab7637b6282df415881dd0d65cab72e7a0c5d214669805e8330f81aa677060c5caeae1d9e303c770b4dda99258855b87d5b08df87eb3b34

data/lib/working_times/cli.rb

@@ -4,12 +4,20 @@ require 'thor'
 
 module WorkingTimes
   class CLI < Thor
+    include State
+
     option :work_on, aliases: ['-w'], desc: 'Specify what group of work on'
     desc 'start [COMMENT] <option>', 'Start working with comment.'
     def start(comment = nil)
-      State.initialize_data_dir
-      work_on = options[:work_on].nil? ? Config.default_work : options[:work_on]
-      Record.new(timestamp: Time.now, comment: comment, work_on: work_on).start
+      initialize_data_dir
+      if working?
+        puts "You are already on working at #{current_work}."
+        puts "To finish this, execute 'wt finish'."
+        return
+      end
+
+      Record.new(timestamp: Time.now, comment: comment, work_on: options[:work_on]).start
+      start_work(options[:work_on])
     end
 
     desc 'st [COMMENT] <option>', 'Short hand for *start*'
@@ -17,10 +25,35 @@ module WorkingTimes
 
     desc 'finish [COMMENT]', 'Finish working on current group.'
     def finish(comment = nil)
+      unless working?
+        puts 'You are not starting work. Execute "wt start" to start working.'
+        return
+      end
+
       Record.new(timestamp: Time.now, comment: comment).finish
+      finish_work
     end
 
     desc 'fi [COMMENT]', 'Short hand for *finish*'
     alias fi finish
+
+    desc 'rest DURATION', 'Record resting time. e.g. \'wt rest 1h30m\''
+    def rest(duration = nil)
+      if duration.nil?
+        puts <<~MSG
+          Please specify duration of resting.
+          e.g. wt rest 1h30m
+          e.g. wt rest '1 hour 30 minutes'
+        MSG
+        return
+      end
+
+      unless working?
+        puts 'You are not starting work. Execute "wt start" to start working.'
+        return
+      end
+
+      Record.new(timestamp: Time.now, duration: duration).rest
+    end
   end
 end

data/lib/working_times/config.rb

@@ -2,7 +2,7 @@
 
 module WorkingTimes
   module Config
-    module_function
+    private
 
     # return where data directory is
     def data_dir

data/lib/working_times/constants.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module WorkingTimes
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 
   START_MSG = [
     'Have a nice work!',

data/lib/working_times/record.rb

@@ -4,37 +4,54 @@ require 'active_support/time'
 
 module WorkingTimes
   class Record
-    attr_reader :timestamp, :comment, :work_on
+    include State
 
-    def initialize(timestamp:, comment:, work_on: nil)
+    attr_reader :timestamp, :comment, :duration, :work_on
+
+    def initialize(timestamp:, comment: nil, duration: nil, work_on: nil)
       @timestamp = timestamp
       @comment   = comment
-      @work_on   = work_on
+      @duration  = duration
+      @work_on   = work_on.nil? ? default_work : work_on
     end
 
     def start
-      if State.working?
-        puts "You are already on working at #{State.current_work}."
-        puts "To finish this, execute 'wt finish'."
-        return
+      File.open("#{data_dir}/#{work_on}", 'a+') do |f|
+        f.puts "#{timestamp.rfc3339},,#{comment},start"
       end
+    end
 
-      File.open("#{Config.data_dir}/#{work_on}", 'a+') do |f|
-        f.puts "start,#{comment},#{timestamp.rfc3339}"
+    def finish
+      File.open("#{data_dir}/#{current_work}", 'a+') do |f|
+        f.puts ",#{timestamp.rfc3339},#{comment},finish"
       end
-      State.start_work(work_on)
     end
 
-    def finish
-      unless State.working?
-        puts 'You are not starting work. Execute "wt start" to start working.'
-        return
+    def rest
+      parse_rest_finished_at
+      File.open("#{data_dir}/#{current_work}", 'a+') do |f|
+        f.puts "#{timestamp.rfc3339},#{@finished_at},#{comment},rest"
       end
 
-      File.open("#{Config.data_dir}/#{State.current_work}", 'a+') do |f|
-        f.puts "finish,#{comment},#{timestamp.rfc3339}"
+      show_rest_msg
+    end
+
+    private
+
+    def parse_rest_finished_at
+      @finished_at = timestamp
+      if /(?<hour>\d+)\s*h/ =~ duration
+        @finished_at += hour.to_i.hour
+      end
+
+      if /(?<minute>\d+)\s*m/ =~ duration
+        @finished_at += minute.to_i.minute
       end
-      State.finish_work
+    end
+
+    def show_rest_msg
+      Time::DATE_FORMATS[:rest_finished_at] = '%H:%m:%S'
+      puts "You can rest until #{@finished_at.to_s(:rest_finished_at)}."
     end
   end
 end

data/lib/working_times/state.rb

@@ -2,7 +2,9 @@
 
 module WorkingTimes
   module State
-    module_function
+    private
+
+    include Config
 
     # generate data directory when does not exist
     # it is usually called by 'start' command
@@ -10,32 +12,34 @@ module WorkingTimes
       return if exist_data_dir?
 
       puts 'data directory .wt not found, generated.'
-      Dir.mkdir(Config.data_dir)
+      Dir.mkdir(data_dir)
     end
 
     def exist_data_dir?
-      File.exist?(Config.data_dir)
+      File.exist?(data_dir)
     end
 
     def working?
-      File.exist?("#{Config.data_dir}/.working")
+      File.exist?("#{data_dir}/.working")
     end
 
+    # return what kind of working on
     def current_work
-      File.readlines("#{Config.data_dir}/.working").last.chomp
+      File.readlines("#{data_dir}/.working").last.chomp
     end
 
     # create ~/.wt/.working include what you working on
     # and show 'started' message
     def start_work(work_on)
-      File.open("#{Config.data_dir}/.working", 'w+') { |f| f.puts work_on }
+      work_on = work_on.nil? ? default_work : work_on
+      File.open("#{data_dir}/.working", 'w+') { |f| f.puts work_on }
       puts START_MSG.sample
     end
 
     # delete 'working' flag
     # and show 'finished' message
     def finish_work
-      File.delete("#{Config.data_dir}/.working")
+      File.delete("#{data_dir}/.working")
       puts FINISH_MSG.sample
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: working_times
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Aoshi Fujioka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-25 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Store your working/worked time simply. This gem gives simple CLI tool.
 email:
 - blue20will@gmail.com