cloudspin-stack-artefact 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f037da1c0a6b242144486f55ae0cfa3b018416c7
-  data.tar.gz: b698581326e121bba0ff3a8c89ca8747164c7f04
+  metadata.gz: 83ddb6d50a51b32adac821167b735bea775e6cfd
+  data.tar.gz: 2d883d5d12f833e9a9ddaa853afce64757593c7d
 SHA512:
-  metadata.gz: 9c421fa49a58b501824f3903d41c3228d2a5df949d694a4d94fd22f4684e55946d51cd4f29c2a3a8c9a777ed16407a2f886ab3323fa5aa88ceb8cf39058a43c4
-  data.tar.gz: ab8c2f6b2351451c6bd0bd3ffe74c3fef70266a2ac11b39632f1bdbeb1287bf86f3f696c7e28ec9a23aabcda17c5326659bcb57b02727c81be2ec95f0cb5d087
+  metadata.gz: 91fdc14e8ae156aa9fca30dcb2c0d60a5ab3d64d72e13cc8244deb6eea2b0df40da2f7655c9b9f6a52991ee71153279aae823b817a0ba791217710664f2aa1f7
+  data.tar.gz: 9cd8f7b609184f6120b4f8417fe584f0c79a4063e84b17549e3009888844cb088b6ba00e38c1a26680c78574fca3366aabed862d1b9f0b348497fd272d40e432

data/lib/cloudspin/stack/artefact/cli.rb

@@ -6,12 +6,6 @@ module Cloudspin
 
     class CLI < Thor
 
-    class_option :source,
-      :aliases => '-s',
-      :banner => 'PATH',
-      :default => './src',
-      :desc => 'Folder with the terraform project source files'
-
       class_option :dist_folder,
         :aliases => '-d',
         :banner => 'PATH',
@@ -19,12 +13,27 @@ module Cloudspin
         :desc => 'The artefact will be created in this folder'
 
       desc 'build', 'Assemble the files to be packaged'
-      option :inspec_folder,
-          :aliases => '-i',
+      option :test_folder,
+          :aliases => '-t',
+          :banner => 'PATH',
+          :default => './test'
+      option :environments_folder,
+          :aliases => '-e',
           :banner => 'PATH',
-          :default => './inspec'
+          :default => './environments'
+      option :instance_defaults_file,
+          :aliases => '-f',
+          :banner => 'FILENAME',
+          :default => './stack-instance-defaults.yaml'
+      option :source,
+        :aliases => '-s',
+        :banner => 'PATH',
+        :default => './src',
+        :desc => 'Folder with the terraform project source files'
       def build
-        add_folder(options[:inspec_folder])
+        add_folder(options[:test_folder])
+        add_folder(options[:environments_folder])
+        add_file(options[:instance_defaults_file])
         builder.build
       end
 
@@ -56,6 +65,10 @@ module Cloudspin
           builder.add_folder_to_package(folder) if Dir.exists?(folder)
         end
 
+        def add_file(filename = nil)
+          builder.add_file_to_package(filename) if File.exists?(filename)
+        end
+
         def stack_definition
           @definition ||= Cloudspin::Stack::Definition.from_file(options[:source] + '/stack-definition.yaml')
         end

data/lib/cloudspin/stack/artefact/version.rb

@@ -1,7 +1,7 @@
 module Cloudspin
   module Stack
     module Artefact
-      VERSION = '0.1.5'
+      VERSION = '0.1.6'
     end
   end
 end

data/lib/cloudspin/stack/rake/artefact_task.rb

@@ -12,13 +12,10 @@ module Cloudspin
 
         def define
           desc 'Assemble files to be packaged'
-          task :build, [:inspec_folder, :config_file] do |t, args|
-            add_folder(args[:inspec_folder] || './inspec')
-            add_file(args[:config_file] || './spin-default.yaml')
-            add_file("./stack-instance-default.yaml")
-            add_file("./stack-instance-defaults.yaml")
-            add_file("./spin-local.yaml")
-            add_file("./stack-instance-local.yaml")
+          task :build, [:test_folder, :environments_folder, :instance_defaults_file] do |t, args|
+            add_folder(args[:test_folder] || './test')
+            add_folder(args[:environments_folder] || './environments')
+            add_file(args[:instance_defaults_file] || './stack-instance-defaults.yaml')
             builder.build
           end
 
@@ -44,7 +41,7 @@ module Cloudspin
         end
 
         def stack_definition
-          @definition ||= Cloudspin::Stack::Definition.from_file(@definition_folder + '/stack.yaml')
+          @definition ||= Cloudspin::Stack::Definition.from_file(@definition_folder + '/stack-definition.yaml')
         end
 
       end

metadata

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