docl 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: fd8567515ced970e31f68664650daa5e5040ab2a
-  data.tar.gz: 2850796769b6f9be205ebbff4ebc17ff5ba2d6e4
+SHA1:
+  metadata.gz: ccdb9a0251a9ffcaf96c58284d879bf86604327b
+  data.tar.gz: e6a70f76a9dcad631752bde424cba09f8a41f03f
 SHA512:
-  metadata.gz: 726f31020e44d163cf397de89e92b4552f58947f39d66ec6c7c6a662499aeea7c59f6d83922cb3eae9bc13a2bf6972a58615c6a1dcf6eaa52c43c27a6d29717b
-  data.tar.gz: 855672c17d31968308b5eab476c4d55df003beaf61a0dfcf048eef4395e86fb0c693501e3621390a7934335e9141c22ee687df98b8a565a958677afe159dad1c
+  metadata.gz: 4dd9c615bd3dc0d6a5a970030f63705e8bd0f7c7fed1fd5d94b8ea234f3828978f42b36aa2167e0896ff85fe1dce6bb478d9ed1024cc076c3f81acc15caf07b6
+  data.tar.gz: 35cff01a914c59a8e8b4459e0df27d09898b50787c51b460637c916eb6b820fd2a5f73b474bbf99ce0da4893aff1a5551d81a81f75f23d9367ead9da126b8ffc

data/.gitignore

@@ -1 +1 @@
-Gemfile.lock
+Gemfile.lock

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org'
+source 'https://rubygems.org'
 gemspec

data/LICENSE

@@ -1,22 +1,22 @@
- Copyright (c) 2014 Nathan Samson <nathan AT nathansamson DOT be>
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
+ Copyright (c) 2014 Nathan Samson <nathan AT nathansamson DOT be>
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,15 +1,15 @@
-# DOCL (DigitalOcean Command Line)
-
-A command line tool for interacting with DigitalOcean.
-
-## Installation
-gem install docl
-
-## Status
-Currently it only supports a very limited subset of oeprations.
-
-## Documentation
-Run `docl help` or `docl command help` to get help.
-
-## Contributing
-To test the code run `bundle exec docl ...` which will include your code changes.
+# DOCL (DigitalOcean Command Line)
+
+A command line tool for interacting with DigitalOcean.
+
+## Installation
+gem install docl
+
+## Status
+Currently it only supports a very limited subset of operations.
+
+## Documentation
+Run `docl help` or `docl command help` to get help.
+
+## Contributing
+To test the code run `bundle exec docl ...` which will include your code changes.

data/bin/docl

@@ -1,5 +1,5 @@
-#! /usr/bin/env ruby
-
-require 'docl'
-
+#! /usr/bin/env ruby
+
+require 'docl'
+
 DOCL::CLI.start

data/docl.gemspec

@@ -1,24 +1,24 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'docl/version'
-
-Gem::Specification.new do |gem|
-    gem.name = "docl"
-    gem.version = DOCL::VERSION
-    gem.authors = ["Nathan Samson"]
-    gem.email = ["nathan@nathansamson.be"]
-    gem.license = "MIT"
-    gem.description = %q{A command line tool for interacting with your DigitalOcean droplets.}
-    gem.summary = %q{A command line tool for interacting with your DigitalOcean droplets.}
-    gem.homepage = "https://github.com/nathansamson/docl"
-
-    gem.files = `git ls-files`.split($/)
-    gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-    gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
-    gem.require_paths = ["lib"]
-    gem.required_ruby_version = ">= 1.9.3"
-
-    gem.add_dependency "thor", "~> 0.19.1"
-    gem.add_dependency "barge", "~> 0.10.0"
-    gem.add_dependency "json", "~> 1.8.1"
-end
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'docl/version'
+
+Gem::Specification.new do |gem|
+    gem.name = "docl"
+    gem.version = DOCL::VERSION
+    gem.authors = ["Nathan Samson"]
+    gem.email = ["nathan@nathansamson.be"]
+    gem.license = "MIT"
+    gem.description = %q{A command line tool for interacting with your DigitalOcean droplets.}
+    gem.summary = %q{A command line tool for interacting with your DigitalOcean droplets.}
+    gem.homepage = "https://github.com/nathansamson/docl"
+
+    gem.files = `git ls-files`.split($/)
+    gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+    gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
+    gem.require_paths = ["lib"]
+    gem.required_ruby_version = ">= 1.9.3"
+
+    gem.add_dependency "thor", "~> 0.19.1"
+    gem.add_dependency "barge", "~> 0.11.0"
+    gem.add_dependency "json", "~> 1.8.1"
+end

data/lib/docl.rb

@@ -1,8 +1,8 @@
-require 'barge'
-require 'json'
-require 'thor'
-
-module DOCL
-end
-
+require 'barge'
+require 'json'
+require 'thor'
+
+module DOCL
+end
+
 require 'docl/cli'

data/lib/docl/cli.rb

@@ -1,147 +1,173 @@
-class DOCL::CLI < Thor
-    desc "authorize", "Authrorize docl to read / modify your DO info"
-    def authorize
-        puts "You'll need to enter your DigitalOcean Private Access Token."
-        puts "To be able to create / modify droplets, it needs to be read / write."
-        puts "You can create a token on the DO website vite the Apps & API menu."
-
-        print "Enter your DO Token: "
-        token = $stdin.gets.chomp
-
-        f = File.open(config_path, 'w')
-        f.write(token)
-        f.close
-        File.chmod(0600, config_path)
-    end
-
-    desc "images", "List all images"
-    method_option :public, type: :boolean, default: false, aliases: '-p'
-    def images()
-        images = barge.image.all.images
-        images = images.select { |image| image.public == options.public }
-        images = images.sort { |a, b| a.name <=> b.name }
-        images.each do |image|
-            if !image.slug.nil?
-                puts "#{image.name} (#{image.slug}, id: #{image.id})"
-            else
-                puts "#{image.name} (id: #{image.id})"
-            end
-        end
-    end
-
-    desc "upload_key [name] [public_key_path]", "Upload a key"
-    def upload_key(name, public_key_path)
-        response = barge.key.create(name: name,
-                                    public_key: File.read(public_key_path))
-
-        if response.message
-            puts response.message
-            exit(1)
-        else
-            puts "Public Key uploaded with ID: #{response.ssh_key.id}"
-        end
-    end
-
-    desc "keys", "List all keys"
-    def keys()
-        barge.key.all.ssh_keys.each do |key|
-            puts "#{key.name} (id: #{key.id})"
-        end
-    end
-
-    desc "regions", "List regions"
-    method_option :metadata, type: :boolean, default: false
-    method_option :private_networking, type: :boolean, default: false
-    method_option :backups, type: :boolean, default: false
-    method_option :ipv6, type: :boolean, default: false
-    def regions()
-        regions = barge.region.all.regions
-        regions = regions.select do |region|
-            if options.ipv6 && !region.features.include?('ipv6')
-                next false
-            end
-
-            if options.metadata && !region.features.include?('metadata')
-                next false
-            end
-
-            if options.private_networking && !region.features.include?('private_networking')
-                next false
-            end
-
-            if options.backups && !region.features.include?('backups')
-                next false
-            end
-
-            next true
-        end
-        regions.sort { |a, b| a.name <=> b.name }.each do |region|
-            puts "#{region.name} (#{region.slug})"
-        end
-    end
-
-    desc "create [name] [image] [size] [region]", "Create a droplet"
-    method_option :key, type: :string, default: nil
-    method_option :user_data, type: :string, default: nil
-    method_option :private_networking, type: :boolean, default: true
-    method_option :enable_backups, type: :boolean, default: false
-    method_option :ipv6, type: :boolean, default: false
-    method_option :wait, type: :boolean, default: false
-    def create(name, image, size, region)
-        call_options = {
-            name: name,
-            image: image,
-            region: region,
-            size: size,
-            private_networking: options.private_networking,
-            enable_backups: options.enable_backups,
-            ipv6: options.ipv6,
-        }
-        if options[:key]
-            call_options[:ssh_keys] = [options[:key]]
-        end
-        if options.user_data
-            call_options[:user_data] = File.read(options.user_data)
-        end
-
-        response = barge.droplet.create(call_options)
-        if response.id == 'unprocessable_entity'
-            puts response.message
-            exit(1)
-        end
-
-        if options.wait
-            print "Waiting for droplet to become available"
-            action_link = response.links.actions.first
-            begin
-                print '.'
-                sleep 1
-                action = barge.action.show(action_link.id).action
-            end until action.status != 'in-progress'
-            puts "Completed"
-
-            droplet = barge.droplet.show(response.droplet.id).droplet
-            network_types = [droplet.networks.v4]
-            network_types << droplet.networks.v6 if droplet.networks.v6
-
-            puts "You can connect to your Droplet via"
-            network_types.flatten.select { |nw| nw.type == 'public' }.each do |network|
-                puts network.ip_address
-            end
-        end
-    end
-
-    private
-    def config_path
-        File.expand_path('~/.docl-access-token')
-    end
-
-    def barge
-        if !File.exist?(config_path)
-            puts 'Please run docl authorize first.'
-            exit(1)
-        end
-
-        @barge ||= Barge::Client.new(access_token: File.read(config_path))
-    end
-end
+class DOCL::CLI < Thor
+    desc "authorize", "Authrorize docl to read / modify your DO info"
+    def authorize
+        puts "You'll need to enter your DigitalOcean Private Access Token."
+        puts "To be able to create / modify droplets, it needs to be read / write."
+        puts "You can create a token on the DO website vite the Apps & API menu."
+
+        print "Enter your DO Token: "
+        token = $stdin.gets.chomp
+
+        f = File.open(config_path, 'w')
+        f.write(token)
+        f.close
+        File.chmod(0600, config_path)
+    end
+
+    desc "images", "List all images"
+    method_option :public, type: :boolean, default: false, aliases: '-p'
+    def images()
+        image_response = barge.image.all
+        display_failure(image_response) and return if failure?(image_response)
+        images = image_response.images.select { |image| image.public == options.public }
+        images = images.sort { |a, b| a.name <=> b.name }
+        images.each do |image|
+            if !image.slug.nil?
+                puts "#{image.name} (#{image.slug}, id: #{image.id})"
+            else
+                puts "#{image.name} (id: #{image.id})"
+            end
+        end
+    end
+
+    desc "keys", "List all keys"
+    def keys()
+        key_response = barge.key.all
+        display_failure(key_response) and return if failure?(key_response)
+        key_response.ssh_keys.each do |key|
+            puts "#{key.name} (id: #{key.id})"
+        end
+    end
+
+    desc "regions", "List regions"
+    method_option :metadata, type: :boolean, default: false
+    method_option :private_networking, type: :boolean, default: false
+    method_option :backups, type: :boolean, default: false
+    method_option :ipv6, type: :boolean, default: false
+    def regions()
+        region_response = barge.region.all
+        display_failure(region_response) and return if failure?(region_response)
+        regions = region_response.regions.select do |region|
+            if options.ipv6 && !region.features.include?('ipv6')
+                next false
+            end
+
+            if options.metadata && !region.features.include?('metadata')
+                next false
+            end
+
+            if options.private_networking && !region.features.include?('private_networking')
+                next false
+            end
+
+            if options.backups && !region.features.include?('backups')
+                next false
+            end
+
+            next true
+        end
+        regions.sort { |a, b| a.name <=> b.name }.each do |region|
+            puts "#{region.name} (#{region.slug})"
+        end
+    end
+
+    desc "create [name] [image] [size] [region]", "Create a droplet"
+    method_option :key, type: :string, default: nil
+    method_option :user_data, type: :string, default: nil
+    method_option :private_networking, type: :boolean, default: true
+    method_option :enable_backups, type: :boolean, default: false
+    method_option :ipv6, type: :boolean, default: false
+    method_option :wait, type: :boolean, default: false
+    def create(name, image, size, region)
+        call_options = {
+            name: name,
+            image: image,
+            region: region,
+            size: size,
+            private_networking: options.private_networking,
+            enable_backups: options.enable_backups,
+            ipv6: options.ipv6,
+        }
+        if options[:key]
+            call_options[:ssh_keys] = [options[:key]]
+        end
+        if options.user_data
+            call_options[:user_data] = File.read(options.user_data)
+        end
+
+        response = barge.droplet.create(call_options)
+        display_failure(response) and return if failure?(response)
+
+        if options.wait
+            print "Waiting for droplet to become available"
+            action_link = response.links.actions.first
+            begin
+                print '.'
+                sleep 1
+                action = barge.action.show(action_link.id).action
+            end until action.status != 'in-progress'
+            puts "Completed"
+
+            puts "You can connect to your Droplet via"
+            droplet = barge.droplet.show(response.droplet.id).droplet
+            ip_addresses(droplet).each(&method(:puts))
+        end
+    end
+
+    desc 'droplets', 'List all droplets'
+    def droplets
+        droplet_response = barge.droplet.all
+        display_failure(droplet_response) and return if failure?(droplet_response)
+        max_name_width = droplet_response.droplets.map { |droplet| droplet.name.length }.max
+        format = "%-10s %-10s %-#{max_name_width + 2}s %-10s %-8s %-8s %-6s %-40s"
+        puts format % ["Image", "ID", "Name", "Status", "Region", "Memory", "Disk", "IP Address"]
+        droplet_response.droplets.each do |droplet|
+            ips = ip_addresses(droplet).join(", ")
+            puts format % [droplet.image.distribution, droplet.id, droplet.name,
+                           droplet.status, droplet.region.slug,
+                           droplet.size_slug.upcase, "#{droplet.disk}GB", ips]
+        end
+    end
+
+    desc 'destroy [droplet-id]', 'Destroy a droplet and scrub its data'
+    def destroy(droplet_id)
+        if !yes?('This is irreversible, are you sure? (y/n)')
+            return
+        end
+        response = barge.droplet.destroy(droplet_id)
+        display_failure(response) and return if failure?(response)
+        puts 'Successfully destroyed droplet'
+    end
+
+    private
+    def config_path
+        File.expand_path('~/.docl-access-token')
+    end
+
+    def barge
+        if !File.exist?(config_path)
+            puts 'Please run docl authorize first.'
+            exit(1)
+        end
+
+        @barge ||= Barge::Client.new(access_token: File.read(config_path))
+    end
+
+    def ip_addresses(droplet)
+        network_types = [droplet.networks.v4]
+        network_types << droplet.networks.v6 if droplet.networks.v6
+
+        network_types.flatten.select { |nw| nw.type == 'public' }.map { |nw| nw.ip_address }
+    end
+
+    def display_failure(response)
+      puts "!" * 60
+      puts response.message
+      puts "!" * 60
+      true # Make sure to return true-ish value to allow "and return" to work
+    end
+
+    def failure?(response)
+      response.id && response.message
+    end
+end

data/lib/docl/version.rb

@@ -1,3 +1,3 @@
-module DOCL
-	VERSION = '0.0.4'
-end
+module DOCL
+	VERSION = '0.0.5'
+end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: docl
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nathan Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-11 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: barge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
 description: A command line tool for interacting with your DigitalOcean droplets.
@@ -60,7 +60,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -79,19 +79,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A command line tool for interacting with your DigitalOcean droplets.
 test_files: []
-has_rdoc: