oc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a15f46e8ae9ee339cf564711538ce8de4e218e1e
-  data.tar.gz: 9efddae071d282f66956d7251364c2e7bf4c422d
+  metadata.gz: 94a513a97b28baca3bad3b2eb2f14f4f3eb78448
+  data.tar.gz: d03e27fce3ca7dc61259815f67c8fa2ef7a2f371
 SHA512:
-  metadata.gz: 56ddd365efd827df9bf35ca78497f29cefc14d1be1f756c3e7f8f642f84deb25f2b3909bafac9f03cde272d498136e3916e970aed7568961967be1c64d5ac127
-  data.tar.gz: 41c90910f3b92ed2286e388dd072d744b8f0bd9d12e0cc13240043954caf50aa5630a89c142a1139b32f2106fa24fa0738855fbeaebe7b44d3163037cff5cf89
+  metadata.gz: 37b08b93b60961693685ab3306d3db80f3f4abe7e661ee86145adc82f3f297a8e726f44ee4c4e2451d0323e21804646122cd9d514ce30f3bb10075ce65b2d8f8
+  data.tar.gz: ee29fa536dfe90e254821171b180b5c63a4b368316e9f52471beed2e15eb44c672154d9762aa29e68d852dc5fe326d78d66f4087a1cedc50d3fa4ce106b6cf54

data/README.md

@@ -17,7 +17,7 @@ Or install it yourself as:
     $ gem install oc
 
 ## Droplets
-
+<pre>
   Droplet List
 	$ oc show [TRUE]
 
@@ -56,9 +56,9 @@ Or install it yourself as:
 
   Rename Droplet
   $ oc droplets rename [DROPLET_ID] [NEW_NAME]
-
+</pre>
 ## SSH
-
+<pre>
   SSH Key List
   $ oc ssh keys
 
@@ -73,19 +73,19 @@ Or install it yourself as:
 
   Destroy SSH Key
   $ oc ssh destroy [KEY_ID]
-
+</pre>
 ## Regions
-
+<pre>
   Region List
   $ oc regions
-
+</pre>
 ## Sizes
-
+<pre>
   Size List
   $ oc sizes
-
+</pre>
 ## Images
-
+<pre>
   Show Images
   $ co images [true]
 
@@ -97,6 +97,17 @@ Or install it yourself as:
 
   Transfer Image
   $ oc images transfer [IMAGE_ID] [REGION_ID]
+</pre>
+
+
+## Information
+<pre>
+  Show API Key and Client ID
+  $ co info show
+
+  Change Information
+  $ co info change
+</pre>
 
 ## Contributing
 

data/bin/oc

@@ -9,10 +9,9 @@ require "terminal-table"
 bin_file = Pathname.new(__FILE__).realpath
 $:.unshift File.expand_path("../../lib", bin_file)
 
-config = Netrc.read
+config = Netrc.read("oc.netrc")
 
 if config["api.digitalocean.com"].nil?
-  puts "\n"
   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

data/bin/oc.netrc

@@ -0,0 +1,3 @@
+machine api.digitalocean.com
+  login mEhY7wLggVeSAM32rWZNt
+  password 1a9c2eb68568f92efc0b7c9e134a1928

data/lib/oc/version.rb

@@ -1,3 +1,3 @@
 module Oc
-  VERSION = "0.0.3"
+  VERSION = "0.0.4" 
 end

data/lib/system/config.rb

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

data/lib/system/get.rb

@@ -3,7 +3,7 @@ require "json"
 module Oc
   class Get
     def self.get_json path,filter=nil
-      source = "https://api.digitalocean.com/#{path}/?client_id=#{Oc::Config.client_id}&api_key=#{Oc::Config.api_key}&filter=#{filter}"
+      source = "https://api.digitalocean.com/#{path}/?client_id=#{Oc::Config.get("client_id")}&api_key=#{Oc::Config.get("api_key")}&filter=#{filter}"
       puts "I'm thinking, please wait..".blue
       response = Net::HTTP.get_response(URI.parse(source))
       data = response.body
@@ -18,7 +18,7 @@ module Oc
         url += "/#{sub_path}"
       end
 
-      url += "?client_id=#{Oc::Config.client_id}&api_key=#{Oc::Config.api_key}"
+      url += "?client_id=#{Oc::Config.get("client_id")}&api_key=#{Oc::Config.get("api_key")}"
 
       parameter = ""
       if parameters.length > 0
@@ -40,7 +40,7 @@ module Oc
 
     def self.get_json_url url ,parameters=[]
 
-      url += "?client_id=#{Oc::Config.client_id}&api_key=#{Oc::Config.api_key}"
+      url += "?client_id=#{Oc::Config.get("client_id")}&api_key=#{Oc::Config.get("api_key")}"
 
       parameter = ""
       if parameters.length > 0

data/lib/system/run/base.rb

@@ -49,7 +49,9 @@ class Oc::Run::Base
       meta << {
         :switches => switches,
         :description => description,
-        :type => String
+        :type => options[:type].nil? ? "String" : options[:type],
+        :default => options[:default],
+        :optional => options[:optional]
       }
     end
 

data/lib/system/run/client.rb

@@ -1,4 +1,6 @@
-require "commander"
+require 'commander'
+require 'commander/command'
+require 'commander/import'
 module Oc
   class Runner
     def self.start

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

@@ -0,0 +1,25 @@
+module Oc::Run
+  class Info < Base
+
+    def show
+      puts "Client ID: #{Oc::Config.get("client_id")}".yellow
+      puts "API Key: #{Oc::Config.get("api_key")}".yellow
+    end
+
+    description "Change your API information"
+    def change(*args)
+      config = Netrc.read("oc.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?
+        puts "Please fill all fields".red
+      else
+        puts "#{client_id} - #{api_key}"
+        config["api.digitalocean.com"] = client_id, api_key
+        config.save
+        puts "Informations is changed".red
+      end
+    end
+
+  end
+end

data/lib/system/run/run.rb

@@ -1,6 +1,3 @@
-require 'commander'
-require 'commander/command'
-require 'commander/import'
 module Oc
   module Run
     autoload :Base, "system/run/base"
@@ -21,8 +18,6 @@ module Oc
 
     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
@@ -35,19 +30,15 @@ module Oc
           c.syntax = opts[:options][:syntax]
 
           (options_metadata = Array(opts[:options][:meta])).each do |o|
-            option_data = [o[:switches], o[:type], o[:description]].compact.flatten(1)
+            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
@@ -62,6 +53,15 @@ module Oc
     end
 
 
+    protected
+    def self.hash_to_array(options)
+      return_data = []
+      options.each do |k,v|
+        return_data[k] = v
+      end
+      return return_data
+    end
+
     def self.commands
       @commands ||= {}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sedat ÇİFTÇİ
@@ -99,6 +99,7 @@ email:
 - iamcodegrab@gmail.com
 executables:
 - oc
+- oc.netrc
 extensions: []
 extra_rdoc_files: []
 files:
@@ -108,6 +109,7 @@ files:
 - README.md
 - Rakefile
 - bin/oc
+- bin/oc.netrc
 - lib/oc.rb
 - lib/oc/version.rb
 - lib/system/config.rb
@@ -116,6 +118,7 @@ files:
 - lib/system/run/client.rb
 - lib/system/run/commands/droplets.rb
 - lib/system/run/commands/images.rb
+- lib/system/run/commands/info.rb
 - lib/system/run/commands/regions.rb
 - lib/system/run/commands/sizes.rb
 - lib/system/run/commands/ssh.rb