cloudspin-stack 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e42299e2c0243036553c2f748348f9ab2d459a5
-  data.tar.gz: c07378a6cf093be520bc4b969dd4d566f03f313b
+  metadata.gz: 0f17e30aca34b64f7cae5cbf8b4bfac77a3e17bd
+  data.tar.gz: 4fe590866118fdd68cc47525426136b864b58bb3
 SHA512:
-  metadata.gz: 2051d8c1761565413f4a1ea9e689cf544e25e388ddd9abf30c817c5b4aa4bcf012e8cabcd3ff0d5f1d81b745374bfefcbc7b12f425cf3b33602126fc2ac10d95
-  data.tar.gz: b6e89ba95bbecd7a94248fdcce690c21379fce7b11e57b8a574ad97ea274340c2219b33af8cb580694251cef33c907f872828566da0f626f5ba4e1b49a50f01c
+  metadata.gz: 47d253e1baa96567a40d540e24998c8ff24c1854fb8eaca8ada3c5705e07859846e5e87b7509e26ea8dcaa8690301ca9f6ed7b47bbfe29071a996c8b38d199e5
+  data.tar.gz: 875ff23b5272d3dabcb9ea22b5c8d8851efa51c6b5577c46bfb8f55e5fc108be045e34443ba0c87ae99a44f3ee619fdd9d18f243617caf69d257fa74e2b2ff8e

data/lib/cloudspin/cli.rb

@@ -69,14 +69,13 @@ module Cloudspin
         Cloudspin::Stack::Instance.from_files(
           instance_configuration_files,
           stack_definition: stack_definition,
-          backend_config: {},
-          working_folder: options[:work],
-          statefile_folder: options[:state]
+          base_working_folder: './work',
+          base_statefile_folder: './state'
         )
       end
 
       def stack_definition
-        Cloudspin::Stack::Definition.from_file(options[:terraform_source] + '/stack-definition.yaml')
+        Cloudspin::Stack::Definition.from_file(options[:source] + '/stack-definition.yaml')
       end
 
       def instance_configuration_files

data/lib/cloudspin/stack/instance.rb

@@ -9,14 +9,12 @@ module Cloudspin
 
       attr_reader :id,
           :working_folder,
-          :backend_config,
           :statefile_folder,
           :configuration
 
       def initialize(
             id:,
             stack_definition:,
-            backend_config:,
             working_folder:,
             statefile_folder:,
             configuration:
@@ -24,46 +22,47 @@ module Cloudspin
         validate_id(id)
         @id = id
         @stack_definition = stack_definition
-        @backend_config = backend_config
         @working_folder = working_folder
-        @statefile_folder = Pathname.new(statefile_folder).realdirpath.to_s
+        @statefile_folder = statefile_folder
         @configuration = configuration
+        @backend_config = {}
       end
 
       def self.from_folder(
             *instance_configuration_files,
             definition_folder:,
-            backend_config:,
-            working_folder:,
-            statefile_folder:
+            base_working_folder:,
+            base_statefile_folder:
       )
         self.from_files(
             instance_configuration_files,
             stack_definition: Definition.from_folder(definition_folder),
-            backend_config: backend_config,
-            working_folder: working_folder,
-            statefile_folder: statefile_folder
+            base_working_folder: base_working_folder,
+            base_statefile_folder: base_statefile_folder
           )
       end
 
       def self.from_files(
             *instance_configuration_files,
             stack_definition:,
-            backend_config:,
-            working_folder:,
-            statefile_folder:
+            base_working_folder:,
+            base_statefile_folder:
       )
         instance_configuration = InstanceConfiguration.from_files(stack_definition, instance_configuration_files)
         self.new(
             id: instance_configuration.instance_identifier,
             stack_definition: stack_definition,
-            backend_config: backend_config,
-            working_folder: working_folder,
-            statefile_folder: statefile_folder,
+            working_folder: ensure_folder("#{base_working_folder}/#{instance_configuration.instance_identifier}"),
+            statefile_folder: ensure_folder("#{base_statefile_folder}/#{instance_configuration.instance_identifier}"),
             configuration: instance_configuration
           )
       end
 
+      def self.ensure_folder(folder)
+        FileUtils.mkdir_p folder
+        Pathname.new(folder).realdirpath.to_s
+      end
+
       def validate_id(raw_id)
         raise "Stack instance ID '#{raw_id}' won't work. It needs to work as a filename." if /[^0-9A-Za-z.\-\_]/ =~ raw_id
         raise "Stack instance ID '#{raw_id}' won't work. No double dots allowed." if /\.\./ =~ raw_id
@@ -83,7 +82,7 @@ module Cloudspin
         mkdir_p File.dirname(working_folder)
         cp_r @stack_definition.source_path, working_folder
         Dir.chdir(working_folder) do
-          RubyTerraform.init(backend_config: backend_config)
+          RubyTerraform.init(backend_config: @backend_config)
           RubyTerraform.plan(
             destroy: plan_destroy,
             state: terraform_statefile,
@@ -109,7 +108,7 @@ module Cloudspin
         mkdir_p File.dirname(working_folder)
         cp_r @stack_definition.source_path, working_folder
         Dir.chdir(working_folder) do
-          RubyTerraform.init(backend_config: backend_config)
+          RubyTerraform.init(backend_config: @backend_config)
           RubyTerraform.apply(
             auto_approve: true,
             state: terraform_statefile,
@@ -134,7 +133,7 @@ module Cloudspin
         mkdir_p File.dirname(working_folder)
         cp_r @stack_definition.source_path, working_folder
         Dir.chdir(working_folder) do
-          RubyTerraform.init(backend_config: backend_config)
+          RubyTerraform.init(backend_config: @backend_config)
           RubyTerraform.destroy(
             force: true,
             state: terraform_statefile,

data/lib/cloudspin/stack/version.rb

@@ -1,5 +1,5 @@
 module Cloudspin
   module Stack
-    VERSION = '0.1.17'
+    VERSION = '0.1.18'
   end
 end

metadata

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