amazon_auth 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f93a64aa935ee1f9aad2016faa128b74a26c72d
-  data.tar.gz: 34a515fb0d726f3a00b07d5011bcb2d07d67c735
+  metadata.gz: 0422990dab48ee78bad2f81fc141227209f9e77c
+  data.tar.gz: eef8ccc48f157f0e069b2634e05ce181b29ac4cd
 SHA512:
-  metadata.gz: a77af4c224e57ba5c67fc9436ad715799ff2636d78c81872aa61d07d351a569120c293e524cd81c3e5ec8302a5a9e1b24d28efe7f1e58cd56c931afb8d7dcf19
-  data.tar.gz: 2e938e369b4a9c81d8d23398dfdba713d16cbecb8b9c65d3e494d95d7158ba03751ef5b6a0d770d7475e7bda8bc9b52a08846ed27522e14500b3d74ee6b12e32
+  metadata.gz: d8bc1f3eb5a564a99b20559461b0960795364b8295b0df22d9fde0bdb2bb547a69c345f6102347fe97bdf253971bc1c4d14a9143c1ea01475af894c098b86ada
+  data.tar.gz: eb081e28d47bb7f51ecfd0301f9ddcc2ea3e7fd5b42952397eb185e9e24f944991e961ecb1cc66f5705a8c7e2236e376bbde2756a1fb330ec2cb31b9081c808a

data/README.md

@@ -26,31 +26,26 @@ This may not work with newer versions of Firefox.
 
 ## Usage
 
-```
-cp .env.sample .env
-vi .env
-```
-
 ### Set Amazon credentials on your local machine
 
-[Quick] You can set `AMAZON_USERNAME` and `AMAZON_PASSWORD` in _.env_.
+[Quick] You can set login and password in console.
 
 [Recommended] Or you can convert them to protect them against shoulder surfing.
-Run `./bin/convert_login` and paste the output to _env_.
-(`AMAZON_USERNAME_CODE` and `AMAZON_PASSWORD_CODE`)
-
-You can change the salt with `AMAZON_CODE_SALT` if you like.
+Run `convert_amazon_credentials` and paste the output to _env_.
+(`AMAZON_USERNAME_CODE` , `AMAZON_PASSWORD_CODE` and `AMAZON_CODE_SALT`)
 
 ### Run
 
-```
-bin/console
-```
-
-You can move around pages using Capybara DSL
+In console, you can move around pages using Capybara DSL
 
 ```ruby
+# Without credentials in .env
+client = AmazonAuth::Client.new(login: 'your_amazon_email', password: 'your_amazon_password')
+
+# With credentials in .env
 client = AmazonAuth::Client.new
+
+# Sign in
 page = client.sign_in
 
 # Continue to the page for Kindle
@@ -64,9 +59,18 @@ page.driver.quit
 
 Some features come from https://github.com/kyamaguchi/kindle
 
-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.
+```
+git clone https://github.com/kyamaguchi/amazon_auth.git
+cd amazon_auth
+bundle
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+./exe/convert_amazon_credentials
+vi .env
+
+rspec
+
+./bin/console
+```
 
 ## Contributing
 

data/amazon_auth.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'capybara'
-  spec.add_runtime_dependency 'selenium-webdriver'
+  spec.add_runtime_dependency 'selenium-webdriver', '~> 3.2.0'
   spec.add_runtime_dependency 'highline'
   spec.add_runtime_dependency 'dotenv'
   spec.add_runtime_dependency 'activesupport'

data/exe/convert_amazon_credentials

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require_relative "../lib/amazon_auth"
+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 = "*" }
+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
+
+converter = AmazonAuth::Converter.new(salt)
+
+puts "Put the following lines in .env"
+puts
+puts "AMAZON_USERNAME_CODE=#{converter.encode(login)}"
+puts "AMAZON_PASSWORD_CODE=#{converter.encode(passwd)}"
+puts "AMAZON_CODE_SALT=#{salt}"

data/lib/amazon_auth/client.rb

@@ -8,14 +8,14 @@ module AmazonAuth
         if (amazon_username_code = ENV['AMAZON_USERNAME_CODE']).present?
           Converter.decode(amazon_username_code)
         else
-          ENV['AMAZON_USERNAME'].presence || raise('AMAZON_USERNAME is required.')
+          raise('AMAZON_USERNAME_CODE is required.')
         end
       end
       @password = options.fetch(:password) do
         if (amazon_password_code = ENV['AMAZON_PASSWORD_CODE']).present?
           Converter.decode(amazon_password_code)
         else
-          ENV['AMAZON_PASSWORD'].presence || raise('AMAZON_PASSWORD is required.')
+          raise('AMAZON_PASSWORD_CODE is required.')
         end
       end
     end

data/lib/amazon_auth/converter.rb

@@ -1,18 +1,30 @@
 module AmazonAuth
   class Converter
 
-    def self.encode(str)
+    def initialize(salt)
+      @salt = salt
+    end
+
+    def encode(str)
       raise "Empty string" if str.to_s.size == 0
       Base64.strict_encode64("#{salt}#{str}")
     end
 
+    def salt
+      @salt || self.class.salt
+    end
+
     def self.decode(code)
       raise "Empty string" if code.to_s.size == 0
       Base64.strict_decode64(code).gsub(/\A#{salt}/, '')
     end
 
     def self.salt
-      ENV['AMAZON_CODE_SALT'] || "iloveamazon"
+      ENV['AMAZON_CODE_SALT'].presence || raise('salt is missing')
+    end
+
+    def self.default_salt
+      "iloveamazon"
     end
   end
 end

data/lib/amazon_auth/version.rb

@@ -1,3 +1,3 @@
 module AmazonAuth
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kazuho Yamaguchi
@@ -28,16 +28,16 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -125,11 +125,11 @@ dependencies:
 description: Login amazon.
 email:
 - kzh.yap@gmail.com
-executables: []
+executables:
+- convert_amazon_credentials
 extensions: []
 extra_rdoc_files: []
 files:
-- ".env.sample"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -139,8 +139,8 @@ files:
 - Rakefile
 - amazon_auth.gemspec
 - bin/console
-- bin/convert_login
 - bin/setup
+- exe/convert_amazon_credentials
 - lib/amazon_auth.rb
 - lib/amazon_auth/amazon_info.rb
 - lib/amazon_auth/client.rb

data/.env.sample

@@ -1,3 +0,0 @@
-AMAZON_CODE_SALT=iloveamazon
-AMAZON_USERNAME_CODE="Run bin/convert_login"
-AMAZON_PASSWORD_CODE="Run bin/convert_login"

data/bin/convert_login

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative "../lib/amazon_auth"
-require 'highline/import'
-
-result = []
-
-login = if amazon_username = ENV['AMAZON_USERNAME']
-  amazon_username
-else
-  ask("Enter your #{AmazonInfo.domain} username: ") { |q| q.echo = true } unless login = ARGV[0]
-end
-passwd = ENV['AMAZON_PASSWORD'] || ask("Enter your #{AmazonInfo.domain} password: ") { |q| q.echo = "*" }
-
-raise "Empty login or password" if login.to_s.size == 0 || passwd.to_s.size == 0
-
-puts "Put the following lines in .env (Remove AMAZON_USERNAME and AMAZON_PASSWORD if you have)"
-puts
-puts "AMAZON_USERNAME_CODE=#{AmazonAuth::Converter.encode(login)}"
-puts "AMAZON_PASSWORD_CODE=#{AmazonAuth::Converter.encode(passwd)}"