ec2-host 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 111eba0b58ae0c88e7c0c8dc2fa342f8f397d594
-  data.tar.gz: cfddfadf8447f1cc751ef005c7173a3b64480cc1
+  metadata.gz: a11603984da7e55345504bce0b96e21a903d26f9
+  data.tar.gz: d01d8ea00adca128ad0e2eb0036725fd4cd2cffa
 SHA512:
-  metadata.gz: 80e09e433370bfd266977ce286de1969dff6137b152745e510937903f0a481b58ef7af01a5d70d97221d0f3912e04d17181cff94e9e18c3ea78a5659f45c806d
-  data.tar.gz: 54d9dca3656d00d3f32d35210bc98e7c9ec40ef1e91985edcb20a4d6ded4280515ad2f32f858cb2ab05464da1cc004e7c8e69f8349fec0f03b28db7724661317
+  metadata.gz: a047cb53fc0a9f1c7234ccd8df891e23223574d8d389d7b968cab5da6890ecf171d71157f916d0122a2b24a2942422be3b61a686244f1784b8c92728914cb131
+  data.tar.gz: 26074ba59e96bf6b71c52862667b882db1d7254b5d053f3e537bdd51f8f1996cb7849fe2c19de186380e69ba7b84863b59e2f1efb25ea3a7576b303def3123d9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.2.1 (2015/08/26)
+
+Fixes:
+
+* Fix to be able to use together with capistrano 3
+
 # 0.2.0 (2015/08/19)
 
 Changes:

data/ec2-host.gemspec

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

data/lib/ec2/host/host_data.rb

@@ -19,12 +19,12 @@ class EC2
         :private_ip_address,
         :public_ip_address,
         :launch_time
-      def state; instance.state.name; end
-      def monitoring; instance.monitoring.state; end
+      def state; self[:instance].state.name; end
+      def monitoring; self[:instance].monitoring.state; end
 
       alias_method :ip, :private_ip_address
       alias_method :start_date, :launch_time
-      def usages; roles; end
+      def usages; self[:roles]; end
 
       def self.initialize(instance)
         d = self.new
@@ -63,12 +63,12 @@ class EC2
       end
 
       def info
-        if hostname and status and roles and tags and service
+        if self[:hostname] and self[:status] and self[:roles] and self[:tags] and self[:service]
           # special treatment for DeNA ;)
-          info = "#{hostname}:#{status}"
-          info << "(#{roles.join(' ')})" unless roles.empty?
-          info << "[#{tags.join(' ')}]" unless tags.empty?
-          info << "{#{service}}" unless service.empty?
+          info = "#{self[:hostname]}:#{self[:status]}"
+          info << "(#{self[:roles].join(' ')})" unless self[:roles].empty?
+          info << "[#{self[:tags].join(' ')}]" unless self[:tags].empty?
+          info << "{#{self[:service]}}" unless self[:service].empty?
           info
         else
           to_hash.to_s
@@ -91,7 +91,7 @@ class EC2
       # "instance.instance_id" => self.send("instance").send("instance_id")
       def get_value(key)
         v = self
-        key.to_s.split('.').each {|k| v = v.send(k) }
+        key.to_s.split('.').each {|k| v = v[k] || v.send(k) }
         v
       end
 
@@ -109,23 +109,23 @@ class EC2
           role3 = (condition[:role3] || condition[:usage3] || []).first
         end
         if role1
-          return false unless self.roles.find {|role| role.match?(role1, role2, role3) }
+          return false unless self[:roles].find {|role| role.match?(role1, role2, role3) }
         end
         true
       end
 
       def set_hostname
-        self.hostname = find_string_tag(Config.hostname_tag)
-        self.hostname = instance.private_dns_name.split('.').first if self.hostname.empty?
+        self[:hostname] = find_string_tag(Config.hostname_tag)
+        self[:hostname] = self[:instance].private_dns_name.split('.').first if self[:hostname].empty?
       end
 
       def set_roles
         roles  = find_array_tag(Config.roles_tag)
-        self.roles = roles.map {|role| EC2::Host::RoleData.initialize(role) }
+        self[:roles] = roles.map {|role| EC2::Host::RoleData.initialize(role) }
       end
 
       def set_region
-        self.region = Config.aws_region
+        self[:region] = Config.aws_region
       end
 
       def set_string_tags

data/spec/host_spec.rb

@@ -39,6 +39,12 @@ describe EC2::Host do
     end
   end
 
+  describe '#get_value' do
+    let(:hosts) { EC2::Host.new(instance_id: 'i-85900780').to_a }
+    let(:subject)  { hosts.first }
+    it { expect(subject.get_value('instance.instance_id')).to eql('i-85900780') }
+  end
+
   context 'by instance_id' do
     let(:hosts) { EC2::Host.new(instance_id: 'i-85900780').to_a }
     let(:subject)  { hosts.first }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk