sortinghat 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9889a8fb4851b45b061c057c8fd958c42c2c5cd
-  data.tar.gz: 124f2e6179e1eda555a010f35b221ce9782cdf60
+  metadata.gz: 7796fcee5c89e9eccdf90a2cd275c921c787b8d6
+  data.tar.gz: f00f7b9af41f75647fba8f6bfb191fa7c8985ee2
 SHA512:
-  metadata.gz: 74410f415bc0043c707bd07e72ee96e69e838ecb309cd0b2fa2975f6f8d65aab5528460e8754a36e3c9aacd6c51375c258ba433d91cd76f101369c6e8f25424d
-  data.tar.gz: 127e62bd80ff09c4640ad3d92c6f12656622bdc4f49076fffb86339e3791f1edc1469d6eb25879a091711ac795977d0e61186061fa714385c26873f8c4122006
+  metadata.gz: e64c35725349723129787d1548ababb0f52bb6fe792d22b8557d47189521f58f02d2bf8ab8e94d9c2d771ffb0e063f1566dff1baa4d6b79fc7beef7756cbac40
+  data.tar.gz: ae90d2230a8661404b43c33fe7240731dcc4317f9551b15c154fca77764b895bac994415f0d81a4a42a10fc88687c89c5f5c7a40ad385bad5cf9e7da19893855

data/README.md

@@ -28,9 +28,11 @@ Install however you please to your AMI(s) with:
 The gem itself was developed under Ruby 2.0.0 to work with CentOS 7.
 
 It requires the following gems:
-* aws-sdk ~> 2
+* aws-sdk 2.1.2
 * pure_json
 
+The v2.1.2 dependency comes from the fact that as of this writting the latest codedeploy-agent (installed via .rpm) breaks if it does not have v2.1.2.
+
 During actually usage, the gem requires that the instance have the following IAM actions allowed via policy:
 * autoscaling:DescribeAutoScalingInstances
 * autoscaling:DescribeAutoScalingGroups

data/lib/sortinghat/banquet.rb

@@ -38,31 +38,34 @@ module Sortinghat
     def start!
 
       # Best thing to avoid run conditions are to wait
-      sleep rand(5)
+      sleep rand(10)
 
       # Find out who is who, instances alive
-      # If discover() returns an Array full of nil(s), alive will be nil
-      alive = cleanup!(@aws.discover())
+      # If discover() returns an Array full of nil(s), alive will become an empty Array
+      alive = cleanup(@aws.discover())
 
       # Given the alive instances, find our prefix
-      # If alive is nil, selection will return the number '1'
+      # If alive an empty array, selection will return the number '1'
       @prefix = ensurezero(selection(alive))
 
       # Put together hostname/fqdn
       construction()
 
+      # Set the Name tag on this instance
       @aws.settag!(@hostname)
 
       # Find out who is who, instances alive
-      # If discover() returns an Array full of nil(s), alive will be nil
-      alive = cleanup!(@aws.discover())
+      # If discover() returns an Array full of nil(s), alive will become an empty Array
+      alive = cleanup(@aws.discover())
 
+      # Only enter recursion if the uniq() length of the alive array does not equal the actual length
+      # On AutoScalingGroup initalization, the cleanup() should ensure the alive array is empty not nil so uniq() works
       unless alive.uniq.length == alive.length
         # There are duplicates, remove tag, wait, restart
         @aws.removetag!()
         sleep rand(10)
         start!()
-      end 
+      end
 
       # Register in DNS
       @aws.setroute53(@options[:zone], @fqdn)
@@ -88,6 +91,7 @@ module Sortinghat
 
     private
 
+    # Method to check that we have write permissions to /etc/*
     def checkpermissions()
       unless File.stat('/etc/hosts').writable?
         # We found it, log error and exit successfully
@@ -96,40 +100,46 @@ module Sortinghat
       end
     end
 
-    def cleanup!(array)
-      array.reject! { |item| item.nil? }
-      return [] if array.empty?
-      array.select! { |name| name.include?(@options[:env]) and name.include?(@options[:client]) and name.include?(@options[:type]) }
+    # Method to cleanup the array returned by aws.discover()
+    # Remove nil values basically
+    def cleanup(array)
+      clean = array.reject { |item| item.nil? }
+      return [] if clean.empty?
+      clean
     end
 
+    # Method to consume the alive array and figure out what this instance's prefix should be
     def selection(array)
-      # If array is nil, just return 01
-      return 1 if array.nil?
+      # If array is empty, just return 01
+      return 1 if array.empty?
 
-      # Array to store the numbers already taken 
+      # Array to store the numbers already taken
       taken = Array.new
-      
+
       # Filter the incoming array, find the numbers and store them in the taken Array
       array.each { |string| taken << string.scan(/\d./).join('').sub(/^0+/, '').to_i }
-      
+
       # We have two digits, define our range of numbers
       limits = (1..99).to_a
 
-      # Return the first value once we find what isn't taken in our range of numbers 
+      # Return the first value once we find what isn't taken in our range of numbers
       (limits - taken)[0]
     end
 
+    # Method to ensure our prefix always has a leading 0 if < 10
     def ensurezero(prefix)
       if prefix < 10
         prefix.to_s.rjust(2, "0")
       end
     end
 
+    # Method to construct our instance variables @hostname and @fqdn
     def construction()
       @hostname = "#{@options[:client]}-#{@options[:env]}-#{@options[:type]}#{@prefix.to_s}-#{@options[:region]}"
       @fqdn = "#{@options[:client]}-#{@options[:env]}-#{@options[:type]}#{@prefix.to_s}-#{@options[:region]}.#{@options[:zone]}"
     end
 
+    # Method to set the local hostname on this instance
     def setlocal()
       if system("hostnamectl set-hostname #{@fqdn}")
         @log.info("Set the localhost hostname to #{@fqdn}.")
@@ -139,9 +149,9 @@ module Sortinghat
     def sethostsfile()
       # Store the ip address so we only make one metadata call here
       privateip = @aws.privateip()
-      if File.readlines('/etc/hosts').grep(/#{@hostname}|#{privateip}/).size < 1 
+      if File.readlines('/etc/hosts').grep(/#{@hostname}|#{privateip}/).size < 1
         File.open('/etc/hosts', 'a') do |file|
-          file.puts "#{@privateip} \t #{@hostname} #{@fqdn}"
+          file.puts "#{privateip} \t #{@hostname} #{@fqdn}"
         end
         @log.info("Added hostname(s) to /etc/hosts.")
       else

data/lib/sortinghat/version.rb

@@ -1,3 +1,3 @@
 module Sortinghat
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sortinghat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - D. Pramann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler