ec2-host 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef29cecf0c6f274808f15f1abcc4998c420ec289
-  data.tar.gz: e06379b2c29923349d6326e295e42896753e8365
+  metadata.gz: c1eb20245f5a476fec6d84ce21697235b24ad6d2
+  data.tar.gz: 5de04a845db6fe32b690f31fe0c82ab70d8f1d68
 SHA512:
-  metadata.gz: 8dbde2c0e7ffd9f7140e1ceff13986a8f5ac605fefcae7f5b83312354b0b2b9b70f3a28ece4329f8e4216c532d02077bf4bc021099f3d83fa190e325de3df3c7
-  data.tar.gz: b946a0386ee1865dd768f48feb398b15a41529a527e954c7002b9ebf0754570a659c2f1ef23f7cf84df393fbd9ec0259b634879c05e27e976dbf09740ebfd030
+  metadata.gz: 745211b9aff4c00cd9c561f788b8eaa0c1764010ab161854750ef21aa1e822e8445c08bf47921bcd9ee198a6a60919ddfd371828b553960a78ca5432ffda5f2e
+  data.tar.gz: 2b8e7c3a2fb51bf199da07c710b9ccb1bf4ef43cf29ac7a0010723c6566e9cdb081f91d4330e188eb4ba8361fb08023ca9c4d2834cd8896abef207989e263ffe

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.3 (2015/08/10)
+
+Enhancement:
+
+* Add ROLE_TAG_DELIMITER and ARRAY_TAG_DELIMITER config
+
 # 0.0.2 (2015/08/10)
 
 Fixes:

data/README.md

@@ -24,11 +24,13 @@ ec2-host parameters:
 
 * **HOSTNAME_TAG**: EC2 tag key used to express a hostname. The default is `Name`.
 * **ROLES_TAG**: EC2 tag keys used to express roles. The default is `Roles`
-  * You can assign multiple roles seperated by `,` comma
-  * Also, you can express levels of roles delimited by `:`.
+  * You can assign multiple roles seperated by `ARRAY_TAG_DELIMITER` (default: `,`)
+  * Also, you can express levels of roles delimited by `ROLE_TAG_DELIMITER` (default `:`)
   * Example: admin:ami, then `EC2::Host.new(role: 'admin:ami')` and also `EC2::Host.new(role1: 'admin')` returns this host
+* **ROLE_TAG_DELIMITER**: A delimiter to express levels of roles. Default is `:`
 * **OPTIONAL_STRING_TAGS**: You may add optional non-array tags. You can specify multiple tags like `Service,Status`. 
-* **OPTIONAL_ARRAY_TAGS**: You may add optional array tags. Array tags allows multiple values delimited by `,` (comma) as `Roles` tag.
+* **OPTIONAL_ARRAY_TAGS**: You may add optional array tags. Array tags allows multiple values delimited by `ARRAY_TAG_DELIMITER` (default: `,`)
+* **ARRAY_TAG_DELIMITER**: A delimiter to express array. Default is `,`
 * **LOG_LEVEL**: Log level such as `info`, `debug`, `error`. The default is `info`. 
 
 See [sampel.conf](./sample.conf)

data/ec2-host.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "ec2-host"
-  gem.version       = '0.0.2'
+  gem.version       = '0.0.3'
   gem.author        = ['Naotoshi Seo']
   gem.email         = ['sonots@gmail.com']
   gem.homepage      = 'https://github.com/sonots/ec2-host'

data/lib/ec2/host.rb

@@ -53,9 +53,6 @@ class EC2
       Config.configure(params)
     end
 
-    ARRAY_TAG_DELIMITER = ','
-    ROLE_TAG_DELIMITER = ':'
-
     attr_reader :conditions, :options
 
     # @param [Array of Hash, or Hash] conditions (and options)

data/lib/ec2/host/cli.rb

@@ -18,15 +18,15 @@ class EC2
       option :role1,
         :aliases => %w[--r1 --usage1 --u1], # hmm, -r1 is not suppored by thor
         :type => :array,
-        :desc => "role1, the 1st part of role delimited by #{ROLE_TAG_DELIMITER}"
+        :desc => "role1, the 1st part of role delimited by #{Config.role_tag_delimiter}"
       option :role2,
         :aliases => %w[--r2 --usage2 --u2],
         :type => :array,
-        :desc => "role2, the 2nd part of role delimited by #{ROLE_TAG_DELIMITER}"
+        :desc => "role2, the 2nd part of role delimited by #{Config.role_tag_delimiter}"
       option :role3,
         :aliases => %w[--r3 --usage3 --u3],
         :type => :array,
-        :desc => "role3, the 3rd part of role delimited by #{ROLE_TAG_DELIMITER}"
+        :desc => "role3, the 3rd part of role delimited by #{Config.role_tag_delimiter}"
       Config.optional_options.each do |opt, tag|
         option opt, :type => :array, :desc => opt
       end

data/lib/ec2/host/config.rb

@@ -69,6 +69,14 @@ class EC2
         @optional_string_tags ||= (ENV['OPTIONAL_STRING_TAGS'] || config.fetch('OPTIONAL_STRING_TAGS', '')).split(',')
       end
 
+      def self.role_tag_delimiter
+        @role_tag_delimiter ||= ENV['ROLE_TAG_DELIMITER'] || config.fetch('ROLE_TAG_DELIMITER', ':')
+      end
+
+      def self.array_tag_delimiter
+        @array_tag_delimiter ||= ENV['ARRAY_TAG_DELIMITER'] || config.fetch('ARRAY_TAG_DELIMITER', ',')
+      end
+
       # private
 
       def self.aws_credentials

data/lib/ec2/host/host_data.rb

@@ -121,7 +121,7 @@ class EC2
 
       def find_array_tag(key)
         v = instance.tags.find {|tag| tag.key == key }
-        v ? v.value.split(ARRAY_TAG_DELIMITER) : []
+        v ? v.value.split(Config.array_tag_delimiter) : []
       end
     end
   end

data/lib/ec2/host/role_data.rb

@@ -7,13 +7,13 @@ class EC2
     # Represents each role
     class RoleData
       def self.initialize(role)
-        role1, role2, role3 = role.split(ROLE_TAG_DELIMITER)
+        role1, role2, role3 = role.split(Config.role_tag_delimiter)
         self.new(role1, role2, role3)
       end
 
       # @return [String] something like "admin:jenkins:slave"
       def role
-        @role ||= [role1, role2, role3].compact.reject(&:empty?).join(ROLE_TAG_DELIMITER)
+        @role ||= [role1, role2, role3].compact.reject(&:empty?).join(Config.role_tag_delimiter)
       end
       alias :to_s :role
 

data/sample.conf

@@ -3,6 +3,8 @@ AWS_SECRET_ACCESS_KEY=xxxxxx
 AWS_REGION=ap-northeast-1
 HOSTNAME_TAG=Name
 ROLES_TAG=Roles
-OPTIONAL_ARRAY_TAGS=Tags
+ROLE_TAG_DELIMITER=:
 OPTIONAL_STRING_TAGS=Service,Status
+OPTIONAL_ARRAY_TAGS=Tags
+ARRAY_TAG_DELIMITER=,
 LOG_LEVEL=info

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naotoshi Seo