knife-digital_ocean 0.0.5 → 0.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTZkMjlmY2NhNmQ3YmQ1ZjM1ZTI0MjM0MmQyMmQwZDRlOGVlM2I0OA==
+  data.tar.gz: !binary |-
+    NTFmN2M3ZTQ0NDZiMzQxM2Y0NmIzZGJlZDgwYWU0NWMzY2E5NDFhYQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NzQ1Y2Y5Mjk5YWJjZTNiOTNlZTQzNTljMjEwMzI0MTZjMTZjNzk1ZmMxYmUy
+    OGYyMzFjMmU0YTRlYjJhMTQwZTFhMGJlMzU1NmJjNzYwOTNlMzc4Mjc0MDM2
+    NGIzOTRkNGMzM2MzYmRlMzcxYjc2MWE4ZTcwMzRiYjNlOWI4Y2U=
+  data.tar.gz: !binary |-
+    NTczNTdhM2E4YTk1ZWM5MTAxZmU0MDI5ZWFiNjM3MjE1ZDA0OTczYjdjZWYy
+    YTgxZDgzNzhjZTJkMjEwZTM0YzVkN2UwNTdmNGI0MGE3Y2RkNzM1NDE2YzYy
+    Y2E2ZDZkZWFkYzJhOWRmNjI5YTRlMmJkYTM4N2E5ZTkyYzY0OWI=

data/.travis.yml

@@ -3,7 +3,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby-19mode
+  - 2.0.0
   - ruby-head
-  - jruby-head
 script: bundle exec rake test

data/CHANGELOG.md

@@ -0,0 +1,30 @@
+## 0.1.1 / unreleased
+
+## 0.1.0 / 2013-03-01
+
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.0.5...master)
+* support for integrated ```knife-solo``` bootstrapping using the ```--solo``` option (by tmatilai)
+* added basic rspec tests for various bootstrapping options
+* remove JRuby from CI as chef itself does currently not work with JRuby
+  except when c-extensions are enabled (off by default)
+
+
+## 0.0.5 / 2013-02-23
+
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.0.4...v0.0.5)
+
+
+## 0.0.4 / 2013-02-18
+
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.0.3...v0.0.4)
+
+
+## 0.0.2 / 2013-02-04
+
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/v0.0.1...v0.0.2)
+
+
+## 0.0.1 / 2013-02-03
+
+* [Full Changelog](https://github.com/rmoriz/knife-digital_ocean/compare/d9bd11c01c8d963a1214e7ab234eeb7f09e6a7eb...v0.0.1)
+* First release

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/README.md

@@ -1,16 +1,18 @@
 # Knife::DigitalOcean
 ## A knife plugin to deal with the [DigitalOcean.com](https://www.digitalocean.com) Cloud services.
 
+[![Build Status](https://travis-ci.org/rmoriz/knife-digital_ocean.png)](https://travis-ci.org/rmoriz/knife-digital_ocean)
+<a href="https://gemnasium.com/rmoriz/knife-digital_ocean"><img src="https://gemnasium.com/rmoriz/knife-digital_ocean.png"/></a>
+<a href="https://codeclimate.com/github/rmoriz/knife-digital_ocean"><img src="https://codeclimate.com/github/rmoriz/knife-digital_ocean.png"/></a>
+
 This is a plugin for [Chef's](http://www.opscode.com/chef/) [knife](http://wiki.opscode.com/display/chef/Knife) tool. It allows you to bootstrap virtual machines with [DigitalOcean.com](https://www.digitalocean.com/) including the initial bootstrapping of chef on that system.
-You can also skip the chef bootstrapping if you prefer using [knife-solo](http://matschaffer.github.com/knife-solo/) or another solution.
+You can also use [knife-solo](http://matschaffer.github.com/knife-solo/) for chef bootstrapping or skip it altogether for another solution.
 
 This knife plugin uses the [digital_ocean](https://github.com/rmoriz/digital_ocean) rubygem.
 
 
 ## Installation
 
-(chef needs to be installed upfront, of course)
-
 ```shell
 ➜ gem install knife-digital_ocean
 ```
@@ -21,7 +23,7 @@ This knife plugin uses the [digital_ocean](https://github.com/rmoriz/digital_oce
 This plugin provides the following sub-commands:
 
 * knife digital_ocean droplet create (options)   
-  **Creates a virtual machine with or without bootstrapping chef-client**
+  **Creates a virtual machine with or without bootstrapping chef**
 
 * knife digital_ocean droplet destroy (options)  
   **Destroys the virtual machine and its data**
@@ -55,7 +57,13 @@ knife[:digital_ocean_api_key]   = 'YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY'
 
 ### Create a Droplet
 
-#### With bootstrapping in an chef-server environment:
+There are three different ways of creating a server/droplet instance:
+
+If you just want to launch an instance 
+form the command line without any bootstrapping, go for option **C**. 
+If you use ```knife-solo``` try **B** and if you are a ```chef-server```-fan
+use method **A**:
+#### A. With bootstrapping in an chef-server environment:
 
 __Example__
 
@@ -93,9 +101,26 @@ __Short Syntax__
                                       -r "<RUNLIST>"
 ```
 
-#### With knife-solo, your custom external bootstrapping script or without chef at all
+#### B. With knife-solo bootstrapping
 
-This will just create a droplet and return its IP-address. Nothing else. You can now run your custom solution to provision the droplet e.g. ```knife solo bootstrap <IP> ``` if you use knife-solo. 
+You need to have [knife-solo](http://matschaffer.github.com/knife-solo/) gem installed.
+
+This will create a droplet and run `knife solo bootstrap <IP>` equivalent for it.
+
+__Example__
+
+```bash
+➜ knife digital_ocean droplet create --server-name awesome-vm1.chef.io \
+                                      --image 25306 \
+                                      --location 2 \
+                                      --size 66 \
+                                      --ssh-keys 1234,4567 \
+                                      --solo
+```
+
+#### C. With your custom external bootstrapping script or without chef at all
+
+This will just create a droplet and return its IP-address. Nothing else. You can now run your custom solution to provision the droplet.
 
 __Example__
 
@@ -123,7 +148,7 @@ ID     Name                  Size   Region       IPv4            Image
 OK
 ```
 
-### List regions (servers)
+### List regions
 
 ```shell
 ➜ knife digital_ocean region list
@@ -132,7 +157,7 @@ ID  Name
 2   Amsterdam 1
 ```
 
-### List sizes (server types)
+### List sizes (instance types)
 
 ```shell
 ➜ knife digital_ocean size list  
@@ -229,6 +254,11 @@ Commercial support is available. Please contact [https://roland.io/](https://rol
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+### Contributors
+
+*   [Teemu Matilainen](https://github.com/tmatilai)
+
+For more information and a complete list see [the contributor page on GitHub](https://github.com/rmoriz/knife-digital_ocean/contributors).
 
 ## License
 

data/knife-digital_ocean.gemspec

@@ -16,14 +16,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'chef', '>= 10.18'
   gem.add_dependency 'digital_ocean'
   gem.add_dependency 'highline'
-  gem.add_dependency 'net-ssh-multi', '~> 1.1'
 
-
-  gem.add_development_dependency 'rspec', '~> 2.0'
+  gem.add_development_dependency 'rspec', '~> 2.13'
   gem.add_development_dependency 'guard'
   gem.add_development_dependency 'guard-rspec'
   gem.add_development_dependency 'rb-fsevent'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'knife-solo'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/chef/knife/digital_ocean_base.rb

@@ -16,19 +16,28 @@ class Chef
   class Knife
     module DigitalOceanBase
 
+      def self.load_deps
+        require 'digital_ocean'
+        require 'highline'
+      end
+
       def self.included(includer)
         includer.class_eval do
           category 'digital_ocean'
 
-          deps do
-            require 'digital_ocean'
-            require 'highline'
-            require 'net/ssh/multi'
-            require 'readline'
-            require 'chef/json_compat'
-            require 'chef/knife/bootstrap'
-            Chef::Knife::Bootstrap.load_deps
-          end
+          # Lazy load our dependencies. Later calls to `Knife#deps` override
+          # previous ones, so if the including class calls it, it needs to also
+          # call our #load_deps, i.e:
+          #
+          #   Include Chef::Knife::DigitalOceanBase
+          #
+          #   deps do
+          #     require 'foo'
+          #     require 'bar'
+          #     Chef::Knife::DigitalOceanBase.load_deps
+          #   end
+          #
+          deps { Chef::Knife::DigitalOceanBase.load_deps }
 
           option :digital_ocean_client_id,
             :short       => '-K CLIENT_ID',

data/lib/chef/knife/digital_ocean_droplet_create.rb

@@ -10,13 +10,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require File.expand_path('../digital_ocean_base', __FILE__)
+require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife
     class DigitalOceanDropletCreate < Knife
       include Knife::DigitalOceanBase
 
+      deps do
+        require 'socket'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+        Chef::Knife::DigitalOceanBase.load_deps
+        # Knife loads subcommands automatically, so we can just check if the
+        # class exists.
+        Chef::Knife::SoloBootstrap.load_deps if defined? Chef::Knife::SoloBootstrap
+      end
+
       banner 'knife digital_ocean droplet create (options)'
 
       option :server_name,
@@ -58,8 +68,12 @@ class Chef
       option :bootstrap,
         :short       => '-B',
         :long        => '--bootstrap',
-        :boolean     => false,
-        :description => 'Do a chef-client bootstrap on the create droplet (for use with chef-server)'
+        :description => 'Do a chef-client bootstrap on the created droplet (for use with chef-server)'
+
+      option :solo,
+        :long        => '--[no-]solo',
+        :description => 'Do a chef-solo bootstrap on the droplet using knife-solo',
+        :proc        => Proc.new { |s| Chef::Config[:knife][:solo] = s }
 
       option :ssh_user,
         :short       => '-x USERNAME',
@@ -90,7 +104,6 @@ class Chef
       option :host_key_verify,
         :long        => "--[no-]host-key-verify",
         :description => "Verify host key, enabled by default",
-        :boolean     => true,
         :default     => true
 
       option :prerelease,
@@ -132,6 +145,15 @@ class Chef
           exit 1
         end
 
+        if solo_bootstrap? && !defined?(Chef::Knife::SoloBootstrap)
+          ui.error [
+            'Knife plugin knife-solo was not found.',
+            'Please add the knife-solo gem to your Gemfile or',
+            'install it manually with `gem install knife-solo`.'
+          ].join(" ")
+          exit 1
+        end
+
         response = client.droplets.create(:name        => locate_config_value(:server_name),
                                           :size_id     => locate_config_value(:size),
                                           :image_id    => locate_config_value(:image),
@@ -158,7 +180,7 @@ class Chef
           puts 'done'
         }
 
-        if locate_config_value(:bootstrap)
+        if locate_config_value(:bootstrap) || solo_bootstrap?
           bootstrap_for_node(ip_address).run
         else
           puts ip_address
@@ -203,22 +225,24 @@ class Chef
       end
 
       def bootstrap_for_node(ip_address)
-        bootstrap = Chef::Knife::Bootstrap.new
+        bootstrap = bootstrap_class.new
         bootstrap.name_args = [ ip_address ]
-        bootstrap.config[:run_list] = config[:run_list]
-        bootstrap.config[:ssh_user] = config[:ssh_user]
-        bootstrap.config[:identity_file] = config[:identity_file]
+        bootstrap.config = config.dup
         bootstrap.config[:chef_node_name] = locate_config_value(:server_name)
-        bootstrap.config[:prerelease] = config[:prerelease]
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
         bootstrap.config[:distro] = locate_config_value(:distro)
         bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
         bootstrap.config[:template_file] = locate_config_value(:template_file)
-        bootstrap.config[:environment] = config[:environment]
-        bootstrap.config[:host_key_verify] = config[:host_key_verify]
         bootstrap
       end
 
+      def bootstrap_class
+        solo_bootstrap? ? Chef::Knife::SoloBootstrap : Chef::Knife::Bootstrap
+      end
+
+      def solo_bootstrap?
+        config[:solo] || (config[:solo].nil? && Chef::Config[:knife][:solo])
+      end
     end
   end
 end

data/lib/chef/knife/digital_ocean_droplet_destroy.rb

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require File.expand_path('../digital_ocean_base', __FILE__)
+require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife

data/lib/chef/knife/digital_ocean_droplet_list.rb

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require File.expand_path('../digital_ocean_base', __FILE__)
+require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife

data/lib/chef/knife/digital_ocean_image_list.rb

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require File.expand_path('../digital_ocean_base', __FILE__)
+require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife

data/lib/chef/knife/digital_ocean_region_list.rb

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require File.expand_path('../digital_ocean_base', __FILE__)
+require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife

data/lib/chef/knife/digital_ocean_size_list.rb

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require File.expand_path('../digital_ocean_base', __FILE__)
+require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife

data/lib/chef/knife/digital_ocean_sshkey_list.rb

@@ -10,7 +10,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require File.expand_path('../digital_ocean_base', __FILE__)
+require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife

data/lib/knife-digital_ocean/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module DigitalOcean
-    VERSION = '0.0.5'
+    VERSION = '0.1.0'
   end
 end

data/spec/lib/chef/knife/digital_ocean_droplet_create_spec.rb

@@ -0,0 +1,152 @@
+require 'spec_helper'
+
+def mock_api_response(data = {})
+  Hashie::Rash.new(data)
+end
+
+describe Chef::Knife::DigitalOceanDropletCreate do
+
+  subject {
+    s = Chef::Knife::DigitalOceanDropletCreate.new
+    s.stub(:client).and_return mock(DigitalOcean::API)
+    s
+  }
+
+  let(:config) {
+    {
+      :digital_ocean_client_id => 'CLIENT_ID',
+      :digital_ocean_api_key   => 'API_KEY',
+      :server_name => 'sever-name.example.com',
+      :image       => 11111,
+      :location    => 22222,
+      :size        => 33333,
+      :ssh_key_ids => [ 44444, 44445 ]
+    }
+  }
+
+  let(:custom_config) {
+    {}
+  }
+
+  let(:api_response) {
+    {
+      :status => 'OK',
+      :droplet => { :id => '123' }
+    }
+  }
+
+  before do
+    Chef::Knife::DigitalOceanDropletCreate.load_deps
+
+    # reset
+    Chef::Config[:knife] = {}
+
+    # config
+    config.merge(custom_config).each do |k, v|
+      Chef::Config[:knife][k] = v
+    end
+  end
+
+  context 'bootstrapping for chef-server' do
+    let(:custom_config) {
+      {
+       :bootstrap => true
+      }
+    }
+
+    describe 'should use the default bootstrap class' do
+      let(:subject) {
+        s = super()
+        s.client.stub_chain(:droplets, :create).and_return mock_api_response(api_response)
+        s.stub!(:ip_address_available).and_return '123.123.123.123'
+        s.stub!(:tcp_test_ssh).and_return true
+        s
+      }
+
+      it 'should use the right bootstrap class' do
+        subject.bootstrap_class.should eql(Chef::Knife::Bootstrap)
+      end
+
+      it 'should call #run on the bootstrap class' do
+        Chef::Knife::Bootstrap.any_instance.stub(:run)
+        lambda { subject.run }.should_not raise_error(SystemExit)
+      end
+    end
+  end
+
+  context 'bootstrapping for knife-solo' do
+
+    let(:custom_config) {
+      {
+       :solo => true
+      }
+    }
+
+    describe 'when knife-solo is installed' do
+      before do
+        # simulate installed knife-solo gem
+        require 'chef/knife/solo_bootstrap'
+      end
+
+      let(:subject) {
+        s = super()
+        s.client.stub_chain(:droplets, :create).and_return mock_api_response(api_response)
+        s.stub!(:ip_address_available).and_return '123.123.123.123'
+        s.stub!(:tcp_test_ssh).and_return true
+        s
+      }
+
+      it 'should use the right bootstrap class' do
+        subject.bootstrap_class.should eql(Chef::Knife::SoloBootstrap)
+      end
+
+      it 'should call #run on the bootstrap class' do
+        Chef::Knife::SoloBootstrap.any_instance.should_receive(:run)
+        Chef::Knife::Bootstrap.any_instance.should_not_receive(:run)
+        lambda { subject.run }.should_not raise_error(SystemExit)
+      end
+    end
+
+    describe 'when knife-solo is not installed' do
+      before do
+        # simulate knife-solo gem is not installed
+        Chef::Knife.send(:remove_const, :SoloBootstrap) if defined?(Chef::Knife::SoloBootstrap)
+      end
+
+      it 'should not create a droplet' do
+        subject.client.should_not_receive(:droplets)
+        lambda { subject.run }.should raise_error(SystemExit)
+      end
+    end
+
+  end
+
+  context 'no bootstrapping' do
+    let(:custom_config) {
+      {}
+    }
+
+    describe 'should not do any bootstrapping' do
+      let(:subject) {
+        s = super()
+        s.client.stub_chain(:droplets, :create).and_return mock_api_response(api_response)
+        s.stub!(:ip_address_available).and_return '123.123.123.123'
+        s.stub!(:tcp_test_ssh).and_return true
+        s
+      }
+
+      it 'should call #bootstrap_for_node' do
+        subject.should_not_receive(:bootstrap_for_node)
+        expect { subject.run }.to raise_error
+      end
+
+      it 'should have a 0 exit code' do
+        expect { subject.run }.to raise_error { |e|
+          e.status.should eql(0)
+          e.should be_a(SystemExit)
+        }
+      end
+    end
+  end
+end
+

data/spec/lib/chef/knife/digital_ocean_droplet_destroy_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe Chef::Knife::DigitalOceanDropletDestroy do
+  pending
+end
+

data/spec/lib/chef/knife/digital_ocean_droplet_list_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe Chef::Knife::DigitalOceanDropletList do
+  pending
+end
+

data/spec/lib/chef/knife/digital_ocean_image_list_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe Chef::Knife::DigitalOceanImageList do
+  pending
+end
+

data/spec/lib/chef/knife/digital_ocean_region_list_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe Chef::Knife::DigitalOceanRegionList do
+  pending
+end
+

data/spec/lib/chef/knife/digital_ocean_size_list_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe Chef::Knife::DigitalOceanSizeList do
+  pending
+end
+

data/spec/lib/chef/knife/digital_ocean_sshkey_list_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe Chef::Knife::DigitalOceanSshkeyList do
+  pending
+end
+

data/spec/lib/knife-digital_ocean/version_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Knife::DigitalOcean do
+  it 'should have a VERSION defined' do
+    described_class::VERSION.should_not be_empty
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,9 +1,16 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'rspec/autorun'
-require 'knife-digital_ocean'
 
+require 'digital_ocean'
+require 'rash'
 
+require 'chef/knife'
+require 'chef/knife/digital_ocean_droplet_create'
+require 'chef/knife/digital_ocean_droplet_destroy'
+require 'chef/knife/digital_ocean_droplet_list'
+require 'chef/knife/digital_ocean_image_list'
+require 'chef/knife/digital_ocean_region_list'
+require 'chef/knife/digital_ocean_size_list'
+require 'chef/knife/digital_ocean_sshkey_list'
 
 Dir['./spec/support/**/*.rb'].sort.each {|f| require f}
-
-

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: knife-digital_ocean
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Roland Moriz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: digital_ocean
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,47 +48,41 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ssh-multi
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
+        version: '2.13'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,15 +90,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,15 +104,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,15 +118,13 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: knife-solo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -164,7 +145,9 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -179,37 +162,46 @@ files:
 - lib/chef/knife/digital_ocean_sshkey_list.rb
 - lib/knife-digital_ocean.rb
 - lib/knife-digital_ocean/version.rb
+- spec/lib/chef/knife/digital_ocean_droplet_create_spec.rb
+- spec/lib/chef/knife/digital_ocean_droplet_destroy_spec.rb
+- spec/lib/chef/knife/digital_ocean_droplet_list_spec.rb
+- spec/lib/chef/knife/digital_ocean_image_list_spec.rb
+- spec/lib/chef/knife/digital_ocean_region_list_spec.rb
+- spec/lib/chef/knife/digital_ocean_size_list_spec.rb
+- spec/lib/chef/knife/digital_ocean_sshkey_list_spec.rb
+- spec/lib/knife-digital_ocean/version_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rmoriz/knife-digital_ocean
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3898868140226600481
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3898868140226600481
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A plugin for chef's knife to manage instances of DigitalOcean servers
 test_files:
+- spec/lib/chef/knife/digital_ocean_droplet_create_spec.rb
+- spec/lib/chef/knife/digital_ocean_droplet_destroy_spec.rb
+- spec/lib/chef/knife/digital_ocean_droplet_list_spec.rb
+- spec/lib/chef/knife/digital_ocean_image_list_spec.rb
+- spec/lib/chef/knife/digital_ocean_region_list_spec.rb
+- spec/lib/chef/knife/digital_ocean_size_list_spec.rb
+- spec/lib/chef/knife/digital_ocean_sshkey_list_spec.rb
+- spec/lib/knife-digital_ocean/version_spec.rb
 - spec/spec_helper.rb