cloudpassage 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e92cb4059f477571d964f49fd2735f21fa121be
-  data.tar.gz: 1c8bc29d6f6066131997878759fb8f59dc2051dd
+  metadata.gz: bcbae6fe51aad88f8f65f058a5d8ecb22a207bc2
+  data.tar.gz: 1eef871955974d8dec4a3a896548fa3e71304309
 SHA512:
-  metadata.gz: ac02633823a20bf061125ac4f417f450057ca385552a7d2815f80613f46ea8331c7ecb913ff7ad28bc07ab31531a846be9f23b3fecbe9366fe98d865a89f5553
-  data.tar.gz: fe1098d718b49f46534bb8d9ce88ab1caa8b0200ad47255130a692b0aa9da3aea46bdeac2afdd1431115bbe899a5ed9601f052b2ec0b9ab8c09564c150e6b31d
+  metadata.gz: b1acde19f515a84d298708829300d7d961de54b8e9746dd771b2a51d4fca90de1bd0cb3b75a27498392af8771d2034ded3114b04fa9e666f3932c770eb350738
+  data.tar.gz: c3f4ff6e6e2706d819e7342d863c3bdcac4efe6c38997f4e5b797109f5258316975e3746939cd1488ba04ebf54e74e0ac3a56697341b31b0a81d9bf53e73e5b7

data/lib/cloudpassage/base.rb

@@ -71,12 +71,19 @@ module Cloudpassage
       class_name[index + 2 .. -1].underscore.to_sym
     end
 
+    # Return true if object exists in the cloudpassage API, false otherwise.
+    def exists?
+      @base_resource.get(headers)
+      true
+    rescue RestClient::ResourceNotFound
+      false
+    end
+
     # Wait for block to evaluate to true.
     # If specified, options can be used to override default options.
     # Options should conform to https://rubygems.org/gems/wait
     def wait_for(options={}, &block)
       Wait.new(Cloudpassage::wait_options.merge(options)).until do
-        reload
         instance_eval &block
       end
     end

data/lib/cloudpassage/servers.rb

@@ -98,16 +98,16 @@ module Cloudpassage
 
     def disable_account(username)
       payload = {:account => {:active=>false}}
-      @server.commands.get(JSON.parse(@base_resource[username].put(payload.to_json, headers))['command']['id'])
+      @server..get(JSON.parse(@base_resource[username].put(payload.to_json, headers))['command']['id'])
     end
 
     def reset(username, opts = {})
       payload = {'password' => password_opts.merge(opts)}
-      JSON.parse @base_resource[username]['password'].put(payload.to_json, headers)
+      @server.commands.get(JSON.parse(@base_resource[username]['password'].put(payload.to_json, headers))['command']['id'])
     end
 
     def remove(username)
-      JSON.parse @base_resource[username].delete(headers)
+      @server.commands.get(JSON.parse(@base_resource[username].delete(headers))['command']['id'])
     end
 
     def headers
@@ -149,8 +149,12 @@ module Cloudpassage
 
   class Command < Single
     def done?
-      self.reload
-      %w'completed failed'.include? self.status
+      reload
+      fail Error.new(self.result) if status == 'failed'
+      'completed' == status
+    end
+
+    class Error < StandardError
     end
   end
 

data/lib/cloudpassage/version.rb

@@ -1,4 +1,4 @@
 module Cloudpassage
   # Version
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudpassage
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - mshea
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake