toggl-jobcan 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f483f4acaf5e1c71fc862cd0c972b96b6bcab779e5fa5337d2cb401e4281c64
-  data.tar.gz: 9d5bb360a386624b0f804eb6033d8e70228c7531cf4a5d10a65e2e6787f2986c
+  metadata.gz: c00b08fdda200e0497122388bb5d2db2c99900e402bcb1f5a010159e19a590e6
+  data.tar.gz: 24b1c959733b880de6da0df91abcace2ff1968038869f76fc3741410211e6847
 SHA512:
-  metadata.gz: 980d306d2ce43065280b5e330a63002832845ad019f6c45c9d549983ad51397861aa124c696c01436b933843f423376943bb610a63c2dc6f9b654a3a8d6d9015
-  data.tar.gz: f944e61ca101b3d2e345aa56f4822e4311ffdd0e08cb138ab577662673d2aae764536e62e6511b8c4af5510ba0dc4e82ae9fd5e7cb4657ab2a19bd08ea03b12a
+  metadata.gz: ef121f202a902d3455b7b5e3dd30b47eef1b6a2b0548a962ef4673f13f3dc1c63933cfdc68d0eb351eb5afd36f9724258b70156044c8619ce45c83fd980e1775
+  data.tar.gz: 763dc53f7743d916cf1dad3b946f63689affb2f1f2955d052d53e91b9b0f9561e2a99841a90fc70d2b33fef7c3960442a37ad979a612019042e258faf9ec194c

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Change Log
+
+## [v0.2.0](https://github.com/limitusus/toggl-jobcan/tree/v0.2.0) (2018-08-01)
+[Full Changelog](https://github.com/limitusus/toggl-jobcan/compare/v0.1.1...v0.2.0)
+
+**Merged pull requests:**
+
+- Configurable for Toggl::Worktime [\#2](https://github.com/limitusus/toggl-jobcan/pull/2) ([limitusus](https://github.com/limitusus))
+- Add dryrun feature [\#1](https://github.com/limitusus/toggl-jobcan/pull/1) ([limitusus](https://github.com/limitusus))
+
+## [v0.1.1](https://github.com/limitusus/toggl-jobcan/tree/v0.1.1) (2018-04-02)
+[Full Changelog](https://github.com/limitusus/toggl-jobcan/compare/v0.1.0...v0.1.1)
+
+## [v0.1.0](https://github.com/limitusus/toggl-jobcan/tree/v0.1.0) (2018-04-02)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -2,6 +2,8 @@
 
 This gem provides `toggl-jobcan` command, which synchronises working time data in Toggl to JobCan.
 
+This gem requires Ruby >= 2.5.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -22,6 +24,8 @@ Or install it yourself as:
 
 Prepare `~/.toggl` including Toggl API token so that [Toggl::Worktime](https://github.com/limitusus/toggl-worktime) works.
 
+Prepare `~/.toggl_worktime` for [Toggl::Worktime](https://github.com/limitusus/toggl-worktime) (Path can be specified via `-c` option).
+
 Prepare `~/.jobcan` YAML file that includes:
 
 ```yaml
@@ -32,7 +36,6 @@ password: YOUR_PASSWORD
 
 ## Usage
 
-
 Pass date strings in `%Y%m%d` format.
 
 ```console
@@ -45,6 +48,8 @@ To synchronise all days in a month, utilise `seq` command:
 toggl-jobcan `seq -f '201702%02g' 1 28`
 ```
 
+You can simulate the inputs with `--dryrun` option.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/exe/toggl-jobcan

@@ -4,27 +4,42 @@
 lib = File.expand_path('../lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require 'optparse'
+
 require 'selenium-webdriver'
 require 'toggl/jobcan'
-require 'toggl/worktime'
 
 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' 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)
+jobcan = Toggl::Jobcan::Client.new(
+  credentials: credentials,
+  toggl_worktime_config: toggl_worktime_config,
+  dryrun: dryrun
+)
 jobcan.login
 
 puts 'Driver ready'

data/lib/toggl/jobcan.rb

@@ -3,9 +3,10 @@
 require 'toggl/jobcan/toggl_support'
 require 'toggl/jobcan/credentials'
 require 'toggl/jobcan/client'
-
 require 'toggl/jobcan/version'
 
+require 'toggl/worktime'
+
 module Toggl
   # Provides Toggl::Jobcan namespace
   module Jobcan

data/lib/toggl/jobcan/client.rb

@@ -10,12 +10,6 @@ module Toggl
 
       include Toggl::Jobcan::TogglSupport
 
-      DEFAULT_CONFIG = {
-        timezone: 'Asia/Tokyo',
-        day_begin_hour: 6,
-        max_working_interval: 10
-      }.freeze
-
       JOBCAN_URLS = {
         attendance: 'https://ssl.jobcan.jp/employee/attendance',
         attendance_modify: 'https://ssl.jobcan.jp/employee/adit/modify/'
@@ -28,15 +22,19 @@ module Toggl
         password_label: %(//label[@for='password'])
       }.freeze
 
-      def initialize(credentials: nil,
-                     options: Selenium::WebDriver::Chrome::Options.new)
+      def initialize(
+            credentials: nil,
+            options: Selenium::WebDriver::Chrome::Options.new,
+            toggl_worktime_config:,
+            dryrun: false
+          )
         @credentials = credentials
-        @config = DEFAULT_CONFIG
         options.add_argument('--headless')
         @driver = Selenium::WebDriver.for :chrome, options: options
         @toggl = Toggl::Worktime::Driver.new(
-          max_working_interval: @config[:max_working_interval]
+          config: Toggl::Worktime::Config.new(path: toggl_worktime_config)
         )
+        @dryrun = dryrun
       end
 
       def login
@@ -92,7 +90,7 @@ module Toggl
           navigate_to_attendance_modify_day(date)
           send_timestamp input_stamp
           send_notice
-          @driver.find_element(:id, 'insert_button').submit
+          @driver.find_element(:id, 'insert_button').submit unless @dryrun
         end
       end
 

data/lib/toggl/jobcan/toggl_support.rb

@@ -5,10 +5,7 @@ module Toggl
     # Provides support methods for Toggl
     module TogglSupport
       def fetch_toggl_worktime(date)
-        @toggl.merge!(
-          date.month, date.day,
-          @config[:day_begin_hour], @config[:timezone]
-        )
+        @toggl.merge!(date.year, date.month, date.day)
         @toggl.work_time
       end
 

data/lib/toggl/jobcan/version.rb

@@ -2,6 +2,6 @@
 
 module Toggl
   module Jobcan
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/toggl-jobcan.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'chromedriver-helper'
   spec.add_dependency 'selenium-webdriver'
-  spec.add_dependency 'toggl-worktime', '>= 0.2.0'
+  spec.add_dependency 'toggl-worktime', '~> 0.3.0'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toggl-jobcan
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomoya Kabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
@@ -42,16 +42,16 @@ dependencies:
   name: toggl-worktime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock