stax 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c1fb0c4863d5f462054105ec15720e4b2055ec4656d703a2217a9bec0ea7957
-  data.tar.gz: 388679f36efeb35b963f7d0a89162282b82df717cd55d69e0100ceff8c0109c9
+  metadata.gz: 77112f21d23c34b627328dbe16dee4c49c380f60094a27584cbd1a58467847ed
+  data.tar.gz: c04005d73b1e5d2d2dd49369b66941419722f01b16a59f9f96993ae87fe95469
 SHA512:
-  metadata.gz: 82b5a4b04a7880868e806fe561be31651efdb30127bba6a2ebd5aaaf9f9a3d314280d53098285853853107a2154d4140ab3fe84092a4e4399c45eae566939193
-  data.tar.gz: f31ff85970907378fed57b52c2daecb0f8b93b65cd2addec05ab0676530fd23e78af870ee35be916b34deff1ccf45b558f2799c7082376f4f2d2b46eaaa85032
+  metadata.gz: cdb6d027064fb78ce133795d3244eed99bb76ca4b4ab1abd6fa85ab748a07d3aaa3b76d4e3bafc3c487813eb90bce623977787138e7252b543da0b9fde17ac37
+  data.tar.gz: 0364f0379cd4dadf176b36172cae8624ee9afb315244758fe587b14df39a705fc887f8a99653378717de34a3f4e9f24048ed9109f0bb35be6c47ab6a4b62827e

data/lib/stax.rb

@@ -11,6 +11,7 @@ require 'stax/cfer'
 
 require 'stax/stack'
 require 'stax/stack/cfn'
+require 'stax/stack/template'
 require 'stax/stack/crud'
 require 'stax/stack/changeset'
 require 'stax/stack/parameters'

data/lib/stax/stack.rb

@@ -15,6 +15,10 @@ module Stax
         self.class.instance_variable_get(:@imports)
       end
 
+      def stack_type
+        self.class.instance_variable_get(:@type)
+      end
+
       def exists?
         Aws::Cfn.exists?(stack_name)
       end

data/lib/stax/stack/crud.rb

@@ -73,26 +73,6 @@ module Stax
         }
       end
 
-      ## location of templates relative to Staxfile
-      def cfn_template_dir
-        'cf'
-      end
-
-      ## get cfn template from file depending on the format
-      def cfn_template
-        @_cfn_template ||= \
-        begin
-          stub = File.join(cfn_template_dir, "#{class_name}")
-          if File.exists?(f = "#{stub}.rb")
-            cfer_generate(f)
-          elsif File.exists?(f = "#{stub}.yaml")
-            File.read(f)
-          elsif File.exists?(f = "#{stub}.json")
-            File.read(f)
-          end
-        end
-      end
-
       ## set this to always do an S3 upload of template
       def cfn_force_s3?
         false

data/lib/stax/stack/template.rb

@@ -0,0 +1,68 @@
+module Stax
+  class Stack < Base
+
+    no_commands do
+      ## location of templates relative to Staxfile
+      def cfn_template_dir
+        'cf'
+      end
+
+      ## template filename without extension
+      def cfn_template_stub
+        @_cfn_template_stub ||= File.join(cfn_template_dir, "#{class_name}")
+      end
+
+      ## load a yaml template
+      def cfn_template_yaml
+        if File.exists?(f = "#{cfn_template_stub}.yaml")
+          File.read(f)
+        end
+      end
+
+      ## load a json template
+      def cfn_template_json
+        if File.exists?(f = "#{cfn_template_stub}.json")
+          File.read(f)
+        end
+      end
+
+      ## load a ruby cfer template
+      def cfn_template_cfer
+        if File.exists?(f = "#{cfn_template_stub}.rb")
+          cfer_generate(f)
+        end
+      end
+
+      ## by default look for cdk templates in same dir as Staxfile
+      def cfn_cdk_dir
+        Stax.root_path
+      end
+
+      ## transcompile and load a cdk template
+      def cfn_template_cdk
+        Dir.chdir(cfn_cdk_dir) do
+          %x[npm run build]
+          %x[cdk synth]
+        end
+      end
+
+      ## try to guess template by filename
+      def cfn_template_guess
+        cfn_template_cfer || cfn_template_yaml || cfn_template_json
+      end
+
+      ## get cfn template based on stack type
+      def cfn_template
+        @_cfn_template ||= \
+        begin
+          if stack_type
+            send("cfn_template_#{stack_type}")
+          else
+            cfn_template_guess || fail_task('cannot find template')
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/stax/staxfile.rb

@@ -55,6 +55,7 @@ module Stax
       end
 
       klass.instance_variable_set(:@imports, Array(opt.fetch(:import, [])))
+      klass.instance_variable_set(:@type, opt.fetch(:type, nil))
     end
   end
 

data/lib/stax/version.rb

@@ -1,3 +1,3 @@
 module Stax
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stax
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Richard Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2018-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -246,6 +246,7 @@ files:
 - lib/stax/stack/outputs.rb
 - lib/stax/stack/parameters.rb
 - lib/stax/stack/resources.rb
+- lib/stax/stack/template.rb
 - lib/stax/staxfile.rb
 - lib/stax/subcommand.rb
 - lib/stax/version.rb