Restrict max line length to 140

.rubocop.yml

@@ -8,7 +8,7 @@ Metrics/CyclomaticComplexity:
   Enabled: false
 
 Metrics/LineLength:
-  Max: 130
+  Max: 140
   Exclude:
     - "spec/**/*"
 

Rakefile

@@ -4,4 +4,3 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-

lib/terraforming.rb

@@ -3,7 +3,7 @@
 begin
   require "ox"
 rescue NameError => e
-  spec = Gem::Specification.stubs.find {|s| s.name == 'ox' }
+  spec = Gem::Specification.stubs.find { |s| s.name == 'ox' }
   raise e unless spec
   require File.join(spec.gem_dir, "lib/ox")
 end

lib/terraforming/cli.rb

@@ -199,7 +199,6 @@ def vgw
       execute(Terraforming::Resource::VPNGateway, options)
     end
 
-
     private
 
     def execute(klass, options)

lib/terraforming/resource/auto_scaling_group.rb

@@ -83,7 +83,7 @@ def vpc_zone_identifier_of(group)
       end
 
       def vpc_zone_specified?(group)
-        group.vpc_zone_identifier && vpc_zone_identifier_of(group).length > 0
+        group.vpc_zone_identifier && !vpc_zone_identifier_of(group).empty?
       end
     end
   end

lib/terraforming/resource/db_security_group.rb

@@ -46,7 +46,7 @@ def ingresses_of(security_group)
       end
 
       def db_security_groups
-        @client.describe_db_security_groups.map(&:db_security_groups).flatten.select { |sg| ingresses_of(sg).length > 0 }
+        @client.describe_db_security_groups.map(&:db_security_groups).flatten.select { |sg| !ingresses_of(sg).empty? }
       end
 
       def module_name_of(security_group)

lib/terraforming/resource/ec2.rb

@@ -25,24 +25,24 @@ def tfstate
           block_devices = block_devices_of(instance)
 
           attributes = {
-            "ami"=> instance.image_id,
-            "associate_public_ip_address"=> "true",
-            "availability_zone"=> instance.placement.availability_zone,
-            "ebs_block_device.#"=> ebs_block_devices_in(block_devices, instance).length.to_s,
-            "ebs_optimized"=> instance.ebs_optimized.to_s,
+            "ami" => instance.image_id,
+            "associate_public_ip_address" => "true",
+            "availability_zone" => instance.placement.availability_zone,
+            "ebs_block_device.#" => ebs_block_devices_in(block_devices, instance).length.to_s,
+            "ebs_optimized" => instance.ebs_optimized.to_s,
             "ephemeral_block_device.#" => "0", # Terraform 0.6.1 cannot fetch this field from AWS
-            "id"=> instance.instance_id,
-            "instance_type"=> instance.instance_type,
+            "id" => instance.instance_id,
+            "instance_type" => instance.instance_type,
             "monitoring" => monitoring_state(instance).to_s,
-            "private_dns"=> instance.private_dns_name,
-            "private_ip"=> instance.private_ip_address,
-            "public_dns"=> instance.public_dns_name,
-            "public_ip"=> instance.public_ip_address,
-            "root_block_device.#"=> root_block_devices_in(block_devices, instance).length.to_s,
-            "security_groups.#"=> in_vpc ? "0" : instance.security_groups.length.to_s,
-            "source_dest_check"=> instance.source_dest_check.to_s,
-            "tenancy"=> instance.placement.tenancy,
-            "vpc_security_group_ids.#"=> in_vpc ? instance.security_groups.length.to_s : "0",
+            "private_dns" => instance.private_dns_name,
+            "private_ip" => instance.private_ip_address,
+            "public_dns" => instance.public_dns_name,
+            "public_ip" => instance.public_ip_address,
+            "root_block_device.#" => root_block_devices_in(block_devices, instance).length.to_s,
+            "security_groups.#" => in_vpc ? "0" : instance.security_groups.length.to_s,
+            "source_dest_check" => instance.source_dest_check.to_s,
+            "tenancy" => instance.placement.tenancy,
+            "vpc_security_group_ids.#" => in_vpc ? instance.security_groups.length.to_s : "0",
           }
 
           placement_group = instance.placement.group_name
@@ -72,7 +72,7 @@ def block_device_ids_of(instance)
       end
 
       def block_devices_of(instance)
-        return [] unless instance.block_device_mappings.length > 0
+        return [] if instance.block_device_mappings.empty?
         @client.describe_volumes(volume_ids: block_device_ids_of(instance)).map(&:volumes).flatten
       end
 
@@ -92,8 +92,8 @@ def ebs_block_devices_in(block_devices, instance)
       #     https://github.com/hashicorp/terraform/blob/281e4d3e67f66daab9cdb1f7c8b6f602d949e5ee/builtin/providers/aws/resource_aws_instance.go#L481-L501
       #
       def in_vpc?(instance)
-        vpc_security_groups_of(instance).length > 0 ||
-          (instance.subnet_id && instance.subnet_id != "" && instance.security_groups.length == 0)
+        !vpc_security_groups_of(instance).empty? ||
+          (instance.subnet_id && instance.subnet_id != "" && instance.security_groups.empty?)
       end
 
       def monitoring_state(instance)

lib/terraforming/resource/eip.rb

@@ -31,7 +31,7 @@ def tfstate
             "public_ip" => addr.public_ip,
             "vpc" => is_vpc?(addr).to_s,
           }
-          attributes.delete_if{|k, v| v.nil?}
+          attributes.delete_if { |_k, v| v.nil? }
           resources["aws_eip.#{addr.allocation_id}"] = {
             "type" => "aws_eip",
             "primary" => {

lib/terraforming/resource/elasti_cache_cluster.rb

@@ -37,9 +37,9 @@ def tfstate
           }
 
           attributes["port"] = if cache_cluster.configuration_endpoint
-            cache_cluster.configuration_endpoint.port.to_s
-          else
-            cache_cluster.cache_nodes[0].endpoint.port.to_s
+                                 cache_cluster.configuration_endpoint.port.to_s
+                               else
+                                 cache_cluster.cache_nodes[0].endpoint.port.to_s
           end
 
           resources["aws_elasticache_cluster.#{cache_cluster.cache_cluster_id}"] = {
@@ -61,7 +61,7 @@ def cache_clusters
       end
 
       def cluster_in_vpc?(cache_cluster)
-        cache_cluster.cache_security_groups.length == 0
+        cache_cluster.cache_security_groups.empty?
       end
 
       def security_group_ids_of(cache_cluster)

lib/terraforming/resource/elb.rb

@@ -48,7 +48,6 @@ def tfstate
           attributes.merge!(instances_attributes_of(load_balancer))
           attributes.merge!(tags_attributes_of(load_balancer))
 
-
           resources["aws_elb.#{module_name_of(load_balancer)}"] = {
             "type" => "aws_elb",
             "primary" => {
@@ -106,7 +105,7 @@ def healthcheck_hashcode_of(health_check)
 
       def tags_attributes_of(elb)
         tags = @client.describe_tags(load_balancer_names: [elb.load_balancer_name]).tag_descriptions.first.tags
-        attributes = {"tags.#" => tags.length.to_s}
+        attributes = { "tags.#" => tags.length.to_s }
 
         tags.each do |tag|
           attributes["tags.#{tag.key}"] = tag.value
@@ -116,7 +115,7 @@ def tags_attributes_of(elb)
       end
 
       def instances_attributes_of(elb)
-        attributes = {"instances.#" => elb.instances.length.to_s}
+        attributes = { "instances.#" => elb.instances.length.to_s }
 
         elb.instances.each do |instance|
           attributes["instances.#{Zlib.crc32(instance.instance_id)}"] = instance.instance_id
@@ -126,7 +125,7 @@ def instances_attributes_of(elb)
       end
 
       def subnets_attributes_of(elb)
-        attributes = {"subnets.#" => elb.subnets.length.to_s}
+        attributes = { "subnets.#" => elb.subnets.length.to_s }
 
         elb.subnets.each do |subnet_id|
           attributes["subnets.#{Zlib.crc32(subnet_id)}"] = subnet_id
@@ -136,7 +135,7 @@ def subnets_attributes_of(elb)
       end
 
       def sg_attributes_of(elb)
-        attributes = {"security_groups.#" => elb.security_groups.length.to_s}
+        attributes = { "security_groups.#" => elb.security_groups.length.to_s }
 
         elb.security_groups.each do |sg_id|
           attributes["security_groups.#{Zlib.crc32(sg_id)}"] = sg_id
@@ -146,7 +145,7 @@ def sg_attributes_of(elb)
       end
 
       def listeners_attributes_of(elb)
-        attributes = {"listener.#" => elb.listener_descriptions.length.to_s}
+        attributes = { "listener.#" => elb.listener_descriptions.length.to_s }
 
         elb.listener_descriptions.each do |listener_description|
           attributes.merge!(listener_attributes_of(listener_description.listener))

lib/terraforming/resource/iam_group.rb

@@ -22,7 +22,7 @@ def tf
       def tfstate
         iam_groups.inject({}) do |resources, group|
           attributes = {
-            "arn"=> group.arn,
+            "arn" => group.arn,
             "id" => group.group_name,
             "name" => group.group_name,
             "path" => group.path,

lib/terraforming/resource/iam_group_membership.rb

@@ -24,7 +24,7 @@ def tfstate
           membership_name = membership_name_of(group)
 
           attributes = {
-            "group"=> group.group_name,
+            "group" => group.group_name,
             "id" => membership_name,
             "name" => membership_name,
             "users.#" => group_members_of(group).length.to_s,

lib/terraforming/resource/iam_policy_attachment.rb

@@ -60,7 +60,7 @@ def entities_for_policy(policy)
           result.policy_users += resp.policy_users
           result.policy_roles += resp.policy_roles
         end
-        
+
         result
       end
 

lib/terraforming/resource/iam_user.rb

@@ -22,7 +22,7 @@ def tf
       def tfstate
         iam_users.inject({}) do |resources, user|
           attributes = {
-            "arn"=> user.arn,
+            "arn" => user.arn,
             "id" => user.user_name,
             "name" => user.user_name,
             "path" => user.path,

lib/terraforming/resource/launch_configuration.rb

@@ -21,7 +21,6 @@ def tf
 
       def tfstate
         launch_configurations.inject({}) do |resources, lc|
-
           attributes = {
             "name" => lc.launch_configuration_name,
             "image_id" => lc.image_id,
@@ -72,7 +71,7 @@ def root_block_device_count(launch_configuration)
       end
 
       def ebs_block_device?(block_device)
-        block_device.virtual_name == nil && block_device.ebs
+        block_device.virtual_name.nil? && block_device.ebs
       end
 
       def ebs_block_device_count(launch_configuration)

lib/terraforming/resource/nat_gateway.rb

@@ -24,7 +24,7 @@ def tfstate
           next resources if nat_gateway.nat_gateway_addresses.empty?
 
           attributes = {
-            "id"     => nat_gateway.nat_gateway_id,
+            "id" => nat_gateway.nat_gateway_id,
             "allocation_id" => nat_gateway.nat_gateway_addresses[0].allocation_id,
             "subnet_id" => nat_gateway.subnet_id,
             "network_inferface_id" => nat_gateway.nat_gateway_addresses[0].network_interface_id,
@@ -43,7 +43,7 @@ def tfstate
         end
       end
 
-    private
+      private
 
       def nat_gateways
         @client.describe_nat_gateways.nat_gateways

lib/terraforming/resource/network_interface.rb

@@ -49,7 +49,7 @@ def attachment_of(network_interface)
       end
 
       def private_ips_of(network_interface)
-        network_interface.private_ip_addresses.map{|addr| addr.private_ip_address }
+        network_interface.private_ip_addresses.map { |addr| addr.private_ip_address }
       end
 
       def security_groups_of(network_interface)
@@ -63,7 +63,6 @@ def module_name_of(network_interface)
       def network_interfaces
         @client.describe_network_interfaces.map(&:network_interfaces).flatten
       end
-
     end
   end
 end

lib/terraforming/resource/opsworks_custom_layer.rb

@@ -21,7 +21,6 @@ def tf
 
       def tfstate
         stacks.inject({}) do |resources, stack|
-
           stack_layers(stack.stack_id).each do |layer|
             attributes = {
               "auto_assign_elastic_ips"       => layer.auto_assign_elastic_ips.to_s,
@@ -107,13 +106,12 @@ def stacks
       end
 
       def stack_layers(stack_id)
-        @client.describe_layers({stack_id: stack_id}).layers
+        @client.describe_layers({ stack_id: stack_id }).layers
       end
 
       def module_name_of(object)
         normalize_module_name(object.name)
       end
-
     end
   end
 end

lib/terraforming/resource/opsworks_stack.rb

@@ -75,7 +75,6 @@ def stacks
       def module_name_of(stack)
         normalize_module_name(stack.name)
       end
-
     end
   end
 end

lib/terraforming/resource/route53_record.rb

@@ -25,8 +25,8 @@ def tfstate
           record_id = record_id_of(record, zone_id)
 
           attributes = {
-            "id"=> record_id,
-            "name"=> name_of(record.name.gsub(/\\052/, '*')),
+            "id" => record_id,
+            "name" => name_of(record.name.gsub(/\\052/, '*')),
             "type" => record.type,
             "zone_id" => zone_id,
           }

lib/terraforming/resource/route53_zone.rb

@@ -25,9 +25,9 @@ def tfstate
           vpc = vpc_of(hosted_zone)
 
           attributes = {
-            "comment"=> comment_of(hosted_zone),
-            "id"=> zone_id,
-            "name"=> name_of(hosted_zone),
+            "comment" => comment_of(hosted_zone),
+            "id" => zone_id,
+            "name" => name_of(hosted_zone),
             "name_servers.#" => name_servers_of(hosted_zone).length.to_s,
             "tags.#" => tags_of(hosted_zone).length.to_s,
             "vpc_id" => vpc ? vpc.vpc_id : "",

lib/terraforming/resource/route_table.rb

@@ -47,8 +47,8 @@ def tfstate
       def routes_of(route_table)
         route_table.routes.reject do |route|
           route.gateway_id.to_s == 'local' ||
-          route.origin.to_s == 'EnableVgwRoutePropagation' ||
-          route.destination_prefix_list_id
+            route.origin.to_s == 'EnableVgwRoutePropagation' ||
+            route.destination_prefix_list_id
         end
       end
 

lib/terraforming/resource/security_group.rb

@@ -75,7 +75,7 @@ def group_hashcode_of(group)
 
       def module_name_of(security_group)
         if security_group.vpc_id.nil?
-          normalize_module_name("#{security_group.group_name}")
+          normalize_module_name(security_group.group_name.to_s)
         else
           normalize_module_name("#{security_group.vpc_id}-#{security_group.group_name}")
         end
@@ -85,7 +85,6 @@ def permission_attributes_of(security_group, permission, type)
         hashcode = permission_hashcode_of(security_group, permission)
         security_groups = security_groups_in(permission, security_group).reject { |group_name| group_name == security_group.group_name }.reject { |group_id| group_id == security_group.group_id }
 
-
         attributes = {
           "#{type}.#{hashcode}.from_port" => (permission.from_port || 0).to_s,
           "#{type}.#{hashcode}.to_port" => (permission.to_port || 0).to_s,
@@ -140,7 +139,7 @@ def permission_hashcode_of(security_group, permission)
           "#{permission.from_port || 0}-" <<
           "#{permission.to_port || 0}-" <<
           "#{permission.ip_protocol}-" <<
-          "#{self_referenced_permission?(security_group, permission).to_s}-"
+          "#{self_referenced_permission?(security_group, permission)}-"
 
         permission.ip_ranges.each { |range| string << "#{range.cidr_ip}-" }
         security_groups_in(permission, security_group).each { |group| string << "#{group}-" }
@@ -157,7 +156,7 @@ def security_groups
       end
 
       def security_groups_in(permission, security_group)
-        permission.user_id_group_pairs.map { |range|
+        permission.user_id_group_pairs.map do |range|
           # EC2-Classic, same account
           if security_group.owner_id == range.user_id && !range.group_name.nil?
             range.group_name
@@ -168,7 +167,7 @@ def security_groups_in(permission, security_group)
           else
             "#{range.user_id}/#{range.group_name}"
           end
-        }
+        end
       end
 
       def tags_attributes_of(security_group)

lib/terraforming/util.rb

@@ -26,6 +26,5 @@ def prettify_policy(document, breakline: false, unescape: false)
         json.strip
       end
     end
-
   end
 end