sistero 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c31adbdb186b28911fef49e9cc7ff7ca3f247a7e
-  data.tar.gz: f19fb31fb796ac1d1781741ce02000f00780e733
+  metadata.gz: 913412741f25ddaf2dfe20d72a32f85f0bccefcf
+  data.tar.gz: 973044328104b9e4b7a623655f15e24ca036a662
 SHA512:
-  metadata.gz: 578488ef88bc13ef6692627ad4f34d6dd86411490a6c45c97a941cde850e0433538f61d5dac2be3ca34c015749c37a73c4086a6c4e8573c34dc2e62cef14c4f5
-  data.tar.gz: a726152b1fd6e1fe310ed6e357ba4ed2bab50a11d3638777c0f664584750cf0a9e1339dcc5248ac41e5671fe550d695b4f591da9d9d1512a7ff250866cc5fd1c
+  metadata.gz: 68a5594b6eff47df34ff8926a1657428e78cf9fb0aa347e6a16ecacd9e46129a7361e5cd9bd444e0eccf355f0b7305ab9e746851dfa159cf1315bd00c168f816
+  data.tar.gz: fbeed2abe6ee036806844b1470cca8e90a6e1c199e83fd43b2dc0ad973bffc4a62a301f13981838db51f482cf8b256559134717a06b2cf4723d0cc1ffc02f87d

data/bin/sistero

@@ -7,6 +7,7 @@ require 'moister'
 module Sistero::Command
   def self.run args
     config = nil
+    command = nil
 
     Moister::SubcommandOptionParser.new do |op|
       op.banner = 'usage: sistero [global options] command [command options]'
@@ -20,12 +21,12 @@ module Sistero::Command
 
       op.on '-c', '--config file', 'override path to config file', 'cfg_file_path'
 
-      op.subcommand 'ssh', 'ssh to vm' do |subop|
+      op.subcommand 'ssh [vm]', 'ssh to vm' do |subop|
         subop.on '-o val', 'add ssh options', 'ssh_options'
       end
 
-      op.subcommand 'create', 'create vm'
-      op.subcommand 'destroy', 'destroy vm'
+      op.subcommand 'create [*vms]', 'create vm'
+      op.subcommand 'destroy [*vms]', 'destroy vm'
       op.subcommand 'list', 'list vms'
       op.subcommand 'show-config', 'show configuration'
       op.subcommand 'ssh-keys', 'show ssh keys'
@@ -33,31 +34,31 @@ module Sistero::Command
       op.subcommand 'regions', 'show possible regions'
       op.subcommand 'images', 'show images'
 
-      parsed_cfg = op.parse(args).to_h
-
-      parsed_cfg.merge! parsed_cfg[:config]
-      parsed_cfg.delete :config
-
-      config = OpenStruct.new parsed_cfg
+      parsed_cfg = op.parse args
+      command = parsed_cfg[:command]
+      config = OpenStruct.new parsed_cfg[:config]
     end
 
-    unless config.command
+    unless command
       puts 'please supply a command, see --help'
       exit
     end
 
+    command_cfg = OpenStruct.new config[command]
     sistero = Sistero::Instance.new({ cfg_file_path: config.cfg_file_path })
-    case config.command
+
+    case command
     when 'ssh'
-      vm_name, *ssh_args = config.positionals
       # TODO: pass ssh_args
-      sistero.ssh_to_vm(vm_name, ssh_options: config.ssh_options)
+      sistero.ssh_to_vm(command_cfg.vm_name, ssh_options: command_cfg.ssh_options)
     when 'create'
-      vms = config.positionals.empty? ? [nil] : config.positionals
-      vms.each { |vm_name| sistero.create_vm(vm_name) }
+      vms = command_cfg.vms
+      vms.push nil if vms.empty?
+      vms.each &sistero.method(:create_vm)
     when 'destroy'
-      vms = config.positionals.empty? ? [nil] : config.positionals
-      vms.each { |vm_name| sistero.destroy_vm(vm_name) }
+      vms = command_cfg.vms
+      vms.push nil if vms.empty?
+      vms.each &sistero.method(:destroy_vm)
     when 'list'
       sistero.list_vms()
     when 'show-config'

data/lib/sistero/version.rb

@@ -1,3 +1,3 @@
 module Sistero
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/sistero.gemspec

@@ -31,5 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
 
   spec.add_dependency "droplet_kit", "~> 1.3"
-  spec.add_dependency "moister", "~> 0.2"
+  spec.add_dependency "moister", "~> 0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 description: Profile based digital ocean cluster management command line tool.
 email:
 - github@chilon.net
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Profile based digital ocean cluster management command line tool.