down.rb in forj-0.0.20

- old
+ new

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
 # (c) Copyright 2014 Hewlett-Packard Development Company, L.P.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -14,40 +15,49 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
 require 'require_relative'
 
-require_relative 'compute.rb'
-include Compute
 require_relative 'network.rb'
 include Network
 require_relative 'yaml_parse.rb'
 include YamlParse
 require_relative 'security.rb'
 include SecurityGroup
 
+#
+# Down module
+#
 module Down
   def down(name)
-    puts 'deleting %s...' % [name]
+    begin
 
-    definitions = YamlParse.get_values('../lib/catalog.yaml')
+      puts format('deleting %{name}...', name: name)
 
-    # first step is to delete the instance
-    Compute.delete_instance(name)
+      definitions = YamlParse::get_values('../lib/catalog.yaml')
 
-    # get the subnet
-    subnet = Network.get_subnet(name)
+      # first step is to delete the instance
+      Compute.delete_instance(name)
 
-    # delete the router interface
-    router = Network.get_router(definitions['redstone']['router'])
-    Network.delete_router_interface(subnet.id, router)
+      # get the subnet
+      subnet = Network::get_subnet(name)
 
-    # delete subnet
-    Network.delete_subnet(subnet.id)
+      # delete the router interface
+      router = Network::get_router(definitions['redstone']['router'])
+      Network.delete_router_interface(subnet.id, router)
 
-    # delete security group
-    # Network.delete_security_group(security_group.id)
+      # delete subnet
+      Network.delete_subnet(subnet.id)
 
-    # delete network
-    Network.delete_network(name)
+      # delete security group
+      # Network.delete_security_group(security_group.id)
+
+      # delete network
+      Network.delete_network(name)
+
+    rescue SystemExit, Interrupt
+      puts 'process interrupted by user'
+    rescue Exception => e
+      puts e
+    end
   end
-end
\ No newline at end of file
+end