opennebula-provider 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b7f61be4aef7e642c43c6fabab751931e962c36
-  data.tar.gz: 7efea70261b1f5b38241ade3e49b610216ddad35
+  metadata.gz: 133a2592923c168d7cf6f232ad5f6a0ab4e75944
+  data.tar.gz: f360bff7b59fe13b08a4ff931e2a27250eb48762
 SHA512:
-  metadata.gz: 8b71ec86bf27fd40bd4964a39f25e40d7ee693b2dea255aea4766b71ca55ceee47125bea4c84b3c92a461181ebe32b8b58303baafcf078e613b67436bdad004e
-  data.tar.gz: 5010b6e53af2fbc94f961ea41540d182e5789b00acba308e2043fe0e622caa3864831e237e4f562c6bfb2f6174b426eec4b21857198576d1965d844abb563a08
+  metadata.gz: aaf3d1935c0abe91bb3cf3c3641aa926ecae4a7c8bb1a6f808bff0a22c05f3d7fa8f60222b44baf973f4f73f9b36e514c93b06b1678b8fea3698f3c8f7c8a1b6
+  data.tar.gz: d48cb67b91f95bd199669b954122ba2c7f2d3520d003439b4478cda08f00f03a178299e35bbc2d608e6977ca32d3390535e6175326010d3f8b5a037c8cb7585f

data/lib/opennebula-provider/action.rb

@@ -15,17 +15,22 @@ module VagrantPlugins
 
       def self.destroy
         Vagrant::Action::Builder.new.tap do |b|
-          b.use Call, DestroyConfirm do |env, b1|
-            b1.use ConfigValidate
-            b1.use ConnectOpenNebula
-            b1.use Call, CheckState do |env2, b2|
-              case env2[:machine_state]
-              when :active, :error, :suspended, :inactive
-                b2.use Destroy
-                b2.use ProvisionerCleanup if defined?(ProvisionerCleanup)
-              when :not_created
-                b2.use MessageAlreadyDestroyed
+          b.use ConfigValidate
+          b.use ConnectOpenNebula
+          b.use Call, CheckState do |env, b1|
+            case env[:machine_state]
+            when :active, :error, :suspended, :inactive
+              b1.use Call, DestroyConfirm do |env1, b2|
+                if env1[:result]
+                  b2.use Destroy
+                  b2.use ProvisionerCleanup if defined?(ProvisionerCleanup)
+                else
+                  b2.use MessageWillNotDestroy
+                end
               end
+            when :not_created
+              b1.use MessageNotCreated
+              next
             end
           end
         end

data/lib/opennebula-provider/action/messages.rb

@@ -43,6 +43,17 @@ module VagrantPlugins
           @app.call(env)
         end
       end
+
+      class MessageWillNotDestroy
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          env[:ui].info I18n.t('opennebula_provider.info.will_not_destroy')
+          @app.call(env)
+        end
+      end
     end
   end
 end

data/lib/opennebula-provider/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module OpenNebulaProvider
-    VERSION = '0.2.3'
+    VERSION = '0.2.4'
   end
 end

data/locales/en.yml

@@ -15,6 +15,8 @@ en:
         Instance already halted
       destroying: |-
         Instance %{machine} is destroying...
+      will_not_destroy: |-
+        Instance will not be destroyed, declined
       state: |-
         Instance state is %{state}
       waiting_for_sshd: |-

data/opennebula-provider.gemspec

@@ -47,6 +47,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency     'occi-api', '~> 4.2'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rake', '~> 0'
+  spec.add_development_dependency 'rspec', '~> 0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-provider
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Cherdancev Evgeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -42,28 +42,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: OpenNebula provider for Vagrant