maas-client 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 471f5ee6442b4722061249e081b46b9ac8e1536ffaa8211d5288b8f924b3b52f
-  data.tar.gz: 9d8e5af1e3d0150acc0002ee5701f15ab2a49252a3cd27f93ba50e49bb3ab722
+  metadata.gz: 0e0af0884af520930a87251571b10143d7a7cfcccda21ef13427027bab7a3cb3
+  data.tar.gz: c1eca77a6dc752adbe75474cf70647140b0562f5471ca01067295f6dc44d43ae
 SHA512:
-  metadata.gz: 77db95ae809a57ecb501b7e3b6283840c16d3a5ac2cb3e86c95b4d2bb51c9a84497937a45ba7a7405a78726bc01d3450a90bbe638ce600a62327622beeec49f3
-  data.tar.gz: 007f067feddda6a797bf0475509ce7a01fafd0d03a8244afea9058e19c03fc3d5e6b091a17799be9f8512b8cebab363a2a65e1a23791e83c3f5aa3c5522ed870
+  metadata.gz: 98d56e06f44c57e59e40b20c63b559911be99e881af6d23eee500bed37bc0b7aaca32ac26defe6e3f6048fb78104dab96b689bf2a9fe4c8f7f6f93d58ec4e1d0
+  data.tar.gz: 98848a20e98a5934473e8a46003a8f55686cf2e39d9ba76b05bba56f669d0bb8dc603f82fe819e2c9b1336c921bf453906fb474bdcfe36925847317faa20febf

data/README.md

@@ -6,6 +6,10 @@ This is a simple client library for MAAS, Metal as a Service, written in Ruby.
 
 ```ruby
 
+# https://github.com/typhoeus/typhoeus/issues/390
+# since 0.3.0
+$ sudo apt install libcurl4-openssl-dev
+
 $ bundle
 
 # Or install it yourself as:
@@ -27,6 +31,8 @@ con = Maas::Client::MaasClient.new()
 con = Maas::Client::MaasClient.new("#{CONSUMER_KEY}:#{KEY}:#{SECRET}",
 "http://#{IP_OR_DOMAIN_NAME}/MAAS/api/2.0")
 
+# use cases
+con.request(:get, ['maas'], {'op' => 'get_config', 'name' => 'main_archive'})
 
 con.request(:get, ['users'])
 
@@ -50,7 +56,7 @@ con.request(:get, ['ipaddresses'])
 myarr = []
 dns_records = con.request(:get, ['dnsresources'])
 dns_records.each_with_index { |item, index| myarr << item['fqdn'] }
-myarr
+pp myarr
 
 ```
 ```bash
@@ -180,12 +186,16 @@ Pushed maas-client x.x.xx to rubygems.org.
 ** Execute release
 
 ```
+
 ## Reference
 https://docs.maas.io/2.4/en/api-authentication
 https://github.com/oauth-xx/oauth-ruby
 https://github.com/typhoeus/typhoeus
 https://docs.maas.io/2.4/en/api
 
+## rubygems
+https://rubygems.org/gems/maas-client
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/maas/client.rb

@@ -100,15 +100,26 @@ module Maas
         hydra.queue(req); hydra.run
         response = req.response
 
-        return JSON.parse(response.body) if response.code == 200
-
-        if response.code == 204
+        if response.code == 200
+          if valid_json?(response.body)
+            return JSON.parse(response.body)
+          else
+            return response.body
+          end
+        elsif response.code == 204
           puts 'No Content'
         else
           raise "#{response.class} #{response.code} \
             #{response.status_message} #{response.body}"
         end
       end
+
+      def valid_json?(json)
+        JSON.parse(json)
+        return true
+      rescue JSON::ParserError => e
+        return false
+      end
     end
   end
 end

data/lib/maas/client/version.rb

@@ -2,6 +2,6 @@
 
 module Maas
   module Client
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maas-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Don Draper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake