toggl-worktime 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d7d312022057b262ea569daa0ff5a2d4fd81f515c6c0fbe32d4dbbac1d5f8bd
-  data.tar.gz: 2412b9d69c4a482400bde188a1a7523b215c63891f1d7159a7834b257cb673b8
+  metadata.gz: 07e6ba242a332844e6949c51f0b680590d7167aac06910ff6612e732ee29d459
+  data.tar.gz: 6ddb96ae57367ca506240f0c5a25af8df0a7e20adaa7d2b3f091eecae7d44d88
 SHA512:
-  metadata.gz: a643c84a3603192a66519cc95cf40523ff98bb626702608f958b9494b2ec8fd6c5551554c18cfac95ac71099a6936553361263e5471cecd7e0c1c2c4616cd79b
-  data.tar.gz: 6f1c575654a741742f3e4efcf438fa0ac89bed10b68b685e2aed44b2e4fe5bbbb292b67ff17dc10fa828acb1c2e133133ac3803cb07812b9f8ccde7d7b444b3c
+  metadata.gz: cc4498ba37d5807d14f46dfd6f6b04bc2e383046fb7e40f65ed0ef2380a07192f0b39bcadb04cd91898f2a6d7d5de3654eafe8b6c1eb650f79174ca30d87c6bd
+  data.tar.gz: 16432e596c87bd4e8f0bc714eaff67d057dabee4030cc9262ff5bd4e1ed711cbfb34933901f82c7f5690e453ec2ef3ccab1a3548766c45ec11d81f95e6d65301

data/.rubocop.yml

@@ -8,3 +8,7 @@ Style/Documentation:
 
 Metrics/MethodLength:
   Max: 15
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'

data/.travis.yml

@@ -2,4 +2,6 @@ sudo: false
 language: ruby
 rvm:
   - 2.3.1
-before_install: gem install bundler -v 1.15.0
+  - 2.7.3
+  - 3.0.1
+before_install: gem install bundler -v 2.2.20

data/CHANGELOG.md

@@ -0,0 +1,97 @@
+# Changelog
+
+## [0.4.1](https://github.com/limitusus/toggl-worktime/tree/0.4.1) (2021-06-22)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.4.0...0.4.1)
+
+**Merged pull requests:**
+
+- Use patched version of togglv8, for the new API endpoint [\#12](https://github.com/limitusus/toggl-worktime/pull/12) ([limitusus](https://github.com/limitusus))
+
+## [v0.4.0](https://github.com/limitusus/toggl-worktime/tree/v0.4.0) (2021-02-14)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.3.2...v0.4.0)
+
+**Merged pull requests:**
+
+- Use newer rake [\#9](https://github.com/limitusus/toggl-worktime/pull/9) ([limitusus](https://github.com/limitusus))
+- Implement calendar mode [\#8](https://github.com/limitusus/toggl-worktime/pull/8) ([limitusus](https://github.com/limitusus))
+
+## [v0.3.2](https://github.com/limitusus/toggl-worktime/tree/v0.3.2) (2018-09-26)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.3.1...v0.3.2)
+
+**Merged pull requests:**
+
+- Deal with empty time slot [\#7](https://github.com/limitusus/toggl-worktime/pull/7) ([limitusus](https://github.com/limitusus))
+
+## [v0.3.1](https://github.com/limitusus/toggl-worktime/tree/v0.3.1) (2018-09-26)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.3.0...v0.3.1)
+
+**Merged pull requests:**
+
+- Bugfix/interval [\#6](https://github.com/limitusus/toggl-worktime/pull/6) ([limitusus](https://github.com/limitusus))
+
+## [v0.3.0](https://github.com/limitusus/toggl-worktime/tree/v0.3.0) (2018-08-01)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.2.0...v0.3.0)
+
+**Closed issues:**
+
+- ignore vacation tag [\#3](https://github.com/limitusus/toggl-worktime/issues/3)
+
+**Merged pull requests:**
+
+- Update README [\#11](https://github.com/limitusus/toggl-worktime/pull/11) ([limitusus](https://github.com/limitusus))
+- Use newer rake [\#10](https://github.com/limitusus/toggl-worktime/pull/10) ([limitusus](https://github.com/limitusus))
+- Config YAML [\#5](https://github.com/limitusus/toggl-worktime/pull/5) ([limitusus](https://github.com/limitusus))
+- Specify year [\#4](https://github.com/limitusus/toggl-worktime/pull/4) ([limitusus](https://github.com/limitusus))
+
+## [v0.2.0](https://github.com/limitusus/toggl-worktime/tree/v0.2.0) (2018-04-02)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.1.8...v0.2.0)
+
+**Merged pull requests:**
+
+- Remove const [\#2](https://github.com/limitusus/toggl-worktime/pull/2) ([limitusus](https://github.com/limitusus))
+
+## [v0.1.8](https://github.com/limitusus/toggl-worktime/tree/v0.1.8) (2018-04-01)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.1.7...v0.1.8)
+
+**Merged pull requests:**
+
+- Export work\_time from driver [\#1](https://github.com/limitusus/toggl-worktime/pull/1) ([limitusus](https://github.com/limitusus))
+
+## [v0.1.7](https://github.com/limitusus/toggl-worktime/tree/v0.1.7) (2017-09-19)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.1.6...v0.1.7)
+
+## [v0.1.6](https://github.com/limitusus/toggl-worktime/tree/v0.1.6) (2017-09-19)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.1.5...v0.1.6)
+
+## [v0.1.5](https://github.com/limitusus/toggl-worktime/tree/v0.1.5) (2017-08-15)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.1.4...v0.1.5)
+
+## [v0.1.4](https://github.com/limitusus/toggl-worktime/tree/v0.1.4) (2017-07-07)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.1.3...v0.1.4)
+
+## [v0.1.3](https://github.com/limitusus/toggl-worktime/tree/v0.1.3) (2017-07-07)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.1.2...v0.1.3)
+
+## [v0.1.2](https://github.com/limitusus/toggl-worktime/tree/v0.1.2) (2017-07-05)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.1.1...v0.1.2)
+
+## [v0.1.1](https://github.com/limitusus/toggl-worktime/tree/v0.1.1) (2017-07-05)
+
+[Full Changelog](https://github.com/limitusus/toggl-worktime/compare/v0.1.0...v0.1.1)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/README.md

@@ -13,6 +13,17 @@ worktime
 2017-06-12 13:29:09 - 2017-06-12 19:23:23
 ```
 
+or you can specify year (default is "this" year)
+
+```console
+$ toggl-worktime 2017 6 12
+Tomoya Kabe
+worktime
+2017-06-12 09:54:34 - 2017-06-12 12:40:45
+2017-06-12 13:29:09 - 2017-06-12 19:23:23
+```
+
+
 Weekend
 
 ```console
@@ -22,6 +33,47 @@ worktime
 nil - nil
 ```
 
+## Calendar mode
+
+You can see your monthly worktime in calendar view
+
+```console
+$ toggl-worktime --calendar 2021 1
+┌────────┬─────────────────┬─────────────────┬─────────────────┬─────────────────┬─────────────────┬────────┐
+│Sun     │Mon              │Tue              │Wed              │Thu              │Fri              │Sat     │
+├────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────┤
+│        │                 │                 │                 │                 │Day: 1           │Day: 2  │
+│        │                 │                 │                 │                 │-                │-       │
+│        │                 │                 │                 │                 │00:00:00         │00:00:00│
+├────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────┤
+│Day: 3  │Day: 4           │Day: 5           │Day: 6           │Day: 7           │Day: 8           │Day: 9  │
+│-       │-                │10:00:00-18:00:00│10:00:00-18:00:00│10:00:00-18:00:00│10:00:00-18:00:00│-       │
+│00:00:00│00:00:00         │07:00:00         │07:00:00         │07:00:00         │07:00:00         │00:00:00│
+├────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────┤
+│Day: 10 │Day: 11          │Day: 12          │Day: 13          │Day: 14          │Day: 15          │Day: 16 │
+│-       │-                │10:00:00-18:00:00│10:00:00-18:00:00│10:00:00-18:00:00│10:00:00-18:00:00│-       │
+│00:00:00│00:00:00         │07:00:00         │07:00:00         │07:00:00         │07:00:00         │00:00:00│
+├────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────┤
+│Day: 17 │Day: 18          │Day: 19          │Day: 20          │Day: 21          │Day: 22          │Day: 23 │
+│-       │10:00:00-18:00:00│10:00:00-18:00:00│10:00:00-18:00:00│10:00:00-18:00:00│10:00:00-18:00:00│-       │
+│00:00:00│07:00:00         │07:00:00         │07:00:00         │07:00:00         │07:00:00         │00:00:00│
+├────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────┤
+│Day: 24 │Day: 25          │Day: 26          │Day: 27          │Day: 28          │Day: 29          │Day: 30 │
+│-       │10:00:00-18:00:00│10:00:00-18:00:00│10:00:00-18:00:00│10:00:00-18:00:00│10:00:00-18:00:00│-       │
+│00:00:00│07:00:00         │07:00:00         │07:00:00         │07:00:00         │07:00:00         │00:00:00│
+├────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼─────────────────┼────────┤
+│Day: 31 │                 │                 │                 │                 │                 │        │
+│-       │                 │                 │                 │                 │                 │        │
+│00:00:00│                 │                 │                 │                 │                 │        │
+└────────┴─────────────────┴─────────────────┴─────────────────┴─────────────────┴─────────────────┴────────┘
+```
+
+You can change the beginning day of the week with `-b` option:
+
+```console
+$ toggl-worktime --calendar 2021 1 -b Mon
+```
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -50,6 +102,36 @@ abcdef0123456789
 
 You can get your API token from Toggl at your profile settings page.
 
+NOTE: as of togglv8 v1.2.1, `.toggl` file **MUST NOT** end with a newline (`\010` or LF).
+The recommended way to create the file is `echo -n 'YOUR_TOGGL_API_TOKEN' > ~/.toggl`.
+This issue [will be fixed in the next togglv8 release](https://github.com/kanet77/togglv8/pull/21).
+
+### Configuration
+
+Place configuration file in `~/.toggl_worktime`.
+Or you can specify your favorite path with `-c CONFIG` option.
+
+```
+# -*- yaml -*-
+
+# working time interval within <working_interval_min> minutes is ignored
+working_interval_min: 10
+# Split the day at <day_begin_hour> o'clock
+day_begin_hour: 6
+# Timezone
+timezone: Asia/Tokyo
+
+# Time entries which match the condition below will not be counted as working time
+# Multiple conditions can be specified as an array in top level,
+# multiple keys (only "tags" for now) can be specified as hash keys in a condition,
+# and multiple values can be specifeid as an array.
+# Array conditions will be treated as "OR"
+# Hash conditions will be treated as "AND"
+ignore_conditions:
+  - tags:
+      - vacation
+```
+
 ### Just run
 
 ```console

data/Rakefile

@@ -2,7 +2,15 @@
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'github_changelog_generator/task'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.user = 'limitusus'
+  config.project = 'toggl-worktime'
+  config.since_tag = 'v0.1.0'
+  config.future_release = '0.4.1'
+end

data/exe/toggl-worktime

@@ -3,27 +3,50 @@
 
 $LOAD_PATH << File.expand_path("#{File.dirname __FILE__}/../lib")
 
+require 'optparse'
 require 'rubygems'
 require 'toggl/worktime'
 
 Version = Toggl::Worktime::VERSION
-MAX_WORKING_INTERVAL = 10
-DAY_BEGIN_HOUR = 6
-DEFAULT_TIMEZONE = 'Asia/Tokyo'
-
-driver = Toggl::Worktime::Driver.new(max_working_interval: MAX_WORKING_INTERVAL)
-
-month = ARGV[0].to_i
-day = ARGV[1].to_i
-hour = DAY_BEGIN_HOUR
-timezone = DEFAULT_TIMEZONE
-
-driver.merge!(month, day, hour, timezone)
-user = driver.me
-
-puts user['fullname']
-puts 'worktime'
-
-driver.write
-
-puts "Total worktime: #{driver.total_time}"
+config_file = "#{ENV['HOME']}/.toggl_worktime"
+mode = :default
+week_begin = :Sun
+debug = false
+
+opt = OptionParser.new
+opt.on('-c CONFIG', '--config CONFIG') { |v| config_file = v }
+opt.on('-l', '--calendar', 'Calendar view mode') { mode = :calendar }
+opt.on('-b', '--week-begin=VAL', 'Beginning of the week: Sun, Mon, etc.') { |v| week_begin = v }
+opt.on('--debug') { |v| debug = v }
+opt.parse!(ARGV)
+
+config = Toggl::Worktime::Config.new(path: config_file)
+driver = Toggl::Worktime::Driver.new(config: config)
+p config if debug
+
+case mode
+when :calendar
+  raise ArgumentError, 'Usage: toggl-worktime --cal YEAR MONTH' if ARGV.size != 2
+
+  driver.calendar(week_begin, *ARGV.map(&:to_i)).write
+else
+  case ARGV.size
+  when 3
+    year, month, day = *ARGV.map(&:to_i)
+  when 2
+    year = Time.now.year
+    month, day = *ARGV.map(&:to_i)
+  else
+    raise ArgumentError, 'Usage: toggl-worktime [YEAR] MONTH DAY'
+  end
+
+  driver.merge!(year, month, day)
+  user = driver.me
+
+  puts user['fullname']
+  puts 'worktime'
+
+  driver.write
+
+  puts "Total worktime: #{driver.total_time}"
+end

data/lib/toggl/worktime.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 require 'togglv8'
+require 'date'
 require 'json'
 require 'toggl/worktime/version'
+require 'toggl/worktime/config'
 require 'toggl/worktime/merger'
 require 'toggl/worktime/time'
 require 'toggl/worktime/driver'
+require 'toggl/worktime/calendar'
+require 'tty-table'
 
 module Toggl
   # Main module

data/lib/toggl/worktime/calendar.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+module Toggl
+  module Worktime
+    # Worktime Calendar
+    class Calendar
+      WEEK = %i[Sun Mon Tue Wed Thu Fri Sat].freeze
+
+      class UnknownWeekdayError < StandardError; end
+
+      def initialize(driver, zone_offset, week_begin, year, month)
+        @driver = driver
+        @zone_offset = zone_offset
+        @year = year
+        @month = month
+        today = ::Time.new
+        @days_in_month = Date.new(year, month, -1).day
+        @last_fetch_day = @days_in_month
+        @last_fetch_day = today.day if today.year == year && today.month == month && today.day < @days_in_month
+        @data = nil
+        @week_begin_day = week_begin.to_sym
+        raise UnknownWeekdayError if WEEK.index(@week_begin_day).nil?
+      end
+
+      def week
+        begin_index = WEEK.index(@week_begin_day)
+        WEEK.rotate(begin_index)
+      end
+
+      def write
+        fetch if @data.nil?
+        rotation = week.index(:Sun)
+        table = TTY::Table.new header: week
+        week_data = []
+        @day_data.each do |datum|
+          wday = datum.day.wday
+          # wday may be rotated
+          wday_index = (wday + rotation) % 7
+          week_data[wday_index] = datum.format
+          if wday_index == 6
+            table << week_data
+            week_data = []
+          end
+        end
+        # last week data may exist
+        unless week_data.length.zero?
+          # Padding
+          (7 - week_data.length).times do
+            week_data << nil
+          end
+          table << week_data
+        end
+        multi_renderer = TTY::Table::Renderer::Unicode.new(table, multiline: true)
+        multi_renderer.border.separator = :each_row
+        puts multi_renderer.render
+      end
+
+      def fetch
+        @day_data = []
+        (1..@days_in_month).each do |day|
+          dateobj = Date.new(@year, @month, day)
+          day_datum = nil
+          if day <= @last_fetch_day
+            @driver.merge!(@year, @month, day)
+            time = @driver.total_time
+            begin_at = @driver.work_time.first[0]&.getlocal(@zone_offset)&.strftime('%T')
+            end_at = @driver.work_time.last[1]&.getlocal(@zone_offset)&.strftime('%T')
+            day_datum = Toggl::Worktime::Day.new(dateobj, time, begin_at, end_at)
+          else
+            day_datum = Toggl::Worktime::Day.new(dateobj, 0, '', '')
+          end
+          @day_data << day_datum
+        end
+      end
+    end
+
+    # One-day datum
+    class Day
+      attr_reader :day
+
+      def initialize(day, time, begin_at, end_at)
+        @day = day
+        @time = time
+        @begin = begin_at
+        @end = end_at
+      end
+
+      def format
+        "Day: #{day.day}\n#{@begin}-#{@end}\n#{@time}"
+      end
+    end
+  end
+end

data/lib/toggl/worktime/config.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module Toggl
+  module Worktime
+    # Config for Toggl::Worktime
+    class Config
+      attr_accessor :foo
+
+      ATTRS = %i[
+        working_interval_min
+        day_begin_hour
+        timezone
+        ignore_conditions
+      ].freeze
+
+      ATTR_DEFAULTS = {
+        working_interval_min: 10,
+        day_begin_hour: 6,
+        timezone: 'Asia/Tokyo',
+        ignore_conditions: []
+      }.freeze
+
+      ATTRS.each do |attr|
+        attr_accessor attr
+      end
+
+      def initialize(args)
+        c = self.class.load_config(args[:path])
+        attr_set(c)
+      end
+
+      class << self
+        def load_config(path)
+          YAML.safe_load(File.open(path).read).transform_keys(&:to_sym)
+        end
+      end
+
+      private
+
+      def attr_set(hash)
+        ATTRS.each do |k|
+          send((k.to_s + '=').to_sym, hash.key?(k) ? hash[k] : ATTR_DEFAULTS[k])
+        end
+      end
+    end
+  end
+end

data/lib/toggl/worktime/driver.rb

@@ -4,31 +4,57 @@ module Toggl
   module Worktime
     # Toggle API driver
     class Driver
+      ONE_DAY_SECONDS = 86_400
+
       attr_reader :toggl
       attr_reader :work_time
 
-      def initialize(max_working_interval: 10)
+      def initialize(config:)
         @toggl = TogglV8::API.new
-        @max_working_interval = max_working_interval
+        @config = config
         @merger = nil
         @work_time = nil
+        @zone_offset = Toggl::Worktime::Time.zone_offset(@config.timezone)
+        @calendar = nil
+      end
+
+      def calendar(week_begin, year, month)
+        @calendar = Toggl::Worktime::Calendar.new(self, @zone_offset, week_begin, year, month)
+      end
+
+      def time_entries(year, month, day)
+        beginning_day = ::Time.new(
+          year, month, day, @config.day_begin_hour, 0, 0, @zone_offset
+        )
+        ending_day = beginning_day + ONE_DAY_SECONDS
+        start_iso = beginning_day.strftime('%FT%T%:z')
+        end_iso = ending_day.strftime('%FT%T%:z')
+        toggl.get_time_entries(start_date: start_iso, end_date: end_iso)
       end
 
-      def time_entries(month, day, hour, timezone)
-        now = DateTime.now
-        offset = Toggl::Worktime::Time.zone_offset(timezone)
-        beginning_day = DateTime.new(now.year, month, day, hour, 0, 0, offset)
-        ending_day = beginning_day + 1
-        toggl.get_time_entries(start_date: beginning_day.iso8601, end_date: ending_day.iso8601)
+      # time_entries filter with @config.ignore_conditions
+      def filter_entries(entries)
+        pass_l = lambda { |entry|
+          @config.ignore_conditions.none? do |cond|
+            cond.keys.all? do |key|
+              case key
+              when 'tags'
+                entry['tags']&.any? { |t| cond[key].include?(t) }
+              end
+            end
+          end
+        }
+        entries.select { |e| pass_l.call(e) }
       end
 
       def me
         @toggl.me(true)
       end
 
-      def merge!(month, day, hour, timezone)
-        time_entries = time_entries(month, day, hour, timezone)
-        @merger = Toggl::Worktime::Merger.new(time_entries, timezone, @max_working_interval)
+      def merge!(year, month, day)
+        time_entries = time_entries(year, month, day)
+        time_entries = filter_entries(time_entries)
+        @merger = Toggl::Worktime::Merger.new(time_entries, @config)
         @work_time = @merger.merge
       end
 
@@ -40,17 +66,16 @@ module Toggl
         end
       end
 
-      def time_expr(t)
-        t ? t.strftime('%F %T') : 'nil'
+      def time_expr(time)
+        time ? time.getlocal(@zone_offset).strftime('%F %T') : 'nil'
       end
 
       def total_time
-        time = @merger.total_time
-        total_seconds = (time * 86400).to_i
+        total_seconds = @merger.total_time.to_i
         hours = total_seconds / (60 * 60)
         minutes = (total_seconds - (hours * 60 * 60)) / 60
         seconds = total_seconds % 60
-        format("%02d:%02d:%02d", hours, minutes, seconds)
+        format('%02d:%02d:%02d', hours, minutes, seconds)
       end
     end
   end

data/lib/toggl/worktime/merger.rb

@@ -1,17 +1,18 @@
 # frozen_string_literal: true
 
+require 'time'
+
 module Toggl
   module Worktime
     # Time-entries merger
     class Merger
       attr_reader :total_time
 
-      ONE_DAY_MINUTES = 24 * 60
+      ONE_MINUTE_SECONDS = 60
 
-      def initialize(time_entries, timezone, max_working_interval)
+      def initialize(time_entries, config)
         @time_entries = time_entries
-        @timezone = timezone
-        @max_working_interval = max_working_interval
+        @config = config
         @current_start = nil
         @current_stop = nil
         @continuing = true
@@ -27,15 +28,23 @@ module Toggl
             next
           end
           work_time << [@current_start, @current_stop]
+          count_total_time
           @current_start = start
           @current_stop = stop
         end
         work_time << [@current_start, @last_stop]
+        count_total_time
         work_time
       end
 
+      def count_total_time
+        return if @current_start.nil? || @current_stop.nil?
+
+        @total_time += @current_stop - @current_start
+      end
+
       def time_entries_each
-        zone_offset = Toggl::Worktime::Time.zone_offset(@timezone)
+        zone_offset = Toggl::Worktime::Time.zone_offset(@config.timezone)
         @time_entries.each do |te|
           start = parse_date(te['start'], zone_offset)
           stop = parse_date(te['stop'], zone_offset)
@@ -43,9 +52,7 @@ module Toggl
           @current_start = start if @current_start.nil?
           @current_stop = stop if @current_stop.nil?
           if start.nil? || stop.nil?
-            warn "start or stop time is nil: total time may be incomplete"
-          else
-            @total_time += stop - start
+            warn 'start or stop time is nil: total time may be incomplete'
           end
           yield [start, stop]
         end
@@ -53,13 +60,15 @@ module Toggl
 
       def parse_date(date, zone_offset)
         return nil if date.nil?
-        DateTime.parse(date).new_offset(zone_offset)
+
+        ::Time.parse(date).getlocal(zone_offset)
       end
 
       def continuing(start)
         return true if @current_stop.nil?
-        interval = (start - @current_stop) * ONE_DAY_MINUTES
-        @continuing = interval < @max_working_interval
+
+        interval = (start - @current_stop) / ONE_MINUTE_SECONDS
+        @continuing = interval < @config.working_interval_min
       end
     end
   end

data/lib/toggl/worktime/time.rb

@@ -4,11 +4,11 @@ module Toggl
   module Worktime
     # Timezone
     module Time
-      # rational
+      # Seconds
       def self.zone_offset(timezone)
         tz = ENV['TZ']
         ENV['TZ'] = timezone
-        offset = DateTime.now.offset
+        offset = ::Time.now.utc_offset
         ENV['TZ'] = tz
         offset
       end

data/lib/toggl/worktime/version.rb

@@ -2,6 +2,6 @@
 
 module Toggl
   module Worktime
-    VERSION = '0.2.0'
+    VERSION = '0.4.1'
   end
 end

data/toggl-worktime.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'toggl/worktime/version'
 
@@ -23,12 +22,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'togglv8'
   spec.add_dependency 'awesome_print'
+  spec.add_dependency 'togglv8-limitusus'
+  spec.add_dependency 'tty-table'
+  spec.add_development_dependency 'bundler', '>= 2.2.10'
+  spec.add_development_dependency 'github_changelog_generator'
   spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rb-readline'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: toggl-worktime
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tomoya KABE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: togglv8
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: togglv8-limitusus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: tty-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-readline
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.10
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.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: Summarise Toggl Time Entries
 email:
 - limit.usus@gmail.com
@@ -134,6 +162,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -143,6 +172,8 @@ files:
 - bin/setup
 - exe/toggl-worktime
 - lib/toggl/worktime.rb
+- lib/toggl/worktime/calendar.rb
+- lib/toggl/worktime/config.rb
 - lib/toggl/worktime/driver.rb
 - lib/toggl/worktime/merger.rb
 - lib/toggl/worktime/time.rb
@@ -167,8 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: '["Summarise Toggl Time Entries", "Summarise Toggl Time Entries", "https://github.com/limitusus/toggl-worktime"]'