upcloud_api 1.1.0 → 1.2.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7a0f11616b14245cfb8ab6eb7a58edc3792146a
-  data.tar.gz: 3fc23c6461352fdff08eda2bbb4dbf2c9f1797bf
+  metadata.gz: becf22140f3d61a6e08668562b19df3bb9b5f585
+  data.tar.gz: 7bc9ed1e86f489a6ce958c036816e921f3693651
 SHA512:
-  metadata.gz: 89047aa5d535b92ca244874c6a2ec382ab40ddfd521526b0e571204b6ed8d0436edbffd2bebcc839651f80b52495e007ac07fb1575de3d09183b54a043286a56
-  data.tar.gz: 441dde9f2241d9dcfeea9ff31f00a8dacfad885be27c98c19d895f89e42fd3d66b7a6a605468596cb6fcc5f1e2cd128eb391b0f4c2f3cc515c8631450ee63319
+  metadata.gz: 58e8408ae341460b75a896047f72f156cc577704947f95630b167c3be28451fc80740d1863b6197907ac8373bdacf4a533ec7d3afc618a77acb6c791699a459e
+  data.tar.gz: fec1c2166a467f1cc58b67c1a696479fa67c5accf31f64866f76a9d28edbcb97f89ddd6e44fc8d65cfb444f9bf71492364ac17fe757b06f57760dcad1ca179a1

data/lib/upcloud_api/version.rb

@@ -1,3 +1,3 @@
 class UpcloudApi
-  VERSION = "1.1.0"
+  VERSION = "1.2.0-rc1"
 end

data/lib/upcloud_api.rb

@@ -152,7 +152,10 @@ class UpcloudApi
     # @param server_uuid UUID of the server
     # @param type Type of the shutdown. Available types are :hard and :soft. Defaults to :soft.
     # @param timeout Time after server will be hard stopped if it didn’t close cleanly. Only affects :soft type.
-    def start_server server_uuid, type: :soft, timeout: nil
+    # @param asynchronous If false, this call will wait until the server has really stopped.
+    #
+    # Raises Timeout::Error in case server does not shut down in 300 seconds in non-asynchronous mode.
+    def stop_server server_uuid, type: :soft, timeout: nil, asynchronous: false
         data = {
             "stop_server" => {
                 "stop_type" => type.to_s
@@ -164,7 +167,14 @@ class UpcloudApi
 
         response = post "server/#{server_uuid}/stop", json
 
-        response
+        return response if asynchronous
+
+        Timeout 300 do
+            loop do
+                details = server_details server_uuid
+                return response if details["server"]["state"] == "stopped"
+            end
+        end
     end
 
     # Restarts down a server that is currently running
@@ -180,7 +190,7 @@ class UpcloudApi
     # @param timeout Time after server will be hard stopped if it didn’t close cleanly. Only affects :soft type.
     # @param timeout_action What will happen when timeout happens. :destroy hard stops the server and :ignore makes
     # server if timeout happens. Default is :ignore.
-    def start_server server_uuid, type: :soft, timeout: nil, timeout_action: :ignore
+    def restart_server server_uuid, type: :soft, timeout: nil, timeout_action: :ignore
         data = {
             "stop_server" => {
                 "stop_type" => type.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upcloud_api
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.pre.rc1
 platform: ruby
 authors:
 - Samu Voutilainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -48,9 +48,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.6