sonycam 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90fb4f5958e878b3db469b9ec92124fdba0e0915
-  data.tar.gz: c39f85d71dddace37cb2c91666523a356920bf1d
+  metadata.gz: 28c852472ba2fb6ca1b5e9cab86e394c895a98b6
+  data.tar.gz: 590c2ce724bed81d0dd9b6960e7a0992ef54be0b
 SHA512:
-  metadata.gz: b4324b2c364f8d4887878e5d6674501cc6f41a7e148aa2db29a775cd13280537c34ff303265c2b3493abb1e0b14620bb1c62202543e295708f7e332296173640
-  data.tar.gz: 6fc12dcd8b5618e348a261983e202a8677ac33d7f7e91dbe5df6950d3f63535d65a89a22fc14465a88e9663dcb6d7b9a6f0042e02aa7f977bb7ba7ceeaa650a4
+  metadata.gz: 80f41b1c7cfa0f57745f0f4230cc640ace9893e406645303db70d1839ac4f48b3ec2f45deb4db45658c25fc06ab946257bf042a35873edc4985429cf67c87552
+  data.tar.gz: 5a4dcf499a2a94904f5c8976db8b071e19fd73c35ae869b9533869bbb99544d158a846537ef1f452281e163f34c63abb362cd628685262bbaad6580e955335d7

data/lib/sonycam/api.rb

@@ -16,7 +16,7 @@ module Sonycam
         error_code, error_message = ret['error']
         raise Sonycam::Error.new_from_code(error_code), error_message
       else
-        ret
+        ret['result']
       end
     end
   end

data/lib/sonycam/cli.rb

@@ -7,6 +7,15 @@ module Sonycam
     DD_PATH = File.join(ENV['HOME'], '.sonycam')
 
     desc 'scan [IP]', 'Discover devices'
+    long_desc <<-LONGDESC
+    Send discovery requests (SSDP M-SEARCH), fetching UPnP device description into `$HOME/.sonycam`.
+
+    A specific IP can be set to bind, for example:
+
+    $ sonycam scan 10.0.0.1
+
+    By default, it binds each local IP address, and uses the first one found.
+    LONGDESC
     def scan ip = nil
       location = Scanner.scan(ip).first
       puts "Found location: #{location}"
@@ -14,7 +23,12 @@ module Sonycam
       puts "Device description file saved to #{DD_PATH}"
     end
 
-    desc 'list [QUERY]', 'List all API or search'
+    desc 'list [QUERY]', 'List API methods'
+    long_desc <<-LONGDESC
+    List or search available API methods, for example, to search API where name contains "act"
+
+    $ sonycam list act
+    LONGDESC
     def list query = nil
       apis = api_client.request(:getAvailableApiList)['result'].first
       apis.select!{|method| method =~ /#{query}/i } if query
@@ -22,8 +36,17 @@ module Sonycam
     end
 
     desc 'api method [PARAMETER ...]', 'Send API request'
+    long_desc <<-LONGDESC
+    Send a camera API request. Use `sonycam list` to see all available methods.
+
+     Take a picture:
+     \x5$ sonycam api actTakePicture
+
+     Zoom in:
+     \x5$ sonycam api actZoom in start
+    LONGDESC
     def api method, *params
-      jj api_client.request(method, *params)
+      puts api_client.request(method, *params).to_json
     end
 
     desc 'liveview', 'Start liveview and output to STDOUT, it should be used with pipe'

data/lib/sonycam/version.rb

@@ -1,3 +1,3 @@
 module Sonycam
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonycam
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Tony Jian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-02 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor