cloudspin-stack 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6270c0e9737073233d8762c0b9ba46f1705ae47d
-  data.tar.gz: a47fa583aa4bed7df2b768426724dfa278871074
+  metadata.gz: 6e42299e2c0243036553c2f748348f9ab2d459a5
+  data.tar.gz: c07378a6cf093be520bc4b969dd4d566f03f313b
 SHA512:
-  metadata.gz: 3d0add6911d011e494c8b9270383adc5001c6e08f316b2e0c14ebcaa2141637073162319ed22bbf9bcf081039c8ecaa138e031f062cbf54ef4a59fe09d9fc61f
-  data.tar.gz: 49e34de90b325df00c5bc791db6612823883c1a52375c6525104a01ee124be013164fa13bd3214a5504c24d59bcf546860db3ea038d5e4d9d3a6baee04911893
+  metadata.gz: 2051d8c1761565413f4a1ea9e689cf544e25e388ddd9abf30c817c5b4aa4bcf012e8cabcd3ff0d5f1d81b745374bfefcbc7b12f425cf3b33602126fc2ac10d95
+  data.tar.gz: b6e89ba95bbecd7a94248fdcce690c21379fce7b11e57b8a574ad97ea274340c2219b33af8cb580694251cef33c907f872828566da0f626f5ba4e1b49a50f01c

data/lib/cloudspin/cli.rb

@@ -10,25 +10,18 @@ module Cloudspin
       :banner => 'YAML-CONFIG-FILE',
       :type => :array,
       :default => ['stack-instance-defaults.yaml', 'stack-instance-local.yaml'],
-      :desc => 'A list of configuration files to load for the stack instance. Values in files listed later override those from earlier files.'
+      :desc => 'A list of stack instance configuration files. Values in files listed later override those from earlier files.'
 
-    class_option :terraform_source,
-      :aliases => '-t',
+    class_option :source,
+      :aliases => '-s',
       :banner => 'PATH',
       :default => './src',
       :desc => 'Folder with the terraform project source files'
 
-    class_option :work,
-      :aliases => '-w',
-      :banner => 'PATH',
-      :default => './work',
-      :desc => 'Folder to create and copy working files into'
-
-    class_option :state,
-      :aliases => '-s',
-      :banner => 'PATH',
-      :default => './state',
-      :desc => 'Folder to create and store local state'
+    class_option :environment,
+      :aliases => '-e',
+      :banner => 'YAML-CONFIG-FILE',
+      :desc => 'An environment instance to manage.'
 
     desc 'up', 'Create or update the stack instance'
     option :dry, :type => :boolean, :default => false
@@ -67,14 +60,14 @@ module Cloudspin
 
     desc 'info', 'Print some info about arguments, for debugging'
     def info
-      puts "Configuration file: #{options[:file]}"
+      puts "Configuration files: #{instance_configuration_files}"
     end
 
     no_commands do
 
       def instance
         Cloudspin::Stack::Instance.from_files(
-          options[:file],
+          instance_configuration_files,
           stack_definition: stack_definition,
           backend_config: {},
           working_folder: options[:work],
@@ -86,6 +79,23 @@ module Cloudspin
         Cloudspin::Stack::Definition.from_file(options[:terraform_source] + '/stack-definition.yaml')
       end
 
+      def instance_configuration_files
+        file_list = options[:file]
+        if options[:environment]
+          if File.exists? environment_config_file
+            file_list << environment_config_file
+          else
+            $stderr.puts "Missing configuration file for environment #{options[:environment]} (#{environment_config_file})"
+            exit 1
+          end
+        end
+        file_list
+      end
+
+      def environment_config_file
+        Pathname.new("./environments/stack-instance-#{options[:environment]}.yaml").realdirpath.to_s
+      end
+
     end
 
     def self.exit_on_failure?

data/lib/cloudspin/stack/version.rb

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

metadata

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