cxeed 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ed9c15754f3bd188355f900cd89cde4e0962e5
-  data.tar.gz: 3b1e2902c7f6f9690bf0717f12ab58af95dc0eb3
+  metadata.gz: b9e0a1ec87cb391cc7de11c2e116029585bacd9c
+  data.tar.gz: cde12341979322e9fd5c503b12a9007a01f90cb2
 SHA512:
-  metadata.gz: 57e7d0228f1b42daba0d476e2a3b07e8a453b7405de837861d6dabcb775c68755962feb0bf25e8cd706f27b9bfb9b530db7845efd73bd1bb35c9bb49cdd09d00
-  data.tar.gz: cff45674ca9bf15c774b89fe4cba0b550a9eeae8bdea6569ccd49ba42fe717b86d23bc7ccf7c856a6964d7e69da0ab52146732b6ab16cc5c2ae4f6ff30d69a8a
+  metadata.gz: d5d3361d38bc04095fed1c67e6dade284f97b5a5973159251fc5227e8d52c2ec763d9c0bf17185cc212b21c97e034c619206709e2ec8bdffdac67256708fd116
+  data.tar.gz: 4b0c01c525edd0b910eda57613b571fd349cdf09575f98dd91ce238a7a35c304631a3a2033c6b923c76b60433f3d0d61392fcd52bd2eebf22a50b9b70ecd0deb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cxeed (0.3.0)
+    cxeed (0.3.3)
       selenium-webdriver
       thor
 
@@ -42,4 +42,4 @@ DEPENDENCIES
   rspec (~> 3.0)
 
 BUNDLED WITH
-   1.15.4
+   1.16.1

data/README.md

@@ -62,7 +62,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/cxeed. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/rhythm191/cxeed. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -70,4 +70,4 @@ The gem is available as open source under the terms of the [MIT License](http://
 
 ## Code of Conduct
 
-Everyone interacting in the Cxeed project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/cxeed/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Cxeed project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/rhythm191/cxeed/blob/master/CODE_OF_CONDUCT.md).

data/lib/cxeed/command.rb

@@ -34,11 +34,13 @@ module Cxeed
     end
 
     desc 'login_test', 'login_test'
+    method_option :verbose, :aliases => '-v', :desc => 'Make the operation more talkative'
+    method_option :save_screenshot, :aliases => '-s', :desc => 'Save debug screenshot'
     def login_test
       cred = Cxeed::Credential.new
-      proxy = Cxeed::Proxy.new cred
+      proxy = Cxeed::Proxy.new cred, verbose: options.key?(:verbose), save_screenshot: options.key?(:save_screenshot)
 
-      if proxy.login_test == 'https://cxg2.i-abs.co.jp/cyberx/Xgw0001.asp?CxClientDispFlg=0'
+      if proxy.login_test != cred.login_url
         say 'login success'
       else
         say 'login fail'
@@ -46,9 +48,12 @@ module Cxeed
     end
 
     desc 'arrive [time] [date]', 'submit arrival time (time format is "%H:%M") (date format 2017/09/27)'
+    method_option :verbose, :aliases => '-v', :desc => 'Make the operation more talkative'
+    method_option :save_screenshot, :aliases => '-s', :desc => 'Save debug screenshot'
     def arrive(time = Time.now.strftime('%H:%M'), date = Time.now.strftime('%Y/%m/%d'))
+
       cred = Cxeed::Credential.new
-      proxy = Cxeed::Proxy.new cred
+      proxy = Cxeed::Proxy.new cred, verbose: options.key?(:verbose), save_screenshot: options.key?(:save_screenshot)
 
       proxy.arrive time, DateTime.parse(date)
 
@@ -56,9 +61,13 @@ module Cxeed
     end
 
     desc 'leave [time] [date]', 'submit leave time (time format is "%H:%M") (date format 2017/09/27)'
+    method_option :verbose, :aliases => '-v', :desc => 'Make the operation more talkative'
+    method_option :save_screenshot, :aliases => '-s', :desc => 'Save debug screenshot'
     def leave(time = Time.now.strftime('%H:%M'), date = Time.now.strftime('%Y/%m/%d'))
+      verbose = options.key? :verbose
+
       cred = Cxeed::Credential.new
-      proxy = Cxeed::Proxy.new cred
+      proxy = Cxeed::Proxy.new cred, verbose: options.key?(:verbose), save_screenshot: options.key?(:save_screenshot)
 
       proxy.leave time, DateTime.parse(date)
 
@@ -66,9 +75,11 @@ module Cxeed
     end
 
     desc 'today', 'show today attendance'
+    method_option :verbose, :aliases => '-v', :desc => 'Make the operation more talkative'
+    method_option :save_screenshot, :aliases => '-s', :desc => 'Save debug screenshot'
     def today
       cred = Cxeed::Credential.new
-      proxy = Cxeed::Proxy.new cred
+      proxy = Cxeed::Proxy.new cred, verbose: options.key?(:verbose), save_screenshot: options.key?(:save_screenshot)
 
       today = proxy.today
 
@@ -76,9 +87,10 @@ module Cxeed
     end
 
     desc 'attendance date(format: %Y/%m/%d)', 'show day attendance'
+    method_option :verbose, :aliases => '-v', :desc => 'Make the operation more talkative'
     def attendance(date)
       cred = Cxeed::Credential.new
-      proxy = Cxeed::Proxy.new cred
+      proxy = Cxeed::Proxy.new cred, verbose: options.key?(:verbose), save_screenshot: options.key?(:save_screenshot)
 
       attendance = proxy.day_attendance date
 

data/lib/cxeed/proxy.rb

@@ -5,24 +5,41 @@ module Cxeed
   class Proxy
     BACKSPACE = "\ue003".freeze
 
-    def initialize(credential)
+    def initialize(credential, verbose: false, save_screenshot: false)
       caps = Selenium::WebDriver::Remote::Capabilities.chrome('chromeOptions': {args: %i(--headless --disable-gpu window-size=1920,1080)})
       @driver = Selenium::WebDriver.for :chrome, desired_capabilities: caps
 
       @credential = credential
+      @verbose = verbose
+      @save_screenshot = save_screenshot
     end
 
     def login
+      verbose_log 'start login'
+
       @driver.navigate.to(@credential.login_url)
 
+      verbose_log "at #{ @driver.current_url }"
+      save_screenshot
+
       # 会社コード入力
       @driver.find_element(:name, 'DataSource').send_keys(@credential.company_code)
       # 個人コード入力
       @driver.find_element(:name, 'LoginID').send_keys(@credential.employee_code)
       # パスワード入力
       @driver.find_element(:name, 'PassWord').send_keys(@credential.password)
+
+
+      verbose_log "input DataSource: #{ @driver.find_element(:name, 'DataSource').attribute('value')}"
+      verbose_log "input login id: #{ @driver.find_element(:name, 'LoginID').attribute('value')}"
+      verbose_log "input password: #{ @driver.find_element(:name, 'PassWord').attribute('value')}"
+      save_screenshot
+
       # ログイン処理
       @driver.find_element(:xpath, '//td[@class="loginBtn"]/a').click
+
+      verbose_log "after click login page: #{ @driver.current_url }"
+      save_screenshot
     end
 
     def login_test
@@ -32,6 +49,9 @@ module Cxeed
     end
 
     def navigate_to_input_form
+      verbose_log "start navigate input form: frame2=#{ @driver.find_element(:name, 'FRAME2').attribute('src') }"
+      save_screenshot
+
       # frameの指定
       @driver.switch_to.frame @driver.find_element(id: 'FRAME1')
       # 勤務データ入力遷移
@@ -41,18 +61,31 @@ module Cxeed
       @driver.switch_to.default_content
       # frameの指定
       @driver.switch_to.frame @driver.find_element(name: 'FRAME2')
+
+      verbose_log "finish navigate input form: #{ @driver.current_url }"
+      save_screenshot
     end
 
     # 引数の日付の入力画面に遷移する
     def open_date(date)
+      verbose_log "start open date command: #{ @driver.current_url }: #{ @driver.find_element(:class, 'cxCmnTitleStr').text }"
+
       # 処理期間の入力
       @driver.find_element(:xpath, '//input[@name="StartYMD"]').send_keys(BACKSPACE * 8)
       @driver.find_element(:xpath, '//input[@name="StartYMD"]').send_keys(date.strftime('%Y%m%d'))
       @driver.find_element(:xpath, '//input[@name="EndYMD"]').send_keys(BACKSPACE * 8)
       @driver.find_element(:xpath, '//input[@name="EndYMD"]').send_keys(date.strftime('%Y%m%d'))
 
+
+      verbose_log "input start date: #{  @driver.find_element(:xpath, '//input[@name="StartYMD"]').attribute('value') }"
+      verbose_log "input end date: #{  @driver.find_element(:xpath, '//input[@name="EndYMD"]').attribute('value') }"
+      save_screenshot
+
       # 検索
       @driver.find_element(:xpath, '//input[@name="srchbutton"]').click
+
+      verbose_log "after click search button: #{ @driver.current_url }"
+      save_screenshot
     end
 
     def arrive(time = Time.now.strftime('%H:%M'), date = Time.now)
@@ -65,9 +98,13 @@ module Cxeed
       # 出勤時間の入力
       work_field = @driver.find_element(:xpath, '//td[@id="grdXyw1100G-rc-0-6"]')
       @driver.action.send_keys(work_field, time).perform
+      save_screenshot
 
       # 登録処理
       @driver.find_element(:xpath, '//input[@name="regbutton"]').click
+
+      verbose_log "after click register button: #{ @driver.current_url }"
+      save_screenshot
     end
 
     def leave(time = Time.now.strftime('%H:%M'), date = Time.now)
@@ -80,9 +117,13 @@ module Cxeed
       # 退勤時間の入力
       work_field = @driver.find_element(:xpath, '//td[@id="grdXyw1100G-rc-0-9"]')
       @driver.action.send_keys(work_field, time).perform
+      save_screenshot
 
       # 登録処理
       @driver.find_element(:xpath, '//input[@name="regbutton"]').click
+
+      verbose_log "after click register button: #{ @driver.current_url }"
+      save_screenshot
     end
 
     def today
@@ -123,5 +164,20 @@ module Cxeed
 
       Cxeed::Attendance.new date, arrive_at, leave_at
     end
+
+    private
+
+    def verbose_log(output_string)
+      puts "* #{ output_string }" if @verbose
+    end
+
+    def frame_source(frame_name)
+      @driver.find_element(:name, frame_name).attribute('src')
+    end
+
+    def save_screenshot
+      @driver.save_screenshot("./cxeed_#{ Time.now.strftime('%Y%m%d%H%M%S%L') }.png") if @save_screenshot
+    end
+
   end
 end

data/lib/cxeed/version.rb

@@ -1,3 +1,3 @@
 module Cxeed
-  VERSION = "0.3.2"
+  VERSION = '0.3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cxeed
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - rhythm191
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler