oc 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8c675dab6b5a469592212d2cae2bf838c2479c8
-  data.tar.gz: 69ac67a33df1cb23a73c062071a0f6c71b6095a3
+  metadata.gz: b98d817e68a5690c2cd2d1511b8badea6b72759f
+  data.tar.gz: 3eb56af2f8165d2a5b5ea7763311fc81a0d9e62d
 SHA512:
-  metadata.gz: bdd475186317b967f0291b0ad00a290f669319cd68174ecb363b77324a2935412aa73fb3b94d29d1fc1cde83ee2e759999f46ff5fd1acff3ee60ffecc3413fa9
-  data.tar.gz: 06509921c99148cfa94ddfa46f029779dac2da30950e3d3dc83ca9a100d9bbe8b2f113f18d18fac6a4dd34e5644e3f469297e675e23f1c192d95dd34ccecc03f
+  metadata.gz: 0e9cfdf198467e7a7e2f5c6f126d4f096c12615d64e9f2761c402af81117ed7f2a6aee30fcdcc3ae53759d04edebd1a2edba970a881a8a57309c5f3083fd8a44
+  data.tar.gz: 73d81d96dff19405f4769bea55000136e259a4b114dc2f60ca084b927df73d946358398af7291a2a1b631354099215b3257726c9c02f970d23a8a74f2a2ff038

data/lib/oc/version.rb

@@ -1,3 +1,3 @@
 module Oc
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/system/run/base.rb

@@ -6,11 +6,9 @@ class Oc::Run::Base
     return if self == Oc::Run::Base
     return if private_method_defined? method
     return if protected_method_defined? method
-
     prefix = self.get_object_name
     method_name = method.to_s == 'run' ? nil : method.to_s.gsub('_','-')
     name = [prefix, method_name].compact
-
     Oc::Run.add({
       :name => name,
       :class => self,

data/lib/system/run/client.rb

@@ -4,13 +4,10 @@ require 'commander/import'
 module Oc
   class Runner
     def self.start
-
       program :name, 'Digital Ocean Client'
       program :version, Oc::VERSION
       program :description, 'Digital Ocean Command Line Tools'
-
       Oc::Run.load_commands.parse_command
-
     end
   end
 end

data/lib/system/run/commands/droplets.rb

@@ -27,7 +27,7 @@ module Oc::Run
           droplets << [
             droplet.id,
             droplet.name.to_s.red,
-            droplet.ip_address.to_s.red,
+            droplet.networks.v4[0].ip_address.to_s.red,
             droplet.status == "active" ? "Active".green : "Deactive".red,
             droplet.created_at
           ]
@@ -37,10 +37,8 @@ module Oc::Run
       end
     end
 
-
     description "Create new droplet"
     syntax "oc droplets new [DROPLET_NAME] [SIZE_ID] [IMAGE_ID] [REGION_ID]"
-
     def new(*args)
       name = args[0]
       size = args[1]
@@ -51,7 +49,6 @@ module Oc::Run
         puts "Usage".yellow
         puts "$ oc droplets new [DROPLET_NAME] [SIZE_ID] [IMAGE_ID] [REGION_ID]".yellow
       else
-
         result = barge.droplet.create({:name => name, :region => region_id, :size => size, :image => image_id})
         if !result.success?
           puts "#{result.message}".red
@@ -72,7 +69,6 @@ module Oc::Run
         puts "$ oc droplets reboot [DROPLET_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-
         result = barge.droplet.reboot(id)
         if !result.success?
           puts "#{result.message}".red
@@ -152,7 +148,6 @@ module Oc::Run
         puts "$ oc droplets on [DROPLET_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-
         result = barge.droplet.power_on(id)
         if !result.success?
           puts "#{result.message}".red
@@ -165,7 +160,6 @@ module Oc::Run
 
     description "This method will reset the root password for a droplet. Please be aware that this will reboot the droplet to allow resetting the password."
     syntax "oc droplets reset_password [DROPLET_ID]"
-
     def reset_password(*args)
       id = args[0]
       if id.nil?
@@ -188,7 +182,6 @@ module Oc::Run
     def resize(*args)
       id = args[0]
       size_id = args[1]
-
       if id.nil? or size_id.nil?
         puts "Argument Error".red
         puts "Usage".yellow
@@ -241,14 +234,12 @@ module Oc::Run
         else
           puts "Your Droplets".yellow
           snapshots = []
-
           snapshots << [
             'Name',
             'Distribution',
             'Public',
             'Created At'
           ]
-
           result.snapshots.each do |snapshot|
             snapshots << [
               snapshot.name.to_s.red,
@@ -264,10 +255,8 @@ module Oc::Run
       end
     end
 
-
     description "This method allows you to restore a droplet with a previous image or snapshot. This will be a mirror copy of the image or snapshot to your droplet. Be sure you have backed up any necessary information prior to restore."
     syntax "oc droplets restore [DROPLET_ID] [IMAGE_ID]"
-
     def restore(*args)
       id = args[0]
       image_id = args[1]
@@ -290,7 +279,6 @@ module Oc::Run
 
     description "This method allows you to reinstall a droplet with a default image. This is useful if you want to start again but retain the same IP address for your droplet."
     syntax "oc droplets rebuild [DROPLET_ID] [IMAGE_ID]"
-
     def rebuild(*args)
       id = args[0]
       image_id = args[1]
@@ -301,7 +289,6 @@ module Oc::Run
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
         raise ArgumentError, "Argument Error - #{image_id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-
         result = barge.droplet.rebuild(id, image: image_id)
         if !result.success?
           puts "#{result.message}".red
@@ -322,7 +309,6 @@ module Oc::Run
         puts "$ oc droplets rename [DROPLET_ID] [NEW_NAME]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-
         result = barge.droplet.rename(id, name: name)
         if !result.success?
           puts "#{result.message}".red
@@ -342,7 +328,6 @@ module Oc::Run
         puts "$ oc droplets enable-ipv6 [DROPLET_ID]"
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-
         result = barge.droplet.enable_ipv6(id)
         if !result.success?
           puts "#{result.message}".red
@@ -352,15 +337,15 @@ module Oc::Run
       end
     end
 
-    def barge
-      puts "I'm thinking, please wait..".blue
-      Oc::Get.get_barge
-    end
-
     private
     def config(value)
       @config ||= value
     end
 
+    def barge
+      puts "I'm thinking, please wait..".blue
+      Oc::Get.get_barge
+    end
+
   end
 end

data/lib/system/run/commands/images.rb

@@ -10,7 +10,6 @@ module Oc::Run
         else
           puts "Images".yellow
           rows = []
-
           rows << [
             'ID',
             'Name',
@@ -18,7 +17,6 @@ module Oc::Run
             'Public',
             'Regions'
           ]
-
           result.images.each do |image|
             rows << [
               image.id,
@@ -49,7 +47,6 @@ module Oc::Run
         else
           puts "Images".yellow
           rows = []
-
           rows << [
             'ID',
             'Name',
@@ -57,9 +54,7 @@ module Oc::Run
             'Public',
             'Regions'
           ]
-
           image = result.image
-
           rows << [
             image.id,
             image.name.to_s.red,
@@ -75,7 +70,6 @@ module Oc::Run
       end
     end
 
-
     description "This method allows you to destroy an image. There is no way to restore a deleted image so be careful and ensure your data is properly backed up."
     syntax "oc images destroy [IMAGE_ID]"
 
@@ -117,10 +111,10 @@ module Oc::Run
       end
     end
 
+    private
     def barge
       puts "I'm thinking, please wait..".blue
       Oc::Get.get_barge
     end
-
   end
 end

data/lib/system/run/commands/regions.rb

@@ -9,12 +9,10 @@ module Oc::Run
       else
         puts "Regions".yellow
         droplets = []
-
         droplets << [
           'ID',
           'Name'
         ]
-
         result.regions.each do |region|
           droplets << [
             region.slug,
@@ -25,6 +23,8 @@ module Oc::Run
         puts table
       end
     end
+
+    private
     def barge
       puts "I'm thinking, please wait..".blue
       Oc::Get.get_barge

data/lib/system/run/commands/sizes.rb

@@ -1,39 +1,39 @@
 module Oc::Run
   class Sizes < Base
+    description "This method returns all the available sizes that can be used to create a droplet."
+    syntax "oc sizes"
+    def run
+      result = barge.size.all
+      if !result.success?
+        puts "Error: #{result["error_message"]}".red
+      else
+        puts "Sizes".yellow
+        rows = []
 
-      description "This method returns all the available sizes that can be used to create a droplet."
-      syntax "oc sizes"
-      def run
-        result = barge.size.all
-        if !result.success?
-          puts "Error: #{result["error_message"]}".red
-        else
-          puts "Sizes".yellow
-          rows = []
+        rows << [
+          'ID',
+          'Memory',
+          'Disk',
+          'Cpu',
+          'Price (Monthly)',
+          'Price (Hourly)',
+        ]
 
+        result.sizes.each do |size|
           rows << [
-            'ID',
-            'Memory',
-            'Disk',
-            'Cpu',
-            'Price (Monthly)',
-            'Price (Hourly)',
+            size.slug,
+            size.memory.to_s + " MB",
+            size.disk.to_s + " GB",
+            size.vcpus,
+            "$ " + size.price_monthly.to_s,
+            "$ " + size.price_hourly.to_s
           ]
-
-          result.sizes.each do |size|
-            rows << [
-              size.slug,
-              size.memory.to_s + " MB",
-              size.disk.to_s + " GB",
-              size.vcpus,
-              "$ " + size.price_monthly.to_s,
-              "$ " + size.price_hourly.to_s
-            ]
-          end
-          table = Terminal::Table.new :rows => rows
-          puts table
         end
+        table = Terminal::Table.new :rows => rows
+        puts table
       end
+    end
+    private
     def barge
       puts "I'm thinking, please wait..".blue
       Oc::Get.get_barge

data/lib/system/run/commands/ssh.rb

@@ -4,7 +4,6 @@ module Oc::Run
       config(Netrc.read)
     end
 
-
     description "This method lists all the available public SSH keys in your account that can be added to a droplet."
     syntax "oc ssh keys"
     def keys
@@ -14,12 +13,10 @@ module Oc::Run
       else
         puts "Your SSH Keys".yellow
         rows = []
-
         rows << [
           'ID',
           'Name'
         ]
-
         result.ssh_keys.each do |key|
           rows << [
             key["id"],
@@ -33,7 +30,6 @@ module Oc::Run
 
     description "This method allows you to add a new public SSH key to your account."
     syntax "oc ssh add [KEY_NAME] [KEY_EMAIL] [KEY_PUB]"
-
     def add(*args)
       name = args[0]
       pub_key = args[1]
@@ -70,12 +66,10 @@ module Oc::Run
         else
           puts "SSH Keys".yellow
           rows = []
-
           rows << [
             'ID',
             'Name'
           ]
-
           key = result.ssh_key
           rows << [
             key.id,
@@ -84,19 +78,16 @@ module Oc::Run
 
           table = Terminal::Table.new :rows => rows
           puts table
-
         end
       end
     end
 
     description "This method allows you to modify an existing public SSH key in your account."
     syntax "oc ssh edit [KEY_ID] [KEY_NAME] [KEY_PUB]"
-
     def update(*args)
       id = args[0]
       name = args[1]
       pub_key = args[2]
-
       if id.nil? or name.nil? or pub_key.nil?
         puts "Argument Error".red
         puts "Usage".yellow
@@ -117,7 +108,6 @@ module Oc::Run
 
     description "This method will delete the SSH key from your account."
     syntax "oc ssh destroy [KEY_ID]"
-
     def destroy(*args)
       id = args[0]
       if id.nil?
@@ -144,10 +134,5 @@ module Oc::Run
       puts "I'm thinking, please wait..".blue
       Oc::Get.get_barge
     end
-
-    def new_key_request name, pub_key
-
-    end
-
   end
 end

data/lib/system/run/run.rb

@@ -1,7 +1,6 @@
 module Oc
   module Run
     autoload :Base, "system/run/base"
-
     attr_accessor :main
 
     def self.load_commands
@@ -15,36 +14,27 @@ module Oc
       commands[opts[:name]] = opts
     end
 
-
     def self.parse_command(ins = Commander::Runner::instance)
-
       commands.each_pair do |name, opts|
         name = Array(name)
         names = [name.reverse.join('-'), name.join(' ')] if name.length > 1
         name = name.join(" ")
-
-
         ins.command name do |c|
           c.description = opts[:options][:description]
           c.summary = opts[:options][:summary]
           c.syntax = opts[:options][:syntax]
-
           (options_metadata = Array(opts[:options][:meta])).each do |o|
             option_data = [o[:switches], o[:type], o[:description], o[:optional]].compact.flatten(1)
             c.option *option_data
             o[:arg] = Commander::Runner.switch_to_sym(Array(o[:switches]).last)
-
           end
-
           c.when_called do |args, options|
             object = opts[:class].new
             object.options = options
             run(object,opts[:method],args)
           end
         end
-
       end
-
     end
 
     protected
@@ -52,8 +42,6 @@ module Oc
       obj.send(method, *args)
     end
 
-
-    protected
     def self.hash_to_array(options)
       return_data = []
       options.each do |k,v|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sedat Ciftci