amazon_auth 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04a18c43fe199086bfa94cb3c6eeb96d6c418f16
-  data.tar.gz: d6a43c21ebfb9e81cc18c917ec3351958af4a04a
+  metadata.gz: 063d73a7b294c00b1e491c7c7fadffe02dd58807
+  data.tar.gz: acb5054776d89ba8c6ecaef6ad5496a92883bd61
 SHA512:
-  metadata.gz: ce2c1e9a62fce22901ac94c3e48bdcf740cf261df96ba10456ead755152fca65037f3a91b9acb4f7d98513438d1e250fd2ce047bb78cc96dd719c71cf09ff523
-  data.tar.gz: 742268eb916028b5927723ecd0ec4911a9feab20aadcaa1fec52960f6657da974600ad3badf960866e03c1f7bd16b29d9eeb3905ab4fed5e6f89ffa4b4b44f2c
+  metadata.gz: e060fd99e003322aee83799c9cf05171db6891e45d7ca06dfee5ad164660b94743c021337d35ef95fdd1adf5df6f5488126bbd44e977bf07d7b377c35dcb7fbd
+  data.tar.gz: 7073d53fe9aec2b7b18094e5762fe560b8f5ce9a7e89790d8a947c26077bbbe1f55fb55990a8ec808bbb61c8c3473ba1fa51b692406914a277fe1a3866ea6b02

data/README.md

@@ -73,6 +73,20 @@ Set `AMAZON_DOMAIN` in _.env_.
 
 e.g. `AMAZON_DOMAIN=amazon.co.jp` for Japanese site
 
+### Logging
+
+Normal logging
+
+```ruby
+client = AmazonAuth::Client.new(verbose: true)
+```
+
+More logging (This includes `session.current_url`)
+
+```ruby
+client = AmazonAuth::Client.new(debug: true)
+```
+
 ### Use Firefox
 
 This gem may not work with newer versions of Firefox.  

data/lib/amazon_auth.rb

@@ -8,6 +8,7 @@ begin
 rescue LoadError
 end
 require_relative "amazon_auth/version"
+require_relative "amazon_auth/extensions/common_extension"
 require_relative "amazon_auth/extensions/session_extension"
 require_relative "amazon_auth/amazon_info"
 require_relative "amazon_auth/capybara"

data/lib/amazon_auth/client.rb

@@ -1,10 +1,12 @@
 module AmazonAuth
   class Client
+    include AmazonAuth::CommonExtension
     include AmazonAuth::SessionExtension
 
     attr_accessor :initial_url
 
     def initialize(options = {})
+      @options = options
       @initial_url = options.fetch(:url) { "https://www.#{AmazonInfo.domain}/" }
       @login = options.fetch(:login) do
         if (amazon_username_code = ENV['AMAZON_USERNAME_CODE']).present?
@@ -30,21 +32,26 @@ module AmazonAuth
 
     def sign_in
       session.visit initial_url
+      debug "Visiting #{initial_url}"
       link = links_for('#nav-signin-tooltip a').find{|link| link =~ %r{\A/gp/navigation/redirector.html} }
+      debug "link: [#{link}]"
       session.visit(link) if link
       submit_signin_form
     end
 
     def submit_signin_form
+      debug "Begin submit_signin_form"
       return true unless session.has_selector?('#signInSubmit')
       session.fill_in 'ap_email', with: @login
       session.fill_in 'ap_password', with: @password
       session.click_on('signInSubmit')
+      log "Clicked signInSubmit"
 
       raise('Failed on signin') if alert_displayed?
       while image_recognition_displayed? do
         retry_signin_form_with_image_recognition
       end
+      debug "End submit_signin_form"
       true
     end
 
@@ -52,8 +59,12 @@ module AmazonAuth
       return true unless session.has_selector?('#signInSubmit')
       session.fill_in 'ap_password', with: @password
       if image_recognition_displayed?
-        input = ask "Got the prompt. Read characters from the image: "
-        return true if input.blank? || !session.first('#auth-captcha-guess') # Skip when form is submitted manually
+        input = ask "Got the prompt. Read characters from the image [blank to cancel]: "
+        if input.blank?
+          debug "Going back to #{initial_url}"
+          session.visit initial_url
+          return true
+        end
         session.fill_in 'auth-captcha-guess', with: input
       end
       sleep 1

data/lib/amazon_auth/extensions/common_extension.rb

@@ -0,0 +1,15 @@
+module AmazonAuth
+  module CommonExtension
+
+    def log(message)
+      return unless (@options[:debug] || @options[:verbose])
+      puts "[#{Time.current.strftime('%Y-%m-%d %H:%M:%S')}] #{message}" +
+        (@options[:debug] ? " -- #{session.current_url}" : '')
+    end
+
+    def debug(message)
+      return unless @options[:debug]
+      log(message)
+    end
+  end
+end

data/lib/amazon_auth/version.rb

@@ -1,3 +1,3 @@
 module AmazonAuth
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_auth
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -160,6 +160,7 @@ files:
 - lib/amazon_auth/capybara.rb
 - lib/amazon_auth/client.rb
 - lib/amazon_auth/converter.rb
+- lib/amazon_auth/extensions/common_extension.rb
 - lib/amazon_auth/extensions/session_extension.rb
 - lib/amazon_auth/version.rb
 homepage: https://github.com/kyamaguchi/amazon_auth
@@ -182,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Login amazon.