ocp 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a352576f4ca8c0a33d39d52c2f2af18a3ab22753
-  data.tar.gz: 2aaa783a048058dddbe7a95e80548652e95b4032
+  metadata.gz: 4e086507bd429a4becbf113a55ef20f09c10dce9
+  data.tar.gz: f98fe258a1dc02d728e7f449668f98d59b6a7938
 SHA512:
-  metadata.gz: 8b8eb5cdbd734b43d5d266adfaf703ade6be48111605bd1213642d3b800b589addc59371ba90380434dd6c805a843f1e5ebc6444b4be4eb25b16ba1c99063ea5
-  data.tar.gz: 2554b6533e8ce076ce666bcf348b48d419dbd210601feb79f1e90429da11cd786e4c3e15fbcc82911512422c9915cfd76c41ed89889d1f6ad548167d293787ba
+  metadata.gz: 0c668293f3506370a3570ace16d148d62b3ecbf9f470c767dacbaefc45db68ac1615cd6583688347d20ac6a50a6d85d6f6eee48b9201c77896f2c76c5d54384d
+  data.tar.gz: 41c608f06dd635c7a9aeedf2c02930ca1ecffc258c9a12a3e638d7b2061841759a9df88ce78e262b93a257ed39ca9ba4bb16b9737a9e0d76259f0542f063b1d5

data/lib/base/Base.rb

@@ -24,12 +24,15 @@ load 'client/OcpClient.rb'
 
 class Base
 
+  attr_reader :response
+
   def initialize(version, api, path, namespace)
     @client = OcpClient.instance
     @api = api
     @version = version
     @path = path
     @namespace = namespace
+    @response = nil
 
     @endpoint = "/"+@api+"/"+@version
 
@@ -46,27 +49,23 @@ class Base
   end
 
   def list
-    data = nil
-    data = @client.get(@endpoint)
-    return data
+    @response = @client.get(@endpoint)
+    return @response
   end
 
   def create(body)
-    data = nil
-    data = @client.post(@endpoint,body)
-    return data
+    @response = @client.post(@endpoint,body)
+    return @response
   end
 
   def update(body)
-    data = nil
-    data = @client.put(@endpoint,body)
-    return data
+    @response = @client.put(@endpoint,body)
+    return @response
   end
 
   def delete(name)
-    data = nil
-    data = @client.delete(@endpoint+"/"+name)
-    return data
+    @response = @client.delete(@endpoint+"/"+name)
+    return @response
   end
 
   private

data/lib/client/OcpClient.rb

@@ -28,6 +28,7 @@ class OcpClient
   include Singleton
 
   attr_reader :url
+  attr_reader :response
 
 	def initialize
 		@method = nil
@@ -40,6 +41,7 @@ class OcpClient
     @clientca = nil
     @clientcafile = nil
     @debug = nil
+    @response = nil
 	end
 
 	def setup(ocpconfig)
@@ -57,18 +59,22 @@ class OcpClient
 
 
   def get(location)
+    @method = :get
 	  return call(location,nil,:get)
   end
 
   def post(location, body)
+    @method = :post
     return call(location,body,:post)
   end
 
   def put(location, body)
+    @method = :put
     return call(location,body,:put)
   end
 
   def delete(location)
+    @method = :delete
     return call(location,nil,:delete)
   end
 
@@ -120,20 +126,21 @@ class OcpClient
         ).execute
       end
     rescue => exception
-      puts "Exception: " << exception.response
+      if @debug and !exception.nil?
+        puts "Exception: " << exception.response.to_s
+      end
+      @response = exception.response
     end
 
-    if @debug and !exception.nil?
-      puts "Response Code: #{exception.response.code}"
-    end
+    @response = response
 
     if !response.nil? and @pretty
       results = JSON.pretty_generate(JSON.parse(response.to_str))
-      return results
-    elsif !response.nil?
-      return response
+      @response = results
     end
 
+    return @response
+
   end
 
   def callbycert(location, body=nil, method)
@@ -173,22 +180,26 @@ class OcpClient
         ).execute
       end
     rescue => exception
+      puts "----- EXCEPTION ----"
       if @debug and !exception.nil?
         puts "Exception: " << exception.response.to_s
       end
-      return exception.response
+      @response = exception.response
     end
 
+
+
+    puts "----- GOT HERE ----"
+
+    @response = response
+
     if !response.nil? and @pretty
       results = JSON.pretty_generate(JSON.parse(response.to_str))
-      puts "Results -- #{results}"
-      return results
-    elsif !response.nil?
-      puts "Response -- #{response}"
-      return response
-    else
-      return "nil response"
+      @response = results
     end
+
+    return @response
+
   end
 
   def query_params

data/lib/commander/OcpCommander.rb

@@ -49,7 +49,9 @@ class OcpCommander
         end
         ocpapi = OcpApi.new
         ocpapi.setup(ocpconfig)
-        puts "#{ocpapi}"
+        puts "---- GOT HERE COMMANDER ----"
+        ocpapi.list
+        puts "#{ocpapi.response}"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocp
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Ken Evensen