colombo 0.0.3 → 0.0.4

data/lib/colombo.rb

@@ -8,6 +8,8 @@ require 'rest-client'
 require "colombo/version"
 require "colombo/configuration"
 require "colombo/request"
+require "colombo/container"
+require "colombo/resource"
 require "colombo/droplet"
 require "colombo/droplets"
 require "colombo/region"

data/lib/colombo/container.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+module Colombo
+  class Container < Array
+
+    def find(image_id)
+
+      image = self.select{ |i| i.id == image_id }.first
+
+      return image if not image.nil?
+
+      response = @client.request(:get, "/images/#{image_id}") do |response|
+        image = Image.new(@client, self, response['image'])
+        self << image
+      end
+
+      return image
+    end
+
+
+    def method_missing(method, *args, &block)
+      if method.to_s =~ /^find_by_(.*)/
+        p "found: #{method} - #{$1}"
+        p "args: #{args[0]}"
+        run_find_by_attr($1, *args)
+      else
+        super
+      end
+    end
+
+    def run_find_by_attr(method, *args)
+      self.select{ |item| item.send(method.to_sym) == args[0] }.first
+    end
+
+    def find(id)
+      find_by_id(id)
+    end
+
+  end
+end

data/lib/colombo/droplet.rb

@@ -1,20 +1,11 @@
 # encoding: utf-8
 
 module Colombo
-  class Droplet
+  class Droplet < Resource
 
     attr_accessor :id, :name, :image_id, :size_id, :region_id
     attr_accessor :backups_active, :ip_address, :status
 
-    def initialize(client, droplets, droplet_hash)
-      @client   = client
-      if droplet_hash
-        droplet_hash.each do |key, value|
-          __send__("#{key}=", value) if self.respond_to?( key.to_sym )
-        end
-      end
-    end
-
     def reboot
       @client.request(:get, "/droplets/#{self.id}/reboot/") do |response|
         return response['event_id']

data/lib/colombo/droplets.rb

@@ -3,13 +3,13 @@
 require "colombo/droplet"
 
 module Colombo
-  class Droplets < Array
+  class Droplets < Container
 
     def initialize(client)
       @client = client
       @client.request(:get, '/droplets/', {}) do |response|
          response['droplets'].each do |droplet|
-            self << Droplet.new(@client, self, droplet)
+            self << Droplet.new(@client, droplet)
          end
       end
     end
@@ -30,19 +30,5 @@ module Colombo
 
     end
 
-    def find(droplet_id)
-
-      droplet = self.select{ |d| d.id == droplet_id }.first
-
-      return droplet if not droplet.nil?
-
-      response = @client.request(:get, "/droplets/#{droplet_id}") do |response|
-        droplet = Droplet.new(@client, self, response['droplet'])
-        self << droplet
-      end
-
-      return droplet
-    end
-
   end
 end

data/lib/colombo/image.rb

@@ -1,16 +1,9 @@
 # encoding: utf-8
 module Colombo
-  class Image
+  class Image < Resource
 
     attr_accessor :id, :name, :distribution
 
-    def initialize(client, images, image_hash)
-      @client   = client
-      image_hash.each do |key, value|
-        __send__("#{key}=", value) if self.respond_to?( key.to_sym )
-      end
-    end
-
     def destroy(confirm=false)
       return unless confirm
       @client.request(:get, "/images/#{self.id}/destroy/") do |response|

data/lib/colombo/images.rb

@@ -3,30 +3,16 @@
 require "colombo/image"
 
 module Colombo
-  class Images < Array
+  class Images < Container
 
     def initialize(client)
       @client = client
       @client.request(:get, '/images/', {}) do |response|
          response['images'].each do |image|
-            self << Image.new(@client, self, image)
+            self << Image.new(@client, image)
          end
       end
     end
 
-    def find(image_id)
-
-      image = self.select{ |i| i.id == image_id }.first
-
-      return image if not image.nil?
-
-      response = @client.request(:get, "/images/#{image_id}") do |response|
-        image = Image.new(@client, self, response['image'])
-        self << image
-      end
-
-      return image
-    end
-
   end
 end

data/lib/colombo/region.rb

@@ -1,16 +1,8 @@
 # encoding: utf-8
 module Colombo
-  class Region
+  class Region < Resource
 
     attr_accessor :id, :name
 
-    def initialize(client, regions, region_hash)
-      @client   = client
-      @regions  = regions
-      region_hash.each do |key, value|
-        __send__("#{key}=", value) if self.respond_to?( key.to_sym )
-      end
-    end
-
   end
 end

data/lib/colombo/regions.rb

@@ -3,30 +3,16 @@
 require "colombo/region"
 
 module Colombo
-  class Regions < Array
+  class Regions < Container
 
     def initialize(client)
       @client = client
       @client.request(:get, '/regions/', {}) do |response|
          response['regions'].each do |region|
-            self[ region['id'].to_i ] = Region.new(@client, self, region)
+            self[ region['id'].to_i ] = Region.new(@client, region)
          end
       end
     end
 
-    def find(region_id)
-
-      region = self.select{ |r| r.id == region_id }.first
-
-      return region if not region.nil?
-
-      response = @client.request(:get, "/regions/#{region_id}") do |response|
-        region = Region.new(@client, self, response['region'])
-        self << region
-      end
-
-      return region
-    end
-
   end
 end

data/lib/colombo/resource.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+module Colombo
+  class Resource
+
+    def initialize(client, attr_hash)
+      @client   = client
+      if attr_hash
+        attr_hash.each do |key, value|
+          __send__("#{key}=", value) if self.respond_to?( key.to_sym )
+        end
+      end
+    end
+  end
+end

data/lib/colombo/size.rb

@@ -1,16 +1,8 @@
 # encoding: utf-8
 module Colombo
-  class Size
+  class Size < Resource
 
     attr_accessor :id, :name
 
-    def initialize(client, sizes, size_hash)
-      @client = client
-      @sizes  = sizes
-      size_hash.each do |key, value|
-        __send__("#{key}=", value) if self.respond_to?( key.to_sym )
-      end
-    end
-
   end
 end

data/lib/colombo/sizes.rb

@@ -3,20 +3,16 @@
 require "colombo/size"
 
 module Colombo
-  class Sizes < Array
+  class Sizes < Container
 
     def initialize(client)
       @client = client
       @client.request(:get, '/sizes/', {}) do |response|
          response['sizes'].each do |size|
-            self << Size.new(@client, self, size)
+            self << Size.new(@client, size)
          end
       end
     end
 
-    def find(size_id)
-      self.select{ |s| s.id == size_id }.first
-    end
-
   end
 end

data/lib/colombo/ssh_key.rb

@@ -1,16 +1,9 @@
 # encoding: utf-8
 module Colombo
-  class SshKey
+  class SshKey < Resource
 
     attr_accessor :id, :name, :ssh_pub_key
 
-    def initialize(client, ssh_keys, ssh_key_hash)
-      @client   = client
-      ssh_key_hash.each do |key, value|
-        __send__("#{key}=", value) if self.respond_to?( key.to_sym )
-      end
-    end
-
     def destroy
       @client.request(:get, "/ssh_keys/#{self.id}/destroy/") do |response|
         return true
@@ -18,6 +11,15 @@ module Colombo
       return false
     end
 
+    def ssh_pub_key
+      return unless self.id
+      return @ssh_pub_key if @ssh_pub_key
+      @client.request(:get, "/ssh_keys/#{self.id}/") do |response|
+        @ssh_pub_key = response['ssh_key']['ssh_pub_key']
+      end
+      @ssh_pub_key
+    end
+
     def update(options={})
       params = {
         :ssh_pub_key => options[:ssh_pub_key]

data/lib/colombo/ssh_keys.rb

@@ -3,30 +3,17 @@
 require "colombo/ssh_key"
 
 module Colombo
-  class SshKeys < Array
+  class SshKeys < Container
 
     def initialize(client)
       @client = client
       @client.request(:get, '/ssh_keys/', {}) do |response|
          response['ssh_keys'].each do |ssh_key|
-            self << SshKey.new(@client, self, ssh_key)
+            self << SshKey.new(@client, ssh_key)
          end
       end
     end
 
-    def find(ssh_key_id)
-      ssh_key  = self.select{ |o| o == ssh_key_id }.first
-
-      return ssh_key if ssh_key
-
-      response = @client.request(:get, "/ssh_keys/#{ssh_key_id}") do |response|
-        ssh_key = SshKey.new(@client, self, response['ssh_key'])
-        self << ssh_key
-      end
-
-      return ssh_key
-    end
-
     def create(options={})
 
       params = {
@@ -37,7 +24,7 @@ module Colombo
       ssh_key = nil
 
       response = @client.request(:get, "/ssh_keys/new/", params) do |response|
-        ssh_key = SshKey.new(@client, self, response['ssh_key'])
+        ssh_key = SshKey.new(@client, response['ssh_key'])
         self << ssh_key
       end
 

data/lib/colombo/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Colombo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/colombo/ssh_keys_test.rb

@@ -2,34 +2,22 @@
 
 require File.expand_path('../test_helper.rb', __FILE__)
 
-def self.test_order
-  :alpha
-end
+describe Colombo::SshKeys do
 
-describe 'SshKeys' do
+  i_suck_and_my_tests_are_order_dependent!
 
   before do
-    Colombo.reset
-
+  Colombo.reset
     Colombo.configure do |c|
       c.api_key   = ENV['DO_API_KEY']
       c.client_id = ENV['DO_CLIENT_ID']
     end
-
     @client = Colombo::Client.new
   end
 
-  it 'list ssh keys' do
-
-    VCR.use_cassette('ssh_keys') do
-      @client.ssh_keys.wont_be_nil
-    end
-
-  end
-
-  it 'add ssh key' do
-
-    VCR.use_cassette('add ssh key') do
+  it 'add key' do
+    $stdout.puts "1 - add key"
+    VCR.use_cassette('sshkeys-add_key') do
 
       ssh_key = @client.ssh_keys.create({
         :name        => COLOMBO_SSH_KEY_NAME,
@@ -37,23 +25,29 @@ describe 'SshKeys' do
       })
 
       ssh_key.must_be_instance_of(Colombo::SshKey)
-
       ssh_key.name.must_equal COLOMBO_SSH_KEY_NAME
-
       ssh_key.ssh_pub_key.must_equal COLOMBO_SSH_KEY
     end
+  end
 
+  it 'list ssh keys' do
+    $stdout.puts "2 - list ssh keys"
+    VCR.use_cassette('sshkeys-list_keys') do
+      @client.ssh_keys.wont_be_empty
+    end
   end
 
   it 'find ssh key by id' do
 
-    VCR.use_cassette('find ssh keys by id') do
+    $stdout.puts "3 - find ssh key by id"
+
+    VCR.use_cassette('sshkeys-find_ssh_keys_by_id') do
 
       # fetch the key list from digital ocean
       ssh_keys = @client.ssh_keys
 
       # find the key with COLOMBO_SSH_KEY_NAME inside the digital ocean colection
-      do_key  = ssh_keys.select{ |k| k.name==COLOMBO_SSH_KEY_NAME }.first
+      do_key  = ssh_keys.select{ |key| key.name == COLOMBO_SSH_KEY_NAME }.first
 
       # check if the key was found
       do_key.must_be_instance_of(Colombo::SshKey)
@@ -74,9 +68,22 @@ describe 'SshKeys' do
 
   end
 
+  it 'find by name' do
+    $stdout.puts "4 - find by name"
+
+    VCR.use_cassette('sshkeys-find_by_name') do
+      p @client.ssh_keys
+      ssh_key = @client.ssh_keys.find_by_name( COLOMBO_SSH_KEY_NAME )
+      ssh_key.must_be_instance_of(Colombo::SshKey)
+    end
+
+  end
+
   it 'update key' do
 
-    VCR.use_cassette('update key') do
+    $stdout.puts "5 - update key"
+
+    VCR.use_cassette('sshkeys_update_key') do
       # fetch the key list from digital ocean
       ssh_keys = @client.ssh_keys
 
@@ -91,8 +98,12 @@ describe 'SshKeys' do
 
   end
 
+
   it 'destroy ssh key' do
-    VCR.use_cassette('destory ssh key') do
+
+    $stdout.puts "6 - destroy ssh key"
+
+    VCR.use_cassette('sshkeys_destroy_ssh_key') do
       # fetch the key list from digital ocean
       ssh_keys = @client.ssh_keys
 
@@ -105,11 +116,120 @@ describe 'SshKeys' do
 
     end
 
-    VCR.use_cassette('are all keys destroyed?') do
-      @client.ssh_keys.select{ |key| key.name == COLOMBO_SSH_KEY_NAME }.must_be_empty
-    end
-
-
   end
 
+
 end
+
+#   it 'add key' do
+
+#     $stdout.puts "1 - sshkeys_add_key"
+
+#     VCR.use_cassette('sskkeys_add_ssh_key') do
+
+#       ssh_key = @client.ssh_keys.create({
+#         :name        => COLOMBO_SSH_KEY_NAME,
+#         :ssh_pub_key => COLOMBO_SSH_KEY
+#       })
+
+#       ssh_key.must_be_instance_of(Colombo::SshKey)
+
+#       ssh_key.name.must_equal COLOMBO_SSH_KEY_NAME
+
+#       ssh_key.ssh_pub_key.must_equal COLOMBO_SSH_KEY
+#     end
+
+#   end
+
+#   it 'list ssh keys' do
+
+#     $stdout.puts "2 - list ssh keys"
+
+#     VCR.use_cassette('sshkeys_list_keys') do
+#       @client.ssh_keys.wont_be_empty
+#     end
+
+#   end
+
+
+#   it 'find ssh key by id' do
+
+#     $stdout.puts "3 - find ssh key by id"
+
+#     VCR.use_cassette('sshkeys_find_ssh_keys_by_id') do
+
+#       # fetch the key list from digital ocean
+#       ssh_keys = @client.ssh_keys
+
+#       $stdout.puts "============ keys ========="
+#       $stdout.puts ssh_keys.inspect
+
+
+#       # find the key with COLOMBO_SSH_KEY_NAME inside the digital ocean colection
+#       do_key  = ssh_keys.find_by_name(COLOMBO_SSH_KEY_NAME)
+#       $stdout.puts "============ find by name ========="
+#       $stdout.puts do_key
+
+#       # check if the key was found
+#       do_key.must_be_instance_of(Colombo::SshKey)
+
+#       # let's try find the key in the collection
+#       ssh_key = @client.ssh_keys.find( do_key.id )
+
+#       # check if it's a ssh_key
+#       ssh_key.must_be_instance_of(Colombo::SshKey)
+
+#       # check if the values are correct
+#       ssh_key.name.must_equal COLOMBO_SSH_KEY_NAME
+
+#       # check if the values are correct
+#       ssh_key.ssh_pub_key.must_equal COLOMBO_SSH_KEY
+
+#     end
+
+#   end
+
+#   it 'update key' do
+
+#     $stdout.puts "4 - update key"
+
+#     VCR.use_cassette('sshkeys_update_key') do
+#       # fetch the key list from digital ocean
+#       ssh_keys = @client.ssh_keys
+
+#       # find the key with COLOMBO_SSH_KEY_NAME inside the digital ocean colection
+#       do_key  = ssh_keys.select{ |k| k.name==COLOMBO_SSH_KEY_NAME }.first
+
+#       # check if the key was found and is a SshKey
+#       do_key.must_be_instance_of(Colombo::SshKey)
+
+#       do_key.update(:ssh_pub_key => COLOMBO_SSH_KEY ).must_equal true
+#     end
+
+#   end
+
+#   it 'destroy ssh key' do
+
+#     $stdout.puts "5 - destroy ssh key"
+
+#     VCR.use_cassette('sshkeys_destory_ssh_key') do
+#       # fetch the key list from digital ocean
+#       ssh_keys = @client.ssh_keys
+
+#       # find the key with COLOMBO_SSH_KEY_NAME inside the digital ocean colection
+#       ssh_keys.each do |ssh_key|
+#         if ssh_key.name==COLOMBO_SSH_KEY_NAME
+#           ssh_key.destroy().must_equal true
+#         end
+#       end
+
+#     end
+
+#     VCR.use_cassette('sshkeys_are_dummy_keys_destroyed?') do
+#       @client.ssh_keys.select{ |key| key.name == COLOMBO_SSH_KEY_NAME }.must_be_empty
+#     end
+
+#   end
+
+
+# end

data/test/colombo/test_helper.rb

@@ -16,7 +16,7 @@ COLOMBO_REGION_ID    = 1      # NY
 COLOMBO_IMAGE_ID     = 42735  # Ubuntu
 COLOMBO_SIZE_ID      = 63     # 1GB
 COLOMBO_SSH_KEY_NAME = 'colombo gem'
-COLOMBO_SSH_KEY      = 'ssh-dss AAAAB3NzaC1kc3MAAACBAK5uLwicCrFEpaVKBzkWxC7RQn+smg5ZQb5keh9RQKo8AszFTol5npgUAr0JWmqKIHv7nof0HndO86x9iIqNjq3vrz9CIVcFfZM7poKBJZ27Hv3v0fmSKfAc6eGdx8eM9UkZe1gzcLXK8UP2HaeY1Y4LlaHXS5tPi/dXooFVgiA7AAAAFQCQl6LZo/VYB9VgPEZzOmsmQevnswAAAIBCNKGsVP5eZ+IJklXheUyzyuL75i04OOtEGW6MO5TymKMwTZlU9r4ukuwxty+T9Ot2LqlNRnLSPQUjb0vplasZ8Ix45JOpRbuSvPovryn7rvS7//klu9hIkFAAQ/AZfGTw+696EjFBg4F5tN6MGMA6KrTQVLXeuYcZeRXwE5t5lwAAAIEAl2xYh098bozJUANQ82DiZznjHc5FW76Xm1apEqsZtVRFuh3V9nc7QNcBekhmHp5Z0sHthXCm1XqnFbkRCdFlX02NpgtNs7OcKpaJP47N8C+C/Yrf8qK/Wt3fExrL2ZLX5XD2tiotugSkwZJMW5Bv0mtjrNt0Q7P45rZjNNTag2c= user@host'
+COLOMBO_SSH_KEY      = 'ssh-dss AAAAB3NzaC1kc3MAAACBAK5uLwicCrFEpaVKBzkWxC7RQn+smg5ZQb5keh9RQKo8AszFTol5npgUAr0JWmqKIHv7nof0HndO86x9iIqNjq3vrz9CIVcFfZM7poKBJZ27Hv3v0fmSKfAc6eGdx8eM9UkZe1gzcLXK8UP2HaeY1Y4LlaHXS5tPi/dXooFVgiA7AAAAFQCQl6LZo/VYB9VgPEZzOmsmQevnswBBBIBCNKGsVP5eZ+IJklXheUyzxuL75i04OOtEGW6MO5TymKMwTZlU9r4ukuwxty+T9Ot2LqlNRnLSPQAjb0vplasZ8Ix45JOpRbuSvPovryn7rvS7//klu9hIkFAAQ/AZfGTw+696EjFBg4F5tN6MGMA6KrTQVLXeuYcZeRXwE5t5lwAAAIEAl2xYh098bozJUANQ82DiZznjHc5FW76Xm1apEqsZtVRFuh3V9nc7QNcBekhmHp5Z0sHthXCm1XqnFbkRCdFlX02NpgtNs7OcKpaJP47N8C+C/Yrf8qK/Wt3fExrL2ZLX5XD2tiotugSkwZJMW5Bv0mtjrNt0Q7P45rZjNNTag2c= user@host'
 
 
 require File.expand_path('../../../lib/colombo.rb', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colombo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,11 @@ cert_chain:
   TGVnalVadkdRSEdmSHN0bDdkd2lCVWluZ1UvMldOTFIKMXBIQThXeGsxVVJi
   Nmxxa2NRdERZbDkyU3FTSk1FY0s0Wk0zRmwrRFM0RXBtM1BINTZlWjR3Qlha
   REhMRUNuTwpubjhCMXUyKwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70145160449540 !ruby/object:Gem::Requirement
+  requirement: &70219260478960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70145160449540
+  version_requirements: *70219260478960
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70145160448440 !ruby/object:Gem::Requirement
+  requirement: &70219260478060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -59,10 +59,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70145160448440
+  version_requirements: *70219260478060
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70145160447500 !ruby/object:Gem::Requirement
+  requirement: &70219260476820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -70,10 +70,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70145160447500
+  version_requirements: *70219260476820
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70145160446620 !ruby/object:Gem::Requirement
+  requirement: &70219260476160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -81,10 +81,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70145160446620
+  version_requirements: *70219260476160
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70145160446200 !ruby/object:Gem::Requirement
+  requirement: &70219260159900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -92,10 +92,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70145160446200
+  version_requirements: *70219260159900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70145160445320 !ruby/object:Gem::Requirement
+  requirement: &70219260159320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -103,7 +103,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70145160445320
+  version_requirements: *70219260159320
 description: A simple ruby client for Digital Ocean API
 email:
 - lmmendes@gmail.com
@@ -120,6 +120,7 @@ files:
 - lib/colombo.rb
 - lib/colombo/client.rb
 - lib/colombo/configuration.rb
+- lib/colombo/container.rb
 - lib/colombo/droplet.rb
 - lib/colombo/droplets.rb
 - lib/colombo/exception.rb
@@ -128,6 +129,7 @@ files:
 - lib/colombo/region.rb
 - lib/colombo/regions.rb
 - lib/colombo/request.rb
+- lib/colombo/resource.rb
 - lib/colombo/size.rb
 - lib/colombo/sizes.rb
 - lib/colombo/ssh_key.rb