adash 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 396638a8ef38f6b9167e149fa1fc627fccac9e61
-  data.tar.gz: a643cde5a6649f266ada88ebdc7f4f9530d75569
+  metadata.gz: 349b18112b944763dbcf5ba78c67a39a800a56f1
+  data.tar.gz: d83c1b8f1b127287f96012a98f8c3cc1ef66c2e1
 SHA512:
-  metadata.gz: a4b4451e6cc62c73845cb62d694eb282bdc4f5d16a83e68a89cfa6e6fdffad16e4bc25f1b6aad19d87d7901d162dad57d4421d63f30722bd964e4203c42cc8e0
-  data.tar.gz: 8c54f4d2e1640c0da553f6aa381051a224dc572e25b61da71d42368cf66fdba54e97a1de3075d6dbee5fe04ba777ec0f52b33945e239a41ed6a9981dd00fb099
+  metadata.gz: f43f1d1a311a55a1fd8bcdfebf3137b555801e7a5174376db3e40039f4b17ed26855d92cce1e35556f8e36bc8c58a5e841ae502462fae5745b1103151fcf5195
+  data.tar.gz: 67506f20e45900253a26bf85dd1634c158b97cb7fafa1a602c42061071af175e01787fc3133c4fce8615bae7fca4a6fb22a4db8bddf2bffd750ab762035a44e2

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'launchy'
+
 # Specify your gem's dependencies in adash.gemspec
 gemspec

data/adash.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "amazon-drs"
-  spec.add_development_dependency "launchy", "~> 2.5"
+  spec.add_dependency "amazon-drs"
+  spec.add_dependency "launchy"
 end

data/exe/adash

@@ -3,130 +3,15 @@
 $: << File.expand_path("../../lib/", __FILE__)
 
 require 'adash'
-require 'adash/config'
-require 'adash/wait_indefinitely'
 require 'optparse'
-require 'readline'
-require 'fileutils'
-require 'yaml'
-require 'amazon-drs'
 
-opt = OptionParser.new
-
-opt.on('-h', '--help') { puts 'help' }
-
-def generate_serial(device_model)
-  orig = [('a'..'z'), ('A'..'Z'), ('0'..'9')].map { |i| i.to_a }.flatten
-  random_suffix = (0...16).map { orig[rand(orig.size)] }.join
-  "#{device_model}_#{Time.now.to_i}_#{random_suffix}"
-end
-
-def get_credentials
-  if File.exist?(Adash::Config.credentials_path)
-    credentials = YAML.load_file(Adash::Config.credentials_path)
-  else
-    { 'authorized_devices' => [] }
-  end
-end
-
-def save_credentials(credentials)
-  open(Adash::Config.credentials_path, 'w') do |f|
-    f.write(credentials.to_yaml)
-  end
-end
-
-def get_device_from_credentials(credentials, device_model)
-  i = credentials['authorized_devices'].find_index { |d| d['device_model'] == device_model }
-  if i
-    credentials['authorized_devices'][i]
-  else
-    nil
-  end
-end
-
-def save_credentials_with_device(credentials, device)
-  i = credentials['authorized_devices'].find_index { |d| d['device_model'] == device['device_model'] }
-  if i
-    credentials['authorized_devices'][i] = device
-  else
-    credentials['authorized_devices'] << device
-  end
-  save_credentials(credentials)
-end
-
-def save_credentials_without_device_model(device_model)
-  credentials = get_credentials
-  credentials['authorized_devices'] = credentials['authorized_devices'].delete_if { |d| d['device_model'] == device_model }
-  save_credentials(credentials)
-end
-
-def create_client_from_device(device)
-  AmazonDrs::Client.new(device['device_model']) do |c|
-    c.authorization_code = device['authorization_code']
-    c.serial = device['serial']
-    c.redirect_uri = device['redirect_uri']
-    c.access_token = device['access_token']
-    c.refresh_token = device['refresh_token']
-    c.client_id = Adash::Config.client_id
-    c.client_secret = Adash::Config.client_secret
-    c.redirect_uri = "http://localhost:#{Adash::Config.redirect_port}/"
-    c.on_new_token = proc { |access_token, refresh_token|
-      credentials = get_credentials
-      updated_device = get_device_from_credentials(credentials, device['device_model'])
-      updated_device['access_token'] = access_token
-      updated_device['refresh_token'] = refresh_token
-      save_credentials_with_device(credentials, updated_device)
-      device['device_model']
-    }
-  end
-end
-
-def get_device_by_name(name)
-  credentials = get_credentials
-  hit = credentials['authorized_devices'].find_index { |d| d['name'] == name }
-  if hit
-    device = credentials['authorized_devices'][hit]
-  else
-    nil
-  end
-end
-
-def show_slots(slots)
-  index = 0
-  slots.each do |slot_id, available|
-    puts
-    puts "---- number: #{index}"
-    puts "* slot_id: #{slot_id}"
-    puts "  available: #{available}"
-    puts
-    index =+ 1
-  end
-end
-
-def select_slot_prompt(client)
-  resp = client.subscription_info
-  slots = resp.json['slotsSubscriptionStatus'].select{ |k, v| v }
-  if slots.size == 1
-    return slots.keys.first
-  end
-  loop do
-    show_slots(slots)
-    slot_num = Readline.readline('Select slot number> ')
-    if (0..(slots.size - 1)).member?(slot_num.to_i)
-      break slots.keys[slot_num.to_i]
-    else
-      puts "ERROR: #{slot_num} is out of Range"
-    end
-  end
-end
-
-argv = opt.order(ARGV)
-unless argv.empty?
-  subcmd = argv.shift
+def run_sub_command(adash, subcmd, argv)
   case subcmd
   when 'init'
     init_opt = OptionParser.new
-    init_opt.on('-h', '--help') { puts 'init help' }
+    init_opt.on('-h', '--help') {
+      puts 'init help'
+    }
     is_test = false
     init_opt.on('-t', '--test') {
       is_test = true
@@ -135,108 +20,53 @@ unless argv.empty?
     argv = init_opt.parse(argv)
     if argv.size < 2
       puts 'Usage: adash init name device_model'
-      exit 2
-    end
-    name = argv.shift
-    device_model = argv.shift
-    serial = generate_serial(device_model)
-    credentials = get_credentials
-    authorized_devices = credentials['authorized_devices']
-    hit = authorized_devices.find_index { |d| d['device_model'] == device_model }
-    if hit
-      puts "Adash knows device what is #{device_model}."
-      exit 3
-    end
-    hit = authorized_devices.find_index { |d| d['name'] == name }
-    if hit
-      puts "Adash knows device what is named #{name}."
-      exit 3
+      1
+    else
+      name = argv.shift
+      device_model = argv.shift
+      adash.sub_init(name, device_model, is_test)
     end
-    wi = Adash::WaitIndefinitely.new(device_model, serial)
-    Signal.trap(:INT){ wi.shutdown }
-    code = wi.get_code
-    FileUtils.mkdir_p(File.expand_path('..', Adash::Config.credentials_path))
-    new_device = {
-      'name' => name,
-      'device_model' => device_model,
-      'serial' => serial,
-      'authorization_code' => code,
-      'redirect_uri' => wi.redirect_uri
-    }
-    new_device['is_test'] = true if is_test
-    credentials['authorized_devices'] << new_device
-    save_credentials(credentials)
-    client = create_client_from_device(new_device)
-    client.get_token
   when 'list'
-    credentials = get_credentials
-    credentials['authorized_devices'].each do |device|
-      puts "---- name: #{device['name']}"
-      puts "* device_model: #{device['device_model']}"
-      puts "  serial: #{device['serial']}"
-      puts '  THIS DEVICE IS TEST PURCHASE MODE' if device['is_test']
-    end
+    adash.sub_list
   when 'deregistrate'
     if argv.size < 1
       puts 'Usage: adash deregistrate name'
-      exit 4
-    end
-    name = argv.shift
-    device = get_device_by_name(name)
-    unless device
-      puts "Device #{name} not found"
-      exit 5
+      1
+    else
+      name = argv.shift
+      adash.sub_deregistrate(name)
     end
-    client = create_client_from_device(device)
-    resp = client.deregistrate_device
-    save_credentials_without_device_model(device['device_model'])
   when 'list-slot'
     if argv.size < 1
       puts 'Usage: adash list-slot name'
-      exit 5
-    end
-    name = argv.shift
-    device = get_device_by_name(name)
-    unless device
-      puts "Device #{name} not found"
-      exit 5
-    end
-    client = create_client_from_device(device)
-    resp = client.subscription_info
-    index = 0
-    resp.json['slotsSubscriptionStatus'].each do |slot_id, available|
-      puts "---- #{index}"
-      puts "* slot_id: #{slot_id}"
-      puts "  available: #{available}"
-      index =+ 1
+      1
+    else
+      name = argv.shift
+      adash.sub_list_slot(name)
     end
   when 'replenish'
     if argv.size < 1
       puts 'Usage: adash replenish name [slot_id]'
-      exit 6
-    end
-    name = argv.shift
-    slot_id = argv.first&.start_with?('-') ? nil : argv.shift
-    device = get_device_by_name(name)
-    unless device
-      puts "Device #{name} not found"
-      exit 5
-    end
-    client = create_client_from_device(device)
-    slot_id = select_slot_prompt(client) unless slot_id
-    resp = client.replenish(slot_id)
-    if resp.json['message']
-      puts "ERROR: #{resp.json['message']}"
+      1
     else
-      case resp.json['detailCode']
-      when 'STANDARD_ORDER_PLACED'
-        puts 'Succeeded to order.'
-      when 'ORDER_INPROGRESS'
-        puts 'The order is in progress.'
-      end
+      name = argv.shift
+      slot_id = argv.first&.start_with?('-') ? nil : argv.shift
+      adash.sub_replenish(name, slot_id)
     end
   else
     $stderr.puts "no such subcommand: #{k}"
-    exit 1
+    2
   end
 end
+
+opt = OptionParser.new
+opt.on('-h', '--help') { puts 'help' }
+
+adash = Adash::Access.new
+
+argv = opt.order(ARGV)
+unless argv.empty?
+  subcmd = argv.shift
+  ret = run_sub_command(adash, subcmd, argv)
+  exit ret if ret != 0
+end

data/lib/adash.rb

@@ -1,5 +1,226 @@
 require 'adash/version'
+require 'adash/config'
+require 'adash/wait_indefinitely'
+require 'readline'
+require 'fileutils'
+require 'yaml'
+require 'amazon-drs'
 
+# TODO: Use each class for return
 module Adash
-  # Your code goes here...
+  class Access
+    def initialize
+    end
+
+    def sub_init(name, device_model, is_test)
+      serial = generate_serial(device_model)
+      credentials = get_credentials
+      authorized_devices = credentials['authorized_devices']
+      hit = authorized_devices.find_index { |d| d['device_model'] == device_model }
+      if hit
+        puts "Adash knows device what is #{device_model}."
+        return 3
+      end
+      hit = authorized_devices.find_index { |d| d['name'] == name }
+      if hit
+        puts "Adash knows device what is named #{name}."
+        return 4
+      end
+      wi = Adash::WaitIndefinitely.new(device_model, serial)
+      Signal.trap(:INT){ wi.shutdown }
+      code = wi.get_code
+      FileUtils.mkdir_p(File.expand_path('..', Adash::Config.credentials_path))
+      new_device = {
+        'name' => name,
+        'device_model' => device_model,
+        'serial' => serial,
+        'authorization_code' => code,
+        'redirect_uri' => wi.redirect_uri
+      }
+      new_device['is_test'] = true if is_test
+      credentials['authorized_devices'] << new_device
+      save_credentials(credentials)
+      client = create_client_from_device(new_device)
+      client.get_token
+      0
+    end
+
+    def sub_list
+      credentials = get_credentials
+      credentials['authorized_devices'].each do |device|
+        puts "---- name: #{device['name']}"
+        puts "* device_model: #{device['device_model']}"
+        puts "  serial: #{device['serial']}"
+        puts '  THIS DEVICE IS TEST PURCHASE MODE' if device['is_test']
+      end
+      0
+    end
+
+    def sub_deregistrate(name)
+      device = get_device_by_name(name)
+      unless device
+        puts "Device #{name} not found"
+        return 5
+      end
+      client = create_client_from_device(device)
+      resp = client.deregistrate_device
+      save_credentials_without_device_model(device['device_model'])
+      0
+    end
+
+    def sub_list_slot(name)
+      device = get_device_by_name(name)
+      unless device
+        puts "Device #{name} not found"
+        return 5
+      end
+      client = create_client_from_device(device)
+      resp = client.subscription_info
+      index = 0
+      resp.json['slotsSubscriptionStatus'].each do |slot_id, available|
+        puts "---- #{index}"
+        puts "* slot_id: #{slot_id}"
+        puts "  available: #{available}"
+        index =+ 1
+      end
+      0
+    end
+
+    def sub_replenish(name, slot_id)
+      device = get_device_by_name(name)
+      unless device
+        puts "Device #{name} not found"
+        return 5
+      end
+      client = create_client_from_device(device)
+      slot_id = select_slot_prompt(client) unless slot_id
+      resp = client.replenish(slot_id)
+      if resp.json['message']
+        puts "ERROR: #{resp.json['message']}"
+      else
+        case resp.json['detailCode']
+        when 'STANDARD_ORDER_PLACED'
+          puts 'Succeeded to order.'
+        when 'ORDER_INPROGRESS'
+          puts 'The order is in progress.'
+        end
+      end
+      0
+    end
+
+    def generate_serial(device_model)
+      orig = [('a'..'z'), ('A'..'Z'), ('0'..'9')].map { |i| i.to_a }.flatten
+      random_suffix = (0...16).map { orig[rand(orig.size)] }.join
+      "#{device_model}_#{Time.now.to_i}_#{random_suffix}"
+    end
+    private :generate_serial
+
+    def get_credentials
+      if File.exist?(Adash::Config.credentials_path)
+        credentials = YAML.load_file(Adash::Config.credentials_path)
+      else
+        { 'authorized_devices' => [] }
+      end
+    end
+    private :get_credentials
+
+    def save_credentials(credentials)
+      open(Adash::Config.credentials_path, 'w') do |f|
+        f.write(credentials.to_yaml)
+      end
+    end
+    private :save_credentials
+
+    def get_device_from_credentials(credentials, device_model)
+      i = credentials['authorized_devices'].find_index { |d| d['device_model'] == device_model }
+      if i
+        credentials['authorized_devices'][i]
+      else
+        nil
+      end
+    end
+    private :get_device_from_credentials
+
+    def save_credentials_with_device(credentials, device)
+      i = credentials['authorized_devices'].find_index { |d| d['device_model'] == device['device_model'] }
+      if i
+        credentials['authorized_devices'][i] = device
+      else
+        credentials['authorized_devices'] << device
+      end
+      save_credentials(credentials)
+    end
+    private :save_credentials_with_device
+
+    def save_credentials_without_device_model(device_model)
+      credentials = get_credentials
+      credentials['authorized_devices'] = credentials['authorized_devices'].delete_if { |d| d['device_model'] == device_model }
+      save_credentials(credentials)
+    end
+    private :save_credentials_without_device_model
+
+    def create_client_from_device(device)
+      AmazonDrs::Client.new(device['device_model']) do |c|
+        c.authorization_code = device['authorization_code']
+        c.serial = device['serial']
+        c.redirect_uri = device['redirect_uri']
+        c.access_token = device['access_token']
+        c.refresh_token = device['refresh_token']
+        c.client_id = Adash::Config.client_id
+        c.client_secret = Adash::Config.client_secret
+        c.redirect_uri = "http://localhost:#{Adash::Config.redirect_port}/"
+        c.on_new_token = proc { |access_token, refresh_token|
+          credentials = get_credentials
+          updated_device = get_device_from_credentials(credentials, device['device_model'])
+          updated_device['access_token'] = access_token
+          updated_device['refresh_token'] = refresh_token
+          save_credentials_with_device(credentials, updated_device)
+          device['device_model']
+        }
+      end
+    end
+    private :create_client_from_device
+
+    def get_device_by_name(name)
+      credentials = get_credentials
+      hit = credentials['authorized_devices'].find_index { |d| d['name'] == name }
+      if hit
+        device = credentials['authorized_devices'][hit]
+      else
+        nil
+      end
+    end
+    private :get_device_by_name
+
+    def show_slots(slots)
+      index = 0
+      slots.each do |slot_id, available|
+        puts
+        puts "---- number: #{index}"
+        puts "* slot_id: #{slot_id}"
+        puts "  available: #{available}"
+        puts
+        index =+ 1
+      end
+    end
+    private :show_slots
+
+    def select_slot_prompt(client)
+      resp = client.subscription_info
+      slots = resp.json['slotsSubscriptionStatus'].select{ |k, v| v }
+      if slots.size == 1
+        return slots.keys.first
+      end
+      loop do
+        show_slots(slots)
+        slot_num = Readline.readline('Select slot number> ')
+        if (0..(slots.size - 1)).member?(slot_num.to_i)
+          break slots.keys[slot_num.to_i]
+        else
+          puts "ERROR: #{slot_num} is out of Range"
+        end
+      end
+    end
+    private :select_slot_prompt
+  end
 end

data/lib/adash/version.rb

@@ -1,3 +1,3 @@
 module Adash
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 end

data/lib/adash/wait_indefinitely.rb

@@ -1,7 +1,6 @@
 require 'uri'
 require 'erb'
 require 'launchy'
-require 'adash/client'
 require 'adash/config'
 
 module Adash
@@ -38,6 +37,26 @@ module Adash
       })
     end
 
+    def get_code
+      t = Thread.new do
+        @code_mutex.synchronize {
+          # TODO: wait for WEBrick launch
+          Launchy.open("http://localhost:#{Adash::Config.redirect_port}/getting_started")
+          while @code_box.size == 0
+            @code_cv.wait(@code_mutex)
+            sleep 1
+            @server.shutdown
+          end
+        }
+      end
+      @server.start
+      @code_box.pop
+    end
+
+    def shutdown
+      @server.shutdown
+    end
+
     def render(content)
       <<~EOH
       <html>
@@ -50,6 +69,7 @@ module Adash
       </html>
       EOH
     end
+    private :render
 
     def amazon_authorization_url(device_model, serial)
       base = 'https://www.amazon.com/ap/oa?'
@@ -63,25 +83,6 @@ module Adash
       }
       "#{base}#{params.map{ |k, v| "#{k}=#{v}" }.join(?&)}"
     end
-
-    def get_code
-      t = Thread.new do
-        @code_mutex.synchronize {
-          # TODO: wait for WEBrick launch
-          Launchy.open("http://localhost:#{Adash::Config.redirect_port}/getting_started")
-          while @code_box.size == 0
-            @code_cv.wait(@code_mutex)
-            sleep 1
-            @server.shutdown
-          end
-        }
-      end
-      @server.start
-      @code_box.pop
-    end
-
-    def shutdown
-      @server.shutdown
-    end
+    private :amazon_authorization_url
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adash
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Code Ass
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-24 00:00:00.000000000 Z
+date: 2016-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,7 +45,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -56,16 +56,16 @@ dependencies:
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '0'
 description: |-
   Adash is a Dash Replenishment Service CLI client.
   You will login with OAuth (Login with Amazon) and replenish items.
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Adash is a Dash Replenishment Service CLI client