cluster 0.7.1 → 0.7.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,10 +12,15 @@ class AmazonInstance < Instance
|
|
12
12
|
:aws_launch_time,
|
13
13
|
:start_time_sorted,
|
14
14
|
:aws_id,
|
15
|
-
:
|
15
|
+
:ec2_id,
|
16
16
|
:aws_image_id,
|
17
17
|
:aws_instance_type
|
18
18
|
|
19
|
+
alias :id :ec2_id
|
20
|
+
alias :aws_instance_id :ec2_id
|
21
|
+
alias :aws_instance_id= :ec2_id=
|
22
|
+
alias :groups :aws_groups
|
23
|
+
|
19
24
|
def identified_by?(arg)
|
20
25
|
arg = arg.downcase
|
21
26
|
super(arg) or @private_dns_name == arg or @dns_name == arg
|
@@ -43,13 +48,6 @@ class AmazonInstance < Instance
|
|
43
48
|
end
|
44
49
|
end
|
45
50
|
|
46
|
-
def id
|
47
|
-
@aws_instance_id
|
48
|
-
end
|
49
|
-
alias :ec2_id :id
|
50
|
-
|
51
|
-
alias :groups :aws_groups
|
52
|
-
|
53
51
|
def no_sdb?
|
54
52
|
!@set_sdb
|
55
53
|
end
|
@@ -59,7 +57,7 @@ class AmazonInstance < Instance
|
|
59
57
|
case k
|
60
58
|
when 'start_time_sorted'
|
61
59
|
self.start_time = Time.parse v
|
62
|
-
when 'entry'
|
60
|
+
when 'entry'
|
63
61
|
# NOP
|
64
62
|
when 'services'
|
65
63
|
@services = Array(v)
|
@@ -72,10 +70,6 @@ class AmazonInstance < Instance
|
|
72
70
|
@set_sdb = true
|
73
71
|
end
|
74
72
|
|
75
|
-
def ec2_id=(id)
|
76
|
-
aws_instance_id = id
|
77
|
-
end
|
78
|
-
|
79
73
|
def aws_id
|
80
74
|
@aws_id ||= UUIDTools::UUID.timestamp_create.to_s
|
81
75
|
end
|
data/lib/cluster/version.rb
CHANGED