knife-digital_ocean 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bedce18b715271ffb566428d10d5ab93e1af8f2
-  data.tar.gz: 5ba947ad792cfa26ec4232457cea6e79cf6dd96c
+  metadata.gz: dd36cab124f582b57336810c5ba2a1a26afc5fa1
+  data.tar.gz: c7706cae3df44fa1fdd30d9cfb500f321fc5f511
 SHA512:
-  metadata.gz: 138af5bec6a1ea1483e41cd5b30503ba53007f04e8f3203288c5e153d63702f8660dc36d350b4e4bb60e169f61c86b3ea5a81c39e66578bbab700f5e604df7fe
-  data.tar.gz: acebc494d1a7b4dab59844e9ac9358837eeae99e28c55c5e9d7a202eb801db06622924d91f5e8fc091f728fb9b531ee1cebb05f54f22d697e7c0afa96f130d3f
+  metadata.gz: c365439ec60572e7b4f88e9934a9e09c5ba9999cddacb6cfa040102e75d01361ef811af3fb486652a516841829239ea77d3d4dba98509b58aec471e73f5b8f5c
+  data.tar.gz: 3e5b2ce87d2025a41ffe64db10a05118ff283ae8475420b05d51374291da4f346066a42d19a7c6b60d07ae450c4e047df2726e39047355308964699867b9be24

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.0
+  - 2.2.2
 env:
   - DIGITALOCEAN_ACCESS_TOKEN="fake_access_token"
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.4.1 / 2015-07-01
+
+* Fix knife digital_ocean droplet destroy
+
 # 2.4.0 / 2015-04-11
 
 * Add knife-zero bootstrapping support

data/README.md

@@ -297,7 +297,7 @@ OK
 OK
 ```
 
-#### Resize A Droplet
+#### Create a droplet from a Snapshot
 ```shell
 ➜ knife digital_ocean snapshot -I 1824315 -N 'my-super-awesome-snapshot'
 OK
@@ -308,15 +308,16 @@ OK
 ```shell
 ➜ knife digital_ocean region list
 Name             Slug
-New York 1       nyc1
 Amsterdam 1      ams1
-San Francisco 1  sfo1
-New York 2       nyc2
 Amsterdam 2      ams2
-Singapore 1      sgp1
+Amsterdam 3      ams3
+Frankfurt 1      fra1
 London 1         lon1
+New York 1       nyc1
+New York 2       nyc2
 New York 3       nyc3
-Amsterdam 3      ams3
+San Francisco 1  sfo1
+Singapore 1      sgp1
 ```
 
 ### List sizes (instance types)

data/lib/chef/knife/digital_ocean_base.rb

@@ -59,9 +59,7 @@ class Chef
           end
         end
 
-        if errors.each { |e| ui.error(e) }.any?
-          exit 1
-        end
+        exit 1 if errors.each { |e| ui.error(e) }.any?
       end
 
       def locate_config_value(key)
@@ -71,7 +69,7 @@ class Chef
 
       def wait_for_status(result, status: 'in-progress', sleep: 3)
         print 'Waiting '
-        while result.status == 'in-progress' do
+        while result.status == 'in-progress'
           sleep sleep
           print('.')
 

data/lib/chef/knife/digital_ocean_domain_create.rb

@@ -47,7 +47,7 @@ class Chef
 
         domain = DropletKit::Domain.new ip_address: locate_config_value(:ip_address), name: locate_config_value(:name)
         result = client.domains.create domain
-        ui.info 'OK' if result.class == DropletKit::Domain or ui.error JSON.parse(result)['message']
+        ui.info 'OK' if result.class == DropletKit::Domain || ui.error(JSON.parse(result)['message'])
       end
     end
   end

data/lib/chef/knife/digital_ocean_domain_destroy.rb

@@ -36,7 +36,7 @@ class Chef
         end
 
         result = client.domains.delete(name: locate_config_value(:domain))
-        ui.info 'OK' if result == true or ui.error JSON.parse(result)['message']
+        ui.info 'OK' if result == true || ui.error(JSON.parse(result)['message'])
       end
     end
   end

data/lib/chef/knife/digital_ocean_domain_record_create.rb

@@ -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.info 'OK' if result.class == DropletKit::DomainRecord or ui.error JSON.parse(result)['message']
+        ui.info 'OK' if result.class == DropletKit::DomainRecord || ui.error(JSON.parse(result)['message'])
       end
     end
   end

data/lib/chef/knife/digital_ocean_domain_record_destroy.rb

@@ -46,7 +46,7 @@ class Chef
         end
 
         result = client.domain_records.delete for_domain: locate_config_value(:domain), id: locate_config_value(:record)
-        ui.info 'OK' if result == true or ui.error JSON.parse(result)['message']
+        ui.info 'OK' if result == true || ui.error(JSON.parse(result)['message'])
       end
     end
   end

data/lib/chef/knife/digital_ocean_domain_record_edit.rb

@@ -81,7 +81,7 @@ class Chef
           data: locate_config_value(:data)
         )
         result = client.domain_records.update domain_record, for_domain: locate_config_value(:domain), id: locate_config_value(:record)
-        ui.info 'OK' if result == true or ui.error JSON.parse(result)['message']
+        ui.info 'OK' if result == true || ui.error(JSON.parse(result)['message'])
       end
     end
   end

data/lib/chef/knife/digital_ocean_droplet_create.rb

@@ -58,7 +58,7 @@ class Chef
              short: '-K KEYID',
              long: '--ssh-keys KEY_ID',
              description: 'Comma spearated list of your SSH key ids',
-             proc: lambda { |o| o.split(/[\s,]+/) }
+             proc: ->(o) { o.split(/[\s,]+/) }
 
       option :identity_file,
              short: '-i IDENTITY_FILE',
@@ -77,9 +77,9 @@ class Chef
              proc: proc { |s| Chef::Config[:knife][:solo] = s }
 
       option :zero,
-            long: '--[no-]zero',
-            description: 'Do a chef-zero bootstrap on the droplet using knife-zero',
-            proc: proc {|z| Chef::Config[:knife][:zero] = z }
+             long: '--[no-]zero',
+             description: 'Do a chef-zero bootstrap on the droplet using knife-zero',
+             proc: proc { |z| Chef::Config[:knife][:zero] = z }
 
       option :ssh_user,
              short: '-x USERNAME',
@@ -98,7 +98,7 @@ class Chef
              short: '-r RUN_LIST',
              long: '--run-list RUN_LIST',
              description: 'Comma separated list of roles/recipes to apply',
-             proc: lambda { |o| o.split(/[\s,]+/) },
+             proc: ->(o) { o.split(/[\s,]+/) },
              default: []
 
       option :template_file,
@@ -132,7 +132,7 @@ class Chef
              short: '-j JSON',
              long: '--json-attributes JSON',
              description: 'A JSON string to be added to the first run of chef-client',
-             proc: lambda { |o| JSON.parse(o) }
+             proc: ->(o) { JSON.parse(o) }
 
       option :private_networking,
              long: '--private_networking',

data/lib/chef/knife/digital_ocean_droplet_destroy.rb

@@ -36,33 +36,26 @@ class Chef
 
         droplets_ids = []
 
-        unless locate_config_value(:server)
-          ui.error('Server cannot be empty. => -S <server-id>')
-          exit 1
-        end
-
-        unless locate_config_value(:all)
-          ui.error('Warning all servers will be lost unless you exit with ctrl-c now!')
-          15.times{|x| print x; print 13.chr; sleep 15}
-        end
-
-        if locate_config_value(:all) && !client.droplets
-          ui.error('You don`t have droplets')
-          exit 1
-        end
-
         if locate_config_value(:server)
           droplets_ids = [locate_config_value(:server)]
+        elsif locate_config_value(:all)
+          ui.error('Warning all servers will be lost unless you exit with ctrl-c now!')
+          15.times { |x| print x; print 13.chr; sleep 1 }
+          droplets_ids = client.droplets.all.map(&:id)
+        else
+          ui.error 'You need to specify either a --server id or --all'
+          exit 1
         end
 
-        if locate_config_value(:all)
-          droplets_ids = client.droplets.all.map(&:id)
+        if droplet_ids.empty?
+          ui.error('Could not find any droplet(s)')
+          exit 1
         end
 
         droplets_ids.each do |id|
           ui.info "Delete droplet with id: #{id}"
           result = client.droplets.delete(id: id)
-          ui.info 'OK' if result == true or ui.error JSON.parse(result)['message']
+          ui.info 'OK' if result == true || ui.error(JSON.parse(result)['message'])
         end
       end
     end

data/lib/chef/knife/digital_ocean_droplet_power.rb

@@ -14,7 +14,7 @@ require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife
-   class DigitalOceanDropletPower < Knife
+    class DigitalOceanDropletPower < Knife
       include Knife::DigitalOceanBase
 
       banner 'knife digital_ocean droplet power (options)'
@@ -61,6 +61,6 @@ class Chef
 
         wait_for_status(result)
       end
-    end
+     end
   end
 end

data/lib/chef/knife/digital_ocean_droplet_powercycle.rb

@@ -14,7 +14,7 @@ require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife
-   class DigitalOceanDropletPowercycle < Knife
+    class DigitalOceanDropletPowercycle < Knife
       include Knife::DigitalOceanBase
 
       banner 'knife digital_ocean droplet powercycle (options)'
@@ -43,6 +43,6 @@ class Chef
 
         wait_for_status(result, status: 'active')
       end
-    end
+     end
   end
 end

data/lib/chef/knife/digital_ocean_droplet_reboot.rb

@@ -14,7 +14,7 @@ require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife
-   class DigitalOceanDropletReboot < Knife
+    class DigitalOceanDropletReboot < Knife
       include Knife::DigitalOceanBase
 
       banner 'knife digital_ocean droplet reboot (options)'
@@ -43,6 +43,6 @@ class Chef
 
         wait_for_status(result)
       end
-    end
+     end
   end
 end

data/lib/chef/knife/digital_ocean_droplet_rebuild.rb

@@ -14,7 +14,7 @@ require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife
-   class DigitalOceanDropletRebuild < Knife
+    class DigitalOceanDropletRebuild < Knife
       include Knife::DigitalOceanBase
 
       banner 'knife digital_ocean droplet rebuild (options)'
@@ -53,6 +53,6 @@ class Chef
 
         wait_for_status(result, status: 'active')
       end
-    end
+     end
   end
 end

data/lib/chef/knife/digital_ocean_droplet_rename.rb

@@ -14,7 +14,7 @@ require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife
-   class DigitalOceanDropletRename < Knife
+    class DigitalOceanDropletRename < Knife
       include Knife::DigitalOceanBase
 
       banner 'knife digital_ocean droplet rename (options)'
@@ -53,6 +53,6 @@ class Chef
 
         wait_for_status(result)
       end
-    end
+     end
   end
 end

data/lib/chef/knife/digital_ocean_droplet_resize.rb

@@ -14,7 +14,7 @@ require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife
-   class DigitalOceanDropletResize < Knife
+    class DigitalOceanDropletResize < Knife
       include Knife::DigitalOceanBase
 
       banner 'knife digital_ocean droplet resize (options)'
@@ -53,6 +53,6 @@ class Chef
 
         wait_for_status(result)
       end
-    end
+     end
   end
 end

data/lib/chef/knife/digital_ocean_droplet_snapshot.rb

@@ -14,7 +14,7 @@ require 'chef/knife/digital_ocean_base'
 
 class Chef
   class Knife
-   class DigitalOceanDropletSnapshot < Knife
+    class DigitalOceanDropletSnapshot < Knife
       include Knife::DigitalOceanBase
 
       banner 'knife digital_ocean droplet snapshot (options)'
@@ -53,6 +53,6 @@ class Chef
 
         wait_for_status(result, status: 'active')
       end
-    end
+     end
   end
 end

data/lib/chef/knife/digital_ocean_image_destroy.rb

@@ -35,7 +35,7 @@ class Chef
         end
 
         result = client.images.delete(id: locate_config_value(:id))
-        ui.info 'OK' if result == true or ui.error JSON.parse(result)['message']
+        ui.info 'OK' if result == true || ui.error(JSON.parse(result)['message'])
       end
     end
   end

data/lib/chef/knife/digital_ocean_image_transfer.rb

@@ -52,12 +52,12 @@ class Chef
         end
 
         print 'Waiting '
-        while result.status == 'in-progress' do
+        while result.status == 'in-progress'
           sleep 8
           print('.')
 
-          break if client.images.find(id: locate_config_value(:id)).
-            regions.include? locate_config_value(:region)
+          break if client.images.find(id: locate_config_value(:id))
+                   .regions.include? locate_config_value(:region)
         end
         ui.info 'OK'
       end

data/lib/chef/knife/digital_ocean_sshkey_create.rb

@@ -47,7 +47,7 @@ class Chef
 
         ssh_key = DropletKit::SSHKey.new name: locate_config_value(:name), public_key: File.read(File.expand_path(locate_config_value(:public_key)))
         result = client.ssh_keys.create(ssh_key)
-        ui.info 'OK' if result.class == DropletKit::SSHKey or ui.error JSON.parse(result)['message']
+        ui.info 'OK' if result.class == DropletKit::SSHKey || ui.error(JSON.parse(result)['message'])
       end
     end
   end

data/lib/chef/knife/digital_ocean_sshkey_destroy.rb

@@ -36,7 +36,7 @@ class Chef
         end
 
         result = client.ssh_keys.delete id: locate_config_value(:id)
-        ui.info 'OK' if result == true or ui.error JSON.parse(result)['message']
+        ui.info 'OK' if result == true || ui.error(JSON.parse(result)['message'])
       end
     end
   end

data/lib/knife-digital_ocean/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module DigitalOcean
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-digital_ocean
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Roland Moriz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -334,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A plugin for chef's knife to manage instances of DigitalOcean servers