knife-digital_ocean 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20219152d6de37594c8b08a29627e41e6e52d245
-  data.tar.gz: 18b24e2ef42827ca6052c5ee5e6828592bddd546
+  metadata.gz: 8650d8892865c192e800a905cc88407920c0f548
+  data.tar.gz: 4faf0a27ed93673948ee1ef1600f36ecdfa07700
 SHA512:
-  metadata.gz: 513bc8bcac02b559db21dfb4624773ef1742ae09dd2ce3406415faec61fdf3d29565b49ca77954635b8d2aa4ef4dfc4a465ed83ca6cf5fdb05a84ba0a5cc2aa8
-  data.tar.gz: 97b6fcae12fd43e3c06850a4bc418600e1c763cc9f00f94f3daf39d53e97e1ae6fa5a10f987fea3829584df6192133e6f27e814c4f85b89120ae18559afdcc93
+  metadata.gz: 8681c4b09a4c16db831e3b0712a72504dea777d74e0459c564c55246411a95f48944724b5efb43c4606d60dca706993d66859715a635ffb1394223e33c39343a
+  data.tar.gz: 1d9c70a286b5453b7c401d411ba53e6d2df7ca73060d0e4426efef377a39a4f53c05204623938816098d9d49c4641d8f9086b717fb9427c3e72391969bc93a9e

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+2.3.0 / 2014-11-18
+
+* New subcommands
+  - knife digital_ocean droplet power
+  - knife digital_ocean droplet powercycle
+  - knife digital_ocean droplet reboot
+  - knife digital_ocean droplet snapshot
+  - knife digital_ocean droplet rename
+  - knife digital_ocean droplet rebuild
+  - knife digital_ocean droplet resize
+  - knife digital_ocean image transfer
+* Removed hacky use of rescue
+* Use sort_by in list commands, where it makes sense
+* Add --bootstrap-version to examples, thanks to [@brandoncc ](https://github.com/brandoncc) [PR #54]
+* Fix status check during droplet create
+
 ## 2.2.0 / 2014-11-14
 
 * Domain support, thanks to [@nozpheratu](https://github.com/nozpheratu) [PR #32]

data/README.md

@@ -1,5 +1,5 @@
 # Knife::DigitalOcean
-## A knife plugin to deal with the [DigitalOcean.com](https://www.digitalocean.com) Cloud services.
+#### A knife plugin to deal with the [DigitalOcean.com](https://www.digitalocean.com) Cloud services.
 
 [![Gem Version](https://badge.fury.io/rb/knife-digital_ocean.png)](http://badge.fury.io/rb/knife-digital_ocean)
 [![Build Status](https://travis-ci.org/rmoriz/knife-digital_ocean.png)](https://travis-ci.org/rmoriz/knife-digital_ocean)
@@ -22,52 +22,79 @@ This knife plugin uses the [droplet_kit](https://github.com/digitalocean/droplet
 
 This plugin provides the following sub-commands:
 
-* knife digital_ocean droplet create (options)
-  **Creates a virtual machine with or without bootstrapping chef**
+* knife digital_ocean droplet create (options)  
+**Creates a virtual machine with or without bootstrapping chef**
 
-* knife digital_ocean droplet destroy (options)
+* knife digital_ocean droplet destroy (options)  
   **Destroys the virtual machine and its data**
 
-* knife digital_ocean droplet list (options)
+* knife digital_ocean droplet list (options)  
   **Lists currently running virtual machines**
 
-* knife digital_ocean image list (options)
+* knife digital_ocean droplet power (options)  
+  **Turn a droplet On/Off**
+
+* knife digital_ocean droplet powercycle (options)  
+  **Powercycle a Droplet**
+
+* knife digital_ocean droplet reboot (options)  
+  **Reboot a Droplet**
+
+* knife digital_ocean droplet snapshot (options)  
+  **Take a snapshot of a Droplet**
+
+* knife digital_ocean droplet rename (options)  
+  **Rename a Droplet**
+
+* knife digital_ocean droplet rebuild (options)  
+  **Rebuild a Droplet**
+
+* knife digital_ocean droplet resize (options)  
+  **Resize a Droplet**
+
+* knife digital_ocean image destroy (options)  
+  **Destroy your private images**
+
+* knife digital_ocean image list (options)  
   **Lists available images (snapshots, backups, OS-images)**
 
-* knife digital_ocean region list (options)
+* knife digital_ocean image transfer (options)  
+  **Transfer a image to another region**
+
+* knife digital_ocean region list (options)  
   **Lists the server regions/locations/data-center**
 
-* knife digital_ocean size list (options)
+* knife digital_ocean size list (options)  
   **Lists the available server sizes**
 
-* knife digital_ocean domain create (options)
+* knife digital_ocean domain create (options)  
   **Creates a domain name**
 
-* knife digital_ocean domain destroy (options)
+* knife digital_ocean domain destroy (options)  
   **Destroys a domain name**
 
-* knife digital_ocean domain list
+* knife digital_ocean domain list (options)  
   **Lists your domains added to Digital Ocean**
 
-* knife digital_ocean domain record create (options)
+* knife digital_ocean domain record create (options)  
   **Creates a record for an existing domain**
 
-* knife digital_ocean domain record destroy (options)
+* knife digital_ocean domain record destroy (options)  
   **Destroys a record for an existing domain**
 
-* knife digital_ocean domain record list (options)
+* knife digital_ocean domain record list (options)  
   **Lists records for an existing domain**
 
-* knife digital_ocean sshkey create (options)
+* knife digital_ocean sshkey create (options)  
   **Creates a ssh key for use on digital ocean**
 
-* knife digital_ocean sshkey destroy (options)
+* knife digital_ocean sshkey destroy (options)  
   **Destroys the ssh key**
 
-* knife digital_ocean sshkey list
+* knife digital_ocean sshkey list (options)  
   **Lists name + id of the uploaded known ssh keys**
 
-* knife digital_ocean account info
+* knife digital_ocean account info (options)  
   **Shows account information**
 
 
@@ -110,6 +137,7 @@ __Examples__
                                       --size 512mb \
                                       --ssh-keys 1234,1235 \
                                       --bootstrap \
+                                      --bootstrap-version 11.16.4-1
                                       --run-list "role[base],role[webserver]" \
                                       --secret-file "/home/user/.ssh/secret_file" \
                                       --ssh-port 22 \
@@ -127,6 +155,7 @@ __Syntax__
                                       --ssh-keys <SSH KEY-ID(s), comma-separated> \
                                       --ssh-port <SSH PORT> \
                                       --bootstrap \
+                                      --bootstrap-version <VERSION NUMBER>
                                       --run-list "<RUNLIST>" \
                                       --secret-file "<FILENAME>" \
                                       --private_networking
@@ -204,6 +233,54 @@ Delete droplet with id: 1824316
 Delete droplet with id: 1824317
 ```
 
+#### Reboot A Droplet
+```shell
+➜ knife digital_ocean droplet reboot -I 1824315
+OK
+```
+
+#### Turn Power On/Off
+```shell
+➜ knife digital_ocean power -I 1824315 -A on
+OK
+```
+
+```shell
+➜ knife digital_ocean power -I 1824315 -A off
+OK
+```
+
+#### Powercycle A Droplet
+```shell
+➜ knife digital_ocean powercycle -I 1824315
+OK
+```
+
+#### Rebuild A Droplet
+```shell
+➜ knife digital_ocean rebuild --droplet-id 1824315 --image-id 65420
+OK
+```
+
+#### Rename A Droplet
+```shell
+➜ knife digital_ocean rename -I 1824315 -N 'mydropletrocks.com'
+OK
+```
+
+
+#### Resize A Droplet
+```shell
+➜ knife digital_ocean rename -I 1824315 -s 1gb
+OK
+```
+
+#### Resize A Droplet
+```shell
+➜ knife digital_ocean snapshot -I 1824315 -N 'my-super-awesome-snapshot'
+OK
+```
+
 ### List regions
 
 ```shell
@@ -293,6 +370,21 @@ ID       Distribution  Name                                      Slug
 7556046  CoreOS        CoreOS (alpha) 490.0.0                    coreos-alpha
 ```
 
+#### Destroy Private Images
+
+```shell
+➜ knife digital_ocean image destroy -I 11112
+OK
+```
+
+#### Transfer Private Images to Another Region
+
+```shell
+➜ knife digital_ocean image destroy -I 11112 -R ams1
+
+```
+
+
 ### SSH keys
 
 #### List SSH keys
@@ -374,7 +466,6 @@ UUID                                      Email           Droplet Limit  Email V
 58e2e737d3b7407b042aa7f99f4da4229166f2a1  joe@example.com 10             true
 ```
 
-
 ## Contributing
 
 1. Fork it
@@ -396,5 +487,6 @@ Apache 2.0 (like Chef itself), see LICENSE.txt file.
 
 ## Copyright
 
-Copyright © 2014 [Roland Moriz](https://roland.io), [Moriz GmbH](https://moriz.de/)
+Copyright © 2014 [Roland Moriz](https://roland.io), [Moriz GmbH](https://moriz.de/)  
 Copyright © 2014 [Greg Fitzgerald](https://github.com/gregf)
+

data/Rakefile

@@ -14,4 +14,10 @@ RuboCop::RakeTask.new(:rubocop) do |task|
   task.patterns = ['lib/**/*.rb']
 end
 
+desc 'Display LOC stats'
+task :loc do
+  puts "\n## LOC Stats"
+  sh 'countloc -r lib/chef/knife'
+end
+
 task default: :spec

data/knife-digital_ocean.gemspec

@@ -25,6 +25,10 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'guard', '~> 2.8'
   gem.add_development_dependency 'guard-rspec', '~> 4.3'
   gem.add_development_dependency 'coveralls'
+  gem.add_development_dependency 'countloc'
+  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'simplecov-console'
+
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }

data/lib/chef/knife/digital_ocean_base.rb

@@ -68,6 +68,21 @@ class Chef
         key = key.to_sym
         config[key] || Chef::Config[:knife][key]
       end
+
+      def wait_for_status(result, status: 'in-progress', sleep: 3)
+        print 'Waiting '
+        while result.status == 'in-progress' do
+          sleep sleep
+          print('.')
+
+          if status == 'in-progress'
+            break if client.droplets.find(id: locate_config_value(:id)).status != 'in-progress'
+          else
+            break if client.droplets.find(id: locate_config_value(:id)).status == status
+          end
+        end
+        ui.info 'OK'
+      end
     end
   end
 end

data/lib/chef/knife/digital_ocean_domain_create.rb

@@ -21,14 +21,14 @@ class Chef
       banner 'knife digital_ocean domain create (options)'
 
       option :name,
-        :short       => '-N NAME',
-        :long        => '--name NAME',
-        :description => 'The domain name'
+             short: '-N NAME',
+             long: '--name NAME',
+             description: 'The domain name'
 
       option :ip_address,
-        :short       => '-I IP Address',
-        :long        => '--ip-address address',
-        :description => 'The ip address'
+             short: '-I IP Address',
+             long: '--ip-address address',
+             description: 'The ip address'
 
       def run
         $stdout.sync = true
@@ -36,20 +36,19 @@ class Chef
         validate!
 
         unless locate_config_value(:name)
-          ui.error("Name cannot be empty. => -N <domain-name>")
+          ui.error('Name cannot be empty. => -N <domain-name>')
           exit 1
         end
 
         unless locate_config_value(:ip_address)
-          ui.error("IP Address cannot be empty. => -I <ip-address>")
+          ui.error('IP Address cannot be empty. => -I <ip-address>')
           exit 1
         end
 
         domain = DropletKit::Domain.new ip_address: locate_config_value(:ip_address), name: locate_config_value(:name)
         result = client.domains.create domain
-        ui.error JSON.parse(result)['message'] rescue 'OK'
+        ui.info 'OK' if result.class == DropletKit::Domain or ui.error JSON.parse(result)['message']
       end
-
     end
   end
 end

data/lib/chef/knife/digital_ocean_domain_destroy.rb

@@ -21,9 +21,9 @@ class Chef
       banner 'knife digital_ocean domain destroy (options)'
 
       option :domain,
-        :short       => '-D Name',
-        :long        => '--domain-name Name',
-        :description => 'The domain name'
+             short: '-D Name',
+             long: '--domain-name Name',
+             description: 'The domain name'
 
       def run
         $stdout.sync = true
@@ -31,12 +31,12 @@ class Chef
         validate!
 
         unless locate_config_value(:domain)
-          ui.error("Domain cannot be empty. => -D <domain-name>")
+          ui.error('Domain cannot be empty. => -D <domain-name>')
           exit 1
         end
 
         result = client.domains.delete(name: locate_config_value(:domain))
-        ui.error JSON.parse(result)['message'] rescue 'OK'
+        ui.info 'OK' if result == true or ui.error JSON.parse(result)['message']
       end
     end
   end

data/lib/chef/knife/digital_ocean_domain_list.rb

@@ -31,14 +31,13 @@ class Chef
 
         domains = client.domains.all
 
-        domains.each do |domain|
+        domains.sort_by(&:name).each do |domain|
           domains_list << domain.name.to_s
           domains_list << domain.ttl.to_s
         end
 
         puts ui.list(domains_list, :uneven_columns_across, 2)
       end
-
     end
   end
 end

data/lib/chef/knife/digital_ocean_domain_record_create.rb

@@ -20,25 +20,25 @@ class Chef
 
       banner 'knife digital_ocean domain record create (options)'
 
-     option :domain,
-        :short       => '-D NAME',
-        :long        => '--domain-id NAME',
-        :description => 'The domain name'
+      option :domain,
+             short: '-D NAME',
+             long: '--domain-id NAME',
+             description: 'The domain name'
 
       option :type,
-        :short       => '-T RECORD TYPE',
-        :long        => '--type RECORD TYPE',
-        :description => 'The type of record'
+             short: '-T RECORD TYPE',
+             long: '--type RECORD TYPE',
+             description: 'The type of record'
 
       option :name,
-        :short       => '-N RECORD NAME',
-        :long        => '--name RECORD NAME',
-        :description => 'The record name'
+             short: '-N RECORD NAME',
+             long: '--name RECORD NAME',
+             description: 'The record name'
 
       option :data,
-        :short       => '-a DATA',
-        :long        => '--data DATA',
-        :description => 'The record data'
+             short: '-a DATA',
+             long: '--data DATA',
+             description: 'The record data'
 
       def run
         $stdout.sync = true
@@ -46,22 +46,22 @@ class Chef
         validate!
 
         unless locate_config_value(:domain)
-          ui.error("Domain cannot be empty. => -D <domain-id>")
+          ui.error('Domain cannot be empty. => -D <domain-id>')
           exit 1
         end
 
         unless locate_config_value(:type)
-          ui.error("Record type cannot be empty. => -T <record-type>")
+          ui.error('Record type cannot be empty. => -T <record-type>')
           exit 1
         end
 
         unless locate_config_value(:name)
-          ui.error("Record name cannot be empty. => -N <record-name>")
+          ui.error('Record name cannot be empty. => -N <record-name>')
           exit 1
         end
 
         unless locate_config_value(:data)
-          ui.error("Record data cannot be empty. => -d <data>")
+          ui.error('Record data cannot be empty. => -d <data>')
           exit 1
         end
 
@@ -71,7 +71,7 @@ class Chef
           data: locate_config_value(:data)
         )
         result = client.domain_records.create domain_record, for_domain: locate_config_value(:domain)
-        ui.error JSON.parse(result)['message'] rescue 'OK'
+        ui.info 'OK' if result.class == DropletKit::DomainRecord or ui.error JSON.parse(result)['message']
       end
     end
   end