cloudspin-stack 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c885e8c2a9014973458e691e79b350769043e562
-  data.tar.gz: d008d0062896585c367f314110768f02ab6325b5
+  metadata.gz: '09f576357a24456f36f68485eb0cdfcc4236e953'
+  data.tar.gz: 4d014c6c8978d8e0465174fc313c4d301f614f0e
 SHA512:
-  metadata.gz: 8f1cea03a705b02c92e805dcbb9de31a698e93f9f1865bd8fc9bdb60f84d8a6dd4e0e14ed9f8a4901d358c5a629f1ac6adb75cee03029e8f1313e83748557247
-  data.tar.gz: 06c98e0cdaec56f173cdb2c90401cb10a05964c76ada6226c6ccf3d9835ecc13503827cde70abb1f09c67fa2a6181d6c629ea93dc18596d1ff6b9078f8090544
+  metadata.gz: 591b428a3e10c2d7e8c753120c7bb29c5bc3a53b336aeb1046359011e0d9ccee679db5a58aec5f6298d072d70c9ce7f4ae363f381fd8fd280279dc194a4cba51
+  data.tar.gz: c8e033b0cff15d03bf9d07086d7aaeb85082a234f5e31439d8ae31142316f837cfe83e62b94c76da6b3ef03f37c48357345629e992163008cd4f8e6ffdd020f6

data/lib/cloudspin/cli.rb

@@ -10,43 +10,38 @@ module Cloudspin
       :banner => 'YAML-CONFIG-FILE',
       :type => :array,
       :default => [
-        Util.full_path_to('spin-default.yaml'),
-        Util.full_path_to('spin-local.yaml')
+        Util.full_path_from_local('spin-default.yaml'),
+        Util.full_path_from_local('spin-local.yaml')
       ],
       :desc => 'A list of configuration files to load for the stack instance. Values in files listed later override those from earlier files.'
 
     class_option :terraform_source,
       :aliases => '-t',
       :banner => 'PATH',
-      :default => Util.full_path_to('./src'),
+      :default => Util.full_path_from_local('./src'),
       :desc => 'Folder with the terraform project source files'
 
     class_option :work,
       :aliases => '-w',
       :banner => 'PATH',
-      :default => Util.full_path_to('./work'),
+      :default => Util.full_path_from_local('./work'),
       :desc => 'Folder to create and copy working files into'
 
     class_option :state,
       :aliases => '-s',
       :banner => 'PATH',
-      :default => Util.full_path_to('./state'),
+      :default => Util.full_path_from_local('./state'),
       :desc => 'Folder to create and store local state'
 
-    desc 'plan', 'Print the changes that will by applied when the \'up\' command is run'
-    option :dry, :type => :boolean, :default => false
-    def plan
-      if options[:dry]
-        puts instance.plan_dry
-      else
-        instance.plan
-      end
-    end
-
     desc 'up', 'Create or update the stack instance'
     option :dry, :type => :boolean, :default => false
+    option :plan, :type => :boolean, :default => false
     def up
-      if options[:dry]
+      if options[:plan] && options[:dry]
+        puts instance.plan_dry
+      elsif options[:plan] && ! options[:dry]
+        puts instance.plan
+      elsif ! options[:plan] && options[:dry]
         puts instance.up_dry
       else
         instance.up
@@ -54,8 +49,18 @@ module Cloudspin
     end
 
     desc 'down', 'Destroy the stack instance'
+    option :dry, :type => :boolean, :default => false
+    option :plan, :type => :boolean, :default => false
     def down
-      instance.down
+      if options[:plan] && options[:dry]
+        puts instance.plan_dry(plan_destroy: true)
+      elsif options[:plan] && ! options[:dry]
+        puts instance.plan(plan_destroy: true)
+      elsif ! options[:plan] && options[:dry]
+        puts instance.down_dry
+      else
+        instance.down
+      end
     end
 
     desc 'version', 'Print the version number'

data/lib/cloudspin/stack/instance.rb

@@ -40,23 +40,25 @@ module Cloudspin
         add_resource_values(config['resources']) if config['resources']
       end
 
-      def plan
+      def plan(plan_destroy: false)
         RubyTerraform.clean(directory: working_folder)
         mkdir_p File.dirname(working_folder)
         cp_r @stack_definition.terraform_source_path, working_folder
         Dir.chdir(working_folder) do
           RubyTerraform.init(backend_config: backend_config)
           RubyTerraform.plan(
+            destroy: plan_destroy,
             state: terraform_statefile,
             vars: terraform_variables
           )
         end
       end
 
-      def plan_dry
+      def plan_dry(plan_destroy: false)
         plan_command = RubyTerraform::Commands::Plan.new
         command_line_builder = plan_command.instantiate_builder
         configured_command = plan_command.configure_command(command_line_builder, {
+          :destroy => plan_destroy,
           :state => terraform_statefile,
           :vars => terraform_variables
         })
@@ -103,6 +105,17 @@ module Cloudspin
         end
       end
 
+      def down_dry
+        down_command = RubyTerraform::Commands::Destroy.new
+        command_line_builder = down_command.instantiate_builder
+        configured_command = down_command.configure_command(command_line_builder, {
+          :state => terraform_statefile,
+          :vars => terraform_variables
+        })
+        built_command = configured_command.build
+        built_command.to_s
+      end
+
       def terraform_variables
         @parameter_values.merge(@resource_values) { |key, oldval, newval|
           raise "Duplicate values for terraform variable '#{key}' ('#{oldval}' and '#{newval}')"

data/lib/cloudspin/stack/version.rb

@@ -1,5 +1,5 @@
 module Cloudspin
   module Stack
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

data/lib/cloudspin/util.rb

@@ -1,7 +1,16 @@
 module Cloudspin
   class Util
-    def self.full_path_to(relative_path)
-      Pathname.new(Dir.pwd + '/' + relative_path).realpath.to_s
+    def self.full_path_from_local(relative_path)
+      raw_path = self.raw_path_from_local(relative_path)
+      if File.exists?(raw_path)
+        Pathname.new(raw_path).realpath.to_s
+      else
+        relative_path
+      end
+    end
+
+    def self.raw_path_from_local(relative_path)
+      Dir.pwd + '/' + relative_path
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudspin-stack
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - 'kief '