cloud_former 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0974d1c76501fe359e3eba0417a508c24c8d4eb0
-  data.tar.gz: d468900b6beba3b319e3c1f73d7fd0cca8f858cc
+  metadata.gz: f15b74755839584a05c3254388c66d505674bb0a
+  data.tar.gz: cbb3a4a4837f07f6b6a9968420b3bd6cab52c662
 SHA512:
-  metadata.gz: 89cd956ad1619403b8bd0154ac9817d6efa0cf8f94dfa0069576c2ba4424e8fa6904797b2313e2d78b8ba86a7f9621f45cd6399c70f7b76a19a45b431248a15c
-  data.tar.gz: 1ec3ce984f31598ef74f5026538804c53881434df6b5c2589db39244d9701aa194d305b07ba088aca7dd503d0be0730ec7a7b535537aa689676205d3dc6f7e6f
+  metadata.gz: a6eec8c39e20eacd2a2349aff9cdd07853fb3abea14153d1578f791cae5752ab83df3f529dd508ad8066c91a9dce70a401948cb95e7d0e7cafcf2cf88ee3703f
+  data.tar.gz: 029fcc446f60cb5f8a6d76800e9713e326ec3638a6dd6a2723c50a21b441fe16015c6441939eb87b44577cfef830e0c05dfe1bb58ca7ed6222f96f7a8ca0d3a9

data/.rubocop.yml

@@ -1,10 +1,3 @@
-AllCops:
-  Include:
-    - '**/Rakefile'
-
-Metrics/AbcSize:
-  Max: 20
-
 Metrics/LineLength:
   Max: 140
 
@@ -33,9 +26,15 @@ Metrics/PerceivedComplexity:
 Style/ClassAndModuleChildren:
   Enabled: false
 
+Style/GuardClause:
+  Enabled: false
+
 Style/IfUnlessModifier:
   Enabled: false
 
+Style/Next:
+  Enabled: false
+
 Style/PredicateName:
   Enabled: false
 

data/lib/cloud_former/functions/get_att.rb

@@ -12,8 +12,8 @@ module CloudFormer
       end
 
       def dump_json
-        if @resource.respond_to?(:name)
-          { 'Fn::GetAtt' => [@resource.name, @attribute] }
+        if @resource.respond_to?(:get_name)
+          { 'Fn::GetAtt' => [@resource.get_name, @attribute] }
         elsif @resource.respond_to?(:to_s)
           { 'Fn::GetAtt' => [@resource.to_s, @attribute] }
         end

data/lib/cloud_former/functions/join.rb

@@ -18,7 +18,7 @@ module CloudFormer
           elsif piece.is_a?(Function)
             piece.dump_json
           elsif piece.is_a?(Resource)
-            { 'Ref' => piece.name }
+            { 'Ref' => piece.get_name }
           else
             piece
           end

data/lib/cloud_former/metadata_resources/cloud_formation/authentication_item.rb

@@ -3,8 +3,6 @@ module CloudFormer
   module CloudFormation
     class AuthenticationItem < MetadataResource
 
-      attr_reader :name
-
       aws_attribute :access_key_id, name: 'accessKeyId', type: String
       aws_attribute :buckets, name: 'buckets', list: true, type: String
       aws_attribute :password, name: 'password', type: String
@@ -20,6 +18,10 @@ module CloudFormer
         @name = name || "AuthenticationItem#{self.class.next_id}"
       end
 
+      def get_name
+        @name
+      end
+
       def self.next_id
         @@current_id ||= 1
         @@current_id += 1

data/lib/cloud_former/parameters/parameter.rb

@@ -16,7 +16,6 @@ module CloudFormer
     aws_attribute :no_echo, type: Boolean
 
     attr_reader :type
-    attr_reader :name
 
     json_attribute(:type)
 
@@ -26,5 +25,9 @@ module CloudFormer
         self.instance_eval(&block)
       end
     end
+
+    def get_name
+      @name
+    end
   end
 end

data/lib/cloud_former/property_or_attribute.rb

@@ -1,7 +1,6 @@
 module CloudFormer
   class PropertyOrAttribute
 
-    attr_reader :name
     attr_reader :options
 
     def initialize(name, options)
@@ -9,6 +8,10 @@ module CloudFormer
       @options = options
     end
 
+    def get_name
+      @name
+    end
+
     def as_json_for(instance)
       val_as_json(instance.send(name))
     end
@@ -17,7 +20,7 @@ module CloudFormer
 
     def val_as_json(val)
       if val.is_a?(Parameter) || val.is_a?(PseudoParameter)
-        { 'Ref' => val.name }
+        { 'Ref' => val.get_name }
       elsif val.is_a?(Function)
         val.dump_json
       elsif val.is_a?(Resource) || val.is_a?(ResourceProperty)
@@ -32,10 +35,10 @@ module CloudFormer
           end
           thing
         else
-          if val.name.nil? || val.name.empty?
-            raise ArgumentError.new("Attempting to reference a resource of type #{val.class.name} with no name")
+          if val.get_name.nil? || val.get_name.empty?
+            fail ArgumentError, "Attempting to reference a resource of type #{val.class.name} with no name"
           end
-          { 'Ref' => val.name }
+          { 'Ref' => val.get_name }
         end
       elsif val.is_a?(Hash)
         mapped_hash = {}

data/lib/cloud_former/pseudo_parameters/pseudo_parameter.rb

@@ -1,5 +1,7 @@
 module CloudFormer
   class PseudoParameter
-    attr_reader :name
+    def get_name
+      @name
+    end
   end
 end

data/lib/cloud_former/resources/resource.rb

@@ -12,7 +12,7 @@ module CloudFormer
     aws_attribute :depends_on, list: true, type: String
     aws_attribute :deletion_policy, type: String
 
-    def initialize(name=nil, &block)
+    def initialize(name = nil, &block)
       @name = name
       @metadata_items = []
       @aws_type = self.class.name.sub('CloudFormer', 'AWS')
@@ -20,12 +20,11 @@ module CloudFormer
         self.instance_eval(&block)
       end
       if @name.nil? || @name.empty?
-        raise ArgumentError.new("Attempting to create a resource of type #{self.class.name} with no name")
+        fail ArgumentError, "Attempting to create a resource of type #{self.class.name} with no name"
       end
     end
 
-    def name(arg=nil)
-      @name = arg if arg
+    def get_name
       @name
     end
 

data/lib/cloud_former/template.rb

@@ -34,7 +34,7 @@ module CloudFormer
         resource_res = {}
         @resources.each do |resource|
           resource.resource_tree.flatten.each do |r|
-            resource_res[r.name] = r.dump_json
+            resource_res[r.get_name] = r.dump_json
           end
         end
         res['Resources'] = resource_res
@@ -44,7 +44,7 @@ module CloudFormer
         output_res = {}
         @outputs.each do |output|
           if (output[1].is_a?(Resource) || output[1].is_a?(Parameter))
-            output_res[output[0]] = { 'Value' => { 'Ref' => output[1].name } }
+            output_res[output[0]] = { 'Value' => { 'Ref' => output[1].get_name } }
           elsif output[1].is_a?(Function)
             output_res[output[0]] = { 'Value' => output[1].dump_json }
           else

data/lib/cloud_former/version.rb

@@ -1,3 +1,3 @@
 module CloudFormer
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloud_former
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Aubrey Holland