droppper 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d00c6930b33d61b10304c6f22866d59fffc9515
-  data.tar.gz: 24f9f5d6504cce0a322ff6a4b35c122327503846
+  metadata.gz: 7ffc7cf76b3d021c1c299b62e31feb439372e306
+  data.tar.gz: 8b11d5ae7b9b96a343e807538165b0b52dd3e675
 SHA512:
-  metadata.gz: 3bcebe5092bc70bb95f410fed1a502b2cd694f48fbe7a9d3de9e6d8de2bed188c5a3bba33911f92945cdb8aa551fd608e6c9425369e4be8c916a2f2c8507b677
-  data.tar.gz: aaeb0c898cba2f93d0bd6e44ed2f198afbc932e714b91e3d31d34076750bbfc7db0785611f156f4478ff6d7013c166509849b7eb29dc334700dde57530354db9
+  metadata.gz: f6a9be8e7b899b326ab0455fefeebce164ec07d38c41f1d04fad0e7ec49a99866254c662039d2d8249d334c4bc5f41df27890f9b5e2182e8919c435697da18d8
+  data.tar.gz: 6f78dc91488a3ec83b83c5b48efe4cf01a32c6464087e7d4e2415672b248c88ba3d99a7bb7323996a90609615c0c7009725177bdeced896dde90417899692a8f

data/bin/droppper

@@ -1,51 +1,5 @@
 #!/usr/bin/env ruby
 
-Signal.trap("INT") { exit 1 }
-
-require 'gli'
 require 'droppper'
-
-include GLI::App
-
-subcommand_option_handling :normal
-
-program_desc 'Droppper is a CLI for your DigitalOcean cloud'
-sort_help :manually
-
-flag [:token], desc: "DigitalOcean Token", arg_name: "token", optional: true
-
-# This gem commands
-commands = Dir[File.join(File.expand_path("../../lib", __FILE__), "**", "commands", "*.rb")]
-
-# Commands from other gems
-Gem::Specification.latest_specs.select{|g| g.name =~ /droppper-/ }.each do |g|
-  begin
-    g.full_require_paths.each do |path|
-      Dir[File.join(path, "**", "commands", "*.rb")].each do |commands_files|
-        commands += commands_files
-      end
-    end
-  rescue
-  end
-end
-
-commands.each do |file|
-  require file
-end
-
-
-pre do |global,command,options,args|
-  token  = global[:token] || Droppper::Utils.find_token
-  help_now! "You must provide a DigitalOcean API v2 token. You can specify it in the command line or write it in a .droppper file. When running droppper it will try to use the 'nearest' .droppper file (in current dir or parent dir and so on; it defaults to ~/.droppper) " unless token
-  Droppper.client = DropletKit::Client.new(access_token: token)
-  true
-end
-
-post do |global,command,options,args|
-end
-
-on_error do |exception|
-  true
-end
-
-exit run(ARGV)
+Signal.trap("INT") { exit 1 }
+Droppper::CLI.start(ARGV)

data/droppper.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "gli", ">= 2.0"
-  spec.add_dependency "highline"
+  spec.add_dependency "thor"
   spec.add_dependency "table_print"
   spec.add_dependency "droplet_kit"
+  spec.add_dependency "hashie"
+  spec.add_dependency "highline"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/droppper.rb

@@ -1,63 +1,22 @@
-require "droppper/version"
-require "droppper/utils"
-require "droplet_kit"
-require 'table_print'
+require 'droppper/version'
+require 'droppper/utils'
+require 'droppper/config'
+require 'droplet_kit'
+require 'hashie/mash'
+require 'droppper/commands/droplets'
+require 'droppper/droplets'
+require 'droppper/cli'
 require 'highline/import'
+require 'table_print'
 
 module Droppper
   class << self
-    def client
-      @client
-    end
-
-    def client=(client)
-      @client = client
-    end
-
-    def droplets(*args)
-      args = args.flatten
-      data = client.droplets.all.to_a
-      if args.size > 0
-        data = data.select do |d|
-          (args.size==1 and (d.id.to_s == args[0] or d.name == args[0])) or (d.name =~ Regexp.new(args.join(".*")))
-        end
-      end
-      data
-    end
-
-    def droplet(*args)
-      list = droplets(*args)
-      if list.size == 0
-        puts "Cannot find droplet"
-      elsif list.size == 1
-        list.first
-      else
-        select_droplet(list)
-      end
-    end
-
-    def select_droplet(list)
-      choose do |menu|
-        menu.prompt = "Multiple droplets found. Select one:"
-        list.each do |droplet|
-          menu.choice droplet.name do droplet end
-        end
-      end
-    end
+    attr_accessor :client, :config
 
-    def ssh(droplet, options={})
-      cmd_options = [
-          "-o", "IdentitiesOnly=yes",
-          "-o", "LogLevel=ERROR",
-          "-o", "StrictHostKeyChecking=no",
-          "-o", "UserKnownHostsFile=/dev/null",
-          "-i", "#{Dir.home}/.ssh/id_rsa"
-      ]
-      cmd_options.push "-l", "#{options[:user]}" if options[:user]
-      cmd_options.push "-p", "#{options[:port]}" if options[:port]
-      cmd_options << droplet.public_ip
-      # puts "Executing: ssh #{cmd_options.join(" ")}"
-      Kernel.exec("ssh", *cmd_options)
+    def setup(options)
+      self.config = Droppper::Config.new
+      self.config.token = options["token"] if options["token"]
+      self.client = DropletKit::Client.new(access_token: config.token)
     end
   end
 end

data/lib/droppper/cli.rb

@@ -0,0 +1,39 @@
+require 'thor'
+
+module Droppper
+  class CLI < Thor
+    include Thor::Actions
+
+    def initialize(args = [], local_options = {}, config = {})
+      super
+      Droppper.setup(options)
+    end
+
+    class_option :token, type: :string, desc: "DigitalOcean API v2 token (needed unless included in the .droppper file)"
+
+    desc "config", "Show your current config information"
+    long_desc "This shows the current information in the .droppper config files
+    being used by the app. Droppper can use more than one config file the one
+    being closer to the current directory having precedence.
+    "
+    def config
+      Droppper.config.print
+    end
+
+    desc "droplets", "Actions related to droplets"
+    subcommand "droplets", Droppper::Commands::Droplets
+
+    desc "ssh [SEARCH_STRING_OR_DROPLET_ID]", "Starts a SSH to a droplet"
+    method_option "user",
+                  :type => :string,
+                  :aliases => "-u",
+                  :desc => "Specifies which user to log in as (default from .droppper files or root)"
+    method_option "port",
+                  :type => :string,
+                  :aliases => "-p",
+                  :desc => "Specifies which post to use for the ssh connection (default from .droppper files or 22)"
+    def ssh(*args)
+      Droppper::Droplets.ssh(*args, options)
+    end
+  end
+end

data/lib/droppper/commands/droplets.rb

@@ -1,48 +1,32 @@
-desc "Manage your DigitalOcean droplets"
-command :droplets do |c|
-  c.default_command :list
+require 'thor'
 
-  c.desc "List droplets"
-  c.arg "search_string"
-  c.command :list do |list|
-    list.action do |global,options,args|
-      data = Droppper.droplets(args)
-      if data.size == 0
-        puts "No droplets found"
-      else
-        tp data, {id: {display_name: "ID"}},
-                 {name: {display_name: "NAME"}},
-                 {"region.slug" => {display_name: "REGION"}},
-                 {"size_slug" => {display_name: "SIZE"}},
-                 :status,
-                 :locked
+module Droppper
+  module Commands
+    class Droplets < Thor
+      default_command :list
+
+      desc "list [SEARCH_STRING_OR_DROPLET_ID]", "Retrieve a list of your droplets"
+      def list(*args)
+        Droppper::Droplets.list(*args)
+      end
+
+      desc "show [SEARCH_STRING_OR_DROPLET_ID]", "Show full details about a droplet"
+      def show(*args)
+        Droppper::Droplets.show(*args)
       end
-    end
-  end
 
-  c.desc "Show a droplet details"
-  c.arg "droplet_id_or_search_string"
-  c.command :show do |show|
-    show.action do |global,options,args|
-      droplet = Droppper.droplet(args)
-      puts Droppper::Utils.print_hash droplet.as_json
-      puts ""
+      desc "ssh [SEARCH_STRING_OR_DROPLET_ID]", "Starts a SSH to a droplet"
+      method_option "user",
+                    :type => :string,
+                    :aliases => "-u",
+                    :desc => "Specifies which user to log in as (default from .droppper files or root)"
+      method_option "port",
+                    :type => :string,
+                    :aliases => "-p",
+                    :desc => "Specifies which post to use for the ssh connection (default from .droppper files or 22)"
+      def ssh(*args)
+        Droppper::Droplets.ssh(*args, options)
+      end
     end
   end
-
-  # c.desc "Create a droplet"
-  # c.command :create do |create|
-  #   create.flag :name, desc: "Hostname"
-  #   create.flag :region, desc: "Region slug"
-  #   create.flag :size, desc: "Droplet size slug"
-  #   create.flag :image, desc: "Image ID or slug"
-  #   create.flag :ssh_keys, desc: "Comma separated SSH keys IDs or names or fingerprint. Pass 'all' to enable all SSH keys", default: "all"
-  #   create.switch :backups, default: true, desc: "Enable backups"
-  #   create.switch :ipv6, default: true, desc: "Enable IPv6"
-  #   create.switch :private_networking, default: true, desc: "Enable private networking"
-
-  #   create.action do |global,options,args|
-  #   end
-  # end
-
 end

data/lib/droppper/config.rb

@@ -0,0 +1,78 @@
+module Droppper
+  class Config
+    attr_accessor :data, :files
+
+    DEFAULT = {
+      token: nil,
+      ssh: {
+        user: "root",
+        port: "22",
+        keyfile: "~/.ssh/id_rsa"
+      },
+      create: {
+        region: "nyc3",
+        image: "ubuntu-14-04-x64",
+        size: "512mb",
+        keys: []
+      }
+    }
+
+    def initialize
+      load_config
+    end
+
+    def print
+      puts Droppper::Utils.print_hash(data)
+    end
+
+    def token
+      data.token
+    end
+
+    def token=(new_token)
+      data.token = new_token
+    end
+
+    def ssh
+      data.ssh
+    end
+
+    def create
+      data.create
+    end
+
+    protected
+      def load_config
+        find_config_files
+        parse_config_files
+      end
+
+      def find_config_files
+        self.files = []
+        root = Dir.pwd
+        while root != '/'
+          add_file File.expand_path(".droppper", root)
+          root = File.expand_path("..", root)
+        end
+        add_file File.join(File.expand_path("~"), ".droppper")
+      end
+
+      def parse_config_files
+        self.data = Hashie::Mash.new(DEFAULT)
+        files.reverse.each do |file|
+          self.data.deep_merge! parse_config_file(file)
+        end
+      end
+
+      def parse_config_file(file)
+        require 'yaml'
+        YAML.load_file(file)
+      rescue
+        {}
+      end
+
+      def add_file(f)
+        files << f if File.exists?(f)
+      end
+  end
+end

data/lib/droppper/droplets.rb

@@ -0,0 +1,88 @@
+require 'time'
+
+module Droppper
+  module Droplets extend self
+
+    def list(*args)
+      data = droplets(*args)
+      tp data, {id: {display_name: "ID"}},
+               {name: {display_name: "NAME"}},
+               {"region.slug" => {display_name: "REGION"}},
+               {"size_slug" => {display_name: "SIZE"}},
+               :status,
+               :locked
+    end
+
+    def show(*args)
+      d = droplet(*args)
+      puts <<-eos
+ID: #{d.id}
+Name: #{d.name}
+Memory: #{d.memory}MB
+vCPUs: #{d.vcpus}
+Disk: #{d.disk}G
+Created on: #{Time.parse(d.created_at).rfc2822}
+Status: #{d.status}
+Backups: #{d.backup_ids.size}
+Features: #{d.features.join(", ")}
+Region: #{d.region.name}
+Image: #{d.image.name}
+Kernel: #{d.kernel.name}
+      eos
+      puts "Networking:"
+      [['v4', 'public'], ['v4', 'private'], ['v6', 'public'], ['v6', 'private']].each do |pair|
+        version, publicity = pair
+        if net = d.networks.send(version).find{|net| net.type == publicity}
+           puts "  IP#{version} (#{publicity}):".ljust(18) +"#{net.ip_address}"
+        end
+      end
+    end
+
+    def ssh(*args, options)
+      d = droplet(*args)
+      cmd_options = [
+          "-o", "IdentitiesOnly=yes",
+          "-o", "LogLevel=ERROR",
+          "-o", "StrictHostKeyChecking=no",
+          "-o", "UserKnownHostsFile=/dev/null",
+          "-i", File.expand_path(Droppper.config.ssh.keyfile)
+      ]
+      cmd_options.push "-l", "#{options['user']||Droppper.config.ssh.user}"
+      cmd_options.push "-p", "#{options['port']||Droppper.config.ssh.port}"
+      cmd_options << d.public_ip
+      puts "Executing: ssh #{cmd_options.join(" ")}"
+      Kernel.exec("ssh", *cmd_options)
+    end
+
+    def droplets(*args)
+      args = Array(args).flatten
+      data = Droppper.client.droplets.all.to_a
+      if args.size > 0
+        data = data.select do |d|
+          (args.size==1 and (d.id.to_s == args[0] or d.name == args[0])) or (d.name =~ Regexp.new(args.join(".*")))
+        end
+      end
+      data
+    end
+
+    def droplet(*args)
+      list = droplets(*args)
+      if list.size == 0
+        puts "Cannot find droplet"
+      elsif list.size == 1
+        list.first
+      else
+        select_droplet(list)
+      end
+    end
+
+    def select_droplet(list)
+      choose do |menu|
+        menu.prompt = "Multiple droplets found. Select one:"
+        list.each do |droplet|
+          menu.choice droplet.name do droplet end
+        end
+      end
+    end
+  end
+end

data/lib/droppper/utils.rb

@@ -1,26 +1,5 @@
 module Droppper
   module Utils extend self
-    def find_token
-      f = find_dot_dropper_file
-      File.open(f).read.strip if f
-    end
-
-    def find_dot_dropper_file
-      find_nearest_dot_dropper_file || default_drop_droppper_file
-    end
-
-    def find_nearest_dot_dropper_file(root=Dir.pwd)
-      f = File.expand_path ".droppper", root
-      return f if File.exists?(f)
-      return nil if root=='/'
-      find_nearest_dot_dropper_file(File.expand_path("..", root))
-    end
-
-    def default_drop_droppper_file
-      f = File.join(File.expand_path("~"), ".droppper")
-      return f if File.exists?(f)
-    end
-
     def print_hash(hash, include_empty=false)
       lines = []
       recursive_flatten_hash(hash).each do |key, value|

data/lib/droppper/version.rb

@@ -1,3 +1,3 @@
 module Droppper
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droppper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Cristian Bica
@@ -11,21 +11,21 @@ cert_chain: []
 date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: table_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: table_print
+  name: droplet_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: droplet_kit
+  name: hashie
+  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: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,8 +123,10 @@ files:
 - bin/droppper
 - droppper.gemspec
 - lib/droppper.rb
+- lib/droppper/cli.rb
 - lib/droppper/commands/droplets.rb
-- lib/droppper/commands/ssh.rb
+- lib/droppper/config.rb
+- lib/droppper/droplets.rb
 - lib/droppper/utils.rb
 - lib/droppper/version.rb
 homepage: https://github.com/cristianbica/droppper

data/lib/droppper/commands/ssh.rb

@@ -1,14 +0,0 @@
-desc "SSH to your DigitalOcean droplets"
-command :ssh do |cmd|
-  cmd.flag [:u, :user], desc: "SSH Username", default_value: 'deploy'
-  cmd.flag [:p, :port], desc: "SSH Port", default_value: '22'
-
-  cmd.action do |global,options,args|
-    droplet = Droppper.droplet(args)
-    if droplet
-      Droppper.ssh droplet, user: options[:user], port: options[:port]
-    else
-      puts "Cannot find any droplet"
-    end
-  end
-end