adash 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61f2c1aaecd17188279e2bdbdcbc27bd9dbcdca5
-  data.tar.gz: 36f79b3aaee75b3a51fb5040e4209863b9c039e2
+  metadata.gz: 396638a8ef38f6b9167e149fa1fc627fccac9e61
+  data.tar.gz: a643cde5a6649f266ada88ebdc7f4f9530d75569
 SHA512:
-  metadata.gz: '099bfecea21fc84cba496e203c126c8d1873a811ba9f1bd95c4e33ea9f94bd6fdb4294e10911144fbcfc8418bb8717f904da09cd3a812ba15eb7ee9a8c35e628'
-  data.tar.gz: '016778d780cd3f95ede569ede0b0026aa8d19dd6d7eb7e40d4ba3797877f3c72f09419be56f3ed66d47b04ed7caba7afb9d6a2309b7b89cd85d4b0b5dd901ffe'
+  metadata.gz: a4b4451e6cc62c73845cb62d694eb282bdc4f5d16a83e68a89cfa6e6fdffad16e4bc25f1b6aad19d87d7901d162dad57d4421d63f30722bd964e4203c42cc8e0
+  data.tar.gz: 8c54f4d2e1640c0da553f6aa381051a224dc572e25b61da71d42368cf66fdba54e97a1de3075d6dbee5fe04ba777ec0f52b33945e239a41ed6a9981dd00fb099

data/.gitignore

@@ -5,6 +5,5 @@
 /coverage/
 /doc/
 /pkg/
-/spec/reports/
 /tmp/
 *.swp

data/README.md

@@ -20,19 +20,91 @@ Or install it yourself as:
 
 ## Usage
 
+### `adash init`
+
+You can initialize with `adash init` sub-command. It takes `name` and `device_model` what likes `01234567-89ab-cdef-0123-456789abcdef`.
+
+```bash
+$ adash init lozenge 01234567-89ab-cdef-0123-456789abcdef
+[2016-12-23 00:11:44] INFO  WEBrick 1.3.1
+[2016-12-23 00:11:44] INFO  ruby 2.3.3 (2016-11-21) [x86_64-linux]
+[2016-12-23 00:11:44] INFO  WEBrick::HTTPServer#start: pid=11687 port=55582
+...
+```
+
+WEBrick web server runs intenally, and a browser is opened for it.
+You are requested OAuth authorization and DRS initialization.
+
+### `adash list`
+
+The sub-command `adash list` shows initialized devices list.
+
 ```bash
-$ adash init [device_model]
+$ adash list
+---- name: lozenge
+* device_model: 01234567-89ab-cdef-0123-456789abcdef
+  serial: d973f856-a21e-4701-bcfa-8e8eb8913c31_1482343916_3SVTiar3FX0CBnZW
+---- name: jaga
+* device_model: fedcba98-7654-3210-fedc-ba9876543210
+  serial: fbb51681-d087-4495-806e-c1f58ac59d4e_1482419498_afSWz8PqGgyqOqaH
 ```
 
-## Development
+### `adash list-slot`
+
+```bash
+$ adash list-slot lozenge
+---- 0
+* slot_id: 01a23b45-c56d-78e9-01a2-3b45c56d78e9
+  available: true
+---- 1
+* slot_id: 9e87d65c-54b3-2a10-9e87-d65c54b32a10
+  available: true
+```
+
+### `adash replenish`
+
+```bash
+$ adash replenish lozenge
+
+---- number: 0
+* slot_id: 01a23b45-c56d-78e9-01a2-3b45c56d78e9
+  available: true
+
 
-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.
+---- number: 1
+* slot_id: 9e87d65c-54b3-2a10-9e87-d65c54b32a10
+  available: true
 
-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).
+Select slot number>
+```
+
+You should select replenish slot.
+
+```bash
+elect slot number> 1
+Succeeded to order.
+```
+
+If the slot is already ordered, the message below is shown.
+
+```bash
+elect slot number> 1
+The order is in progress.
+```
+
+There are no the selection prompts when the slot is just one.
+
+### `adash deregistrate`
+
+You can delete device from Adash and Amazon.
+
+```bash
+$ adash deregistrate lozenge
+```
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/adash.
+Bug reports and pull requests are welcome on GitHub at https://github.com/aycabta/adash.
 
 
 ## License

data/Rakefile

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

data/adash.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Code Ass"]
   spec.email         = ["aycabta@gmail.com"]
 
-  spec.summary       = %q{Adash}
-  spec.description   = %q{Adash}
+  spec.summary       = %q{Adash is a Dash Replenishment Service CLI client}
+  spec.description   = %Q{Adash is a Dash Replenishment Service CLI client.\nYou will login with OAuth (Login with Amazon) and replenish items.}
   spec.homepage      = "https://github.com/aycabta/adash"
   spec.license       = "MIT"
 
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "amazon-drs"
   spec.add_development_dependency "launchy", "~> 2.5"
 end

data/exe/adash

@@ -9,6 +9,7 @@ require 'optparse'
 require 'readline'
 require 'fileutils'
 require 'yaml'
+require 'amazon-drs'
 
 opt = OptionParser.new
 
@@ -60,12 +61,15 @@ def save_credentials_without_device_model(device_model)
 end
 
 def create_client_from_device(device)
-  Adash::Client.new(device['device_model']) do |c|
+  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'])
@@ -101,7 +105,10 @@ end
 
 def select_slot_prompt(client)
   resp = client.subscription_info
-  slots = resp.json['slotsSubscriptionStatus']
+  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> ')

data/lib/adash/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adash
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Code Ass
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: amazon-drs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-description: Adash
+description: |-
+  Adash is a Dash Replenishment Service CLI client.
+  You will login with OAuth (Login with Amazon) and replenish items.
 email:
 - aycabta@gmail.com
 executables:
@@ -75,7 +77,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -87,7 +88,6 @@ files:
 - data/client
 - exe/adash
 - lib/adash.rb
-- lib/adash/client.rb
 - lib/adash/config.rb
 - lib/adash/version.rb
 - lib/adash/wait_indefinitely.rb
@@ -114,5 +114,5 @@ rubyforge_project:
 rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
-summary: Adash
+summary: Adash is a Dash Replenishment Service CLI client
 test_files: []

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/lib/adash/client.rb

@@ -1,213 +0,0 @@
-require 'net/http'
-require 'uri'
-require 'json'
-require 'yaml'
-require 'time'
-require 'date'
-require 'adash/config'
-
-class Net::HTTPResponse
-    attr_accessor :json
-end
-
-module Adash
-  class Client
-    attr_accessor :device_model, :serial, :authorization_code, :redirect_uri, :access_token, :refresh_token
-    attr_accessor :on_new_token
-    attr_writer :user_agent
-
-    def initialize(device_model)
-      @drs_host = 'dash-replenishment-service-na.amazon.com'
-      @amazon_host = 'api.amazon.com'
-      @device_model = device_model
-      @serial = nil
-      @authorization_code = nil
-      @redirect_uri = nil
-      @access_token = nil
-      @refresh_token = nil
-      @on_new_token = nil
-      yield(self) if block_given?
-    end
-
-    def user_agent
-      @user_agent ||= "AdashRubyGem/#{Adash::VERSION}/#{RUBY_DESCRIPTION}"
-    end
-
-    def deregistrate_device
-      headers = {
-        'x-amzn-accept-type': 'com.amazon.dash.replenishment.DrsDeregisterResult@1.0',
-        'x-amzn-type-version': 'com.amazon.dash.replenishment.DrsDeregisterInput@1.0'
-      }
-      path = "/deviceModels/#{@device_model}/devices/#{@serial}/registration"
-      request_drs(:delete, path, headers: headers)
-    end
-
-    def device_status(most_recently_active_date)
-      headers = {
-        'x-amzn-accept-type': 'com.amazon.dash.replenishment.DrsDeviceStatusResult@1.0',
-        'x-amzn-type-version': 'com.amazon.dash.replenishment.DrsDeviceStatusInput@1.0'
-      }
-      path = '/deviceStatus'
-      request_drs(:post, path, headers: headers, params: { 'mostRecentlyActiveDate' =>  convert_to_iso8601(most_recently_active_date) })
-    end
-
-    def subscription_info
-      headers = {
-        'x-amzn-accept-type': 'com.amazon.dash.replenishment.DrsSubscriptionInfoResult@1.0',
-        'x-amzn-type-version': 'com.amazon.dash.replenishment.DrsSubscriptionInfoInput@1.0'
-      }
-      path = '/subscriptionInfo'
-      request_drs(:get, path, headers: headers)
-    end
-
-    def slot_status(slot_id, expected_replenishment_date, remaining_quantity_in_unit, original_quantity_in_unit, total_quantity_on_hand, last_use_date)
-      headers = {
-        'x-amzn-accept-type': 'com.amazon.dash.replenishment.DrsSlotStatusResult@1.0',
-        'x-amzn-type-version': 'com.amazon.dash.replenishment.DrsSlotStatusInput@1.0'
-      }
-      path = "/slotStatus/#{slot_id}"
-      params = {
-        'expectedReplenishmentDate' => convert_to_iso8601(expected_replenishment_date),
-        'remainingQuantityInUnit' => remaining_quantity_in_unit,
-        'originalQuantityInUnit' => original_quantity_in_unit,
-        'totalQuantityOnHand' => total_quantity_on_hand,
-        'lastUseDate' => convert_to_iso8601(last_use_date)
-      }
-      request_drs(:post, path, headers: headers, params: params)
-    end
-
-    def replenish(slot_id)
-      headers = {
-        'x-amzn-accept-type': 'com.amazon.dash.replenishment.DrsReplenishResult@1.0',
-        'x-amzn-type-version': 'com.amazon.dash.replenishment.DrsReplenishInput@1.0'
-      }
-      path = "/replenish/#{slot_id}"
-      response = request_drs(:post, path, headers: headers)
-      # TODO: imprement response processing
-      # https://developer.amazon.com/public/solutions/devices/dash-replenishment-service/docs/dash-replenish-endpoint
-      # response examples:
-      #   {"message":"Unable to place order - slot : <01234567-89ab-cdef-0123-456789abcdef> is unsubscribed."}
-      #   {"detailCode":"STANDARD_ORDER_PLACED","eventInstanceId":"amzn1.dash.v2.o.xxxxxx......"}
-      #   {"detailCode":"ORDER_INPROGRESS","eventInstanceId":"amzn1.dash.v2.o.xxxxxx......"}
-    end
-
-    def get_token
-      if @access_token
-        @access_token
-      else
-        resp = request_token
-        process_token_response(resp)
-      end
-    end
-
-    private
-
-    def convert_to_iso8601(input)
-      case input
-      when Date, Time
-        input.iso8601
-      when String
-        input
-      else
-        input.to_s
-      end
-    end
-
-    def process_token_response(resp)
-      if resp.json['error']
-        puts resp.json['error']
-        puts resp.json['error_description']
-        nil
-      else
-        @access_token = resp.json['access_token']
-        @refresh_token = resp.json['refresh_token']
-        @on_new_token.call(@access_token, @refresh_token) if @on_new_token
-        @access_token
-      end
-    end
-
-    def request_drs(method, path, headers: {}, params: {})
-      url = "https://#{@drs_host}#{path}"
-      if @authorization_code.nil?
-        raise 'Authorization Code is not set'
-      end
-      if @access_token.nil?
-        token = get_token
-        if token.nil?
-          raise 'Failed to get token'
-        end
-      end
-      resp = request(method, url, headers: headers, params: params)
-      if resp.code == '400' && resp.json['message'] == 'Invalid token' && @refresh_token
-        resp = refresh_access_token
-        process_token_response(resp)
-        request(method, url, headers: headers, params: params)
-      else
-        resp
-      end
-    end
-
-    def refresh_access_token
-      params = {
-        grant_type: 'refresh_token',
-        refresh_token: @refresh_token,
-        client_id: Adash::Config.client_id,
-        client_secret: Adash::Config.client_secret
-      }
-      @access_token = nil
-      request(:post, "https://#{@amazon_host}/auth/o2/token", params: params)
-    end
-
-    def request_token
-      params = {
-        grant_type: 'authorization_code',
-        code: @authorization_code,
-        client_id: Adash::Config.client_id,
-        client_secret: Adash::Config.client_secret,
-        redirect_uri: "http://localhost:#{Adash::Config.redirect_port}/"
-      }
-      request(:post, "https://#{@amazon_host}/auth/o2/token", params: params)
-    end
-
-    def request(method, url, headers: {}, params: {})
-      uri = URI.parse(url)
-      if params.any?{ |key, value| value.is_a?(Enumerable) }
-        converted_params = []
-        params.each do |key, value|
-          if value.is_a?(Enumerable)
-            value.each_index do |i|
-              converted_params << ["#{key}[#{i}]", value[i]]
-            end
-          else
-            converted_params << [key, value]
-          end
-        end
-        params = converted_params
-      end
-      case method
-      when :delete
-        uri.query = URI.encode_www_form(params)
-        request = Net::HTTP::Delete.new(uri)
-      when :get
-        uri.query = URI.encode_www_form(params)
-        request = Net::HTTP::Get.new(uri)
-      when :post
-        request = Net::HTTP::Post.new(uri.path)
-        request.body = URI.encode_www_form(params)
-      end
-      request['Content-Type'] = 'application/x-www-form-urlencoded'
-      request['User-Agent'] = @user_agent
-      headers.each do |key, value|
-        request[key] = value
-      end
-      if not @access_token.nil?
-        request["Authorization"] = "Bearer #{@access_token}"
-      end
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      response = http.request(request)
-      response.json = JSON.parse(response.body)
-      response
-    end
-  end
-end