docli 0.0.2.pre.alpha.pre.15 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2798d692a350a4cbb3cf235c247ca534ba9b75c8
-  data.tar.gz: fcfdfa9fb9bad47bcd24551474ade885e6b4d2ed
+  metadata.gz: 4b5a19feb4efba06936d7508521a1f300910110f
+  data.tar.gz: c57ddd636a57812bb8d35780dd3a3435879da65e
 SHA512:
-  metadata.gz: 76eb57cbd8c4d930dfbc84bca1a75119e7c48dc8971b064e6e4b5961578d96d3d401def18a62d1ceaeba57fa0fcd59dddd6eaada6f87a1940c44a1636ba5051e
-  data.tar.gz: 840ac7bfdc9e325b6a165a6248f3fbfc7278afbd68e0f50f68cd33a3d4d69e0c6310608a503307fe82ff98c143ccc975fbfc7324d07a84df519579d08bfcb40f
+  metadata.gz: 4ac7aa347385a2955b307966430febc0a0696d3d06e459b77554ba661d1ec559beb57c63ec29b1a50312c03c3112cb29239dcf31aba26cb90174b0472684b57b
+  data.tar.gz: 345ee1f4405c231ae0664a3f7c9cf6f156fc6b0f01e1f0b9e0df97258dbc9e34f820ad43025794dd1889a7023ece5a23cc89766ec34e771704604549950ed16f

data/exe/docli

@@ -1,5 +1,36 @@
 #!/usr/bin/env ruby
+STDOUT.sync = true
 
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+
+require 'optparse'
 require 'docli'
 
-Docli::Main.start(ARGV)
+opt_parser = OptionParser.new do |opt|
+  opt.banner = "Usage: docli COMMAND [OPTIONS]"
+  opt.separator  ""
+  opt.separator  "Commands"
+  opt.separator  "     create / apply -f : create new resources from YAML config file"
+  opt.separator  "           (Support only YAML at the moment)"
+  opt.separator  "     droplets: droplets actions"
+  opt.separator  ""
+  opt.separator  "Options"
+  opt.on( "-v", "--version", String,
+  		"Show version of DoCli." )
+  opt.on("-h","--help","show help message")
+end
+
+case ARGV[0]
+when "create", "apply"
+  argv = ARGV*" "
+  DoCli::Parser.file_parse argv
+when "droplets"
+	argv = ARGV*" "
+	DoCli::Parser.droplets_parse argv
+when "-v", "--version"
+	DoCli::Version.show_version
+when "-h", "--help", ""
+	puts opt_parser
+else
+	puts opt_parser
+end

data/lib/cmd/authen.rb

@@ -0,0 +1,36 @@
+# Authentication with DigitalOcean
+module Cmd
+	class Authen
+		def self.check_config_file_exists
+			if !File.exists?(ENV['HOME'] + "/.digitalocean/config")
+				puts "Miss DigitalOcean config, please init your config " + "docli config create".red
+				exit
+			end
+		end
+
+		def self.get_token
+			file_config = ENV['HOME'] + '/.digitalocean/config'
+
+			exception_message = "Miss the DO config files, please run: " + "docli digitalocean config create".red + " to create a new config file"
+			unless File.exist?(file_config)
+				puts exception_message
+				exit
+			end
+
+			file_data = {}
+			File.open(file_config, 'r') do |file|
+				file.each_line do |line|
+					line_data = line.split(' = ')
+					file_data[line_data[0]] = line_data[1]
+				end
+			end
+
+			return file_data['DO_TOKEN']
+		end
+
+		
+		def self.client
+			@@client ||= DropletKit::Client.new(access_token: get_token)
+		end
+	end
+end

data/lib/cmd/create_new_droplets.rb

@@ -0,0 +1,164 @@
+# Create new droplets
+
+module Cmd
+	class NewDroplets
+		require 'yaml'
+		def self.create_new_droplets options
+			@client = Cmd::Authen.client
+			table = []
+
+			if options[:file_config] != nil
+
+				if options[:name] != nil
+					puts "Please specify the name of droplets into YAML config files, do not use both."
+					exit
+				end
+
+				context = YAML.load(File.open(options[:file_config]))
+				resource_first_key = context.keys[0]
+				context[resource_first_key].reject!{ |k| k == "resource_type"}.each do |key, value|
+					if value['specs']['user_data'].nil? || value['specs']['user_data']['files'].nil? && value['specs']['user_data']['scripts'].nil?
+						user_data = nil
+					else
+						user_data = value['specs']['user_data']['files'].nil? ? value['specs']['user_data']['scripts'] : File.read(value['specs']['user_data']['files'])
+					end
+
+					if value['specs']['name'].length > 1
+						new_droplet = DropletKit::Droplet.new(
+							names: value['specs']['name'],
+							region: options[:region].nil? ? value['specs']['region'] : options[:region],
+							size: options[:size].nil? ? value['specs']['size'] : options[:size],
+							image: options[:image].nil? ? value['specs']['image'] : options[:image],
+							ipv6: options[:ipv6].nil? ? value['specs']['ipv6'] : options[:ipv6],
+							tags: options[:tags].nil? ? value['specs']['tags'] : options[:tags],
+							backups: options[:backups].nil? ? value['specs']['backups'] : options[:backups],
+							ssh_keys: options[:ssh_keys].nil? ? value['specs']['ssh_keys'] : options[:ssh_keys],
+							private_networking: options[:private_networking].nil? ? value['specs']['private_networking'] : options[:private_networking],
+							user_data: options[:user_data].nil? ? user_data : options[:user_data],
+							volumes: options[:volumes].nil? ? value['specs']['volumes'] : options[:volumes]
+							)
+						create_new_droplet = @client.droplets.create_multiple(new_droplet)
+						create_new_droplet.each do |droplet|
+							table << {
+								:id => droplet.id,
+								:name => droplet.name,
+								:region => droplet.region.name,
+								:size => droplet.size,
+								:status => droplet.status
+							}
+						end
+					else
+						new_droplet = DropletKit::Droplet.new(
+							name: value['specs']['name'][0],
+							region: options[:region].nil? ? value['specs']['region'] : options[:region],
+							size: options[:size].nil? ? value['specs']['size'] : options[:size],
+							image: options[:image].nil? ? value['specs']['image'] : options[:image],
+							ipv6: options[:ipv6].nil? ? value['specs']['ipv6'] : options[:ipv6],
+							tags: options[:tags].nil? ? value['specs']['tags'] : options[:tags],
+							backups: options[:backups].nil? ? value['specs']['backups'] : options[:backups],
+							ssh_keys: options[:ssh_keys].nil? ? value['specs']['ssh_keys'] : options[:ssh_keys],
+							private_networking: options[:private_networking].nil? ? value['specs']['private_networking'] : options[:private_networking],
+							user_data: options[:user_data].nil? ? user_data : options[:user_data],
+							volumes: options[:volumes].nil? ? value['specs']['volumes'] : options[:volumes]
+							)
+						create_new_droplet = @client.droplets.create(new_droplet)
+						table << {
+							:id => create_new_droplet.id,
+							:name => create_new_droplet.name,
+							:region => create_new_droplet.region.name,
+							:size => create_new_droplet.size,
+							:status => create_new_droplet.status
+						}
+					end
+				end
+			else
+				new_droplet = DropletKit::Droplet.new(
+					name: options[:name],
+					region: options[:region].nil? ? "nyc1" : options[:region],
+					size: options[:size].nil? ? "512mb" : options[:size],
+					image: options[:image].nil? ? "21669205" : options[:image],
+					ipv6: options[:ipv6].nil? ? true : options[:ipv6],
+					tags: options[:tags],
+					backups: options[:backups].nil? ? true : options[:backups],
+					ssh_keys: options[:ssh_keys],
+					private_networking: options[:private_networking].nil? ? false : options[:private_networking],
+					user_data: options[:user_data],
+					volumes: options[:volumes]
+					)
+				create_new_droplet =  @client.droplets.create(new_droplet)
+				table << {
+							:id => create_new_droplet.id,
+							:name => create_new_droplet.name,
+							:region => create_new_droplet.region.name,
+							:size => create_new_droplet.size,
+							:status => create_new_droplet.status
+						}
+			end
+			puts "Droplets create successfully".red if !table[0][:id].nil?
+			tp table
+		end
+
+
+		def self.create_new_droplets_from_file value
+			@client = Cmd::Authen.client
+			table = []
+			value.reject!{ |k| k == "resource_type"}.each do |key, value|
+				if value['specs']['user_data'].nil? || value['specs']['user_data']['files'].nil? && value['specs']['user_data']['scripts'].nil?
+					user_data = nil
+				else
+					user_data = value['specs']['user_data']['files'].nil? ? value['specs']['user_data']['scripts'] : File.read(value['specs']['user_data']['files'])
+				end
+
+				if value['specs']['name'].length > 1
+					new_droplet = DropletKit::Droplet.new(
+						names: value['specs']['name'],
+						region: value['specs']['region'],
+						size: value['specs']['size'],
+						image: value['specs']['image'],
+						ipv6: value['specs']['ipv6'],
+						tags: value['specs']['tags'],
+						backups: value['specs']['backups'],
+						ssh_keys: value['specs']['ssh_keys'],
+						private_networking: value['specs']['private_networking'],
+						user_data: user_data,
+						volumes: value['specs']['volumes']
+						)
+					create_new_droplet = @client.droplets.create_multiple(new_droplet)
+					create_new_droplet.each do |droplet|
+						table << {
+							:id => droplet.id,
+							:name => droplet.name,
+							:region => droplet.region.name,
+							:size => droplet.size,
+							:status => droplet.status
+						}
+					end
+				else
+					new_droplet = DropletKit::Droplet.new(
+						name: value['specs']['name'][0],
+						region: value['specs']['region'],
+						size: value['specs']['size'],
+						image: value['specs']['image'],
+						ipv6: value['specs']['ipv6'],
+						tags: value['specs']['tags'],
+						backups: value['specs']['backups'],
+						ssh_keys: value['specs']['ssh_keys'],
+						private_networking: value['specs']['private_networking'],
+						user_data: user_data,
+						volumes: value['specs']['volumes']
+						)
+					create_new_droplet = @client.droplets.create(new_droplet)
+					table << {
+						:id => create_new_droplet.id,
+						:name => create_new_droplet.name,
+						:region => create_new_droplet.region.name,
+						:size => create_new_droplet.size,
+						:status => create_new_droplet.status
+					}
+				end
+			end
+			puts "Droplets create successfully".red if !table[0][:id].nil?
+			tp table
+		end
+	end
+end

data/lib/docli.rb

@@ -5,122 +5,16 @@ def require_all(path)
   end
 end
 
-require 'thor'
+require 'rubygems'
 require 'droplet_kit'
 require 'colorize'
 require 'json'
 require 'table_print'
-require 'yaml'
-require 'byebug'
-require 'fileutils'
 
-require 'docli/version'
-require 'docli/subcommand_base'
-require 'docli/utils'
-require 'docli/create'
-require 'docli/delete'
-require 'docli/get'
-
-module Docli
-
-  CONFIG_FILE = ENV['HOME'] + '/.docli/config'
-
-  @@client = nil
-
-  def self.client=(client)
-    @@client = client
-  end
-
-  def self.client
-    @@client
-  end
-
-  def self.debug?
-    true
-  end
-
-  class Main < Thor
-
-    def self.start(*args)
-      super
-    rescue DropletKit::Error => ex
-      puts 'Error occured'.red + ": #{ex.message}"
-    end
-
-    def initialize(args = [], local_options = {}, config = {})
-      require_config! unless %w{help init version config}.include? config[:current_command].name
-      super
-    end
-
-    map %w[--version -v] => :version
-
-    desc 'version', 'Show version information'
-    def version
-      puts "DigitalOcean CommandLine Interface version #{Docli::VERSION}"
-    end
-
-    desc 'config', 'Init or update config'
-    def config
-      access_token = nil
-      current_config = configured? ? read_config : {}
-      current_access_token = current_config[:access_token]
-      new_access_token = ask "Your DigitalOcean access token [#{current_access_token}]: "
-      new_access_token = nil if new_access_token.blank?
-      unless access_token = new_access_token || current_access_token
-        puts 'Failed to config, empty access token !'
-        exit
-      else
-        write_config(:access_token => access_token)
-      end
-    end
-
-    desc 'create', 'Create a resource by filename or stdin'
-    subcommand 'create', Create
-
-    desc 'get', 'Display one or many resource'
-    subcommand 'get', Get
-
-    desc 'delete', 'Delete resources by filenames, stdin, resources and names, or by resources and label selector'
-    subcommand 'delete', Delete
-
-    private
-
-    def configured?
-      File.exists?(Docli::CONFIG_FILE)
-    end
-
-    def require_config!
-      unless configured?
-        puts "Missing config, run #{'docli config'.yellow} to init your"
-        exit
-      end
-      Docli.client ||= DropletKit::Client.new(access_token: read_config[:access_token])
-    end
-
-    def read_config
-      result = {}
-      File.read(Docli::CONFIG_FILE).split("\n").map do |line|
-        k, v = line.split("=").map(&:strip)
-        result[k.to_sym] = v
-      end
-      result
-    end
-
-    def write_config(config = {})
-      dir = Docli::CONFIG_FILE.split('/')[0..-2].join('/')
-      unless File.directory?(dir)
-        FileUtils::mkdir dir
-        FileUtils.touch Docli::CONFIG_FILE
-        puts 'Create ' + Docli::CONFIG_FILE.green
-      end
-      File.open(Docli::CONFIG_FILE, 'w+') do |file|
-        file.write config.map { |k,v| "#{k} = #{v}" }.join
-      end
-      puts "Config updated !"
-    end
-  end
+module DoCli
+	require_all 'docli'
 end
 
 module Cmd
-  require_all 'cmd'
-end
+	require_all 'cmd'
+end

data/lib/docli/create_new_droplets.rb

@@ -0,0 +1,69 @@
+module Docli
+	class Droplets
+		def self.create_new_droplets argv
+
+			options = {}
+
+			opt_parser = OptionParser.new do |opt|
+				opt.banner = "Usage: docli droplets create [OPTIONS]"
+				opt.separator  ""
+				opt.separator  "Commands"
+				opt.separator  "     create: create new droplets on DigitalOcean"
+				opt.separator  ""
+				opt.separator  "Options"
+				opt.on("-f", "--file ", "create from YAML config file") do |file|
+					options[:file_config] = file
+				end
+				opt.on( "-n ", "--name ", "droplets name (require for the hostname of droplets" ) do |name|
+					options[:name] = name
+				end
+				opt.on("-r ", "--region ", "define region, default NYC1") do |region|
+					options[:region] = region
+				end
+				opt.on("-s ", "--size ", "define size of droplets, exp: 512mb, 1gb... default 512mb") do |s|
+					options[:size] = s
+				end
+				opt.on("-i ", "--image ", "define image name or image id on DO, default 21669205 - Ubuntu 16x04") do |i|
+					options[:image] = i
+				end
+				opt.on("--ipv6 ", "turn on or off ipv6 on droplets [true or false], default true") do |ipv6|
+					options[:ipv6] = ipv6
+				end
+				opt.on("-v ", "--volumes ", "define block storage will attach to droplets support one per one") do |volumes|
+					options[:volumes] = volumes
+				end
+				opt.on("-m ", "--monitoring ", "true or false: enable monitoring in new droplets") do |monitoring|
+					options[:monitoring] = monitoring
+				end
+				opt.on("-u ", "--user-data ", "Add command or cloud config on first boot droplets") do |user_data|
+					options[:user_data] = user_data
+				end
+				opt.on("-p", "--private-networking", "true or false: enable private network eth") do |priv_network|
+					options[:private_networing] = priv_network
+				end
+				opt.on("-b", "--backups", "true or false: enabled auto backup") do |backups|
+					options[:backups] = backups
+				end
+				opt.on("-t ", "--tags ", Array, "Add tags to droplets") do |tags|
+					options[:tags] = tags
+				end
+				opt.on("-h", "--help", "show help message") do
+					puts opt_parser
+					exit
+				end
+			end
+
+			opt_parser.parse!
+			if options[:name].nil? && options[:file_config].nil?
+				puts "Please specify the name of droplet".red
+				puts opt_parser
+				exit
+			elsif options[:name].nil? && !File.exists?(options[:file_config])
+				puts "Please specify file that you want to use for creation".red
+				puts opt_parser
+				exit
+			end
+			Cmd::NewDroplets.create_new_droplets options
+		end
+	end
+end