working_times 0.3.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d42c1a4ebd7f1f1f281f19acb32a48e1380b98bd3aa3cc2bb1bcd5d56debd527
-  data.tar.gz: a11317affbb17526880eabedd2d03f696e65e6d9c93d7574c5c623ec40843c6a
+  metadata.gz: 1b873d5ea276962e2e2b73cbb9cade749b8ebd8879415b3f9ecb6859a8a95b19
+  data.tar.gz: 26c9539dc6c44c96f235da3deca0185385227cd94fa3863fe7f92aa8639e5288
 SHA512:
-  metadata.gz: 9fa455a36013da66a73c91bfbabd64a1c3f3fa5b7aef9a7dc52dd782e133ebad74d17a19ed28e86dc6e6f3e4d701f2c87652029ac4ba9c41812d88a683a50813
-  data.tar.gz: cc4944b5c7c4a957bf5be1567f393902bc848032e08c3dc281f78c0c28333ec87c2d278fa6874e57258ceba687e87a31413fc71279aea2e726a44d1809b38e5e
+  metadata.gz: eb2e1255c35746e8169308746cacfc8eadd2e59fc6ef79e0b3bbd62e2f48d9623b9dbb0bcc84b07c73036cffe8fd40e4d5fa5283707e71f0cf24f1146eafdd0a
+  data.tar.gz: c71470e2de46a3727f19e2a9d9c14385a57d32af8a1514f76acc17a341e3db886c4337b6c66467c9815b7bf7bd1d372244c74226bec215ccb6b17cfcfef9f1f3

data/exe/wt

@@ -2,4 +2,18 @@
 
 require 'working_times'
 
+# mock config
+# do not remove ACTUAL configurations
+module WorkingTimes::Config
+  private
+
+  def data_dir
+    File.expand_path('tmp/.wt')
+  end
+
+  def default_work
+    'default'
+  end
+end
+
 WorkingTimes::CLI.start

data/lib/working_times/cli.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'thor'
 
 module WorkingTimes
@@ -8,15 +6,17 @@ module WorkingTimes
 
     option :work_on, aliases: ['-w'], desc: 'Specify what group of work on'
     desc 'start [COMMENT] <option>', 'Start working with comment.'
-    def start(comment = nil)
-      initialize_data_dir
+    def start(comment = '')
       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
+      initialize_data_dir
+      initialize_work_log(options[:work_on])
+
+      Record.new(timestamp: DateTime.now, comment: comment, work_on: options[:work_on]).start
       start_work(options[:work_on])
     end
 
@@ -24,13 +24,13 @@ module WorkingTimes
     alias st start
 
     desc 'finish [COMMENT]', 'Finish working on current group.'
-    def finish(comment = nil)
+    def finish(comment = '')
       unless working?
         puts 'You are not starting work. Execute "wt start" to start working.'
         return
       end
 
-      Record.new(timestamp: Time.now, comment: comment).finish
+      Record.new(timestamp: DateTime.now, comment: comment).finish
       finish_work
     end
 
@@ -53,7 +53,7 @@ module WorkingTimes
         return
       end
 
-      Record.new(timestamp: Time.now, duration: duration).rest
+      Record.new(timestamp: DateTime.now, duration: duration).rest
     end
   end
 end

data/lib/working_times/config.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module WorkingTimes
   module Config
     private

data/lib/working_times/constants.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module WorkingTimes
-  VERSION = '0.3.2'
+  VERSION = '0.5.1'.freeze
 
   START_MSG = [
     'Have a nice work!',
@@ -12,4 +10,11 @@ module WorkingTimes
     'Great job!',
     'Time to beer!'
   ].freeze
+
+  SCHEMA = [
+    'started_at',  # DateTime#rfc3339
+    'finished_at', # DateTime#rfc3339
+    'rest_sec',    # Integer (inidicates second)
+    'comment'      # String
+  ].freeze
 end

data/lib/working_times/record.rb

@@ -1,11 +1,12 @@
-# frozen_string_literal: true
-
 require 'active_support/time'
+require 'csv'
 
 module WorkingTimes
   class Record
     include State
 
+    OPTIONS = { headers: true, return_headers: true, write_headers: true }.freeze
+
     attr_reader :timestamp, :comment, :duration, :work_on
 
     def initialize(timestamp:, comment: nil, duration: nil, work_on: nil)
@@ -16,42 +17,47 @@ module WorkingTimes
     end
 
     def start
-      File.open("#{data_dir}/#{work_on}", 'a+') do |f|
-        f.puts "#{timestamp.rfc3339},,#{comment},start"
+      CSV.open("#{data_dir}/#{work_on}", 'a+', OPTIONS) do |csv|
+        csv.puts([timestamp.rfc3339, '', 0, comment])
       end
     end
 
     def finish
-      File.open("#{data_dir}/#{current_work}", 'a+') do |f|
-        f.puts ",#{timestamp.rfc3339},#{comment},finish"
+      updated_csv = ''
+      CSV.filter(File.open("#{data_dir}/#{current_work}"), updated_csv, OPTIONS) do |row|
+        next if row.header_row?
+        next unless row['finished_at'].empty?
+
+        row['finished_at'] = timestamp.rfc3339
+        row['comment'] = comment
       end
+      File.write("#{data_dir}/#{current_work}", updated_csv)
     end
 
     def rest
-      parse_rest_finished_at
-      File.open("#{data_dir}/#{current_work}", 'a+') do |f|
-        f.puts "#{timestamp.rfc3339},#{@finished_at.rfc3339},#{comment},rest"
-      end
+      parse_rest_sec
 
-      show_rest_msg
+      updated_csv = ''
+      CSV.filter(File.open("#{data_dir}/#{current_work}"), updated_csv, OPTIONS) do |row|
+        next if row.header_row?
+        next unless row['finished_at'].empty?
+
+        row['rest_sec'] = @rest_sec
+      end
+      File.write("#{data_dir}/#{current_work}", updated_csv)
     end
 
     private
 
-    def parse_rest_finished_at
-      @finished_at = timestamp
+    def parse_rest_sec
+      @rest_sec = 0
       if /(?<hour>\d+)\s*h/ =~ duration
-        @finished_at += hour.to_i.hour
+        @rest_sec += hour.to_i * 3600
       end
 
       if /(?<minute>\d+)\s*m/ =~ duration
-        @finished_at += minute.to_i.minute
+        @rest_sec += minute.to_i * 60
       end
     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

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module WorkingTimes
   module State
     private
@@ -15,6 +13,14 @@ module WorkingTimes
       Dir.mkdir(data_dir)
     end
 
+    # creates csv with header
+    def initialize_work_log(work_on)
+      work_on = work_on.nil? ? default_work : work_on
+      return if File.exist?("#{data_dir}/#{work_on}")
+
+      File.write("#{data_dir}/#{work_on}", SCHEMA.join(',') + "\n")
+    end
+
     def exist_data_dir?
       File.exist?(data_dir)
     end
@@ -39,8 +45,19 @@ module WorkingTimes
     # delete 'working' flag
     # and show 'finished' message
     def finish_work
+      puts "You were working about #{worked_time}."
       File.delete("#{data_dir}/.working")
       puts FINISH_MSG.sample
     end
+
+    def worked_time
+      last_record = CSV.read("#{data_dir}/#{current_work}").last
+      started_at  = Time.parse(last_record[0])
+      finished_at = Time.parse(last_record[1])
+      duration    = (finished_at - started_at).to_i
+      hour = duration / 3600
+      min  = (duration - 3600 * hour) / 60
+      "#{hour.to_s.rjust(2, '0')} hour #{min.to_s.rjust(2, '0')} min"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: working_times
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Aoshi Fujioka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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