colombo 0.0.4 → 0.0.5

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+- 1.8.7
+- 1.9.2
+- 1.9.3
+- 2.0.0
+- ruby-head
+script: bundle exec rake
+env:
+  global:
+  - secure: UONHIMkNeiFe+PXjoDV0p8eTRf94Pw0G+ijp5CcFJ/9JzX7tDUg1MHLI7Q2ycJWBcxojsOdpqceS9U0ZDK5Yx+AqDqAF65/ug4rFU0XLqNOw9dCK18tOKSiNqc7GhpR15yd5w6SQODO9z4Pe50eVNs8KpaaY2r/XnFWjX60DSGQ=
+  - secure: VDOAqNhAO73mL4OVyg65BCIqHC05sTMDfxajO9cMPtfGhdSlNed44Uc5KKtRcVT6xomcCHj0WIaAqjE2pm31kw0EJYxsZJbUR6g83qfK+S6pRQ6Dk7pP3dEEQIlTuP36o94o/gfhBJUwqii345PQBgbrjfI7ys8pjMpE6zqm8ak=

data/README.md

@@ -3,8 +3,6 @@
 
 A simple Digital Ocean (http://digitalocean.com) API wrapper
 
-NOTE: This version is an experimental version not ready for usage.
-
 ## Install
 
 ```
@@ -78,7 +76,9 @@ new_droplet = droplets.create({
 
 # This method allows you to destroy an image. There is no way to restore a
 # deleted image so be careful and ensure your data is properly backed up.
-@client.images.find( image_id ).destroy
+# NOTE: You need to pass true to the destroy method to ensure that you know
+# what you are doing.
+@client.images.find( image_id ).destroy(true)
 ```
 
 ### SSH Keys

data/colombo.gemspec

@@ -19,14 +19,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
+  s.license = 'MIT'
 
+  s.add_runtime_dependency "json", "~> 1.8.0"
   s.add_runtime_dependency "rest-client", "~> 1.6.7"
 
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "webmock"
-  s.add_development_dependency "vcr"
+  s.add_development_dependency "minitest","~> 5.0.6"
+  s.add_development_dependency "webmock", "1.8.0"
+  s.add_development_dependency "vcr", "2.5.0"
   s.add_development_dependency "turn"
   s.add_development_dependency "rake"
 

data/lib/colombo.rb

@@ -25,6 +25,7 @@ module Colombo
   extend Configuration
 
 
+  # @param [Object] options
   def self.new(options={})
     Client.new(options)
   end

data/lib/colombo/container.rb

@@ -3,25 +3,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

data/lib/colombo/droplet.rb

@@ -64,7 +64,7 @@ module Colombo
     end
 
     def destroy(confirm=false)
-      return false unless confirm
+      raise 'must pass true for confirm' unless confirm
       @client.request(:get, "/droplets/#{self.id}/destroy/") do |response|
         return response['event_id']
       end

data/lib/colombo/image.rb

@@ -5,7 +5,7 @@ module Colombo
     attr_accessor :id, :name, :distribution
 
     def destroy(confirm=false)
-      return unless confirm
+      raise 'must pass true for confirm' unless confirm
       @client.request(:get, "/images/#{self.id}/destroy/") do |response|
         return response['event_id']
       end

data/lib/colombo/version.rb

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

data/test/colombo/test_helper.rb

@@ -7,14 +7,14 @@ require 'minitest/pride'
 require 'vcr'
 
 VCR.configure do |c|
-  c.cassette_library_dir = File.join( File.dirname(__FILE__),  'fixtures/vcr_cassettes')
+  c.cassette_library_dir = File.join( File.dirname(__FILE__),  'fixtures/vcr/cassettes')
   c.hook_into :webmock
 end
 
 COLOMBO_DROPLET_NAME = 'colombo'
-COLOMBO_REGION_ID    = 1      # NY
-COLOMBO_IMAGE_ID     = 42735  # Ubuntu
-COLOMBO_SIZE_ID      = 63     # 1GB
+COLOMBO_REGION_ID    = 1       # NY
+COLOMBO_IMAGE_ID     = 345791  # Ubuntu 13.04 x32
+COLOMBO_SIZE_ID      = 63      # 1GB
 COLOMBO_SSH_KEY_NAME = 'colombo gem'
 COLOMBO_SSH_KEY      = 'ssh-dss AAAAB3NzaC1kc3MAAACBAK5uLwicCrFEpaVKBzkWxC7RQn+smg5ZQb5keh9RQKo8AszFTol5npgUAr0JWmqKIHv7nof0HndO86x9iIqNjq3vrz9CIVcFfZM7poKBJZ27Hv3v0fmSKfAc6eGdx8eM9UkZe1gzcLXK8UP2HaeY1Y4LlaHXS5tPi/dXooFVgiA7AAAAFQCQl6LZo/VYB9VgPEZzOmsmQevnswBBBIBCNKGsVP5eZ+IJklXheUyzxuL75i04OOtEGW6MO5TymKMwTZlU9r4ukuwxty+T9Ot2LqlNRnLSPQAjb0vplasZ8Ix45JOpRbuSvPovryn7rvS7//klu9hIkFAAQ/AZfGTw+696EjFBg4F5tN6MGMA6KrTQVLXeuYcZeRXwE5t5lwAAAIEAl2xYh098bozJUANQ82DiZznjHc5FW76Xm1apEqsZtVRFuh3V9nc7QNcBekhmHp5Z0sHthXCm1XqnFbkRCdFlX02NpgtNs7OcKpaJP47N8C+C/Yrf8qK/Wt3fExrL2ZLX5XD2tiotugSkwZJMW5Bv0mtjrNt0Q7P45rZjNNTag2c= user@host'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colombo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,22 @@ cert_chain:
   TGVnalVadkdRSEdmSHN0bDdkd2lCVWluZ1UvMldOTFIKMXBIQThXeGsxVVJi
   Nmxxa2NRdERZbDkyU3FTSk1FY0s0Wk0zRmwrRFM0RXBtM1BINTZlWjR3Qlha
   REhMRUNuTwpubjhCMXUyKwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70314675746380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70314675746380
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70219260478960 !ruby/object:Gem::Requirement
+  requirement: &70314675777760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,43 +59,43 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70219260478960
+  version_requirements: *70314675777760
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70219260478060 !ruby/object:Gem::Requirement
+  requirement: &70314675776940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.6
   type: :development
   prerelease: false
-  version_requirements: *70219260478060
+  version_requirements: *70314675776940
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70219260476820 !ruby/object:Gem::Requirement
+  requirement: &70314675775580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70219260476820
+  version_requirements: *70314675775580
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70219260476160 !ruby/object:Gem::Requirement
+  requirement: &70314675774200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70219260476160
+  version_requirements: *70314675774200
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70219260159900 !ruby/object:Gem::Requirement
+  requirement: &70314675772880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -92,10 +103,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219260159900
+  version_requirements: *70314675772880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70219260159320 !ruby/object:Gem::Requirement
+  requirement: &70314675771400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -103,7 +114,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70219260159320
+  version_requirements: *70314675771400
 description: A simple ruby client for Digital Ocean API
 email:
 - lmmendes@gmail.com
@@ -112,6 +123,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -145,7 +157,8 @@ files:
 - test/colombo/ssh_keys_test.rb
 - test/colombo/test_helper.rb
 homepage: http://github.com/lmmendes/colombo
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: