cfer 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 05b80c1775b880a3b92953f25ab31b863ba7ed3b
-  data.tar.gz: 3d8c82a4fc20c18d6af7edbe2085d3413e6676ca
+SHA256:
+  metadata.gz: 629fe44ee8569e44618d1697d3d466eda739d5181dde1b694741bfd09ead4c4a
+  data.tar.gz: db78bef95f3c77f7ab97bd66febb40cd8a56b660621afa70ad2d37fa9f86017c
 SHA512:
-  metadata.gz: 989ac1ceb29703cb5fc3e4cc17c0bfef537fcb29b1bf73cbcecd1376cf6ede2c6950fe08f581649f9a585174c7159781b32eb7a780a63c454195cf747301d998
-  data.tar.gz: 7a172c3d7e7ed3bab8d7efc4a3e561fd98cb59d748a3e0df23dde00f3b225d004f2e048d586cb628fde1acb59531ce58a266d6bf60dd2597627e0088bf84f48b
+  metadata.gz: b8ecbc6a69a00c6f318ef52078a30a90f797ff6eda558e1c3ce8a90497e98b1cc8297d9b03b7379a87dc97eaaecc67d7873690ae3fc4098de0a75b8b999adcb2
+  data.tar.gz: 0c3fe1e3c6c53988b2d83d418655ab37446e99baeb402d3744f5e8c3b14f320b045f6a4cd6b7648cbb04f0b30a3811128b9f7f7aad3501e696a2b93ef168f083

data/.travis.yml

@@ -1,8 +1,11 @@
 language: ruby
 install: bundle install --without debug --jobs=3 --retry=3
 rvm:
-- 2.2.5
-- 2.3.0
+- 2.2
+- 2.3
+- 2.4
+- 2.5
+- 2.6
 - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,14 +1,5 @@
 # Cfer Change Log
 
-## 0.6.2
-### Bugfixes
-* Fixes a Cri compatibility issue, which should have gone out in 0.6.1
-
-## 0.6.1
-### Bugfixes
-* Fixes an issue with version pinning of Docile. Docile 1.3 makes breaking changes, so Cfer now pins Docile 1.1.*
-* Removes Yard version specification. There's no particular need to pin yard to a version, and Github reported security problems with the old version.
-
 ## 0.6.0
 
 ### Enhancements

data/Gemfile

@@ -8,7 +8,7 @@ group :test do
   gem 'rspec-mocks'
   gem 'guard-rspec'
   gem 'simplecov'
-  gem 'rubocop', '~> 0.47.1'
+  gem 'rubocop', '~> 0.51'
   gem "codeclimate-test-reporter", "~> 1.0.0"
 end
 

data/cfer.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'docile', '~> 1.1.5'
   spec.add_runtime_dependency 'cri', '~> 2.7'
   spec.add_runtime_dependency 'activesupport', '>= 3'
-  spec.add_runtime_dependency 'aws-sdk', '~> 2.2'
-  spec.add_runtime_dependency 'aws-sdk-resources', '~> 2.2'
+  spec.add_runtime_dependency 'aws-sdk', '~> 2'
+  spec.add_runtime_dependency 'aws-sdk-resources', '~> 2'
   spec.add_runtime_dependency 'preconditions', '~> 0.3.0'
   spec.add_runtime_dependency 'semantic', '~> 1.4'
-  spec.add_runtime_dependency 'rainbow', '~> 2.1'
+  spec.add_runtime_dependency 'rainbow', '~> 2.2'
   spec.add_runtime_dependency 'highline', '~> 1.7'
   spec.add_runtime_dependency 'table_print', '~> 1.5'
   spec.add_runtime_dependency "git", '~> 1.3'

data/examples/vpc.md

@@ -176,13 +176,13 @@ output :vpcid, Fn::ref(:vpc)
 
 Now that you have your template ready, you'll be able to use Cfer to create or update a CloudFormation stack:
 
-{% highlight bash %}
+```bash
 cfer converge vpc -t examples/vpc.rb --profile ${AWS_PROFILE} --region ${AWS_REGION}
 ```
 
 Which should produce something like this.
 
-![Cfer Demo]({{ site.url }}/images/cfer/cfer-demo.gif)
+![Cfer Demo](https://raw.githubusercontent.com/seanedwards/cfer/master/doc/cfer-demo.gif)
 
 Use `cfer help` to get more usage information, or check `README.md` and `Rakefile` in the source repository to see how to embed Cfer into your own projects.
 

data/examples/vpc.rb

@@ -54,7 +54,8 @@ end
     # Other CloudFormation intrinsics, such as `Fn::Select` and `AWS::Region` are available as Ruby objects
     # Inspecting these functions will reveal that they simply return a Ruby hash representing the same CloudFormation structures
     availability_zone Fn::select(i, Fn::get_azs(AWS::region))
-    cidr_block "172.42.#{i}.0/24"
+    # this calculates "172.42.#{i}.0/24"
+    cidr_block Fn::select(i, Fn::cidr(Fn::get_att(:vpc, :CidrBlock), 256, 8))
     vpc_id Fn::ref(:vpc)
   end
 

data/lib/cfer.rb

@@ -89,10 +89,9 @@ module Cfer
                 stack_name: stack_name
               }
 
-              rollback_opts[:role_arn] = options[:role_arn] if options[:role_arn]
-
               case operation
               when :created
+                rollback_opts[:role_arn] = options[:role_arn] if options[:role_arn]
                 cfn_stack.delete_stack rollback_opts
               when :updated
                 cfn_stack.cancel_update_stack rollback_opts

data/lib/cfer/cfn/client.rb

@@ -8,7 +8,7 @@ module Cfer::Cfn
     attr_reader :stack
 
     def initialize(options)
-      super
+      super(options)
       @name = options[:stack_name]
       @options = options
       @options.delete :stack_name
@@ -72,7 +72,7 @@ module Cfer::Cfn
       current_version = Cfer::SEMANTIC_VERSION
       previous_version = fetch_cfer_version rescue nil
 
-      current_hash = stack.git_version
+      current_hash = stack.git_state.sha rescue nil
       previous_hash = fetch_git_hash rescue nil
 
       # Compare current and previous versions and hashes?
@@ -112,15 +112,15 @@ module Cfer::Cfn
 
       Cfer::LOGGER.debug "==================="
 
-      stack_options = {
-        stack_name: name,
-        capabilities: response.capabilities
-      }
+      stack_options = options[:stack_options] || {}
+
+      stack_options.merge! stack_name: name, capabilities: response.capabilities
 
       stack_options[:on_failure] = options[:on_failure] if options[:on_failure]
       stack_options[:timeout_in_minutes] = options[:timeout] if options[:timeout]
       stack_options[:role_arn] = options[:role_arn] if options[:role_arn]
       stack_options[:notification_arns] = options[:notification_arns] if options[:notification_arns]
+      stack_options[:enable_termination_protection] = options[:enable_termination_protection] if options[:enable_termination_protection]
 
       stack_options.merge! parse_stack_policy(:stack_policy, options[:stack_policy])
 

data/lib/cfer/core/functions.rb

@@ -4,6 +4,10 @@ module Cfer::Core::Functions
     {"Fn::Join" => [sep, [ *args ].flatten ]}
   end
 
+  def split(sep, str)
+    {"Fn::Split" => [sep, str ]}
+  end
+
   def ref(r)
     {"Ref" => r}
   end
@@ -40,10 +44,14 @@ module Cfer::Core::Functions
     {"Fn::Not" => [cond]}
   end
 
-  def get_azs(region)
+  def get_azs(region = '')
     {"Fn::GetAZs" => region}
   end
 
+  def cidr(ip_block, count, size_mask)
+    {"Fn::Cidr" => [ip_block, count, size_mask]}
+  end
+
   def sub(str, vals = {})
     {"Fn::Sub" => [str, vals]}
   end

data/lib/cfer/core/hooks.rb

@@ -2,13 +2,15 @@ module Cfer::Core
   # Provides support for hooking into resource types, and evaluating code before or after properties are set
   module Hooks
     def pre_block
-      self.class.pre_hooks.sort { |a, b| (a[:nice] || 0) <=> (b[:nice] || 0) }.each do |hook|
-        Docile.dsl_eval(self, &hook[:block])
-      end
+      eval_hooks self.class.pre_hooks
     end
 
     def post_block
-      self.class.post_hooks.sort { |a, b| (a[:nice] || 0) <=> (b[:nice] || 0) }.each do |hook|
+      eval_hooks self.class.post_hooks
+    end
+
+    private def eval_hooks(hooks)
+      hooks.sort { |a, b| (a[:nice] || 0) <=> (b[:nice] || 0) }.each do |hook|
         Docile.dsl_eval(self, &hook[:block])
       end
     end

data/lib/cfer/core/resource.rb

@@ -2,6 +2,21 @@ module Cfer::Core
   class Resource < Cfer::BlockHash
     include Cfer::Core::Hooks
 
+    class Handle
+      attr_reader :name
+      def initialize(name)
+        @name = name.to_s
+      end
+
+      def ref
+        Functions::Fn::ref(name)
+      end
+
+      def method_missing(method)
+        Functions::Fn::get_att(name, method.to_s.camelize)
+      end
+    end
+
     @@types = {}
 
     attr_reader :stack
@@ -16,6 +31,10 @@ module Cfer::Core
       build_from_block(&block)
     end
 
+    def handle
+      @handle ||= Handle.new(@name)
+    end
+
     # Sets a tag on this resource. The resource must support the CloudFormation `Tags` property.
     # @param k [String] The name of the tag to set
     # @param v [String] The value for this tag

data/lib/cfer/core/stack.rb

@@ -13,7 +13,7 @@ module Cfer::Core
 
     attr_reader :options
 
-    attr_reader :git_version
+    attr_reader :git_state
 
     def client
       @options[:client] || raise('No client set on this stack')
@@ -45,11 +45,16 @@ module Cfer::Core
       self[:Resources] = {}
       self[:Outputs] = {}
 
-      if options[:client] && git = options[:client].git && @git_version = (git.object('HEAD^').sha rescue nil)
-        self[:Metadata][:Cfer][:Git] = {
-          Rev: @git_version,
-          Clean: git.status.changed.empty?
-        }
+      if options[:client] && git = options[:client].git
+        begin
+          @git_state = git.object('HEAD^')
+          self[:Metadata][:Cfer][:Git] = {
+            Rev: git_state.sha,
+            Clean: git.status.changed.empty?
+          }
+        rescue => e
+          Cfer::LOGGER.warn("Unable to add Git information to CloudFormation Metadata. #{e}")
+        end
       end
 
       @parameters = HashWithIndifferentAccess.new
@@ -140,7 +145,7 @@ module Cfer::Core
       rc = clazz.new(name, type, self, options, &block)
 
       self[:Resources][name] = rc
-      rc
+      rc.handle
     end
 
     # Adds an output to the CloudFormation stack.

data/lib/cfer/version.rb

@@ -1,5 +1,5 @@
 module Cfer
-  VERSION = "0.6.2"
+  VERSION = "0.7.0"
 
   begin
     require 'semantic'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfer
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Sean Edwards
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-14 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: preconditions
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Toolkit for automating infrastructure using AWS CloudFormation