adash 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 349b18112b944763dbcf5ba78c67a39a800a56f1
-  data.tar.gz: d83c1b8f1b127287f96012a98f8c3cc1ef66c2e1
+  metadata.gz: c3bf354baae4874d47f0f6fd795da1a4663ad874
+  data.tar.gz: ce988ab6a88d3fc484d04a117f1ccac76270c22b
 SHA512:
-  metadata.gz: f43f1d1a311a55a1fd8bcdfebf3137b555801e7a5174376db3e40039f4b17ed26855d92cce1e35556f8e36bc8c58a5e841ae502462fae5745b1103151fcf5195
-  data.tar.gz: 67506f20e45900253a26bf85dd1634c158b97cb7fafa1a602c42061071af175e01787fc3133c4fce8615bae7fca4a6fb22a4db8bddf2bffd750ab762035a44e2
+  metadata.gz: 7ce593770dc9943926f45f597296cd1bc4cdbceeaaba6087f48cde0dda6d82eb75dca6f0dcf3f2c893571be64d525ea6b0bc0fbba7573fabf21bc45195289610
+  data.tar.gz: c0b143679b7536438aa40acd827067b7f5a508c25b58e0ccc223780054e116cba9be9b4a50e96a3b18af9becbd86b632537cc0f8c7729651a42e088b1dd9fd61

data/exe/adash

@@ -54,18 +54,31 @@ def run_sub_command(adash, subcmd, argv)
       adash.sub_replenish(name, slot_id)
     end
   else
-    $stderr.puts "no such subcommand: #{k}"
+    $stderr.puts "no such sub-command: #{subcmd}"
     2
   end
 end
 
+def help
+  puts 'adash sub-command'
+  puts 'sub-commands:'
+  puts '  init'
+  puts '  list'
+  puts '  list-slot'
+  puts '  replenish'
+end
+
 opt = OptionParser.new
-opt.on('-h', '--help') { puts 'help' }
+opt.on('-h', '--help') {
+  help
+}
 
-adash = Adash::Access.new
+adash = Adash::Manager.new
 
 argv = opt.order(ARGV)
-unless argv.empty?
+if argv.empty?
+  help
+else
   subcmd = argv.shift
   ret = run_sub_command(adash, subcmd, argv)
   exit ret if ret != 0

data/lib/adash.rb

@@ -6,9 +6,8 @@ require 'fileutils'
 require 'yaml'
 require 'amazon-drs'
 
-# TODO: Use each class for return
 module Adash
-  class Access
+  class Manager
     def initialize
     end
 
@@ -16,12 +15,12 @@ module Adash
       serial = generate_serial(device_model)
       credentials = get_credentials
       authorized_devices = credentials['authorized_devices']
-      hit = authorized_devices.find_index { |d| d['device_model'] == device_model }
+      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 }
+      hit = authorized_devices&.find_index { |d| d['name'] == name }
       if hit
         puts "Adash knows device what is named #{name}."
         return 4
@@ -38,7 +37,11 @@ module Adash
         'redirect_uri' => wi.redirect_uri
       }
       new_device['is_test'] = true if is_test
-      credentials['authorized_devices'] << new_device
+      if credentials['authorized_devices']
+        credentials['authorized_devices'] << new_device
+      else
+        credentials['authorized_devices'] = [new_device]
+      end
       save_credentials(credentials)
       client = create_client_from_device(new_device)
       client.get_token
@@ -77,7 +80,7 @@ module Adash
       client = create_client_from_device(device)
       resp = client.subscription_info
       index = 0
-      resp.json['slotsSubscriptionStatus'].each do |slot_id, available|
+      resp.slots.each do |slot_id, available|
         puts "---- #{index}"
         puts "* slot_id: #{slot_id}"
         puts "  available: #{available}"
@@ -95,10 +98,10 @@ module Adash
       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']}"
+      if resp.instance_of?(AmazonDrs::Replenish)
+        puts "ERROR: #{resp.message}"
       else
-        case resp.json['detailCode']
+        case resp.detail_code
         when 'STANDARD_ORDER_PLACED'
           puts 'Succeeded to order.'
         when 'ORDER_INPROGRESS'
@@ -207,7 +210,7 @@ module Adash
 
     def select_slot_prompt(client)
       resp = client.subscription_info
-      slots = resp.json['slotsSubscriptionStatus'].select{ |k, v| v }
+      slots = resp.slots.select{ |k, v| v }
       if slots.size == 1
         return slots.keys.first
       end

data/lib/adash/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adash
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Code Ass
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-30 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler