mind_meld 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c36f7bd086fb8cf7f5a125636870edbca927c7f2
-  data.tar.gz: 63dd877a5c0916987285487006e21aa89d5d1644
+  metadata.gz: abbb5393c6f319e896e4f0b13ae040ed085255ca
+  data.tar.gz: d76a86d3865b2277663c9a6b2a35d01dd6d98cf7
 SHA512:
-  metadata.gz: 293b8adbe092a8000b56134cfd5375a469f2b3e0c5816e8651577a385595eac1fd4c3fbed7a17a15f14b0b3c73aee771890b4669525311326c0ca16d9e4d44ef
-  data.tar.gz: 7ff18a9c7664bf67e515d95b833427d2392fa588ce5a629f888343d076e1fd915f4100f5aab4f69ce0a13c3941d8d803c682a30d66dcfc99db0daeaf16ba2111
+  metadata.gz: c3800bfe361a6520b76d87acb11093afdf18115a92bf86ee3cf42136563a883bdef6cfdda1f4c6af80a430199cfd934c44a07d16a70c6f73e050f70299832a3a
+  data.tar.gz: 5179039aeb0d2ca6e2472e7921bf06adf8fe29399d364a54648b8d5535c814cd5a37d44a02e3a743ddf2d4df595adf1c9e36e3cd883cbf806543384d10d21f3f

data/bin/mind_meld

@@ -36,8 +36,11 @@ class Parser
               device: { id: i }
             )
       end
-      opts.on("-t TYPE") { |t| options.action_type = t }
-      opts.on("-b BODY") { |b| options.body = b }
+      case type
+      when 'action'
+        opts.on("-t TYPE") { |t| options.action_type = t }
+        opts.on("-b BODY") { |b| options.body = b }
+      end
     end
 
     opt_parser.parse(opts)
@@ -73,6 +76,17 @@ when 'action'
   opts = Parser.parse 'action', ARGV
 
   opts[:connection].create_action( opts[:options].to_h )
+
+when 'details'
+  opts = Parser.parse 'device', ARGV
+  dd = opts[:connection].device_details(view: 'simple')
+  puts "Id: #{dd['id']}"
+  puts "Name: #{dd['name']}"
+  puts "Model: #{dd['model_display_name']} (#{dd['model']})"
+  puts "Brand: #{dd['brand_display_name']} (#{dd['brand']})"
+  puts "Type: #{dd['device_type']}"
+  puts "Serial: #{dd['serial']}"
+  puts "Asset Id: #{dd['asset_id']}"
 when nil, /^-+/
   puts "Missing command"
   puts "(and missing help file)"

data/lib/mind_meld/device.rb

@@ -9,7 +9,7 @@ class MindMeld::Device < MindMeld
     @device = options[:device]
     # To trigger registration (is this needed?)
     @device_details = {}.with_indifferent_access
-    device_details
+    device_details(view: 'simple')
   end
 
   def id
@@ -51,12 +51,21 @@ class MindMeld::Device < MindMeld
     response
   end
 
-  def device_details(refresh = false)
+  def device_details(options = {refresh: false})
+    if options.is_a? Hash
+      refresh = options[:refresh] || false
+      view = options[:view] || 'full'
+    else
+      puts "[DEPRECATION WARNING] device_details(true) replaced by device_details(refresh: true) in Mind Meld"
+      refresh = options
+      view = 'full'
+    end
+
     if refresh || ! @device_details.has_key?(:id)
       if @device_details.has_key? :id
-        @device_details = request :get, "devices/#{@device_details[:id]}"
+        @device_details = request :get, "devices/#{@device_details[:id]}", { view: view }
       elsif @device.has_key? :id
-        @device_details = request :get, "devices/#{@device[:id]}"
+        @device_details = request :get, "devices/#{@device[:id]}", { view: view }
       else
         @device_details = register @device
       end

data/lib/mind_meld.rb

@@ -28,12 +28,22 @@ class MindMeld
   def request type, call, params = {}
     if @http
       begin
+        path = "/api/#{call}.json"
+        params_query = params.to_query
+        # Apparently request_get is inconsistent with request_<everything else>
+        # (Great)
+        case type
+        when :get
+          response = @http.request_get("#{path}?#{params_query}")
+        else
+          response = @http.send(
+              "request_#{type}",
+              path,
+              params_query
+            )
+        end
         # Allow for 'array with indifferent access'
-        { reply: JSON.parse(@http.send(
-            "request_#{type}",
-            "/api/#{call}.json",
-            type == :get ? params : params.to_query
-          ).body) }.with_indifferent_access[:reply]
+        { reply: JSON.parse(response.body) }.with_indifferent_access[:reply]
       rescue => e
         { error: e.message }.with_indifferent_access
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mind_meld
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Joe Haig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport