oceanarium 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4b32f0940005c2be645d5a3d1c484bb4ccf5d1b
-  data.tar.gz: b0ccc326251d4aaf6745c7908e6fdd16e38ec2e7
+  metadata.gz: d24e5ef02095427cad50b2459ece46c38e0af9b4
+  data.tar.gz: 1e7b9003d684efacc1905937d5aeed40de3359d4
 SHA512:
-  metadata.gz: 80ddc350fb123972558594b31dc1753c6c22e47854549f9b59df2f401a9d33dae5b5e5552b2c22b36222fad7527c8c4431eb80b6514065d9bd1935071a63ee4c
-  data.tar.gz: 488d9ebda15d936246d26378297af84842f264dbc0f6bc52e0889728821b6086465a28a569c958397370036ef2fbfcc097a0af50bf396ba96671fe7a12a2f923
+  metadata.gz: e3ff20e8057cdc8aa549c772cb858f37d9779cb3feddd4c56e3265e3ccc2a0f14481c35edf6e516c3c0f1a9a96e23df739f5296d5f99c0bd1f6d60d3f3df7d12
+  data.tar.gz: bfbe77e8322113347a7e47ef8c6f700a8aafca53a5db483ed90d183c95268d482f276bfb0e0fac72f34a72159db9a70646eb009d9aec4476f698c5e4b81b4238

data/lib/oceanarium/resources/droplet.rb

@@ -2,7 +2,7 @@ require 'open-uri'
 
 module Oceanarium
   class Droplet
-    attr_accessor :id, :name, :image_id, :size_id, :region_id, :backups_active, :ip_address, :status, :created_at
+    attr_accessor :id, :name, :image_id, :size_id, :region_id, :backups_active, :ip_address, :locked, :status, :created_at
 
     def initialize(option, api_key, config_id)
       if api_key.nil? || config_id.nil?
@@ -23,6 +23,7 @@ module Oceanarium
           self.region_id = @object['region_id']
           self.backups_active = @object['backups_active']
           self.ip_address = @object['ip_address']
+          self.locked = @object['locked']
           self.status = @object['status']
           self.created_at = @object['created_at']
         end
@@ -33,8 +34,8 @@ module Oceanarium
 
     def new(name, size_id, image_id, region_id, ssh_key_ids=nil)
       @new_id = Oceanarium::Droplet.create(name, size_id, image_id, region_id, ssh_key_ids=nil)
-      unless @new_id == 'ERROR'
-        Oceanarium::droplet(@new_id)
+      unless @new_id['status'] == 'ERROR'
+        [Oceanarium::droplet(@new_id['droplet']['id']), @new_id['droplet']['event_id']]
       end
     end
 
@@ -122,9 +123,9 @@ module Oceanarium
         @get = @request.get(URI::encode("/droplets/new?name=#{name}&size_id=#{size_id}&image_id=#{image_id}&region_id=#{region_id}&ssh_key_ids=#{ssh_key_ids}"))
       end
       if @get.parsed_response['status'] == 'OK'
-        @get.parsed_response['droplet']['id']
+        @get.parsed_response
       else
-        @get.parsed_response['status']
+        @get.parsed_response
       end
     end
 
@@ -134,7 +135,7 @@ module Oceanarium
       if @approved_actions.include? action
         @request = Oceanarium::Request.new
         @get = @request.get("/droplets/#{id}/#{action}")
-        @get.parsed_response['status']
+        return [@get.parsed_response['status'], @get.parsed_response['event_id']]
       else
         'ERROR'
       end
@@ -149,7 +150,7 @@ module Oceanarium
         'Error'
       else
         @get = @request.get("/droplets/#{id}/resize?size_id=#{size_id}")
-        @get.parsed_response['status']
+        [@get.parsed_response['status'], @get.parsed_response['event_id']]
       end
     end
 
@@ -157,35 +158,35 @@ module Oceanarium
       # Renames Droplet. Name must be FQDN. Returns OK or Error
       @request = Oceanarium::Request.new
       @get = @request.get("/droplets/#{id}/rename/?name=#{name}")
-      @get.parsed_response['status']
+      [@get.parsed_response['status'], @get.parsed_response['event_id']]
     end
 
     def self.snapshot(id, name)
       # Makes snapshot of Droplet. Returns OK or Error
       @request = Oceanarium::Request.new
       @get = @request.get("/droplets/#{id}/snapshot?name=#{name}")
-      @get.parsed_response['status']
+      [@get.parsed_response['status'], @get.parsed_response['event_id']]
     end
 
     def self.restore(id, image_id)
       # Restores snapshot of Droplet. Returns OK or Error
       @request = Oceanarium::Request.new
       @get = @request.get("/droplets/#{id}/restore/?image_id=#{image_id}")
-      @get.parsed_response['status']
+      [@get.parsed_response['status'], @get.parsed_response['event_id']]
     end
 
     def self.rebuild(id, image_id)
       # Rebuild OS image on Droplet. Returns OK or Error
       @request = Oceanarium::Request.new
       @get = @request.get("/droplets/#{id}/rebuild/?image_id=#{image_id}")
-      @get.parsed_response['status']
+      [@get.parsed_response['status'], @get.parsed_response['event_id']]
     end
 
     def self.destroy(id)
       # Destroys Droplet
       @request = Oceanarium::Request.new
       @get = @request.get("/droplets/#{id}/destroy/")
-      @get.parsed_response['status']
+      [@get.parsed_response['status'], @get.parsed_response['event_id']]
     end
   end
 end

data/lib/oceanarium/resources/image.rb

@@ -83,7 +83,7 @@ module Oceanarium
     def self.transfer(id, region_id)
       @request = Oceanarium::Request.new
       @get = @request.get("/images/#{id}/transfer/?region_id=#{region_id}")
-      @get.parsed_response['status']
+      [@get.parsed_response['status'], @get.parsed_response['event_id']]
     end
   end
 end

data/lib/oceanarium/resources/sshkey.rb

@@ -26,14 +26,17 @@ module Oceanarium
     # User API
 
     def new(name, key)
-      @new_id = Oceanarium::SSHKey.create(name, id)
+      @new_id = Oceanarium::SSHKey.create(name, key)
       unless @new_id == 'ERROR'
         Oceanarium::ssh_key(@new_id)
       end
     end
 
     def edit(key)
-      Oceanarium::SSHKey.update(self.id, key)
+      @update = Oceanarium::SSHKey.update(self.id, key)
+      unless @update.nil?
+        Oceanarium::ssh_key(self.id)
+      end
     end
 
     def destroy

data/lib/oceanarium/version.rb

@@ -1,3 +1,3 @@
 module Oceanarium
-  VERSION = "0.2.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oceanarium
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Valdos Sine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler