cloudspin-stack-rake 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c743a9b518a96958cd198915e9ef83bb59efdfc91fc6d8ad5df56ba4d8f83fbf
-  data.tar.gz: 4098215b277c4df095d433b7168700e575700a0cb745a4839f35b95d5ee2a350
+  metadata.gz: 8fd7e71574a680bb058b48cbae71eed41acc118d68eb964e6fd60701f19773f6
+  data.tar.gz: 9f76039b22270373ffb3fc2bc9efd73a89a0a9bb5171b271dc94d23cc550c2bc
 SHA512:
-  metadata.gz: 3f526ed2df69623a827710de015fbd3b4dfb954199a5fb4f2deeb47a30884eec6545bf01902f7029179cb11f31765f26fc905fff5e2a856b4497f1588ec5f5de
-  data.tar.gz: bc4945d21bb7ff5330fee853117a35c21f9930a771fb891c56e935e6698fb5b431e9ef12cb004f56fece373a1fb8f910d36e83896b8d8a5062bb3941be3bd3fc
+  metadata.gz: a598546bfd6b2105fa0a64c5c5e7af0938dc4c603f8e1947fe59617dd7436c392dffa6260feafe8661cf7a1d279691a39da7b9f993674076429b2f45b9dd21c1
+  data.tar.gz: 83f9e0413f3223f139867b7e4d3c5221dce2e6b0dcf68f06a8b12c9c0b6ee101d2cab6fd8b8f6a0fffb0c98dc42e79a6ebbbd058637fe311c99efe4537effaf0

data/.ruby-version

@@ -0,0 +1 @@
+2.4.3

data/.travis.yml

@@ -1,5 +1,12 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.3
-before_install: gem install bundler -v 1.16.2
+  - 2.5.1
+before_install:
+  - curl -sLo /tmp/terraform.zip https://releases.hashicorp.com/terraform/0.11.10/terraform_0.11.10_linux_amd64.zip
+  - unzip /tmp/terraform.zip -d /tmp
+  - mkdir -p ~/bin
+  - mv /tmp/terraform ~/bin
+  - chmod 0755 ~/bin/terraform
+  - export PATH="~/bin:$PATH"
+  - gem install bundler -v 1.17.1

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

@@ -21,7 +21,7 @@ module Cloudspin
           @environment = environment
           @stack_name = stack_name
           @base_folder = base_folder
-          @configuration_files = configuration_files || the_usual_configuration_files
+          set_configuration_files(configuration_files)
 
           # TODO: Pick this up from the configuration files?
           @definition_location = if definition_location
@@ -37,51 +37,8 @@ module Cloudspin
           define
         end
 
-        def instance
-          @instance ||= begin
-            local_definition_folder = fetch_definition
-            puts "Will use local stack definition files in #{local_definition_folder}"
-
-            the_instance = Cloudspin::Stack::Instance.from_folder(
-              @configuration_files,
-              stack_name: stack_name,
-              definition_folder: local_definition_folder,
-              base_folder: @base_folder,
-              base_working_folder: "#{@base_folder}/work"
-            )
-
-            if the_instance.configuration.has_remote_state_configuration?
-              add_terraform_backend_source(local_definition_folder)
-            end
-
-            the_instance
-          end
-        end
-
-        def fetch_definition
-          if /^http.*\.zip$/.match @definition_location
-            puts "Downloading stack definition source from a remote zipfile"
-            fetch_definition_zipfile
-          elsif /^[\.\/]/.match @definition_location
-            puts "Using local stack definition source"
-            @definition_location
-          else
-            raise UnsupportedStackDefinitionLocationError, @definition_location
-          end
-        end
-
-        def add_terraform_backend_source(terraform_source_folder)
-
-          puts "Creating file #{terraform_source_folder}/_cloudspin_created_backend.tf"
-
-          File.open("#{terraform_source_folder}/_cloudspin_created_backend.tf", 'w') { |backend_file|
-            backend_file.write(<<~TF_BACKEND_SOURCE
-              terraform {
-                backend "s3" {}
-              }
-            TF_BACKEND_SOURCE
-            )
-          }
+        def set_configuration_files(additional_configuration_files)
+          @configuration_files = (the_usual_configuration_files << additional_configuration_files).flatten.compact
         end
 
         def the_usual_configuration_files
@@ -98,8 +55,8 @@ module Cloudspin
 
         def default_configuration_files
           [
-            "#{@base_folder}/stack-#{@stack_name}-defaults.yaml",
-            "#{@base_folder}/stack-#{@stack_name}-local.yaml"
+            "#{@base_folder}/stack-instance-defaults.yaml",
+            "#{@base_folder}/stack-instance-local.yaml"
           ]
         end
 
@@ -145,8 +102,53 @@ module Cloudspin
           end
         end
 
+        def instance
+          @instance ||= begin
+            local_definition_folder = fetch_definition
+            puts "Will use local stack definition files in #{local_definition_folder}"
+
+            the_instance = Cloudspin::Stack::Instance.from_folder(
+              @configuration_files,
+              stack_name: stack_name,
+              definition_folder: local_definition_folder,
+              base_folder: @base_folder,
+              base_working_folder: "#{@base_folder}/work"
+            )
+
+            if the_instance.configuration.has_remote_state_configuration?
+              add_terraform_backend_source(local_definition_folder)
+            end
+
+            the_instance
+          end
+        end
+
+        def add_terraform_backend_source(terraform_source_folder)
+          puts "Creating file #{terraform_source_folder}/_cloudspin_created_backend.tf"
+          File.open("#{terraform_source_folder}/_cloudspin_created_backend.tf", 'w') { |backend_file|
+            backend_file.write(<<~TF_BACKEND_SOURCE
+              terraform {
+                backend "s3" {}
+              }
+            TF_BACKEND_SOURCE
+            )
+          }
+        end
+
         # TODO: This stuff belongs in a core class, so the CLI and other stuff can use it, too.
 
+        def fetch_definition
+          if /^http.*\.zip$/.match @definition_location
+            puts "Downloading stack definition source from a remote zipfile"
+            fetch_definition_zipfile
+          elsif /^[\.\/]/.match @definition_location
+            puts "Using local stack definition source"
+            @definition_location
+          else
+            raise UnsupportedStackDefinitionLocationError, @definition_location
+          end
+        end
+
         def fetch_definition_zipfile
           unpack(download_artefact(@definition_location), '.cloudspin/definitions')
         end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudspin-stack-rake
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - 'kief '
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cloudspin-stack
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile