euca 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDUyYjg1NDRkMDIwNjYyY2YxNjJjMjRmNWMwNDAzMDU5Yjk2NDEzZA==
+    NzIyNGI5YWY5NDllMzI0M2E3NzM5M2NlMmEwOTU3MDhkNzE4MWJjZg==
   data.tar.gz: !binary |-
-    MDUwNzZkM2UzNDBmNzk2NDFmZjZhYjA0NmJjNzgxYjhjMGYyOTgxYQ==
+    ODFmYWY5YjZlYTM5YjliMDZlZjYwNDRhNjAxNDBjN2FkZTAyMDkwMw==
 SHA512:
   metadata.gz: !binary |-
-    MzBiNmVmZjhlMDUyNTU1MDU0ZjZkOGRkYWJhY2UzNTdhMmI5N2E4ZWViMjk3
-    OTdkZGFjZTg3ODFjODM2YTA1NDIxOWI2YTJhNjdkZDJkN2RjOGQ3OGFkMGI0
-    OGI4MmJkMDJjMjdhY2Q1NzZlMzk2MmJmOTljMDNjOTczZTRmOWQ=
+    YjI3YWQzNGFhOTEyNDZiOWYxOWE3YTMxZjMyNTlkNjlhZGZlYTBlMmQ1YzA2
+    YzZmNmY4YmVkYzBhMTNjNzE5MTJhZTMzZDNkYTE2MmE2YTM0ODQ2Zjk1NjFi
+    MGE1MjAwMGExZDc1ZWFkM2Y4MTdhOTNjNTA5YmIyYzVkZDNkNDY=
   data.tar.gz: !binary |-
-    ZjNiMTkyZmVlODkxMThkNGYzZDBmZGQ0YjMzZjU5YmZlMjliZTZhZTE3NTFm
-    ZGYyZjJiZGU4Zjg0Zjk2Mzc5ZDE1NzJjYTllMmIzZGM5ZDRlNjFhMGZjNDFm
-    MmM5NDJiOTZiZGUxNGUzOWQzMDQ1MzJmNDVhNGMyOGVkMGNmNGY=
+    MDAzNTY3NWJhYmFjMTc1ZDBlZGRiZGE3NmZiMWRmYjc0NTI0MWNlZWRlMzY4
+    MWE0M2JjYmEzZTlhOGRhZjYwNTcwNWUyYjUyZDU3NjNkZGFkODdjYjM4NTMx
+    OTY4ZWE2MDljYmQ1NmY4MGMzOTc3NTJkMmRiNzA3ZmZiOWUwNGE=

data/lib/euca/api.rb

@@ -1,7 +1,9 @@
 require "euca/model"
+require "euca/filterable"
 require "euca/api/address"
 require "euca/api/instance"
 require "euca/api/keypair"
+require "euca/api/tag"
 module Euca
   module Api
   end

data/lib/euca/api/instance.rb

@@ -2,6 +2,7 @@ module Euca
   class Instance
       
     include Euca::Model
+    include Euca::Filterable
       
     TYPE_ID = "instance"
     TYPE_ATTRS = %w(type_id id image public_dns_name private_dns_name status group 
@@ -18,14 +19,6 @@ module Euca
       euca("terminate-instances",id).first
     end
 
-    def self.where *args
-      describe "--filter", *args
-    end
-      
-    def self.find_by *args
-      where(*args).first
-    end      
-      
   end
 end
     

data/lib/euca/api/tag.rb

@@ -0,0 +1,29 @@
+module Euca
+  class Tag
+      
+    include Euca::Model
+    include Euca::Filterable
+          
+    TYPE_ID = "tag"
+    TYPE_ATTRS = %w(type owner_id owner_type key value)
+      
+    def self.create key, value, instance_id = nil
+      if key.is_a? Hash
+        euca("create-tags", key.map{|key,value| "--tag #{key}=#{value}" }.join(" ") , value).first
+      else
+        return nil if instance_id.nil?
+        euca("create-tags", "--tag #{key}=#{value}", instance_id).first
+      end
+    end
+      
+    def self.destroy key, value, instance_id = nil
+      if key.is_a? Hash
+        euca("delete-tags", key.map{|key,value| "--tag #{key}=#{value}" }.join(" ") , value).first
+      else
+        return nil if instance_id.nil?
+        euca("delete-tags", "--tag #{key}=#{value}", instance_id).first 
+      end
+    end  
+    
+  end
+end

data/lib/euca/filterable.rb

@@ -0,0 +1,21 @@
+module Euca
+  module Filterable
+    
+    module ClassMethods
+      
+      def where args
+        args = args.map{|key,value| "--filter #{key}=#{value}" }
+        describe *args
+      end
+  
+      def find_by args
+        where(args).first
+      end  
+    end
+    
+    def self.included(base)
+      base.extend ClassMethods
+    end
+    
+  end
+end

data/lib/euca/model.rb

@@ -19,12 +19,15 @@ module Euca
           s.values.sort == query.values.sort 
         }
       end
+      
       def find_by query = {}
         where(query).first
       end
+      
       def find id
         describe(id).first
       end 
+      
       def describe *args
         euca("describe-#{self.describer}",*args)
       end                 

data/lib/euca/version.rb

@@ -1,3 +1,3 @@
 module Euca
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/instance_spec.rb

@@ -16,6 +16,10 @@ module Euca
       instance = Instance.create "-t", Euca::T1_NANO, Euca::UBUNTU_13_10
       
       instance["public_dns_name"].must_equal "i-46-149-29-252.compute.is-1.greenqloud.com"
+
+      mock.expect :run, fixture, [ "describe-instances", "--filter instance-id=i-6e13180f" ]      
+      finded = Instance.find_by({"instance-id" => instance["id"]})
+      finded["public_dns_name"].must_equal instance["public_dns_name"]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: euca
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Onur Uyar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,6 +99,8 @@ files:
 - lib/euca/api/address.rb
 - lib/euca/api/instance.rb
 - lib/euca/api/keypair.rb
+- lib/euca/api/tag.rb
+- lib/euca/filterable.rb
 - lib/euca/model.rb
 - lib/euca/version.rb
 - lib/euca/wrapper.rb