amazon_auth 0.4.1 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fb52bb61159de3aeef649b0203530e590d59355d
-  data.tar.gz: 2178634b98ead6d4c9196a9980a5b65311ab5148
+SHA256:
+  metadata.gz: 8bd3624417b3a13baad3a2812cf7bdc6f874966e69290b3e5dce2bfb748b4a9a
+  data.tar.gz: fff02f6937501b76a01d16a9de7b9ade90b02b2e4ac5de8448b58293a69b8579
 SHA512:
-  metadata.gz: 150b640f60be7bf3a1b8b0229514517adbd5d14a713cc7ab14eea6f680c4ecbb1186ed1604433f3294069951b40cdc4574c7616396c59ef81083ba0d0064fdf7
-  data.tar.gz: 27d9bf5c9b4e7a7251451076474c99a8a08f38cdcf4e2a6c44e4841f4ee7e9884761d6d8c497987d3f5af377facd7bafb8953fe5471d85b7252c90386decc2f6
+  metadata.gz: 3dfdb0bf93116a962ab13314f7342837bb920371d35f9e0cb1ab26754d9b65d23237b2de6263d6621b2eb1dc3631f6ebe262c457695192882edf41d304090060
+  data.tar.gz: 3a72e83fc180ee2028b5b4b0382f0b290d631a233eb9aae4a71827c9eae7d90f91701b672c16a98066dcf7567c70aa27539faf6ec2c3e7c6ef2249af7549667b

data/.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
-before_install: gem install bundler -v 1.14.6
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
+before_install: gem install bundler

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/amazon_auth.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'amazon_auth/version'

data/exe/amazon_auth

@@ -3,12 +3,10 @@
 require_relative "../lib/amazon_auth"
 require 'highline/import'
 
-result = []
-
-domain = ask("Enter your amazon domain: ") { |q| q.echo = true ; q.default = AmazonInfo.domain }
+domain = ask("Enter your amazon domain: ") { |q| q.echo = true; q.default = AmazonInfo.domain }
 login = ask("Enter your #{domain} username: ") { |q| q.echo = true }
 passwd = ask("Enter your #{domain} password: ") { |q| q.echo = "*" }
-salt = ask("Enter your salt: ") { |q| q.default = AmazonAuth::Converter.default_salt ; q.echo = true }
+salt = ask("Enter your salt: ") { |q| q.default = AmazonAuth::Converter.default_salt; q.echo = true }
 
 raise "Empty login or password" if login.to_s.size == 0 || passwd.to_s.size == 0
 

data/lib/amazon_auth/extensions/common_extension.rb

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

data/lib/amazon_auth/extensions/session_extension.rb

@@ -1,6 +1,5 @@
 module AmazonAuth
   module SessionExtension
-
     def doc
       Nokogiri.HTML(session.html)
     end
@@ -12,7 +11,7 @@ module AmazonAuth
 
     def wait_for_selector(selector, options = {})
       options.fetch(:wait_time, 3).times do
-        if session.first(selector)
+        if session.first(selector, minimum: 0)
           break
         else
           sleep(1)
@@ -30,7 +29,7 @@ module AmazonAuth
       session.visit url
       debug "Visiting #{url}"
       restore_cookies if keep_cookie?
-      if (link = links_for('a').find{|link| link =~ %r{\A/gp/navigation/redirector.html} })
+      if (link = links_for('a').find{|l| l =~ %r{\A/gp/navigation/redirector.html} })
         debug "link: [#{link}]"
         session.visit(link)
       end
@@ -50,12 +49,22 @@ module AmazonAuth
     end
 
     def submit_signin_form
+      # Click account switcher if it is displayed
+      dom_account_switcher = '.cvf-account-switcher-profile-details, .cvf-account-switcher-claim'
+      session.first(dom_account_switcher).click if session.has_selector?(dom_account_switcher)
+
       debug "Begin submit_signin_form"
       unless session.has_selector?('#signInSubmit')
-        log "signInSubmit button not found in this page"
-        return false
+        if session.has_selector?('input#continue') && session.has_selector?('input#ap_email')
+          log "Found a form which asks only email"
+          session.fill_in 'ap_email', with: login
+          session.first('input#continue').click
+        else
+          log "signInSubmit button not found in this page"
+          return false
+        end
       end
-      session.fill_in 'ap_email', with: login if session.first('#ap_email') && session.first('#ap_email').value.blank?
+      session.fill_in 'ap_email', with: login if session.first('#ap_email', minimum: 0) && session.first('#ap_email').value.blank?
       session.fill_in 'ap_password', with: password
       session.first('#signInSubmit').click
       log "Clicked signInSubmit"
@@ -98,11 +107,12 @@ module AmazonAuth
 
     private
 
-      def login
-        options.fetch(:login, Converter.decode(ENV['AMAZON_USERNAME_CODE']))
-      end
-      def password
-        options.fetch(:password, Converter.decode(ENV['AMAZON_PASSWORD_CODE']))
-      end
+    def login
+      options.fetch(:login, Converter.decode(ENV['AMAZON_USERNAME_CODE']))
+    end
+
+    def password
+      options.fetch(:password, Converter.decode(ENV['AMAZON_PASSWORD_CODE']))
+    end
   end
 end

data/lib/amazon_auth/version.rb

@@ -1,3 +1,3 @@
 module AmazonAuth
-  VERSION = "0.4.1"
+  VERSION = "0.4.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_auth
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.6
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -196,8 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Login amazon.