oc 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d117af6f190633d90c279830b34b373a6de057b5
-  data.tar.gz: da3130d2c44f668ff658c7ef18067ee62dc1c9ee
+  metadata.gz: 0d074a9487fcacce6033c9a6ffa5c796f6bb378f
+  data.tar.gz: c5f1094f985d74bd5f8cbf87bce07b79320788b1
 SHA512:
-  metadata.gz: c240c1c999e3f7e1423b8a304d3ef1e34c8864c9564906b72a2979e9984566f133be76fe71b447288eeb87648255a10a5ecd40ecbe2489d83b259b12e10e1f88
-  data.tar.gz: 8acfa9362414b7b348a045699680506c371c602cd99b6b1c0c35145d7b2081187f0a3018d4f7e3ec182f5cf26e6830c58036310c5cc533c86fd2fa3c1e9c9b20
+  metadata.gz: 672e890f29dab2511e06d64ac7bbac933210015e6d9e5417b0384fbb8f48d2a7293da4fbe78ef749c8a5f4f5c5b478e67ee44e377fbae2f8446f87b07d4087a3
+  data.tar.gz: 5f1f9492e0493830937ba15ab7ca913c1d1a04d39a512dabcafecf4cbac281c5bd0ba52c20c48dbb7d0f3b4c08880fa8b5070d20f80cd666eb8ddfbdf643989b

data/lib/oc/version.rb

@@ -1,3 +1,3 @@
 module Oc
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

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

@@ -8,12 +8,13 @@ module Oc::Run
 
     description "Change your API information"
     def change(*args)
-      config = Netrc.read("#{(ENV["HOME"] || "./")}/digitalocean.netrc")
+      config = Netrc.read("#{(ENV["HOME"] || "./")}/oc.netrc")
       api_key = [(print 'Access Tokens: '), STDIN.gets.rstrip][1]
+      client_id = "empty"
       if api_key.empty?
         puts "Please fill all fields".red
       else
-        config["api.digitalocean.com"] = api_key
+        config["api.digitalocean.com"] = api_key, client_id
         config.save
         puts "Informations is changed".red
       end

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

@@ -8,8 +8,8 @@ module Oc::Run
     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
-      result = Oc::Get.get_json("ssh_keys")
-      if result["status"] == "ERROR"
+      result = barge.key.all
+      if !result.success?
         puts "Error: Please check your information".red
       else
         puts "Your SSH Keys".yellow
@@ -20,7 +20,7 @@ module Oc::Run
           'Name'
         ]
 
-        result["ssh_keys"].each do |key|
+        result.ssh_keys.each do |key|
           rows << [
             key["id"],
             key["name"].red,
@@ -36,16 +36,18 @@ module Oc::Run
 
     def add(*args)
       name = args[0]
-      email = args[1]
-      pub_key = args[2]
+      pub_key = args[1]
       if name.nil? or pub_key.nil?
         puts "Argument Error".red
         puts "Usage".yellow
         puts "$ oc ssh add [KEY_NAME] [KEY_EMAIL] [KEY_PUB]".yellow
       else
-        result = Oc::Get.get_json_parameter("ssh_keys","new",{"name" => name, "ssh_pub_key" => "ssh-rsa " + pub_key + " #{email}"})
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.key.create({
+          :name => name,
+          :public_key => pub_key
+          })
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "SSH Key Added".green
         end
@@ -62,23 +64,22 @@ module Oc::Run
         puts "$ oc ssh show [KEY_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        result = Oc::Get.get_json_parameter("ssh_keys",id)
-        if result["status"] == "ERROR"
-          puts "#{result["error_message"]}".red
+        result = barge.key.show(id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "SSH Keys".yellow
           rows = []
 
           rows << [
             'ID',
-            'Name',
-            'SSH Pub Key'
+            'Name'
           ]
 
+          key = result.ssh_key
           rows << [
-            result["ssh_key"]["id"],
-            result["ssh_key"]["name"].red,
-            result["ssh_key"]["ssh_pub_key"].red
+            key.id,
+            key.name.to_s.red
           ]
 
           table = Terminal::Table.new :rows => rows
@@ -91,22 +92,23 @@ module Oc::Run
     description "This method allows you to modify an existing public SSH key in your account."
     syntax "oc ssh edit [KEY_ID] [KEY_NAME] [KEY_EMAIL] [KEY_PUB]"
 
-    def edit(*args)
+    def update(*args)
       id = args[0]
       name = args[1]
-      email = args[2]
-      pub_key = args[3]
+      pub_key = args[2]
 
-      if id.nil? or name.nil? or email.nil? or pub_key.nil?
+      if id.nil? or name.nil? or pub_key.nil?
         puts "Argument Error".red
         puts "Usage".yellow
-        puts "$ oc ssh edit [KEY_ID] [KEY_NAME] [KEY_EMAIL] [KEY_PUB]".yellow
+        puts "$ oc ssh edit [KEY_ID] [KEY_NAME] [KEY_PUB]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/ssh_keys/#{id}/edit/"
-        result = Oc::Get.get_json_url(url,{"name" => name, "ssh_pub_key" => "ssh-rsa " + pub_key + " #{email}"})
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.key.update(id, {
+          :name => name,
+          :public_key => pub_key
+          })
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "SSH Key Edited".green
         end
@@ -124,10 +126,9 @@ module Oc::Run
         puts "$ oc ssh destroy [KEY_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/ssh_keys/#{id}/destroy/"
-        result = Oc::Get.get_json_url(url)
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.key.destroy(id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "SSH Key Deleted".green
         end
@@ -139,7 +140,11 @@ module Oc::Run
       @config ||=value
     end
 
-    private
+    def barge
+      puts "I'm thinking, please wait..".blue
+      Oc::Get.get_barge
+    end
+
     def new_key_request name, pub_key
 
     end

metadata

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