adash 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3bf354baae4874d47f0f6fd795da1a4663ad874
-  data.tar.gz: ce988ab6a88d3fc484d04a117f1ccac76270c22b
+  metadata.gz: e77acc65e5e0c50937e10fdd3bb5aacd656b0aeb
+  data.tar.gz: 1f8502ee18f880e50e84e4c6e62369bfdf942fba
 SHA512:
-  metadata.gz: 7ce593770dc9943926f45f597296cd1bc4cdbceeaaba6087f48cde0dda6d82eb75dca6f0dcf3f2c893571be64d525ea6b0bc0fbba7573fabf21bc45195289610
-  data.tar.gz: c0b143679b7536438aa40acd827067b7f5a508c25b58e0ccc223780054e116cba9be9b4a50e96a3b18af9becbd86b632537cc0f8c7729651a42e088b1dd9fd61
+  metadata.gz: d4a2eb2bcf01c249d7975d9f667d8038cc49f958d3b639e2a0ac02e39a1e686e8bb5fa78946c42ba244d218f9902249da99db9008824a695ba61aafb9952446e
+  data.tar.gz: 7a90a65826e0dff7b3916fda0819600696ab097dafc7ccd5382f4bc56bea811dc66b5d4db6766e0f8171b950cad6c647f12322e83ab5d0a7e042f54b65feaa71

data/README.md

@@ -35,6 +35,8 @@ $ adash init lozenge 01234567-89ab-cdef-0123-456789abcdef
 WEBrick web server runs intenally, and a browser is opened for it.
 You are requested OAuth authorization and DRS initialization.
 
+You can use `--test` option for test purchase mode: `adash init lozenge 01234567-89ab-cdef-0123-456789abcdef --test`
+
 ### `adash list`
 
 The sub-command `adash list` shows initialized devices list.
@@ -102,6 +104,12 @@ You can delete device from Adash and Amazon.
 $ adash deregistrate lozenge
 ```
 
+### `--credentials` Option
+
+You can specify credentials file path: `adash -c ~/foo/bar list`
+
+Default credentials file path is `~/.config/adash/credentials`.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/aycabta/adash.
@@ -110,4 +118,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/aycabt
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/Rakefile

@@ -1,3 +1,3 @@
 require "bundler/gem_tasks"
 
-task :default => :spec
+task :default

data/adash.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["aycabta@gmail.com"]
 
   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.description   = %Q{Adash is a Dash Replenishment Service CLI client.\nYou will login with OAuth (Login with Amazon) and replenish items.\n}
   spec.homepage      = "https://github.com/aycabta/adash"
   spec.license       = "MIT"
 
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
   spec.add_dependency "amazon-drs"
   spec.add_dependency "launchy"
 end

data/exe/adash

@@ -4,6 +4,7 @@ $: << File.expand_path("../../lib/", __FILE__)
 
 require 'adash'
 require 'optparse'
+require 'adash/config'
 
 def run_sub_command(adash, subcmd, argv)
   case subcmd
@@ -68,15 +69,20 @@ def help
   puts '  replenish'
 end
 
+help_option = false
 opt = OptionParser.new
 opt.on('-h', '--help') {
-  help
+  help_option = true
+}
+opt.on('-c', '--credentials CREDENTIALS_PATH') { |path|
+  puts "Use credentials file: #{path}"
+  Adash::Config.credentials_path = path
 }
 
 adash = Adash::Manager.new
 
 argv = opt.order(ARGV)
-if argv.empty?
+if help_option || argv.empty?
   help
 else
   subcmd = argv.shift

data/lib/adash.rb

@@ -67,7 +67,11 @@ module Adash
       end
       client = create_client_from_device(device)
       resp = client.deregistrate_device
-      save_credentials_without_device_model(device['device_model'])
+      if resp.instance_of?(AmazonDrs::Error)
+        STDERR.puts resp.inspect
+      else
+        save_credentials_without_device_model(device['device_model'])
+      end
       0
     end
 

data/lib/adash/config.rb

@@ -1,6 +1,5 @@
 module Adash
   class Config
-
     open("#{File.expand_path('../../../data', __FILE__)}/client", 'r') do |f|
       @@client_id = f.readline.chomp
       @@client_secret = f.readline.chomp
@@ -23,5 +22,9 @@ module Adash
     def self.credentials_path
       @@credentials_path
     end
+
+    def self.credentials_path=(new_path)
+      @@credentials_path = new_path
+    end
   end
 end

data/lib/adash/version.rb

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

data/lib/adash/wait_indefinitely.rb

@@ -16,7 +16,19 @@ module Adash
       @code_box = Queue.new
       @code_cv = ConditionVariable.new
       @code_mutex = Mutex.new
-      @server = WEBrick::HTTPServer.new({ :BindAddress => '127.0.0.1', :Port => Adash::Config.redirect_port })
+      @start_box = Queue.new
+      @start_cv = ConditionVariable.new
+      @start_mutex = Mutex.new
+      @server = WEBrick::HTTPServer.new({
+        :BindAddress => '127.0.0.1',
+        :Port => Adash::Config.redirect_port,
+        :StartCallback => proc {
+          @start_mutex.synchronize {
+            @start_box.push(true)
+            @start_cv.signal
+          }
+        }
+      })
       @server.mount_proc('/getting_started', proc { |req, res|
         res.content_type = 'text/html'
         content = %Q`<p>Please go to <a href="#{ERB::Util.html_escape(amazon_authorization_url(@device_model, @serial))}">initial tour</a>.</p>`
@@ -40,8 +52,12 @@ module Adash
     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")
+          @start_mutex.synchronize {
+            while @start_box.size == 0
+              @start_cv.wait(@start_mutex)
+            end
+            Launchy.open("http://localhost:#{Adash::Config.redirect_port}/getting_started")
+          }
           while @code_box.size == 0
             @code_cv.wait(@code_mutex)
             sleep 1

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: adash
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Code Ass
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: amazon-drs
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
+description: |
   Adash is a Dash Replenishment Service CLI client.
   You will login with OAuth (Login with Amazon) and replenish items.
 email: