rubycfn 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8bbfd96b52e5c94ad29c4e89bf7ed14d750fead
-  data.tar.gz: a7c90de723006295102a0d6bd755c1ffb60c4885
+  metadata.gz: 9fe3ee2069e907977b8b170664d94fbc98c5f623
+  data.tar.gz: a662a1aa55c0fc18c22dc43ac8dab07e306a9a5c
 SHA512:
-  metadata.gz: 0eee75a312c81532c472a584f2cb6f25f44311f1a483ffa4e84ad466bbea90d0ac06eb89a0489b736d270b4c7faafd7014d96466e4a7dcb68c1ef4ebf6bb9df9
-  data.tar.gz: 4443807ba18bc1a96abc4fcac72c683f617de62de29a700cf740b970d9e1ef9855493ac60f0a56f21614a2ea521da275cd7a40d1f866f6e925c2809136d4b8d6
+  metadata.gz: 41bb9c6dbe8818ac85427f94f8e64a8ce72178baf59bfb1f076629be4ac17d1c774ff7785edc6c83cce42a59830c9f7e59fb69f88faee6f8c629404c00df9eee
+  data.tar.gz: 8ff7a3c7d25a7fb5fbcf0c6a4f20b021c317c4ee5346c75426926adde33d92f3fcceeb05b31d18a5619f7c8b75764da3310de3d301817b3c6a4e676b377dda28

data/CHANGELOG.md

@@ -2,7 +2,15 @@
 All notable changes to Rubycfn will be documented in this file.
 This project uses [Semantic Versioning](http://semver.org/).
 
-## 0.1.5 (Next Release)
+## 0.1.7 (Next Release)
+
+## 0.1.6
+  * Fixed bug where variables that were passed a `false` (boolean) value invoked super -- [@dennisvink][@dennisvink]
+  * Skip compacting of `false` boolean values in json output -- [@dennisvink][@dennisvink]
+  * Fixed layout default rendered project concern
+ 
+## 0.1.5
+  * Fixed bug where properties were not reset when amount was greater than 1 -- [@dennisvink][@dennisvink]
 
 ## 0.1.4 
   * Made resource names overridable from within resource block with `_id` resource method. -- [@dennisvink][@dennisvink]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubycfn (0.1.5)
+    rubycfn (0.1.6)
       activesupport (~> 5.1.5)
       dotenv (~> 2.4.0)
       json (~> 2.1.0)
@@ -44,7 +44,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hitimes (1.3.0)
-    i18n (1.0.1)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     launchy (2.4.3)
@@ -73,25 +73,25 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
+      rspec-support (~> 3.8.0)
     rspec-given (3.8.0)
       given_core (= 3.8.0)
       rspec (>= 2.14.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.7.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby_dep (1.5.0)
@@ -106,7 +106,7 @@ GEM
     thread_safe (0.3.6)
     timers (4.1.2)
       hitimes
-    tty-color (0.4.2)
+    tty-color (0.4.3)
     tty-cursor (0.5.0)
     tty-prompt (0.16.1)
       necromancer (~> 0.4.0)
@@ -118,7 +118,7 @@ GEM
       tty-cursor (~> 0.5.0)
       tty-screen (~> 0.6.4)
       wisper (~> 2.0.0)
-    tty-screen (0.6.4)
+    tty-screen (0.6.5)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     wisper (2.0.0)

data/README.md

@@ -12,7 +12,7 @@ or, create a Gemfile with this content:
 ```
 source "https://rubygems.org"
 
-gem "rubycfn", "~> 0.1.5"
+gem "rubycfn", "~> 0.1.6"
 
 ```
 

data/lib/compound/vpc.rb

@@ -21,6 +21,7 @@ module RubyCfn
                    default: true
           variable :instance_tenancy,
                    filter: :validate_instance_tenancy
+
           # TODO: Move to separate compound resource
           # variable :ipv6,
           #          default: false

data/lib/rubycfn/version.rb

@@ -1,4 +1,4 @@
 # Rubycfn version
 module Rubycfn
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/rubycfn.rb

@@ -106,6 +106,7 @@ class ::Hash
 
   def recursive_compact
     delete_if do |k, v|
+      next if v === false
       (v.respond_to?(:empty?) ? v.empty? : !v) or v.instance_of?(Hash) && v.recursive_compact.empty?
     end
   end
@@ -130,7 +131,9 @@ module Rubycfn
   included do
     def self.method_missing(name, *args)
       super unless TOPLEVEL_BINDING.eval("@variables[:#{name}]") || \
-                   TOPLEVEL_BINDING.eval("@global_variables[:#{name}]")
+                   TOPLEVEL_BINDING.eval("@variables[:#{name}] === false") ||
+                   TOPLEVEL_BINDING.eval("@global_variables[:#{name}]") ||
+                   TOPLEVEL_BINDING.eval("@global_variables[:#{name}] === false")
       if TOPLEVEL_BINDING.eval("@variables[:#{name}]")
         TOPLEVEL_BINDING.eval("@variables[:#{name}]")
       else
@@ -158,7 +161,7 @@ module Rubycfn
         "#{name}": {
           "#{arguments[:name]}": kv_pairs
         }
-      } 
+      }
       TOPLEVEL_BINDING.eval("@mappings = @mappings.deep_merge(#{res})")
     end
 

data/templates/project_concern.rb.erb

@@ -7,12 +7,21 @@ module <%= name %>Stack
       #parameter :example_stack_parameter_name,
       #          default: "example_value"
 
-      # Example variable
+      # Example variables
       variable :example_variable,
                required: false,
                value: ENV["SOME_ENV_VAR"],
                default: "default_value"
 
+      variable :cidr_block,
+               default: "10.0.0.0/16"
+      variable :enable_dns_support,
+               default: true
+      variable :enable_dns_hostnames,
+               default: true
+      variable :instance_tenancy,
+               filter: :validate_instance_tenancy
+
       # Example resource, custom name
       resource :my_example_s3_bucket,
                type: "AWS::S3::Bucket" do |r|
@@ -30,14 +39,7 @@ module <%= name %>Stack
                type: RubyCfn::VPC do |r|
         r.set(:cidr_block) { "10.1.0.0/16" }
       end
-          variable :cidr_block,
-                   default: "10.0.0.0/16"
-          variable :enable_dns_support,
-                   default: true
-          variable :enable_dns_hostnames,
-                   default: true
-          variable :instance_tenancy,
-                   filter: :validate_instance_tenancy
+
       # Example resource, dynamically generated name
       resource :my_example_s3_bucket,
                type: "AWS::S3::Bucket"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Dennis Vink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-08 00:00:00.000000000 Z
+date: 2018-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson