euca 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2YxMDBlZGVjNDk5MzNjZWM1MjVhMTFjNDRkMGJhNjUzMzE1MmQ0Zg==
+    ZDc1ZDIwODNiNjJlZTMxODc4ZjdkMGJjYjdiNWI1NjY1ZjBlZGRjYw==
   data.tar.gz: !binary |-
-    OGE2MDZkYWE5NmFhMmU0Yzg3ZTllMzY1YThlMTAxNDM2MjlmMmQ2OA==
+    ZmMyYjgxZGMxOTZkNjdjMzU0MTIxZDc1ZGQ1NDUyMmVjNjdlZjBiYg==
 SHA512:
   metadata.gz: !binary |-
-    ZWU0NzQwNWJkN2IzNDZjMWFjNmNmY2Q5MWI1N2ViMDI3MmE4YWUwZmFjOWZk
-    NjA0NzY5OGJmZTlmOWYxMDk0NWFkMTIxMTljZTE2NDJmOWFmYjk2MmJmNGI1
-    OWE5NTg1MmIzMmU1YWM3ZWMyOTlmNTBmZWJkYTFhOGJkNTMwYzM=
+    MWE1YTVlMDI3OWU5YTMyNDI5ZTQzOWQxMGNlNTRkODc0OTY1ZjYxOTg5MDVl
+    ZjEzNGFmOWQyOGFkODNhOTdkMzg1Y2RlMWYwMjFlOWI0OWNkYWU1N2NhNzU2
+    MTJlOWQ1YmE5MjgxNmNkMmNlZTU5NGVmMmFkMzk0NDE5ZTdlMTE=
   data.tar.gz: !binary |-
-    MTY5MzI3MGU3YTVmMGYxNThjYmQ2OTc2NjdhNGE3ODQ5OWEyNzcyMTA3MTE4
-    Mjg5Y2I4NTAwNzNkMDFhZGU1MGM3NjdjM2I5YWM1ZDFmZjVkMGNkY2Y4MDA1
-    NTQ0YjU0MmUwZmVmMGIxZjE5NzcwNmQ3NjRlMDg0MTM2NDEyNWM=
+    NGRiMWZkMTQ0MjkyZGNiMTgxZmI5Zjg3MDY1NGU2YTQ1Zjk4ZWU3YWJhNDRi
+    ZDczOGZmNmJiMDIxNjJiNGNiNjdmNjhhMjU1OTI2YzkxN2IwMGJhZDEyODc5
+    MTY3MDQwZjU3YTI2Njc2NTI0OGU0NTZiZWI4ZTA3MzYyYTdjYjI=

data/euca.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
-  spec.add_dependency 'pult', '~> 0.0.4'
+  spec.add_dependency 'pult', '~> 0.0.5'
   spec.add_dependency 'vhs', '~> 0.0.1'
   spec.add_dependency 'activesupport', '~> 4.0.2'  
 end

data/lib/euca.rb

@@ -1,11 +1,14 @@
 require 'pult'
 require 'vhs'
 require "euca/version"
-require "euca/model"
+require "euca/api"
 
 module Euca
   BIN_NAME="euca2ools".freeze
   BIN_VERSION="euca-version".freeze
+  UBUNTU_13_10="qmi-c4c45230"
+  UBUNTU_12_04="qmi-b58041dd"
+  T1_NANO="t1.nano"
   
   def self.has_cli?
     !(self.version =~ /\d+\.\d+\.\d+/).nil?

data/lib/euca/api.rb

@@ -0,0 +1,8 @@
+require "euca/model"
+require "euca/api/address"
+require "euca/api/instance"
+require "euca/api/keypair"
+module Euca
+  module Api
+  end
+end

data/lib/euca/api/address.rb

@@ -0,0 +1,29 @@
+module Euca
+  class Address
+      
+    include Euca::Model
+      
+    TYPE_ID = "address"
+    TYPE_ATTRS = %w(type_id ip instance_id)
+
+    def self.create force = false
+      !force ? find_by(instance_id: "None") || allocate : allocate
+    end
+      
+    def self.destroy ip
+      euca("release-address", ip)
+    end
+    
+    def self.associate instance_id, ip
+      euca("associate-address", "-i", instance_id, ip)
+    end
+    
+    private
+    
+    def self.allocate
+      euca("allocate-address").first
+    end
+      
+  end
+end
+    

data/lib/euca/api/instance.rb

@@ -0,0 +1,31 @@
+module Euca
+  class Instance
+      
+    include Euca::Model
+      
+    TYPE_ID = "instance"
+    TYPE_ATTRS = %w(type_id id image public_dns_name private_dns_name status group 
+    ami_launch_index product_code instance_type launched_at zone kernel_id 
+    ramdisk_id platform monitoring public_ip private_ip vpc_id subnet_id 
+    root_type lifecycle spot_id license placement_group virtualization hypervisor
+    client_token security_group_id tenancy ebs_optimized)
+
+    def self.create *args
+      euca("run-instances",*args).first
+    end
+    
+    def self.destroy id
+      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/keypair.rb

@@ -0,0 +1,23 @@
+module Euca
+  class Keypair
+      
+    include Euca::Model
+      
+    TYPE_ID = "keypair"
+    TYPE_ATTRS = %w(type id fingerprint)
+      
+    def self.create email, path = "~/.ssh"
+      put :debug, email, path
+      
+      keyfile = "#{path}/#{email}.id"
+      keypairs = euca("create-keypair", email, ">", keyfile)
+      sh("chmod 600 #{keyfile}")
+      {"id" => email}
+    end
+      
+    def self.destroy id 
+      euca("delete-keypair", id).first 
+    end
+      
+  end
+end

data/lib/euca/model.rb

@@ -1,4 +1,3 @@
-require 'euca'
 require 'euca/wrapper'
 require 'active_support/inflector'
 module Euca
@@ -13,12 +12,16 @@ module Euca
       def all
         describe
       end
-      def where *args
-        describe "--filter", *args
+
+      def where query = {}
+        all.select{ |m| 
+          s = m.select{ |k,v| query.keys.include?(k.to_sym) }
+          s.values.sort == query.values.sort 
+        }
+      end
+      def find_by query = {}
+        where(query).first
       end
-      def find_by *args
-        where(*args).first
-      end      
       def find id
         describe(id).first
       end 

data/lib/euca/version.rb

@@ -1,3 +1,3 @@
 module Euca
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/address_spec.rb

@@ -0,0 +1,26 @@
+require 'support/minitest_helper'
+require 'euca/api/address'
+
+module Euca
+  describe Address do
+  
+    it "finds unassociated ip unless foce given on create" do
+      wrapper = Address.wrapper
+      fixture = Address.wrapper.parse(fixture(:address)["free"]) 
+    
+      mock = MiniTest::Mock.new
+      mock.expect :run, fixture, [ "describe-addresses" ]
+      mock.expect :run, fixture, [ "allocate-address" ]
+      
+            
+      Address.instance_variable_set "@wrapper",mock      
+
+      address = Address.create
+      
+      address["ip"].must_equal "46.149.28.166"
+            
+      address = Address.create(true)
+      address["ip"].must_equal "46.149.28.166"
+    end
+  end
+end

data/spec/fixtures/address.yml

@@ -0,0 +1,5 @@
+free: | 
+  ADDRESS	46.149.28.166	None	standard
+
+associated: | 
+  ADDRESS	46.149.18.35	i-29940840	standard

data/spec/fixtures/instance.yml

@@ -0,0 +1,19 @@
+registry: | 
+  RESERVATION	r-c5627bef	7e36d16f-19c1-404a-babb-36c8e3c6ddd9	default
+  INSTANCE	i-c3d0e9df	qmi-b58041dd	i-46-149-29-23.compute.is-1.greenqloud.com		running	default	0		t1.nano	2014-02-17T01:19:04.000+00:00	is-1a					10.0.0.1	10.0.0.1
+
+host: | 
+  RESERVATION	r-230d75e3	7e36d16f-19c1-404a-babb-36c8e3c6ddd9	default
+  INSTANCE	i-6e13180f	qmi-b58041dd	i-46-149-29-252.compute.is-1.greenqloud.com		running	default	0		t1.nano	2014-02-16T16:56:07.000+00:00	is-1a					0.0.0.0	0.0.0.0
+
+valid: | 
+  RESERVATION	r-230d75e3	7e36d16f-19c1-404a-babb-36c8e3c6ddd9	default
+  INSTANCE	i-6e13180f	qmi-b58041dd	i-46-149-29-252.compute.is-1.greenqloud.com		running	default	0		t1.nano	2014-02-16T16:56:07.000+00:00	is-1a		
+
+invalid: | 
+  RESERVATION	r-230d75e3	7e36d16f-19c1-404a-babb-36c8e3c6ddd9	default
+  INSTANCE
+
+dokku: | 
+  RESERVATION	r-230d75e3	7e36d16f-19c1-404a-babb-36c8e3c6ddd9	default
+  INSTANCE	i-29940840	qmi-b58041dd	i-46-149-29-252.compute.is-1.greenqloud.com		running	default	0		t1.nano	2014-02-16T16:56:07.000+00:00	is-1a					0.0.0.0	0.0.0.0	

data/spec/fixtures/keypairs.yml

@@ -0,0 +1,2 @@
+test: | 
+  KEYPAIR	test@best.com	a3:99:e7:22:6d:b7:c7:1f:5a:bf:3e:b8:9f:05:fa:00

data/spec/instance_spec.rb

@@ -0,0 +1,21 @@
+require 'support/minitest_helper'
+require 'euca/api/instance'
+
+module Euca
+  describe Instance do
+  
+    it "finds unassociated ip unless foce given on create" do
+      wrapper = Instance.wrapper
+      fixture = Instance.wrapper.parse(fixture(:instance)["valid"]) 
+    
+      mock = MiniTest::Mock.new
+      mock.expect :run, fixture, [ "run-instances", "-t", Euca::T1_NANO, Euca::UBUNTU_13_10 ]
+            
+      Instance.instance_variable_set "@wrapper",mock      
+
+      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"
+    end
+  end
+end

data/spec/keypair_spec.rb

@@ -0,0 +1,24 @@
+require 'support/minitest_helper'
+
+module Euca
+  describe Keypair do
+  
+    it "generates ssh key for given email" do
+      wrapper = Keypair.wrapper
+      fixture = Keypair.wrapper.parse(fixture(:keypairs)["test"]) 
+    
+      mock = MiniTest::Mock.new
+      mock.expect :run, fixture, [ "create-keypair", "test@best.com", ">", "~/.ssh/test@best.com.id" ]
+      mock.expect :run, fixture, [ "describe-keypairs", "test@best.com" ]      
+            
+      Keypair.instance_variable_set "@wrapper",mock      
+
+      keypair = Keypair.create "test@best.com"
+      
+      keypair["id"].must_equal "test@best.com"
+      
+      Keypair.find(keypair["id"])["fingerprint"].wont_be_nil
+    
+    end
+  end
+end

data/spec/model_spec.rb

@@ -20,7 +20,7 @@ describe Euca::Model do
     wrapper = MiniTest::Mock.new
     wrapper.expect :run, api.send(:wrapper).parse(fixture(:images)["all"]), [ "describe-images" ]
     
-    api.instance_variable_set "@wrapper", wrapper
+    Api.instance_variable_set "@wrapper", wrapper
         
     images = api.euca("describe-images")
     images.first["name"].must_equal "Ubuntu Server 12.04.1"

data/spec/support/minitest_helper.rb

@@ -2,6 +2,9 @@ require "minitest/pride"
 require "minitest/autorun"
 require 'euca'
 require 'yaml'
+require 'pult'
+
+Pult.log_level = 0
 
 class MiniTest::Spec
   

data/test2.p

@@ -0,0 +1,17 @@
+KEYPAIR	test2	96:f2:50:98:96:0c:16:42:a7:da:a7:6b:c9:67:98:d4
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCQ5yW6YkMmdxuuKpApnTroV5mkF0BJuWUV7jXCVJ1rUCOn2UfR
+dan4kc+1ULqGu5EZfrsaba442Ijx0537A3tjj9T1DCOxOA5ocn2syQmkaLD2oTKK
+8aeZvYx4PoWL6E2zfB4vKiQHNpAcTs9druCbGGiShMI8bpjw4u0M9pVkSwIDAQAB
+AoGAQOpMzKMY0jKqA+ytiPcXXN9hxVFlS6Hy11BQZS7jFyBf2OJOelfsPZ+VHfV8
+mr+M0Y8k40IfuvfG4g+bxshYjiNkdU5kM5PHDuQUanWzvwaDySaU8z+qWCRPrZl6
+NB8/gK0Q+zKuqoJMlI/SfaDWtTBwPdcXKb4SUjuIa1bRmAECQQDgFUdIGy0zq8D6
+ythuVntNPGqc1re1kWEqTWpA/42XYtSRa3LDlxg3KpA3auAnsArhnxpPojDHQ1hb
+mHc6UP6LAkEApYq6k2aq3udxqMbufm4P5/Oknqw8hi/2UeM9n20Kyh6hJNv1bZRa
+Ie7ngGG47hwkc0lqMVCWa4TjC6HQMlGpQQJASg5eN3Nb1fbOWVQOgTCtoVH1Pg4s
+OqJoRU2+burGRaDQ9ZpYHFHkG99COD5nBFbG0df+HxFQI5qbKfJSfQBljwJAXv4f
+mEv2y1hWUXpuCuDPgdO+6Ep/pKTLHSxgBScGZPt0jvklec8Cdaxo7bOl8gT2Ka28
+ITZUSriDrP4awXU4wQJBAIVzp2obMSWIhWmZ9VjEVxRH8QFT1byqmOzn5uuh/Rci
+7ecBKKg3BTLnfArzgcjqqu2bEUAyx1HvWH6vnWB6MIM=
+-----END RSA PRIVATE KEY-----
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: euca
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Onur Uyar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: vhs
   requirement: !ruby/object:Gem::Requirement
@@ -109,13 +109,24 @@ files:
 - Rakefile
 - euca.gemspec
 - lib/euca.rb
+- lib/euca/api.rb
+- lib/euca/api/address.rb
+- lib/euca/api/instance.rb
+- lib/euca/api/keypair.rb
 - lib/euca/model.rb
 - lib/euca/version.rb
 - lib/euca/wrapper.rb
+- spec/address_spec.rb
+- spec/fixtures/address.yml
 - spec/fixtures/images.yml
+- spec/fixtures/instance.yml
+- spec/fixtures/keypairs.yml
+- spec/instance_spec.rb
+- spec/keypair_spec.rb
 - spec/model_spec.rb
 - spec/support/minitest_helper.rb
 - spec/wrapper_spec.rb
+- test2.p
 homepage: ''
 licenses:
 - MIT
@@ -141,7 +152,13 @@ signing_key:
 specification_version: 4
 summary: Ultra thin Ruby wrapper for euca2ools command line tools
 test_files:
+- spec/address_spec.rb
+- spec/fixtures/address.yml
 - spec/fixtures/images.yml
+- spec/fixtures/instance.yml
+- spec/fixtures/keypairs.yml
+- spec/instance_spec.rb
+- spec/keypair_spec.rb
 - spec/model_spec.rb
 - spec/support/minitest_helper.rb
 - spec/wrapper_spec.rb