oc 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 638a377d275bbd68480111848d4f86e74e12b53f
-  data.tar.gz: 2954b0c26c357b464cf3aee3f73c5febbb16fdf4
+  metadata.gz: d117af6f190633d90c279830b34b373a6de057b5
+  data.tar.gz: da3130d2c44f668ff658c7ef18067ee62dc1c9ee
 SHA512:
-  metadata.gz: 89ba27daca1a8f8fc1a22e8d77d0d2085de5e802e9fa68d5479f13a6811ba90825507bef5442ca829dfb67de38d01aa88364a060e0b0c6c1480836c6993b3b7b
-  data.tar.gz: 42859d67dd75009550276cd7c0edf8f68410699e6d14721734d5135b8560a0716720510cfdc95b6bdc5c1a6ec3bec1f87f2ba8dc205f0f600fc1f0fd9d75a721
+  metadata.gz: c240c1c999e3f7e1423b8a304d3ef1e34c8864c9564906b72a2979e9984566f133be76fe71b447288eeb87648255a10a5ecd40ecbe2489d83b259b12e10e1f88
+  data.tar.gz: 8acfa9362414b7b348a045699680506c371c602cd99b6b1c0c35145d7b2081187f0a3018d4f7e3ec182f5cf26e6830c58036310c5cc533c86fd2fa3c1e9c9b20

data/bin/oc

@@ -11,11 +11,10 @@ bin_file = Pathname.new(__FILE__).realpath
 $:.unshift File.expand_path("../../lib", bin_file)
 
 config = Netrc.read("#{(ENV["HOME"] || "./")}/oc.netrc")
-
 if config["api.digitalocean.com"].nil?
-  client_id = [(print 'Digital Ocean Client ID: '), STDIN.gets.rstrip][1]
-  api_key = [(print 'Digital Ocean API Key: '), STDIN.gets.rstrip][1]
-  config["api.digitalocean.com"] = client_id, api_key
+  api_key = [(print 'Access Tokens: '), STDIN.gets.rstrip][1]
+  client_id = "empty"
+  config["api.digitalocean.com"] = api_key, client_id
   config.save
 else
   require 'oc'

data/lib/oc/version.rb

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

data/lib/system/config.rb

@@ -1,11 +1,10 @@
 module Oc
   class Config
     def self.get(key)
-      config = Netrc.read("#{(ENV["HOME"] || "./")}/digitalocean.netrc")
+      config = Netrc.read("#{(ENV["HOME"] || "./")}/oc.netrc")
       config = config["api.digitalocean.com"]
       options = {
-        :client_id => config[0],
-        :api_key => config[1]
+        :api_key => config[0]
       }
       return options[:"#{key}"]
     end

data/lib/system/get.rb

@@ -1,5 +1,6 @@
 require "net/http"
 require "json"
+require "barge"
 module Oc
   class Get
     def self.get_json path,filter=nil
@@ -10,6 +11,10 @@ module Oc
       result = JSON.parse(data)
     end
 
+    def self.get_barge
+      barge = ::Barge::Client.new(access_token: Oc::Config.get(:api_key))
+    end
+
 
     def self.get_json_parameter path, sub_path = nil ,parameters=[]
       url = "https://api.digitalocean.com/#{path}"

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

@@ -8,8 +8,8 @@ module Oc::Run
     description "Show Droplets"
     syntax "oc show"
     def show
-      result = Oc::Get.get_json("droplets")
-      if result["status"] == "ERROR"
+      result = barge.droplet.all
+      if !result.success?
         puts "Error: Please check your information".red
       else
         puts "Your Droplets".yellow
@@ -19,19 +19,17 @@ module Oc::Run
           'ID',
           'Name',
           'IP Address',
-          'Private Ip Address',
           'Status',
           'Created At'
         ]
 
-        result["droplets"].each do |droplet|
+        result.droplets.each do |droplet|
           droplets << [
-            droplet["id"],
-            droplet["name"].red,
-            droplet["ip_address"].red,
-            droplet["private_ip_address"].nil? ? "Null".red : droplet["private_ip_address"],
-            droplet["status"] == "active" ? "Active".green : "Deactive".red,
-            droplet["created_at"]
+            droplet.id,
+            droplet.name.to_s.red,
+            droplet.ip_address.to_s.red,
+            droplet.status == "active" ? "Active".green : "Deactive".red,
+            droplet.created_at
           ]
         end
         table = Terminal::Table.new :rows => droplets
@@ -56,10 +54,9 @@ module Oc::Run
         raise ArgumentError, "Argument Error - #{size}" unless size =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
         raise ArgumentError, "Argument Error - #{image_id}" unless image_id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
 
-        url = "https://api.digitalocean.com/droplets/new"
-        result = Oc::Get.get_json_url(url,{"name" => name, "size_id" => size, "image_id" => image_id, "region_id" => region_id})
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.droplet.create({:name => name, :region => region_id, :size => size_id, :image => image_id})
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Droplet created".green
         end
@@ -77,10 +74,10 @@ module Oc::Run
         puts "$ oc droplets reboot [DROPLET_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/droplets/#{id}/reboot"
-        result = Oc::Get.get_json_url(url)
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+
+        result = barge.droplet.reboot(id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Droplet rebooted".green
         end
@@ -97,10 +94,9 @@ module Oc::Run
         puts "$ oc droplets cycle [DROPLET_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/droplets/#{id}/power_cycle"
-        result = Oc::Get.get_json_url(url)
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.droplet.power_cycle(id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Power cycle has been successful".green
         end
@@ -118,10 +114,9 @@ module Oc::Run
         puts "$ oc droplets down [DROPLET_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/droplets/#{id}/shutdown"
-        result = Oc::Get.get_json_url(url)
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.droplet.shutdown(id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Shut down has been successful".green
         end
@@ -139,10 +134,9 @@ module Oc::Run
         puts "$ oc droplets off [DROPLET_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/droplets/#{id}/power_off"
-        result = Oc::Get.get_json_url(url)
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.droplet.power_off(id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Power off has been successful".green
         end
@@ -160,10 +154,10 @@ module Oc::Run
         puts "$ oc droplets on [DROPLET_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/droplets/#{id}/power_on"
-        result = Oc::Get.get_json_url(url)
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+
+        result = barge.droplet.power_on(id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Power on has been successful".green
         end
@@ -182,10 +176,9 @@ module Oc::Run
         puts "$ oc droplets reset_password [DROPLET_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/droplets/#{id}/password_reset"
-        result = Oc::Get.get_json_url(url)
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.droplet.password_reset(id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Password restored. Please check your email".green
         end
@@ -205,10 +198,9 @@ module Oc::Run
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
         raise ArgumentError, "Argument Error - #{id}" unless size_id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/droplets/#{id}/resize/"
-        result = Oc::Get.get_json_url(url,{ "size" => size_id })
-        if result["status"] == "ERROR"
-          puts "#{result["error_message"]}".red
+        result = barge.droplet.resize(id, size: size_id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Droplet resized".green
         end
@@ -226,10 +218,9 @@ module Oc::Run
         puts "$ oc droplets snaphot [DROPLET_ID] [SNAPSHOT_NAME]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/droplets/#{id}/snapshot"
-        result = Oc::Get.get_json_url(url, {"name" => name})
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.droplet.snapshot(id, name: name)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Snapshot generated.".green
         end
@@ -250,10 +241,9 @@ module Oc::Run
         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/
 
-        url = "https://api.digitalocean.com/droplets/#{id}/restore"
-        result = Oc::Get.get_json_url(url, {"image_id" => image_id})
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.droplet.restore(id, image: image_id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Droplets restored.".green
         end
@@ -274,10 +264,9 @@ module Oc::Run
         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/
 
-        url = "https://api.digitalocean.com/droplets/#{id}/rebuild"
-        result = Oc::Get.get_json_url(url, {"image_id" => image_id})
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.droplet.rebuild(id, image: image_id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Droplets rebuilded.".green
         end
@@ -296,16 +285,19 @@ module Oc::Run
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
 
-        url = "https://api.digitalocean.com/droplets/#{id}/rename"
-        result = Oc::Get.get_json_url(url, {"name" => name})
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.droplet.rename(id, name: name)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Droplets renamed.".green
         end
       end
     end
 
+    def barge
+      puts "I'm thinking, please wait..".blue
+      Oc::Get.get_barge
+    end
 
     private
     def config(value)

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

@@ -2,12 +2,10 @@ module Oc::Run
   class Images < Base
 
     description "This method returns all the available images that can be accessed by your client ID. You will have access to all public images by default, and any snapshots or backups that you have created in your own account."
-    syntax "co images [FLAG true -> Show my images]"
+    syntax "co images"
     def run(*args)
-      filter = args[0]
-      if filter == "true"
-        result = Oc::Get.get_json("images","my_images")
-        if result["status"] == "ERROR"
+      result = barge.image.all
+        if !result.success?
           puts "Error: Please check your information".red
         else
           puts "Images".yellow
@@ -21,47 +19,18 @@ module Oc::Run
             'Regions'
           ]
 
-          result["images"].each do |images|
+          result.images.each do |image|
             rows << [
-              images["id"],
-              images["name"].red,
-              images["distribution"].red,
-              images["public"] == true ? "True".green : "False".red,
-              images["regions"].join(",").yellow
+              image.id,
+              image.name.to_s.red,
+              image.distribution.to_s.red,
+              image.public.to_s == "true" ? "True".green : "False".red,
+              image.regions.join(",").yellow
             ]
           end
           table = Terminal::Table.new :rows => rows
           puts table
         end
-      else
-        result = Oc::Get.get_json("images")
-        if result["status"] == "ERROR"
-          puts "Error: Please check your information".red
-        else
-          puts "Images".yellow
-          rows = []
-
-          rows << [
-            'ID',
-            'Name',
-            'Distribution',
-            'Public',
-            'Regions'
-          ]
-
-          result["images"].each do |images|
-            rows << [
-              images["id"],
-              images["name"].red,
-              images["distribution"].red,
-              images["public"] == true ? "True".green : "False".red,
-              images["regions"].join(",").yellow
-            ]
-          end
-          table = Terminal::Table.new :rows => rows
-          puts table
-        end
-      end
     end
 
     description "This method displays the attributes of an image."
@@ -74,11 +43,9 @@ module Oc::Run
         puts "$ oc images show [IMAGE_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-
-        url = "https://api.digitalocean.com/images/#{id}/"
-        result = Oc::Get.get_json_url(url)
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.image.show(id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Images".yellow
           rows = []
@@ -91,14 +58,14 @@ module Oc::Run
             'Regions'
           ]
 
-          images = result["image"]
+          image = result.image
 
           rows << [
-            images["id"],
-            images["name"].red,
-            images["distribution"].red,
-            images["public"] == true ? "True".green : "False".red,
-            images["regions"].join(",").yellow
+            image.id,
+            image.name.to_s.red,
+            image.distribution.to_s.red,
+            image.public.to_s == "true" ? "True".green : "False".red,
+            image.regions.join(",").yellow
           ]
 
           table = Terminal::Table.new :rows => rows
@@ -120,10 +87,9 @@ module Oc::Run
         puts "$ oc images destroy [IMAGE_ID]".yellow
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/images/#{id}/destroy/"
-        result = Oc::Get.get_json_url(url)
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.image.destroy(id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Image destroyed".green
         end
@@ -142,16 +108,19 @@ module Oc::Run
       else
         raise ArgumentError, "Argument Error - #{id}" unless id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
         raise ArgumentError, "Argument Error - #{id}" unless region_id =~ /\A[-+]?[0-9]*\.?[0-9]+\Z/
-        url = "https://api.digitalocean.com/images/#{id}/transfer/"
-        result = Oc::Get.get_json_url(url,{ "region_id" => region_id })
-        if result["status"] == "ERROR"
-          puts "#{result["message"]}".red
+        result = barge.image.transfer(id, region: region_id)
+        if !result.success?
+          puts "#{result.message}".red
         else
           puts "Image transfered".green
         end
       end
     end
 
+    def barge
+      puts "I'm thinking, please wait..".blue
+      Oc::Get.get_barge
+    end
 
   end
 end

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

@@ -3,19 +3,17 @@ module Oc::Run
 
     description "Show your API information"
     def show
-      puts "Client ID: #{Oc::Config.get("client_id")}".yellow
-      puts "API Key: #{Oc::Config.get("api_key")}".yellow
+      puts "Access Tokens: #{Oc::Config.get("api_key")}".yellow
     end
 
     description "Change your API information"
     def change(*args)
       config = Netrc.read("#{(ENV["HOME"] || "./")}/digitalocean.netrc")
-      client_id = [(print 'Digital Ocean Client ID: '), STDIN.gets.rstrip][1]
-      api_key = [(print 'Digital Ocean API Key: '), STDIN.gets.rstrip][1]
-      if client_id.empty? and api_key.empty?
+      api_key = [(print 'Access Tokens: '), STDIN.gets.rstrip][1]
+      if api_key.empty?
         puts "Please fill all fields".red
       else
-        config["api.digitalocean.com"] = client_id, api_key
+        config["api.digitalocean.com"] = api_key
         config.save
         puts "Informations is changed".red
       end

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

@@ -3,8 +3,8 @@ module Oc::Run
     description "This method will return all the available regions within the DigitalOcean cloud."
     syntax "oc regions"
     def run
-      result = Oc::Get.get_json("regions")
-      if result["status"] == "ERROR"
+      result = barge.region.all
+      if !result.success?
         puts "Error: Please check your information".red
       else
         puts "Regions".yellow
@@ -15,15 +15,19 @@ module Oc::Run
           'Name'
         ]
 
-        result["regions"].each do |droplet|
+        result.regions.each do |region|
           droplets << [
-            droplet["id"],
-            droplet["name"].red,
+            region.slug,
+            region.name.to_s.red,
           ]
         end
         table = Terminal::Table.new :rows => droplets
         puts table
       end
     end
+    def barge
+      puts "I'm thinking, please wait..".blue
+      Oc::Get.get_barge
+    end
   end
 end

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

@@ -4,9 +4,8 @@ module Oc::Run
       description "This method returns all the available sizes that can be used to create a droplet."
       syntax "oc sizes"
       def run
-        url = "https://api.digitalocean.com/sizes"
-        result = Oc::Get.get_json_url(url)
-        if result["status"] == "ERROR"
+        result = barge.size.all
+        if !result.success?
           puts "Error: #{result["error_message"]}".red
         else
           puts "Sizes".yellow
@@ -14,18 +13,30 @@ module Oc::Run
 
           rows << [
             'ID',
-            'Name'
+            'Memory',
+            'Disk',
+            'Cpu',
+            'Price (Monthly)',
+            'Price (Hourly)',
           ]
 
-          result["sizes"].each do |key|
+          result.sizes.each do |size|
             rows << [
-              key["id"],
-              key["name"].red,
+              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
       end
+    def barge
+      puts "I'm thinking, please wait..".blue
+      Oc::Get.get_barge
+    end
   end
 end

data/oc.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency      'commander', '~> 4.2.0'
   spec.add_runtime_dependency      'terminal-table', '~> 1.4.5'
   spec.add_runtime_dependency      'netrc', '~> 0.7.7'
-  spec.add_runtime_dependency      'colorize', '~> 0.7.2'
+  spec.add_runtime_dependency      'colorize'
+  spec.add_runtime_dependency      'barge'
 
 
   spec.add_development_dependency "bundler", "~> 1.5"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oc
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Sedat Ciftci
@@ -56,16 +56,30 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: barge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement