cluster 0.7.1 → 0.7.2

data/lib/cluster/infrastructure.rb

@@ -63,7 +63,7 @@ class Infrastructure
     raise NotImplementedError
   end
 
-  def machines(filter_groups)
+  def machines(*filter_groups)
     if filter_groups.empty?
       self.instances
     else

data/lib/cluster/infrastructures/amazon_instance.rb

@@ -12,10 +12,15 @@ class AmazonInstance < Instance
     :aws_launch_time,
     :start_time_sorted,
     :aws_id,
-    :aws_instance_id,
+    :ec2_id,
     :aws_image_id,
     :aws_instance_type
 
+  alias :id :ec2_id
+  alias :aws_instance_id :ec2_id
+  alias :aws_instance_id= :ec2_id=
+  alias :groups :aws_groups
+
   def identified_by?(arg)
     arg = arg.downcase
     super(arg) or @private_dns_name == arg or @dns_name == arg
@@ -43,13 +48,6 @@ class AmazonInstance < Instance
     end
   end
 
-  def id
-    @aws_instance_id
-  end
-  alias :ec2_id :id
-
-  alias :groups :aws_groups
-
   def no_sdb?
     !@set_sdb
   end
@@ -59,7 +57,7 @@ class AmazonInstance < Instance
       case k
       when 'start_time_sorted'
         self.start_time = Time.parse v
-      when 'entry', 'ec2_id'
+      when 'entry'
         # NOP
       when 'services'
         @services = Array(v)
@@ -72,10 +70,6 @@ class AmazonInstance < Instance
     @set_sdb = true
   end
 
-  def ec2_id=(id)
-    aws_instance_id = id
-  end
-
   def aws_id
     @aws_id ||= UUIDTools::UUID.timestamp_create.to_s
   end

data/lib/cluster/version.rb

@@ -5,7 +5,7 @@ class Cluster
 
   class << self
     def version
-      '0.7.1'
+      '0.7.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cluster
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors: