sistero 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4080a3d41d94a1fc0bf76f4119ee171345ffeac0
-  data.tar.gz: 011f83fc73f1089f652443f107f1ecd3e1aee9f7
+  metadata.gz: fdd66f2da7e7ea38ca56f0d04c109514d747d438
+  data.tar.gz: 033a3a3595eae6e1b9d4fd1c0b3ace83b23364c6
 SHA512:
-  metadata.gz: b440ed4172f0f1fea35cabb912e3f05f3e6ad6e203f3b5e2ec848e5d2193b8409e1145b7c1ef122ba0242825a32377d3d741f90d0836e8bbf1834235d322863e
-  data.tar.gz: 13ef1838719c35eeebfade47f3ae52eaa2289b6fee33d7198c93587d672ee002e50976dba22df501b7e71e663481e7129d6b154b22ee5967d6cf367f632bd6f9
+  metadata.gz: d7b12ca75bcc2b361bc68cef3d1222fe0fdeddd9950a75b4e24b62c63f370b3dad83da3fac83276f037de5f41eed70d567b7b5dd83a608ae7a0c7556dafe04cc
+  data.tar.gz: 2a020dbeeff2bf026266b2a57ce4fe826e107d74a58434914fd51b9aeb5853387fa63c47438e45d27127b670b8f6950ce33be5d300f48eb9808465ba0904852e

data/bin/sistero

@@ -20,13 +20,15 @@ module Sistero::Command
     end
   end
 
-  def self.parse_opts op
-    op.order!
+  def self.parse_opts op, args
+    args = @config.args = args.clone
+    op.order! args
+    raise "must supply subcommand" if args.empty?
 
-    action = ARGV[0]
+    action = args.first
     subcmd_meta = @subcommands[action]
-    raise "invalid subcommand #{action}" unless @subcommands.has_key? action
-    ARGV.shift
+    raise "invalid subcommand: #{action}" unless @subcommands.has_key? action
+    args.shift
 
     @config.action = action
     OptionParser.new do |subop|
@@ -34,11 +36,10 @@ module Sistero::Command
       with_help subop
       parse_cmdline = subcmd_meta[:parse_cmdline]
       parse_cmdline.call(subop) if parse_cmdline
-    end.order!
-    @config.action_arg = ARGV[0]
+    end.order! args
   end
 
-  def self.run
+  def self.run args
     OptionParser.new do |op|
       @op = op
 
@@ -56,6 +57,10 @@ module Sistero::Command
         exit
       end
 
+      op.on '-c', '--config file', 'override path to config file' do |cfg_file_path|
+        @config.cfg_file_path = cfg_file_path
+      end
+
       subcommand 'ssh', 'ssh to vm' do |subop|
         subop.on '-o val', 'add ssh options' do |ssh_options|
           @config.ssh_options = ssh_options
@@ -70,7 +75,15 @@ module Sistero::Command
 
       subcommand 'show-config', 'show configuration'
 
-      parse_opts op
+      subcommand 'ssh-keys', 'show ssh keys'
+
+      subcommand 'sizes', 'show possible sizes'
+
+      subcommand 'regions', 'show possible regions'
+
+      subcommand 'images', 'show images'
+
+      parse_opts op, args
     end
 
     unless @config.action
@@ -78,26 +91,34 @@ module Sistero::Command
       exit
     end
 
-    vm_name = @config.action_arg
-
-    begin
-      sistero = Sistero::Instance.new
-      case @config.action
-      when 'ssh'
-        sistero.ssh_to_vm(vm_name, ssh_options: @config.ssh_options)
-      when 'create'
-        sistero.create_vm(vm_name)
-      when 'destroy'
-        sistero.destroy_vm(vm_name)
-      when 'list'
-        sistero.list_vms()
-      when 'show-config'
-        sistero.show_config()
-      end
-    rescue RuntimeError => e
-      puts e.to_s
+    sistero = Sistero::Instance.new({ cfg_file_path: @config.cfg_file_path })
+    case @config.action
+    when 'ssh'
+      vm_name, *ssh_args = @config.args
+      # TODO: pass ssh_args
+      sistero.ssh_to_vm(vm_name, ssh_options: @config.ssh_options)
+    when 'create'
+      vms = @config.args.empty? ? [nil] : @config.args
+      vms.each { |vm_name| sistero.create_vm(vm_name) }
+    when 'destroy'
+      vms = @config.args.empty? ? [nil] : @config.args
+      vms.each { |vm_name| sistero.destroy_vm(vm_name) }
+    when 'list'
+      sistero.list_vms()
+    when 'show-config'
+      sistero.show_config()
+    when 'ssh-keys'
+      sistero.show_ssh_keys()
+    when 'sizes'
+      sistero.show_sizes()
+    when 'regions'
+      sistero.show_regions()
+    when 'images'
+      sistero.show_images()
     end
+  rescue RuntimeError => e
+    puts e.to_s
   end
 end
 
-Sistero::Command::run
+Sistero::Command::run ARGV.clone if __FILE__ == $0

data/lib/sistero/config.rb

@@ -0,0 +1,63 @@
+require "yaml"
+APP_NAME = "sistero"
+
+module Sistero
+  PROFILE_KEYS = [:vm_name, :vm_size, :vm_region, :vm_image, :access_token, :ssh_keys, :ssh_options]
+
+  Profile = Struct.new(*PROFILE_KEYS) do
+    def to_s
+      "vm #{vm_name}\n" + PROFILE_KEYS.map do |key|
+        val = self[key]
+        if val and key != :vm_name
+          "  #{key} #{val}\n"
+        else
+          ""
+        end
+      end.join
+    end
+  end
+
+  class Config
+    attr_accessor :defaults, :profiles
+
+    def profile vm_name
+      if @defaults['vm_name'] and vm_name.nil?
+        profile = @defaults
+      else
+        # TODO: also handle wildcards
+        profile = @profiles.find do |profile|
+          profile.vm_name == vm_name
+        end
+        raise "could not find profile for #{vm_name}" unless profile
+      end
+      profile
+    end
+
+    def initialize(opts = {})
+      # read defaults from config file
+      cfg_file_path = opts[:cfg_file_path] || "#{ENV['HOME']}/.config/#{APP_NAME}"
+
+      @defaults = Profile.new
+      @profiles = []
+
+      cfg = YAML.load_file cfg_file_path
+      cfg['defaults'].each do |key, value|
+        @defaults[key] = value
+      end
+
+      @profiles = cfg['profiles'].map do |profile_cfg|
+        profile = Profile.new *@defaults
+        profile_cfg.each do |key, value|
+          profile[key] = value
+        end
+        profile
+      end
+
+      @profiles.push(@defaults) if @defaults.vm_name
+    end
+
+    def to_s
+      @profiles.map(&:to_s).join "\n"
+    end
+  end
+end

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/sistero.rb

@@ -1,68 +1,8 @@
 require "sistero/version"
-require "yaml"
+require "sistero/config"
 require "droplet_kit"
 
-APP_NAME = "sistero"
-
 module Sistero
-  PROFILE_KEYS = [:vm_name, :vm_size, :vm_region, :vm_image, :access_token, :ssh_keys, :ssh_options]
-
-  Profile = Struct.new(*PROFILE_KEYS) do
-    def to_s
-      "vm #{vm_name}\n" + PROFILE_KEYS.map do |key|
-        val = self[key]
-        if val and key != :vm_name
-          "  #{key} #{val}\n"
-        else
-          ""
-        end
-      end.join
-    end
-  end
-
-  class Config
-    attr_accessor :defaults, :profiles
-
-    def profile vm_name
-      if @defaults['vm_name'] and vm_name.nil?
-        profile = @defaults
-      else
-        # TODO: also handle wildcards
-        profile = @profiles.find do |profile|
-          profile.vm_name == vm_name
-        end
-        raise "could not find profile for #{vm_name}" unless profile
-      end
-      profile
-    end
-
-    def initialize(opts = {})
-      # read defaults from config file
-      cfg_file_path = "#{ENV['HOME']}/.config/#{APP_NAME}"
-      @defaults = Profile.new
-      @profiles = []
-
-      cfg = YAML.load_file cfg_file_path
-      cfg['defaults'].each do |key, value|
-        @defaults[key] = value
-      end
-
-      @profiles = cfg['profiles'].map do |profile_cfg|
-        profile = Profile.new *@defaults
-        profile_cfg.each do |key, value|
-          profile[key] = value
-        end
-        profile
-      end
-
-      @profiles.push(@defaults) if @defaults['vm_name']
-    end
-
-    def to_s
-      @profiles.map(&:to_s).join "\n"
-    end
-  end
-
   class Instance
     def initialize(opts = {})
       @config = Config.new(opts)
@@ -159,5 +99,41 @@ module Sistero
     def show_config
       puts @config.to_s
     end
+
+    def show_ssh_keys
+      @client.ssh_keys.all().each do |key|
+        puts "#{key.name}: #{key.id}"
+      end
+    end
+
+    def show_sizes
+      @client.sizes.all().each do |size|
+        puts "size #{size.slug}"
+        puts "  regions    #{size.regions.join ', '}"
+        puts "  available  #{size.available}"
+      end
+    end
+
+    def show_regions
+      @client.regions.all().each do |region|
+        puts "region #{region.slug}" + (region.available ? '' : ' (unavailable)')
+        puts "  name       #{region.name}"
+        if region.available
+          puts "  sizes      #{region.sizes.join ', '}"
+          puts "  features   #{region.features.join ', '}"
+        end
+      end
+    end
+
+    def show_images
+      @client.images.all().each do |image|
+        puts "image #{image.slug}"
+        puts "  name          #{image.name}"
+        puts "  distribution  #{image.distribution}"
+        puts "  public        #{image.public}"
+        puts "  type          #{image.type}"
+        puts "  regions       #{image.regions.join ', '}"
+      end
+    end
   end
 end

data/readme.md

@@ -0,0 +1,49 @@
+# Sistero
+
+sistero is a profile based tool to manage a digital ocean cluster.
+
+## Installation
+
+```gem install sistero```
+
+## Configuration
+
+The configuration file lives at `.config/sistero`, an example looks like this:
+
+```
+defaults:
+  vm_name: default-vm
+  ssh_keys:
+    - 1234567
+  ssh_options: -D1080 -A
+  access_token: f788fffffffffffff8ffffffffffffffffffffff8fffffffffffffffffffffff
+  vm_size: 512mb
+  vm_region: nyc3
+  vm_image: ubuntu-14-04-x64
+profiles:
+  -
+    vm_name: london-vm
+    vm_region: lon1
+  -
+    vm_name: london-bigger-vm
+    vm_region: lon1
+    vm_size: 1gb
+```
+
+Any values not specified in a profile are taken from `defaults`. If the `defaults` entry specifies a `vm_name` then it becomes the default VM for the `create`, `ssh` and `destroy` commands.
+
+The `ssh_keys` is a list of ID numbers (rather than names) of ssh keys, these can be found by running `sistero ssh-keys`.
+
+The valid options for `region`, `vm_size` and `vm_image` can be found by running `sistero regions`, `sistero sizes` and `sistero images` respectively.
+
+## Running
+
+Assuming the previous config file, to create a VM in new york called default-vm:
+```
+sistero create
+```
+
+Or to create a VM called `london-vm` in london:
+```
+sistero create london-vm
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-01 00:00:00.000000000 Z
+date: 2016-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,13 +80,14 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- README.md
 - Rakefile
 - bin/console
 - bin/setup
 - bin/sistero
 - lib/sistero.rb
+- lib/sistero/config.rb
 - lib/sistero/version.rb
+- readme.md
 - sistero.gemspec
 homepage: http://github.com/ohjames/sistero
 licenses: []

data/README.md

@@ -1,44 +0,0 @@
-# Sistero
-
-sistero is a profile based tool to manage a digital ocean cluster.
-
-## Installation
-
-```gem install sistero```
-
-## Usage
-
-Create a config file at `.config/sistero` with something like:
-
-```
----
-defaults:
-  vm_name: default-vm
-  ssh_keys:
-    - 1234567
-  ssh_options: -D1080 -A
-  access_token: f788fffffffffffff8ffffffffffffffffffffff8fffffffffffffffffffffff
-  vm_size: 512mb
-  vm_region: nyc3
-  vm_image: ubuntu-14-04-x64
-profiles:
-  -
-    vm_name: london-vm
-    vm_region: lon1
-  -
-    vm_name: london-bigger-vm
-    vm_region: lon1
-    vm_size: 1gb
-```
-
-The `ssh_keys` is a list of the ID numbers of your ssh keys.
-
-Then to create a VM in new york called default-vm:
-```
-sistero create
-```
-
-Or to create a VM called `london-vm` in london:
-```
-sistero create london
-```