sistero 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f35cc9623defac9aa56a5001ea501efb8cb1d8
-  data.tar.gz: 337014699bacd1fff480765b9d9406c0f0664be6
+  metadata.gz: adc5b3b7bea1e58657bbf47ddffd5e3efa69c6c1
+  data.tar.gz: c77fbaf01f32c5833db5960c6cb52b7acc0f92fe
 SHA512:
-  metadata.gz: a20d70f01af21bd2c091ba9cbe5099dcf3b1c6edef4c0420fc4a73e72df0f2e726f3cb55fa367b2e69efeb332e641bf048a48cc3d54f45b7857b70ded6c64673
-  data.tar.gz: 30735f69d59cab88b7b7c0355e3b5a934b501a20d8fe7b52ab1c78b0d8056be3b1ba5ce8671b4180309917550b9e699e56d925fc340c304f34043646c7ab6b6b
+  metadata.gz: faec4b54c8ff3d797f16c00d67e6d21598d69ade190ed600205f07823849f0ba104eace69870cc2a2be5de8b5413ac5f89b3132e1cb391c3d0179548e23ab14e
+  data.tar.gz: 7e0e6901c61589863bbf1a6f23f81e9dbc607b17e04f749ac91a61deccb950ac49722a39d90107b6fd708611b1860d1ce5801db06eb535773eadc4ea88242064

data/README.md

@@ -13,7 +13,7 @@ Create a config file at `.config/sistero` with something like:
 ```
 ---
 defaults:
-  vm_name: my_default_vm_name
+  vm_name: default-vm
   ssh_keys:
     - 1234567
   ssh_options: -D1080 -A
@@ -21,19 +21,24 @@ defaults:
   vm_size: 512mb
   vm_region: nyc3
   vm_image: ubuntu-14-04-x64
-london:
-  vm_name: my_london_vm_name
-  vm_region: lon1
+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:
+Then to create a VM in new york called default-vm:
 ```
 sistero create
 ```
 
-Or to create a VM configured the same only in London:
+Or to create a VM called london-vm in london:
 ```
-sistero -p london create
+sistero -n london create
 ```

data/bin/sistero

@@ -46,8 +46,8 @@ module Sistero::Command
         exit
       end
 
-      op.on '-p val', '--profile', 'set profile' do |profile_name|
-        @config.profile_name = profile_name
+      op.on '-n vm-name', '--name', 'set vm name' do |vm_name|
+        @config.vm_name = vm_name
       end
 
       subcommand 'ssh', 'ssh to vm' do |subop|
@@ -62,6 +62,8 @@ module Sistero::Command
 
       subcommand 'list', 'list vms'
 
+      subcommand 'show-config', 'show configuration'
+
       op.parse!
     end
 
@@ -70,16 +72,24 @@ module Sistero::Command
       exit
     end
 
-    sistero = Sistero::Instance.new
-    case @config.action
-    when 'ssh'
-      sistero.ssh_to_vm(@config.profile_name, ssh_options: @config.ssh_options)
-    when 'create'
-      sistero.create_vm(@config.profile_name)
-    when 'destroy'
-      sistero.destroy_vm(@config.profile_name)
-    when 'list'
-      sistero.list_vms()
+    vm_name = @config.vm_name
+
+    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
     end
   end
 end

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/sistero.rb

@@ -5,42 +5,61 @@ require "droplet_kit"
 APP_NAME = "sistero"
 
 module Sistero
-  Profile = Struct.new(:access_token, :ssh_keys, :ssh_options, :vm_name, :vm_size, :vm_region, :vm_image)
-  # DEFAULTS = {
-  #   :access_token => nil,
-  #   :ssh_keys => [],
-  #   :ssh_options => '',
-  #   :vm_name => nil,
-  #   :vm_size => 512,
-  #   :vm_region => 'nyc3',
-  #   :vm_image => 'ubuntu-14-04-x64',
-  # }
+  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
+    attr_accessor :defaults, :profiles
 
-    def profile name
-      @profiles[name] || @defaults
+    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 = {}
+      @profiles = []
 
       cfg = YAML.load_file cfg_file_path
       cfg['defaults'].each do |key, value|
         @defaults[key] = value
       end
 
-      cfg.each do |name, profile_cfg|
-        next if name == 'defaults'
-        profile = @profiles[name] = Profile.new *@defaults
+      @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
 
@@ -50,7 +69,7 @@ module Sistero
       @client = DropletKit::Client.new(access_token: @config.defaults.access_token)
     end
 
-    def find_vm(vm_name:)
+    def find_vm(vm_name)
       @client.droplets.all.find { |vm| vm.name == vm_name }
     end
 
@@ -60,10 +79,14 @@ module Sistero
       end
     end
 
-    def create_vm(profile_name, vm_name: nil)
-      profile = @config.profile profile_name
-      vm_name ||= profile.vm_name
+    def get_profile vm_name
+      profile = @config.profile vm_name
+      vm_name = profile.vm_name if vm_name.nil?
+      [ profile, vm_name ]
+    end
 
+    def create_vm(vm_name)
+      profile, vm_name = get_profile vm_name
       puts "creating vm: #{vm_name}"
 
       vm = DropletKit::Droplet.new(
@@ -74,7 +97,7 @@ module Sistero
         ssh_keys: profile.ssh_keys
       )
       vm = @client.droplets.create(vm)
-      puts "created vm: #{profile.to_s}"
+      puts "created: #{profile.to_s}"
       vm
     end
 
@@ -94,17 +117,16 @@ module Sistero
       return false
     end
 
-    def ssh_to_vm(profile_name, vm_name: nil, ssh_options: nil)
-      profile = @config.profile profile_name
-      vm_name ||= profile.vm_name
+    def ssh_to_vm(vm_name, ssh_options: nil)
+      profile, vm_name = get_profile vm_name
       ssh_options ||= profile.ssh_options
 
-      vm = find_vm(vm_name: vm_name) || create_vm(profile_name, vm_name: vm_name)
+      vm = find_vm(vm_name) || create_vm(vm_name)
       public_network = vm.networks.v4.find { |network| network.type == 'public' }
       until public_network
         puts "no public interfaces, trying again in a second"
         sleep 1
-        vm = find_vm(vm_name: vm_name)
+        vm = find_vm(vm_name)
         public_network = vm.networks.v4.find { |network| network.type == 'public' }
       end
       ip = public_network.ip_address
@@ -122,11 +144,10 @@ module Sistero
       exec cmd
     end
 
-    def destroy_vm(profile_name, vm_name: nil)
-      profile = @config.profile profile_name
-      vm_name ||= profile.vm_name
+    def destroy_vm(vm_name)
+      profile, vm_name = get_profile vm_name
 
-      vm = find_vm(vm_name: vm_name)
+      vm = find_vm(vm_name)
       if vm
         puts "destroying #{vm.id}"
         @client.droplets.delete(id: vm.id)
@@ -134,5 +155,9 @@ module Sistero
         puts "vm #{vm_name} not found"
       end
     end
+
+    def show_config
+      puts @config.to_s
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler