knife-digital_ocean 0.7.0 → 2.0.0

data/lib/chef/knife/digital_ocean_region_list.rb

@@ -1,9 +1,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,22 +25,18 @@ class Chef
         validate!
 
         region_list = [
-          h.color('ID',   :bold),
-          h.color('Name', :bold)
+          ui.color('Name',   :bold),
+          ui.color('Slug', :bold)
         ]
 
-        regions = client.regions.list.regions
-
-        regions.sort! do |a, b|
-          a.name.to_i <=> b.name.to_i
-        end
+        regions = client.regions.all
 
         regions.each do |region|
-          region_list << region.id.to_s
-          region_list << region.name.to_s
+          region_list << region.name
+          region_list << region.slug
         end
 
-        puts h.list(region_list, :uneven_columns_across, 2)
+        puts ui.list(region_list, :uneven_columns_across, 2)
       end
     end
   end

data/lib/chef/knife/digital_ocean_size_list.rb

@@ -1,9 +1,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,22 +25,16 @@ class Chef
         validate!
 
         size_list = [
-          h.color('ID',   :bold),
-          h.color('Name', :bold)
+          ui.color('Slug',   :bold)
         ]
 
-        sizes = client.sizes.list.sizes
-
-        sizes.sort! do |a, b|
-          a.name.to_i <=> b.name.to_i
-        end
+        sizes = client.sizes.all
 
         sizes.each do |size|
-          size_list << size.id.to_s
-          size_list << size.name.to_s
+          size_list << size.slug
         end
 
-        puts h.list(size_list, :uneven_columns_across, 2)
+        puts ui.list(size_list, :uneven_columns_across, 1)
       end
     end
   end

data/lib/chef/knife/digital_ocean_sshkey_list.rb

@@ -1,9 +1,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,24 +25,21 @@ class Chef
         validate!
 
         sshkey_list = [
-          h.color('ID',   :bold),
-          h.color('Name', :bold),
+          ui.color('ID',   :bold),
+          ui.color('Name', :bold),
+          ui.color('Fingerprint', :bold)
         ]
 
-        sshkeys = client.ssh_keys.list.ssh_keys
-
-        sshkeys.sort! do |a, b|
-          a.name <=> b.name
-        end
+        sshkeys = client.ssh_keys.all
 
         sshkeys.each do |sshkey|
           sshkey_list << sshkey.id.to_s
           sshkey_list << sshkey.name.to_s
+          sshkey_list << sshkey.fingerprint.to_s
         end
 
-        puts h.list(sshkey_list, :uneven_columns_across, 2)
+        puts ui.list(sshkey_list, :uneven_columns_across, 3)
       end
-
     end
   end
 end

data/lib/knife-digital_ocean.rb

@@ -1,4 +1,4 @@
-require "knife-digital_ocean/version"
+require 'knife-digital_ocean/version'
 
 module Knife
   module DigitalOcean

data/lib/knife-digital_ocean/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module DigitalOcean
-    VERSION = '0.7.0'
+    VERSION = '2.0.0'
   end
 end

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

@@ -6,34 +6,33 @@ end
 
 describe Chef::Knife::DigitalOceanDropletCreate do
 
-  subject {
+  subject do
     s = Chef::Knife::DigitalOceanDropletCreate.new
-    s.stub(:client).and_return double(DigitalOcean::API)
+    allow(s).to receive(:client).and_return double(DropletKit::Droplet)
     s
-  }
+  end
 
-  let(:config) {
+  let(:config) do
     {
-      :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 ]
+      digital_ocean_access_token: 'ACCESS_TOKEN',
+      server_name: 'sever-name.example.com',
+      image: 11_111,
+      location: 22_222,
+      size: 33_333,
+      ssh_key_ids: [44_444, 44_445]
     }
-  }
+  end
 
-  let(:custom_config) {
+  let(:custom_config) do
     {}
-  }
+  end
 
-  let(:api_response) {
+  let(:api_response) do
     {
-      :status => 'OK',
-      :droplet => { :id => '123' }
+      status: 'OK',
+      droplet: { id: '123' }
     }
-  }
+  end
 
   before do
     Chef::Knife::DigitalOceanDropletCreate.load_deps
@@ -54,39 +53,39 @@ describe Chef::Knife::DigitalOceanDropletCreate do
   end
 
   context 'bootstrapping for chef-server' do
-    let(:custom_config) {
+    let(:custom_config) do
       {
-       :bootstrap => true
+        bootstrap: true
       }
-    }
+    end
 
     describe 'should use the default bootstrap class' do
-      let(:subject) {
+      let(:subject) do
         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
+        allow(s.client).to receive_message_chain(:droplets, :create).and_return mock_api_response(api_response)
+        allow(s).to receive(:ip_address_available).and_return '123.123.123.123'
+        allow(s).to receive(:tcp_test_ssh).and_return true
         s
-      }
+      end
 
       it 'should use the right bootstrap class' do
-        subject.bootstrap_class.should eql(Chef::Knife::Bootstrap)
+        expect(subject.bootstrap_class).to 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)
+        allow_any_instance_of(Chef::Knife::Bootstrap).to receive(:run)
+        expect { subject.run }.not_to raise_error
       end
     end
   end
 
   context 'bootstrapping for knife-solo' do
 
-    let(:custom_config) {
+    let(:custom_config) do
       {
-       :solo => true
+        solo: true
       }
-    }
+    end
 
     describe 'when knife-solo is installed' do
       before do
@@ -94,22 +93,22 @@ describe Chef::Knife::DigitalOceanDropletCreate do
         require 'chef/knife/solo_bootstrap'
       end
 
-      let(:subject) {
+      let(:subject) do
         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
+        allow(s.client).to receive_message_chain(:droplets, :create).and_return mock_api_response(api_response)
+        allow(s).to receive(:ip_address_available).and_return '123.123.123.123'
+        allow(s).to receive(:tcp_test_ssh).and_return true
         s
-      }
+      end
 
       it 'should use the right bootstrap class' do
-        subject.bootstrap_class.should eql(Chef::Knife::SoloBootstrap)
+        expect(subject.bootstrap_class).to 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)
+        expect_any_instance_of(Chef::Knife::SoloBootstrap).to receive(:run)
+        expect_any_instance_of(Chef::Knife::Bootstrap).not_to receive(:run)
+        expect { subject.run }.not_to raise_error
       end
     end
 
@@ -120,36 +119,36 @@ describe Chef::Knife::DigitalOceanDropletCreate do
       end
 
       it 'should not create a droplet' do
-        subject.client.should_not_receive(:droplets)
-        lambda { subject.run }.should raise_error(SystemExit)
+        expect(subject.client).not_to receive(:droplets)
+        expect { subject.run }.to raise_error(SystemExit)
       end
     end
 
   end
 
   context 'no bootstrapping' do
-    let(:custom_config) {
+    let(:custom_config) do
       {}
-    }
+    end
 
     describe 'should not do any bootstrapping' do
-      let(:subject) {
+      let(:subject) do
         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
+        allow(s.client).to receive_message_chain(:droplets, :create).and_return mock_api_response(api_response)
+        allow(s).to receive(:ip_address_available).and_return '123.123.123.123'
+        allow(s).to receive(:tcp_test_ssh).and_return true
         s
-      }
+      end
 
       it 'should call #bootstrap_for_node' do
-        subject.should_not_receive(:bootstrap_for_node)
+        expect(subject).not_to 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)
+          expect(e.status).to eql(0)
+          expect(e).to be_a(SystemExit)
         }
       end
     end
@@ -157,45 +156,44 @@ describe Chef::Knife::DigitalOceanDropletCreate do
 
   context 'passing json attributes (-j)' do
     let(:json_attributes) { '{ "apache": { "listen_ports": 80 } }' }
-    let(:custom_config) {
+    let(:custom_config) do
       {
-       :json_attributes => json_attributes
+        json_attributes: json_attributes
       }
-    }
+    end
 
     it 'should configure the first boot attributes on Bootstrap' do
       bootstrap = subject.bootstrap_for_node('123.123.123.123')
-      bootstrap.config[:first_boot_attributes].should eql(json_attributes)
+      expect(bootstrap.config[:first_boot_attributes]).to eql(json_attributes)
     end
   end
 
   context 'passing secret_file (--secret-file)' do
     let(:secret_file) { '/tmp/sekretfile' }
-    let(:custom_config) {
+    let(:custom_config) do
       {
-       :secret_file => secret_file
+        secret_file: secret_file
       }
-    }
+    end
 
     it 'secret_file should be available to Bootstrap' do
       bootstrap = subject.bootstrap_for_node('123.123.123.123')
-      bootstrap.config[:secret_file].should eql(secret_file)
+      expect(bootstrap.config[:secret_file]).to eql(secret_file)
     end
   end
 
   context 'passing ssh_port (--ssh-port)' do
     let(:ssh_port) { 22 }
-    let(:custom_config) {
+    let(:custom_config) do
       {
-       :ssh_port => ssh_port
+        ssh_port: ssh_port
       }
-    }
+    end
 
     it 'ssh_port should be available to Bootstrap' do
       bootstrap = subject.bootstrap_for_node('123.123.123.123')
-      bootstrap.config[:ssh_port].should eql(ssh_port)
+      expect(bootstrap.config[:ssh_port]).to eql(ssh_port)
     end
   end
 
 end
-

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

@@ -3,4 +3,3 @@ require 'spec_helper'
 describe Chef::Knife::DigitalOceanDropletDestroy do
   pending
 end
-

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

@@ -3,4 +3,3 @@ require 'spec_helper'
 describe Chef::Knife::DigitalOceanDropletList do
   pending
 end
-

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

@@ -3,4 +3,3 @@ require 'spec_helper'
 describe Chef::Knife::DigitalOceanImageList do
   pending
 end
-

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

@@ -3,4 +3,3 @@ require 'spec_helper'
 describe Chef::Knife::DigitalOceanRegionList do
   pending
 end
-

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

@@ -3,4 +3,3 @@ require 'spec_helper'
 describe Chef::Knife::DigitalOceanSizeList do
   pending
 end
-

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

@@ -3,4 +3,3 @@ require 'spec_helper'
 describe Chef::Knife::DigitalOceanSshkeyList do
   pending
 end
-

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

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe Knife::DigitalOcean do
   it 'should have a VERSION defined' do
-    described_class::VERSION.should_not be_empty
+    expect(described_class::VERSION).not_to be_empty
   end
 end
-

data/spec/spec_helper.rb

@@ -1,7 +1,5 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'rspec/autorun'
-
-require 'digital_ocean'
+require 'droplet_kit'
 require 'hashie'
 
 require 'chef/knife'
@@ -13,4 +11,4 @@ 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}
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: knife-digital_ocean
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Roland Moriz
+- Greg Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -25,47 +26,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.18'
 - !ruby/object:Gem::Dependency
-  name: digital_ocean
+  name: droplet_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '3.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0.27'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0.27'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +98,7 @@ dependencies:
 description: A plugin for chef's knife to manage instances of DigitalOcean servers
 email:
 - roland@moriz.de
+- greg@gregf.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A plugin for chef's knife to manage instances of DigitalOcean servers