sistero 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96adaad8acc04fa6b38ed622150d5a993fb9279d
-  data.tar.gz: 49a8eefc611b198779728ad4ade3fa91fa82ec81
+  metadata.gz: 3c05a40e7cbaf966250545adca8bedcaeab750a7
+  data.tar.gz: 28d77522246e1e102e90bb25919fedd756bd8fe9
 SHA512:
-  metadata.gz: c64efc4ecbfd6b30302a19805331b876facb979c5b3e50d2e18aff4c20e7c4d3c62f5e619458b2934a7cc8212c9ff3ab3769f8cae50976dad12437a2cad5968f
-  data.tar.gz: d7fd78c6b1605887013c5032e6c2bf0e10ac773019c70b3824ab551fdbb9572d52730e00d11617033ac377caeaeecee9fdcfe86f5af6fe37a47016b2ba9b3581
+  metadata.gz: 2eadc9dcdc499285f719f8798e6fbcb64192eb816cd778f01df49097ee11f5b4d2ce5bde18f8bfbda735268ff68ba1dfc5af5fab19186319338a18d83e08f2a6
+  data.tar.gz: 40c4a034b59468d9dc3201f0b69abe04a0239d884749c967311bb310fe5349e0c335d3c6a390e85f03d09e78f4a40bee85d0a18297ba519ed9728027cfce7409

data/bin/sistero

@@ -2,6 +2,7 @@
 
 require 'bundler/setup'
 require 'sistero'
+require 'sistero/version'
 require 'moister'
 
 module Sistero::Command
@@ -10,7 +11,8 @@ module Sistero::Command
     command = nil
 
     Moister::SubcommandOptionParser.new do |op|
-      op.banner = 'usage: sistero [global options] command [command options]'
+      op.banner = "sistero #{Sistero::VERSION}\nusage: sistero [global options] command [command options]"
+      op.version = Sistero::VERSION
 
       op.for_all do |op|
         op.on_tail '-h', '--help', 'show this help message' do
@@ -26,7 +28,7 @@ module Sistero::Command
       end
 
       op.subcommand 'create [*vms]', 'create vm'
-      op.subcommand 'create-all', 'create all vms in profile'
+      op.subcommand 'create-all', 'create all vms in config'
       op.subcommand 'destroy [*vms]', 'destroy vm'
       op.subcommand 'list', 'list vms'
       op.subcommand 'show-config', 'show configuration'

data/lib/sistero/config.rb

@@ -2,14 +2,14 @@ require "yaml"
 APP_NAME = "sistero"
 
 module Sistero
-  PROFILE_KEYS = [:vm_name, :vm_size, :vm_region, :vm_image, :access_token, :ssh_user,
-                  :ssh_keys, :ssh_options, :user_data, :private_networking]
+  VM_KEYS = [:name, :size, :region, :image, :access_token, :user_data, :private_networking,
+             :ssh_keys, :ssh_options, :ssh_user ]
 
-  Profile = Struct.new(*PROFILE_KEYS) do
+  VM = Struct.new(*VM_KEYS) do
     def to_s
-      "vm #{vm_name}\n" + PROFILE_KEYS.map do |key|
+      "vm #{name}\n" + VM_KEYS.map do |key|
         val = self[key]
-        if val and key != :vm_name
+        if val and key != :name
           "  #{key} #{val}\n"
         else
           ""
@@ -19,17 +19,17 @@ module Sistero
   end
 
   class Config
-    attr_accessor :defaults, :profiles
+    attr_accessor :defaults, :vms
 
-    def profile vm_name
-      vm_name ||= @defaults['vm_name']
-      raise "must set a default vm_name or specify one" unless vm_name
+    def vm name
+      name ||= @defaults['name']
+      raise "must set a default name or specify one" unless name
       # TODO: also handle wildcards
-      profile = @profiles.find do |profile|
-        profile.vm_name == vm_name
+      vm = @vms.find do |vm|
+        vm.name == name
       end
-      raise "could not find profile for #{vm_name}" unless profile
-      profile
+      raise "could not find vm for #{name}" unless vm
+      vm
     end
 
     def initialize(opts = {})
@@ -40,8 +40,8 @@ module Sistero
         @cfg_file_path = "#{ENV['HOME']}/.config/#{APP_NAME}" unless File.exists? @cfg_file_path
       end
 
-      @defaults = Profile.new
-      @profiles = []
+      @defaults = VM.new
+      @vms = []
 
       cfg = YAML.load_file @cfg_file_path
       postprocess_cfg cfg
@@ -50,30 +50,30 @@ module Sistero
         @defaults[key] = value
       end
 
-      @profiles = cfg['profiles'].map do |profile_cfg|
-        profile = Profile.new *@defaults
-        profile.vm_name = nil
+      @vms = cfg['vms'].map do |vm_cfg|
+        vm = VM.new *@defaults
+        vm.name = nil
 
-        profile_cfg.each do |key, value|
-          profile[key] = value
+        vm_cfg.each do |key, value|
+          vm[key] = value
         end
-        unless profile.user_data.nil?
-          user_data = profile.user_data.dup
-          PROFILE_KEYS.each do |key|
-            value = profile[key]
+        unless vm.user_data.nil?
+          user_data = vm.user_data.dup
+          VM_KEYS.each do |key|
+            value = vm[key]
             if value.is_a? String
               user_data.gsub! "\#{#{key}}", value
             end
           end
-          profile.user_data = user_data
+          vm.user_data = user_data
         end
-        raise "every profile must have a vm_name field" unless profile.vm_name
-        profile
+        raise "every vm must have a name field" unless vm.name
+        vm
       end
     end
 
     def to_s
-      @profiles.map(&:to_s).join "\n"
+      @vms.map(&:to_s).join "\n"
     end
 
     private

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/sistero.rb

@@ -9,8 +9,8 @@ module Sistero
       @client = DropletKit::Client.new(access_token: @config.defaults.access_token)
     end
 
-    def find_vm(vm_name)
-      @client.droplets.all.find { |vm| vm.name == vm_name }
+    def find_droplet(name)
+      @client.droplets.all.find { |vm| vm.name == name }
     end
 
     def list_vms()
@@ -19,33 +19,33 @@ module Sistero
       end
     end
 
-    def get_profile vm_name
-      profile = @config.profile vm_name
-      vm_name = profile.vm_name if vm_name.nil?
-      [ profile, vm_name ]
+    def get_vm name
+      vm = @config.vm name
+      name = vm.name if name.nil?
+      [ vm, name ]
     end
 
-    def create_vm(vm_name)
-      profile, vm_name = get_profile vm_name
-      puts "creating vm: #{vm_name}"
-
-      vm = DropletKit::Droplet.new(
-        name: vm_name,
-        region: profile.vm_region,
-        size: profile.vm_size,
-        image: profile.vm_image,
-        ssh_keys: profile.ssh_keys,
-        user_data: profile.user_data,
-        private_networking: profile.private_networking
+    def create_droplet_from_vm(name)
+      vm, name = get_vm name
+      puts "creating vm: #{name}"
+
+      droplet = DropletKit::Droplet.new(
+        name: name,
+        region: vm.region,
+        size: vm.size,
+        image: vm.image,
+        ssh_keys: vm.ssh_keys,
+        user_data: vm.user_data,
+        private_networking: vm.private_networking
       )
-      vm = @client.droplets.create(vm)
-      puts "created: #{profile.to_s}"
-      vm
+      droplet = @client.droplets.create(droplet)
+      puts "created: #{vm.to_s}"
+      droplet
     end
 
     def create_all
-      @config.profiles.each do |profile|
-        create_vm profile.vm_name
+      @config.vms.each do |vm|
+        create_droplet_from_vm vm.name
       end
     end
 
@@ -65,17 +65,17 @@ module Sistero
       return false
     end
 
-    def ssh_to_vm(vm_name, ssh_options: nil)
-      profile, vm_name = get_profile vm_name
-      ssh_options ||= profile.ssh_options
+    def ssh_to_vm(name, ssh_options: nil)
+      vm, name = get_vm name
+      ssh_options ||= vm.ssh_options
 
-      vm = find_vm(vm_name) || create_vm(vm_name)
-      public_network = vm.networks.v4.find { |network| network.type == 'public' }
+      droplet = find_droplet(name) || create_droplet_from_vm(name)
+      public_network = droplet.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)
-        public_network = vm.networks.v4.find { |network| network.type == 'public' }
+        droplet = find_droplet(name)
+        public_network = droplet.networks.v4.find { |network| network.type == 'public' }
       end
       ip = public_network.ip_address
 
@@ -87,20 +87,20 @@ module Sistero
         end
       end
 
-      cmd = "ssh -o 'StrictHostKeyChecking no' #{ssh_options} #{profile.ssh_user || 'root'}@#{ip}"
+      cmd = "ssh -o 'StrictHostKeyChecking no' #{ssh_options} #{vm.ssh_user || 'root'}@#{ip}"
       puts cmd
       exec cmd
     end
 
-    def destroy_vm(vm_name)
-      profile, vm_name = get_profile vm_name
+    def destroy_vm(name)
+      vm, name = get_vm name
 
-      vm = find_vm(vm_name)
-      if vm
-        puts "destroying #{vm.id}"
-        @client.droplets.delete(id: vm.id)
+      droplet = find_droplet(name)
+      if droplet
+        puts "destroying #{droplet.id}"
+        @client.droplets.delete(id: droplet.id)
       else
-        puts "vm #{vm_name} not found"
+        puts "vm #{name} not found"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - James Pike