toggl-jobcan 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3cdb7a80c8e7ad9c00533c004caa4f3fdf96115ca8dbaede97ab125aa6c7b91
-  data.tar.gz: 261bbea71592c29ecb6970728a1d58a14ec1397e7731b5f3a4df77e5a5bd41d5
+  metadata.gz: 949c32514cbce938b26e91fe48eceb4033fb992f951fd5e3acc04dd2fe55a8fb
+  data.tar.gz: e84549b66520109801009354cdc5d95d02be579f85d8e8fdd8b7826df8f9ea42
 SHA512:
-  metadata.gz: 3da1babad7759982777a14187e005866ee9219d1bc502f67bf795793de28ee9d0f49f56ac59e1e8f27373019526fef687faeac605914c43d11b4b25647aa1556
-  data.tar.gz: 1ceebb05b5f42cf63c7d1168e417f23aee7a39ebb34dd1dc98f39615faa0df7a0090871df50fc5af55beb232d4bbe015ae710d5e9c7854717fa745f4bf7016bb
+  metadata.gz: 36b60237831926d3d95d7d8dbef01b3effc2da31f1376177591cc470f09c594d14aa8635578fac895c979e4632da09e84ee6167b8fe2134536ebda700632e1ad
+  data.tar.gz: f187d5b17bc6658f274824c4713f7e59be6540a8cc960a4b75344daf4fb661220eafdecfb17d5a20d4618e4d0340c25a337bfb897f1b9dd61d1c2d89138df05a

data/.rubocop.yml

@@ -3,3 +3,19 @@ AllCops:
 
 Metrics/AbcSize:
   Max: 20
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*.rb
+
+Style/EvalWithLocation:
+  Exclude:
+    - spec/**/*.rb
+
+Style/AccessModifierDeclarations:
+  Exclude:
+    - spec/**/*.rb
+
+Security/Eval:
+  Exclude:
+    - spec/**/*.rb

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.3.1](https://github.com/limitusus/toggl-jobcan/tree/v0.3.1) (2019-02-01)
+[Full Changelog](https://github.com/limitusus/toggl-jobcan/compare/v0.3.0...v0.3.1)
+
+**Merged pull requests:**
+
+- Fix bug from 2019 [\#4](https://github.com/limitusus/toggl-jobcan/pull/4) ([limitusus](https://github.com/limitusus))
+
 ## [v0.3.0](https://github.com/limitusus/toggl-jobcan/tree/v0.3.0) (2018-09-26)
 [Full Changelog](https://github.com/limitusus/toggl-jobcan/compare/v0.2.0...v0.3.0)
 

data/Gemfile.lock

@@ -1,41 +1,35 @@
 PATH
   remote: .
   specs:
-    toggl-jobcan (0.3.1)
-      chromedriver-helper
+    toggl-jobcan (0.4.0)
       selenium-webdriver
+      thor
       toggl-worktime (~> 0.3.0, >= 0.3.2)
+      webdrivers
 
 GEM
   remote: https://rubygems.org/
   specs:
-    archive-zip (0.11.0)
-      io-like (~> 0.3.0)
     awesome_print (1.8.0)
-    byebug (10.0.2)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
-    chromedriver-helper (2.1.0)
-      archive-zip (~> 0.10)
-      nokogiri (~> 1.8)
+    byebug (11.0.1)
+    childprocess (1.0.1)
+      rake (< 13.0)
     coderay (1.1.2)
     diff-lcs (1.3)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.10.0)
-    io-like (0.3.0)
     logger (1.3.0)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    multipart-post (2.0.0)
-    nokogiri (1.10.1)
+    multipart-post (2.1.1)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    oj (3.7.8)
+    oj (3.7.12)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
       pry (~> 0.10)
     rake (10.5.0)
     rspec (3.8.0)
@@ -44,7 +38,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)
@@ -52,9 +46,10 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     rubyzip (1.2.2)
-    selenium-webdriver (3.141.0)
-      childprocess (~> 0.5)
+    selenium-webdriver (3.142.3)
+      childprocess (>= 0.5, < 2.0)
       rubyzip (~> 1.2, >= 1.2.2)
+    thor (0.20.3)
     toggl-worktime (0.3.2)
       awesome_print
       togglv8
@@ -62,6 +57,10 @@ GEM
       faraday
       logger
       oj
+    webdrivers (3.9.4)
+      nokogiri (~> 1.6)
+      rubyzip (~> 1.0)
+      selenium-webdriver (~> 3.0)
 
 PLATFORMS
   ruby

data/exe/toggl-jobcan

@@ -4,61 +4,9 @@
 lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-require 'optparse'
-
-require 'selenium-webdriver'
 require 'toggl/jobcan'
 
-cred_file = "#{ENV['HOME']}/.jobcan"
-
-Version = Toggl::Jobcan::VERSION
-
-toggl_worktime_config = "#{ENV['HOME']}/.toggl_worktime"
-dryrun = false
-
-opt = OptionParser.new
-opt.on('-c CONFIG', '--tw-config CONFIG') { |v| toggl_worktime_config = v }
-opt.on('--dryrun') { |v| dryrun = v }
-opt.parse!(ARGV)
-
-raise RangeError, 'No dates given' if ARGV.empty?
-
-target_days = ARGV.map do |s|
-  raise RangeError, "Invalid format #{s}" unless s.match?(/\d{8}/)
-
-  Date.parse(s)
-end
-
-puts '*** DRYRUN MODE ***' if dryrun
-
-puts 'Target days:'
-target_days.each do |date|
-  puts "  - #{date.strftime('%F')}"
-end
-
-credentials = Toggl::Jobcan::Credentials.new(path: cred_file)
-jobcan = Toggl::Jobcan::Client.new(
-  credentials: credentials,
-  toggl_worktime_config: toggl_worktime_config,
-  dryrun: dryrun
-)
-jobcan.login
-
-puts 'Driver ready'
-
-target_days.each do |date|
-  puts "Input date: #{date}"
-  working_times = jobcan.fetch_toggl_worktime(date).flatten
-  if working_times.any?(&:nil?)
-    puts 'Includes nil data: skip'
-    next
-  end
-  jobcan.navigate_to_attendance_modify_day(date)
-  jobcan.input_day_worktime(date, working_times)
-  sleep 1
-  puts "  - Finish: #{date}; Total time: #{jobcan.toggl.total_time}"
-end
-
-jobcan.driver.quit
+# Default action: main
+%w[main version help].include?(ARGV[0]) || ARGV.unshift('main')
 
-puts 'All Input finished'
+Toggl::Jobcan::Cli.start

data/lib/toggl/jobcan.rb

@@ -3,6 +3,7 @@
 require 'toggl/jobcan/toggl_support'
 require 'toggl/jobcan/credentials'
 require 'toggl/jobcan/client'
+require 'toggl/jobcan/cli'
 require 'toggl/jobcan/version'
 
 require 'toggl/worktime'

data/lib/toggl/jobcan/cli.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+require 'thor'
+require 'optparse'
+require 'selenium-webdriver'
+
+module Toggl
+  module Jobcan
+    # CLI provider
+    class Cli < Thor
+      package_name 'toggl-jobcan'
+      default_command :main
+
+      DEFAULT_JOBCAN_CREDENTIAL_FILE_PATH = "#{ENV['HOME']}/.jobcan"
+      DEFAULT_TOGGL_WORKTIME_CONFIG_FILE_PATH = "#{ENV['HOME']}/.toggl_worktime"
+
+      desc(
+        '[options] DATE [DATE...]',
+        'Register worktime in Toggl into Jobcan for the given dates ' \
+        '("toggl-jobcan help main" for detailed usage)'
+      )
+      method_option(
+        :tw_config,
+        type: :string, aliases: '-c',
+        default: DEFAULT_TOGGL_WORKTIME_CONFIG_FILE_PATH,
+        banner: 'CONFIG', required: false,
+        desc: 'configuration file for toggl_worktime'
+      )
+      method_option(
+        :jc_credential,
+        type: :string, aliases: '-r',
+        default: DEFAULT_JOBCAN_CREDENTIAL_FILE_PATH,
+        banner: 'CREDENTIAL', required: false,
+        desc: 'credentials file for Jobcan'
+      )
+      method_option(
+        :days,
+        type: :boolean,
+        default: false,
+        desc: 'print days and exit'
+      )
+      method_option :dryrun, type: :boolean
+      def main(*args)
+        parse_args(args)
+        puts '*** DRYRUN MODE ***' if options[:dryrun]
+
+        show_target_days
+        return if options[:days]
+
+        prepare_jobcan
+
+        puts 'Driver ready'
+        register_days
+
+        jobcan.driver.quit
+        puts 'All Input finished'
+      end
+
+      map %w[--version -v] => :version
+      desc 'version', 'Show version.'
+      def version
+        puts "Version #{Toggl::Jobcan::VERSION}"
+      end
+
+      no_commands do # rubocop:disable Metrics/BlockLength
+        def initialize(*args)
+          super
+          @target_days = []
+        end
+
+        def parse_args(args)
+          @target_days = args.map do |s|
+            raise RangeError, "Invalid format #{s}" unless s.match?(/\d{8}/)
+
+            Date.parse(s)
+          end
+          raise NoDayGivenError if @target_days.size.zero?
+        end
+
+        def prepare_jobcan
+          @jc_credentials = Toggl::Jobcan::Credentials.new(
+            path: options[:jc_credential]
+          )
+          jobcan.login
+        end
+
+        def jobcan
+          @jobcan ||= Toggl::Jobcan::Client.new(
+            credentials: @jc_credentials,
+            toggl_worktime_config: options[:tw_config],
+            dryrun: options[:dryrun]
+          )
+          @jobcan
+        end
+
+        def show_target_days
+          puts 'Target days:'
+          @target_days.each do |date|
+            puts "  - #{date.strftime('%F')}"
+          end
+        end
+
+        def register_days
+          @target_days.each do |date|
+            register_day(date)
+          end
+        end
+
+        def register_day(date)
+          puts "Input date: #{date}"
+          working_times = jobcan.fetch_toggl_worktime(date).flatten
+          if working_times.any?(&:nil?)
+            puts 'Includes nil data: skip'
+            return
+          end
+          jobcan.navigate_to_attendance_modify_day(date)
+          jobcan.input_day_worktime(date, working_times)
+          sleep 1
+          puts "  - Finish: #{date}; Total time: #{jobcan.toggl.total_time}"
+        end
+      end
+    end
+
+    class NoDayGivenError < StandardError; end
+  end
+end

data/lib/toggl/jobcan/toggl_support.rb

@@ -12,6 +12,7 @@ module Toggl
       def toggl_time_format(date, timestamp)
         same_day = date == timestamp.to_date
         return timestamp.strftime('%H%M') if same_day
+
         hour = timestamp.hour + 24
         minute = timestamp.min
         format('%02d%02d', hour, minute)

data/lib/toggl/jobcan/version.rb

@@ -2,6 +2,6 @@
 
 module Toggl
   module Jobcan
-    VERSION = '0.3.1'
+    VERSION = '0.4.0'
   end
 end

data/toggl-jobcan.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'chromedriver-helper'
   spec.add_dependency 'selenium-webdriver'
+  spec.add_dependency 'thor'
   spec.add_dependency 'toggl-worktime', '~> 0.3.0', '>= 0.3.2'
+  spec.add_dependency 'webdrivers'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: toggl-jobcan
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Tomoya Kabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chromedriver-helper
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -58,6 +58,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +165,7 @@ files:
 - bin/setup
 - exe/toggl-jobcan
 - lib/toggl/jobcan.rb
+- lib/toggl/jobcan/cli.rb
 - lib/toggl/jobcan/client.rb
 - lib/toggl/jobcan/credentials.rb
 - lib/toggl/jobcan/toggl_support.rb