working_times 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b873d5ea276962e2e2b73cbb9cade749b8ebd8879415b3f9ecb6859a8a95b19
-  data.tar.gz: 26c9539dc6c44c96f235da3deca0185385227cd94fa3863fe7f92aa8639e5288
+  metadata.gz: e5a2fb5e4c26ca5d6f922fc3f1bd01a0557ff60331f34b5e58163de1a13a8284
+  data.tar.gz: 1c870e507ac414e53d4a45d873b012226986b9d39c6bd505b31dd0b8ffc9d4b6
 SHA512:
-  metadata.gz: eb2e1255c35746e8169308746cacfc8eadd2e59fc6ef79e0b3bbd62e2f48d9623b9dbb0bcc84b07c73036cffe8fd40e4d5fa5283707e71f0cf24f1146eafdd0a
-  data.tar.gz: c71470e2de46a3727f19e2a9d9c14385a57d32af8a1514f76acc17a341e3db886c4337b6c66467c9815b7bf7bd1d372244c74226bec215ccb6b17cfcfef9f1f3
+  metadata.gz: d693128ec3ef10af8c1fcf9dbb139c51d33878bfd3888aa737e3c938ed4a48287b1fe23104ac8ca0bc2b1841c6dd7a980696c5aef62f5b61b0e5829b3451cb56
+  data.tar.gz: 7a0296790a7170b47daacf803734942b1cc2af0b6ab8bfe3df6dc676ec34c7842818d4c5ab4c975b453c8eaa2175afd218432ce1bd270f08805007db44e1addd

data/exe/wt

@@ -2,18 +2,4 @@
 
 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,11 +1,22 @@
 require 'thor'
+require 'fileutils'
 
 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.'
+    desc 'init WORKON [TERM] [COMPANY]', 'initialize data directory for your working'
+    def init(workon, term = 'default', company = '')
+      if Dir.exist?(workon)
+        puts "WORKON '#{workon}' is already created. Or name conflicted.'"
+        return
+      end
+
+      FileUtils.mkdir_p(File.join(workon, 'terms'))
+      initialize_wtconf(workon, term, company)
+    end
+
+    desc 'start [COMMENT] ', 'Start working with comment.'
     def start(comment = '')
       if working?
         puts "You are already on working at #{current_work}."
@@ -13,14 +24,13 @@ module WorkingTimes
         return
       end
 
-      initialize_data_dir
-      initialize_work_log(options[:work_on])
+      initialize_term_log
 
-      Record.new(timestamp: DateTime.now, comment: comment, work_on: options[:work_on]).start
-      start_work(options[:work_on])
+      Record.new(timestamp: DateTime.now, comment: comment).start
+      start_work
     end
 
-    desc 'st [COMMENT] <option>', 'Short hand for *start*'
+    desc 'st [COMMENT]', 'Short hand for *start*'
     alias st start
 
     desc 'finish [COMMENT]', 'Finish working on current group.'
@@ -37,17 +47,8 @@ module WorkingTimes
     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
-
+    desc 'rest DURATION', 'Record resting time. e.g. \'wt rest 1h30m\'\'wt rest 1 hour 30 minutes\''
+    def rest(duration)
       unless working?
         puts 'You are not starting work. Execute "wt start" to start working.'
         return
@@ -55,5 +56,24 @@ module WorkingTimes
 
       Record.new(timestamp: DateTime.now, duration: duration).rest
     end
+
+    private
+
+    def initialize_wtconf(workon, term, company)
+      # on initializing, we shouldn't use path helper e.g. Config#data_dir
+      data_dir = File.expand_path(workon)
+      File.write(File.join(data_dir, 'wtconf.json'), <<~WTCONF)
+        {
+          "term": "#{term}",
+          "company": "#{company}"
+        }
+      WTCONF
+    end
+
+    def initialize_term_log
+      return if File.exist?(path_current_term)
+
+      File.write(path_current_term, SCHEMA.join(',') + "\n")
+    end
   end
 end

data/lib/working_times/config.rb

@@ -1,43 +1,39 @@
+require 'json'
+
 module WorkingTimes
   module Config
     private
 
-    # return where data directory is
     def data_dir
-      File.expand_path(wtconf['DATADIR'])
+      File.expand_path('.')
+    end
+
+    def path_wtconf
+      File.join(data_dir, 'wtconf.json')
+    end
+
+    def term_dir
+      File.join(data_dir, 'terms')
+    end
+
+    def path_working_flag
+      File.join(data_dir, '.working')
+    end
+
+    def current_term
+      wtconf['term']
+    end
+
+    def path_current_term
+      File.join(term_dir, current_term)
     end
 
-    # return default working project/task/etc...
-    def default_work
-      wtconf['DEFAULTWORK']
+    def current_company
+      wtconf['company']
     end
 
-    # parse ~/.wtconf
     def wtconf
-      conf = default_conf
-      begin
-        File
-          .readlines(File.expand_path('~/.wtconf'))
-          .map(&:chomp)
-          .each do |row|
-            k, v = row.split('=')
-            conf[k] = v
-          end
-      rescue Errno::ENOENT
-        puts '~/.wtconf not found, generated.'
-        generate_wtconf
-      end
-      conf
-    end
-
-    # default configurations of .wtconf
-    def default_conf
-      { 'DATADIR' => File.expand_path('~/.wt'), 'DEFAULTWORK' => 'default' }
-    end
-
-    # generate configuration file to ~/.wtconf when does not exist
-    def generate_wtconf
-      File.open(File.expand_path('~/.wtconf'), 'w') { |f| f.puts(default_conf.map { |k, v| "#{k}=#{v}" }) }
+      JSON.parse(File.read(path_wtconf))
     end
   end
 end

data/lib/working_times/constants.rb

@@ -1,5 +1,5 @@
 module WorkingTimes
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 
   START_MSG = [
     'Have a nice work!',

data/lib/working_times/record.rb

@@ -7,44 +7,43 @@ module WorkingTimes
 
     OPTIONS = { headers: true, return_headers: true, write_headers: true }.freeze
 
-    attr_reader :timestamp, :comment, :duration, :work_on
+    attr_reader :timestamp, :comment, :duration
 
-    def initialize(timestamp:, comment: nil, duration: nil, work_on: nil)
+    def initialize(timestamp:, comment: nil, duration: nil)
       @timestamp = timestamp
       @comment   = comment
       @duration  = duration
-      @work_on   = work_on.nil? ? default_work : work_on
     end
 
     def start
-      CSV.open("#{data_dir}/#{work_on}", 'a+', OPTIONS) do |csv|
+      CSV.open(path_current_term, 'a+', OPTIONS) do |csv|
         csv.puts([timestamp.rfc3339, '', 0, comment])
       end
     end
 
     def finish
       updated_csv = ''
-      CSV.filter(File.open("#{data_dir}/#{current_work}"), updated_csv, OPTIONS) do |row|
+      CSV.filter(File.open(path_current_term), 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)
+      File.write(path_current_term, updated_csv)
     end
 
     def rest
       parse_rest_sec
 
       updated_csv = ''
-      CSV.filter(File.open("#{data_dir}/#{current_work}"), updated_csv, OPTIONS) do |row|
+      CSV.filter(File.open(path_current_term), 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)
+      File.write(path_current_term, updated_csv)
     end
 
     private

data/lib/working_times/state.rb

@@ -4,54 +4,28 @@ module WorkingTimes
 
     include Config
 
-    # generate data directory when does not exist
-    # it is usually called by 'start' command
-    def initialize_data_dir
-      return if exist_data_dir?
-
-      puts 'data directory .wt not found, generated.'
-      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
-
     def working?
-      File.exist?("#{data_dir}/.working")
+      File.exist?(path_working_flag)
     end
 
     # return what kind of working on
     def current_work
-      File.readlines("#{data_dir}/.working").last.chomp
+      File.readlines(path_working_flag).last.chomp
     end
 
-    # create ~/.wt/.working include what you working on
-    # and show 'started' message
-    def start_work(work_on)
-      work_on = work_on.nil? ? default_work : work_on
-      File.open("#{data_dir}/.working", 'w+') { |f| f.puts work_on }
+    def start_work
+      File.write(path_working_flag, current_term)
       puts START_MSG.sample
     end
 
-    # delete 'working' flag
-    # and show 'finished' message
     def finish_work
       puts "You were working about #{worked_time}."
-      File.delete("#{data_dir}/.working")
+      File.delete(path_working_flag)
       puts FINISH_MSG.sample
     end
 
     def worked_time
-      last_record = CSV.read("#{data_dir}/#{current_work}").last
+      last_record = CSV.read(path_current_term).last
       started_at  = Time.parse(last_record[0])
       finished_at = Time.parse(last_record[1])
       duration    = (finished_at - started_at).to_i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: working_times
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Aoshi Fujioka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport