mind_meld 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9d0ba40a18f35d0c355af76acaca4d9ae4bfad4
-  data.tar.gz: 1ae4db663fe0273179b6654865edb6f324779f68
+  metadata.gz: a5e9cb6b0333f7744eae18b357aedc5a7f210639
+  data.tar.gz: 5a92afa0428c48cdc212600653e8d513bcc7368f
 SHA512:
-  metadata.gz: 76c96230d574d71f238499d4d653bc0e1e2619d9c2ab52bafe48e0102583ebee039b8519f90f4c39765f5a09b5b28191b993601f50d2819651c0069521e27b1f
-  data.tar.gz: 52063c167072582502f024eaa913913c51a23fce1117f8064527e326f41e3aeb9ba4e0448890b435eae440c79c4ad111b74bdc0befa0c5a5d5bbeaffac8f6ecb
+  metadata.gz: f31caa2e9f52f55235867b1202d14be9c3cba76ff11f8637f985cc4930281e0885bcbc8a9f572b02c111544aba8228830aacad6f543d55ece8faf3f1942c2f01
+  data.tar.gz: 7f20393534f3521c56c08212844ca7e758b4aae522960eb7a49bdb1a4d4b23c159e6cfc5df9765b6e42fda87bf1b112dcb0fa99e3be1164c25c82afeb572c484

data/bin/mind_meld

@@ -55,9 +55,19 @@ when 'list'
       )
 
   devs = mm.devices
-
-  devs.each do |dev|
-    puts "#{dev['id']}) #{dev['name']}"
+  if devs.is_a? Hash
+    if devs['status'] == '500'
+      puts "Error: #{devs['error']}"
+    else
+      puts "Error: Cannot understand response"
+      puts devs
+    end
+  else
+    devs.each do |dev|
+      dev['plugin_type'] =~ /HiveMind(.*)::/
+      type = $1
+      puts "%10s : %4d : %s" % [ type, dev['id'], dev['name'] ]
+    end
   end
 when 'action'
   opts = Parser.parse 'action', ARGV

data/lib/mind_meld/device.rb

@@ -1,6 +1,5 @@
 require 'json'
 require 'net/http'
-require 'active_support/core_ext/object/to_query'
 require 'mind_meld'
 
 class MindMeld::Device < MindMeld
@@ -9,7 +8,7 @@ class MindMeld::Device < MindMeld
 
     @device = options[:device]
     # To trigger registration (is this needed?)
-    @device_details = {}
+    @device_details = {}.with_indifferent_access
     device_details
   end
 

data/lib/mind_meld.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'net/http'
 require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/hash/indifferent_access'
 require 'openssl'
 
 class MindMeld
@@ -27,16 +28,17 @@ class MindMeld
   def request type, call, params = {}
     if @http
       begin
-        JSON.parse(@http.send(
+        # Allow for 'array with indifferent access'
+        { reply: JSON.parse(@http.send(
             "request_#{type}",
             "/api/#{call}.json",
             type == :get ? params : params.to_query
-          ).body)
+          ).body) }.with_indifferent_access[:reply]
       rescue => e
-        { error: e.message }
+        { error: e.message }.with_indifferent_access
       end
     else
-      { error: 'Mind Meld not configured' }
+      { error: 'Mind Meld not configured' }.with_indifferent_access
     end
   end
 end

metadata

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