amazon_auth 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa82a34f07a1ecc5cdb0ee81688539c6c885c61d
-  data.tar.gz: 71b30141dd78e4a77738b0720d8940d0d04eec78
+  metadata.gz: c76ce0ce2b597d51bfeb14b3418ec5cd15841a3b
+  data.tar.gz: 47bb457cff9d84cd0d53f737f93ab70761293b8a
 SHA512:
-  metadata.gz: 7e0d7c578d0fbe19a6da91cc9b71f80faca4f6b4824ed796a9f1b21a1691c1d941856a807ae4a8e26349093af59826ba78da0842ef29a8c0e154dd075635cfff
-  data.tar.gz: 9436ec0df002954d7bb41902111e8648cf5bf17e8d0eb3167ea54d1016bb88d33285629ebb612154cdd535f2ea8e5eb374249cfa8d59c83e88cd55a8b0b9decf
+  metadata.gz: 6655aa1704f5762ade472ee7db50539f1f111222f1a90196c82536bf7dea7d501f64191e292680de1ce9b7165ae97aa115159fca4c2361e0c3f9324ed6c1e892
+  data.tar.gz: 0c20edebafc3574836c8821da69bb46fb088088a6d89fc74e7efea186aa6977f8b833f914fade1708cbada683a3a2972e0a1abb147392269e1c91911c6a6c85c

data/.gitignore

@@ -8,3 +8,5 @@
 /spec/reports/
 /tmp/
 /.env
+/.env.development
+/.byebug_history

data/.travis.yml

@@ -2,4 +2,6 @@ sudo: false
 language: ruby
 rvm:
   - 2.2.4
+  - 2.2.6
+  - 2.3.3
 before_install: gem install bundler -v 1.12.5

data/README.md

@@ -1,5 +1,7 @@
 # AmazonAuth
 
+[![Build Status](https://travis-ci.org/kyamaguchi/amazon_auth.svg?branch=master)](https://travis-ci.org/kyamaguchi/amazon_auth)
+
 Sign In Amazon using Capybara and Selenium
 
 ## Installation
@@ -20,9 +22,17 @@ Or install it yourself as:
 
 ## Requirements
 
+This gem may not work with newer versions of Firefox.
+
 Firefox (<= 47.0.2)
 
-This may not work with newer versions of Firefox.
+[Download Firefox](https://ftp.mozilla.org/pub/firefox/releases/)  
+Don't forget to disable automatic updates of Firefox.  
+
+You may also need geckodriver.  
+This may need to be older depending on the version of selenium-webdriver.  
+e.g. geckodriver v0.14.0 works with selenium-webdriver 3.2  
+[Download geckodriver](https://github.com/mozilla/geckodriver/releases)  
 
 ## Usage
 
@@ -30,8 +40,8 @@ This may not work with newer versions of Firefox.
 
 [Quick] You can set login and password in console.
 
-[Recommended] Or you can convert them to protect them against shoulder surfing.  
-Run `amazon_auth` and paste the output to _env_.  
+[Recommended] Or you can convert them to protect them against shoulder surfing.
+Run `amazon_auth` and paste the output to _.env_.
 (`AMAZON_USERNAME_CODE` , `AMAZON_PASSWORD_CODE` and `AMAZON_CODE_SALT`)
 
 ### Run
@@ -46,26 +56,34 @@ client = AmazonAuth::Client.new(login: 'your_amazon_email', password: 'your_amaz
 client = AmazonAuth::Client.new
 
 # Sign in
-page = client.sign_in
+client.sign_in
 
 # Continue to the page for Kindle
-page.first('a', text: 'コンテンツと端末の管理').click
+client.session.all('a').find{|e| e['href'] =~ %r{/gp/digital/fiona/manage/} }.click
 
 # Close browser
-page.driver.quit
+client.driver.quit
 ```
 
+### Use amamzon site in different domain
+
+Set `AMAZON_DOMAIN` in _.env_.
+
+e.g. `AMAZON_DOMAIN=amazon.co.jp` for Japanese site
+
 ## Development
 
 Some features come from https://github.com/kyamaguchi/kindle
 
+Use _.env.development_ instead of _.env_ in development.
+
 ```
 git clone https://github.com/kyamaguchi/amazon_auth.git
 cd amazon_auth
 bundle
 
 ./exe/amazon_auth
-vi .env
+vi .env.development
 
 rspec
 

data/amazon_auth.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "byebug"
 end

data/bin/console

@@ -2,6 +2,7 @@
 
 require "bundler/setup"
 require "amazon_auth"
+Dotenv.load('.env.development')
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/exe/amazon_auth

@@ -5,8 +5,9 @@ require 'highline/import'
 
 result = []
 
-login = ask("Enter your #{AmazonInfo.domain} username: ") { |q| q.echo = true }
-passwd = ask("Enter your #{AmazonInfo.domain} password: ") { |q| q.echo = "*" }
+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 }
 
 raise "Empty login or password" if login.to_s.size == 0 || passwd.to_s.size == 0
@@ -15,6 +16,7 @@ converter = AmazonAuth::Converter.new(salt)
 
 puts "Put the following lines in .env"
 puts
+puts "AMAZON_DOMAIN=#{domain}"
 puts "AMAZON_USERNAME_CODE=#{converter.encode(login)}"
 puts "AMAZON_PASSWORD_CODE=#{converter.encode(passwd)}"
 puts "AMAZON_CODE_SALT=#{salt}"

data/lib/amazon_auth/amazon_info.rb

@@ -1,5 +1,5 @@
 class AmazonInfo
   def self.domain
-    'amazon.co.jp'
+    ENV['AMAZON_DOMAIN'].presence || 'amazon.com'
   end
 end

data/lib/amazon_auth/client.rb

@@ -1,9 +1,9 @@
 module AmazonAuth
   class Client
-    INITIAL_ENTRY_URL = 'https://www.amazon.co.jp/'
+    attr_accessor :initial_url
 
     def initialize(options = {})
-      @url = options.fetch(:url) { INITIAL_ENTRY_URL }
+      @initial_url = options.fetch(:url) { "https://www.#{AmazonInfo.domain}/" }
       @login = options.fetch(:login) do
         if (amazon_username_code = ENV['AMAZON_USERNAME_CODE']).present?
           Converter.decode(amazon_username_code)
@@ -21,46 +21,53 @@ module AmazonAuth
     end
 
     def sign_in
-      @session = Capybara::Session.new(:selenium)
-      @session.visit @url
-      @session.within('#nav-tools') do
-        @session.click_on 'サインイン'
-      end
+      session.visit initial_url
+      session.first('#a-autoid-0-announce').click
 
       fill_in_with_stroke('ap_email', @login)
       fill_in_with_stroke('ap_password', @password)
-      @session.click_on('signInSubmit')
+      session.click_on('signInSubmit')
 
-      while image_recognition_displayed? do
+      while alert_displayed? do
         retry_sign_in
       end
 
-      @session.first('.nav-line-2').click
-      @session
+      session.first('.nav-line-2').click
+      session
     end
 
     def retry_sign_in
       fill_in_with_stroke('ap_password', @password)
-      input = ask "Got the prompt. Read characters from the image: "
-      fill_in_with_stroke('auth-captcha-guess', input)
-      @session.click_on('signInSubmit')
+      if image_recognition_displayed?
+        input = ask "Got the prompt. Read characters from the image: "
+        fill_in_with_stroke('auth-captcha-guess', input)
+      end
+      session.click_on('signInSubmit')
     end
 
     def fill_in_with_stroke(dom_id, value)
       sleep_s
-      element = @session.first("##{dom_id}")
+      element = session.first("##{dom_id}")
       value.split(//u).each do |char|
         element.send_keys(char)
         sleep rand
       end
     end
 
+    def alert_displayed?
+      session.has_selector?('.a-alert-container')
+    end
+
     def image_recognition_displayed?
-      @session.has_content?('お客様のアカウントを強力に保護するため') || @session.has_content?('問題が発生しました')
+      session.has_selector?('#auth-captcha-image-container')
+    end
+
+    def session
+      @session ||= Capybara::Session.new(:selenium)
     end
 
     def driver
-      @session.driver
+      session.driver
     end
 
     def sleep_s(sec = 2)

data/lib/amazon_auth/version.rb

@@ -1,3 +1,3 @@
 module AmazonAuth
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/amazon_auth.rb

@@ -3,6 +3,10 @@ Dotenv.load
 require "active_support/all"
 require "capybara"
 require "highline/import"
+begin
+  require 'byebug'
+rescue LoadError
+end
 require_relative "amazon_auth/version"
 require_relative "amazon_auth/amazon_info"
 require_relative "amazon_auth/converter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kazuho Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Login amazon.
 email:
 - kzh.yap@gmail.com
@@ -166,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Login amazon.