gaptool-api 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fb544d15271dc0f8e58011527d834fa9be5ef76
-  data.tar.gz: 5e17f75f5238fce3a78de2f6041457a032fc2d0b
+  metadata.gz: 622a85457a9746a3ab0e32f0e69510d1607e9f2e
+  data.tar.gz: ffecfba6406a5d46da77cf9109fa7a684ccd5414
 SHA512:
-  metadata.gz: 38a4d0dd8886b1058b85d845ac61665cd73ae54434fab4b5e636d91630054103061bfb1d58c239e975b2722713c4df58db00cd5c889bedaea87f04f1ae3aedb3
-  data.tar.gz: 6f06f42a2e1f36ff28814777b927ca471fd41348d716b5f0b831af631110ef66c6e8815bd2f45b15bbc5b603799e8a96dc6206ac81dee10b77e5f935a8e7ad77
+  metadata.gz: a4427618b2bf0c74166a3e814ee61df962d05053d9fc4f195ab0f835336db7c0687f73f4751a418c79d77468d3f71404aa3c553ce60f29483b5675235b6a4d4c
+  data.tar.gz: 6bb664360df70e2ec44b3ee6a0de1ceae731d3cb161f08b32fad74f6bca2ff7286c2233a01e2e7afa5ee518d1653651f334ea2f1df089130b619b4afb5b5b8dc

data/VERSION

@@ -1 +1 @@
-0.6.5
+0.6.6

data/lib/gaptool-api.rb

@@ -17,25 +17,47 @@ module GTAPI
       GaptoolServer.base_uri uri
     end
 
+    def call(verb, url, opts={})
+      options = opts || {}
+      options[:headers] ||= {}
+      options[:headers].merge!(@auth)
+      options[:headers]['Accept'] = 'application/json'
+      options[:headers]['Content-Type'] = 'application/json'
+      case verb
+      when :post
+        options[:body] ||= ''
+      end
+      JSON.parse(self.class.send(verb, url, options).body)
+    end
+
+    def get(url, opts={})
+      call(:get, url, opts)
+    end
+
+    def post(url, opts={})
+      call(:post, url, opts)
+    end
+
+    def patch(url, opts={})
+      call(:patch, url, opts)
+    end
+
     def rehash()
-      options = {:body => '', :headers => @auth}
-      JSON::parse self.class.post("/rehash", options)
+      post("/rehash")
     end
 
     def getonenode(id)
-      options = {:headers => @auth}
-      JSON::parse self.class.get("/instance/#{id}", options)
+      get("/instance/#{id}")
     end
 
     def getenvroles(role, environment, params={})
-      options = {:headers => @auth, :query => params}
-      JSON::parse self.class.get("/hosts/#{role}/#{environment}", options)
+      get("/hosts/#{role}/#{environment}", {query: params})
     end
 
     def addnode(zone, itype, role, environment, mirror=nil, security_group=nil,
                 ami=nil, chef_repo=nil, chef_branch=nil, chef_runlist=nil,
                 no_terminate=nil)
-      @body = {
+      body = {
         'zone' => zone || @default_aws_az,
         'itype' => itype,
         'role' => role,
@@ -45,60 +67,48 @@ module GTAPI
         'chef_branch' => chef_branch
       }
       unless security_group.nil?
-        @body['security_group'] = security_group
+        body['security_group'] = security_group
       end
       unless chef_runlist.nil? || chef_runlist.empty?
-        @body['chef_runlist'] = [*chef_runlist]
+        body['chef_runlist'] = [*chef_runlist]
       end
       if no_terminate
-        @body['terminate'] = false
+        body['terminate'] = false
       end
-      @body = @body.to_json
-      options = { :body => @body, :headers => @auth}
-      JSON::parse self.class.post("/init", options)
+      post('/init', {body: body.to_json})
     end
 
     def terminatenode(id, zone)
-      @body = {'id' => id, 'zone' => zone || @default_aws_region}.to_json
-      options = {:body => @body, :headers => @auth}
-      JSON::parse self.class.post("/terminate", options)
+      post('/terminate', {body: {'id' => id, 'zone' => zone || @default_aws_region}.to_json})
     end
 
-    def setparameters(instance, params)
-      @body = params.to_json
-      options = {:body => @body, :headers => @auth}
-      JSON::parse self.class.patch("/instance/#{instance}", options)
+    def setparameters(instance, params={})
+      patch("/instance/#{instance}", {body: params.to_json})
     end
 
     def getappnodes(app, environment, params={})
-      options = {:headers => @auth, :query => params}
-      role = JSON::parse(self.class.get("/apps", options))["app:#{app}"]['role']
-      JSON::parse self.class.get("/hosts/#{role}/#{environment}", options)
+      role = get("/apps", {query: params})["app:#{app}"]['role']
+      get("/hosts/#{role}/#{environment}", {query: params})
     end
 
     def ssh(role, environment, id)
-      options = { :headers => @auth}
-      JSON::parse self.class.get("/ssh/#{role}/#{environment}/#{id}", options)
+      get("/ssh/#{role}/#{environment}/#{id}")
     end
 
     def getrolenodes(role, params={})
-      options = {:headers => @auth, :query => params}
-      JSON::parse self.class.get("/hosts/#{role}", options)
+      get("/hosts/#{role}", {query: params})
     end
 
     def getenvnodes(environment, params={})
-      options = {:headers => @auth, :query => params}
-      JSON::parse self.class.get("/hosts/ALL/#{environment}", options)
+      get("/hosts/ALL/#{environment}", {query: params})
     end
 
     def getallnodes(params)
-      options = {:headers => @auth, :query => params}
-      JSON::parse self.class.get("/hosts", options)
+      get("/hosts", {query: params})
     end
 
     def api_version()
-      options = { :headers => @auth }
-      JSON::parse self.class.get("/version", options)
+      get("/version")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gaptool-api
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Matt Bailey
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: gaptool-server ruby API