sistero 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46afcf4d2b2acdb8217689eb5211dbee64f72ad4
-  data.tar.gz: e65a84a742003c6c7ddde077fd19dd49c0033d75
+  metadata.gz: c31adbdb186b28911fef49e9cc7ff7ca3f247a7e
+  data.tar.gz: f19fb31fb796ac1d1781741ce02000f00780e733
 SHA512:
-  metadata.gz: 969c627528636576fb3e3a5e1993b8df53ca5783055d811801aabbd8dce814597d55903087c7e30038cbec9c5e9c582b41af4f71af2a9fbca84dc9b167964454
-  data.tar.gz: 7ec2865ef037edd095614eb81758a04c461507b2ae0c368a210a0b1ac17ba037b740d1a7bf47a100d8f4e6f3ff9ce2020702500b62a3c4e68535dc90ca1ae10d
+  metadata.gz: 578488ef88bc13ef6692627ad4f34d6dd86411490a6c45c97a941cde850e0433538f61d5dac2be3ca34c015749c37a73c4086a6c4e8573c34dc2e62cef14c4f5
+  data.tar.gz: a726152b1fd6e1fe310ed6e357ba4ed2bab50a11d3638777c0f664584750cf0a9e1339dcc5248ac41e5671fe550d695b4f591da9d9d1512a7ff250866cc5fd1c

data/bin/sistero

@@ -2,106 +2,61 @@
 
 require 'bundler/setup'
 require 'sistero'
+require 'moister'
 
 module Sistero::Command
-  @config = OpenStruct.new
-
-  @subcommands = {}
-  @op = nil
-
-  def self.subcommand name, banner, &block
-    @subcommands[name] = { name: name, banner: banner, parse_cmdline: block }
-  end
-
-  def self.with_help help_op
-    help_op.on '-h', '--help', 'show this help message' do
-      puts help_op
-      exit
-    end
-  end
-
-  def self.parse_opts op, args
-    args = @config.args = args.clone
-    op.order! args
-    raise "must supply subcommand" if args.empty?
-
-    action = args.first
-    subcmd_meta = @subcommands[action]
-    raise "invalid subcommand: #{action}" unless @subcommands.has_key? action
-    args.shift
-
-    @config.action = action
-    OptionParser.new do |subop|
-      subop.banner = subcmd_meta[:banner]
-      with_help subop
-      parse_cmdline = subcmd_meta[:parse_cmdline]
-      parse_cmdline.call(subop) if parse_cmdline
-    end.order! args
-  end
-
   def self.run args
-    OptionParser.new do |op|
-      @op = op
+    config = nil
 
+    Moister::SubcommandOptionParser.new do |op|
       op.banner = 'usage: sistero [global options] command [command options]'
-      op.on '-h', '--help', 'show this help message' do
-        max_len = @subcommands.values.map { |subcommand| subcommand[:name].length }.max
 
-        puts op
-        puts "\ncommands:"
-        @subcommands.values.each do |subcommand|
-          prefix = subcommand[:name]
-          prefix += ' ' * (max_len - prefix.length + 2)
-          puts "    #{prefix}  #{subcommand[:banner]}"
+      op.for_all do |op|
+        op.on_tail '-h', '--help', 'show this help message' do
+          puts op
+          exit
         end
-        exit
       end
 
-      op.on '-c', '--config file', 'override path to config file' do |cfg_file_path|
-        @config.cfg_file_path = cfg_file_path
-      end
+      op.on '-c', '--config file', 'override path to config file', 'cfg_file_path'
 
-      subcommand 'ssh', 'ssh to vm' do |subop|
-        subop.on '-o val', 'add ssh options' do |ssh_options|
-          @config.ssh_options = ssh_options
-        end
+      op.subcommand 'ssh', 'ssh to vm' do |subop|
+        subop.on '-o val', 'add ssh options', 'ssh_options'
       end
 
-      subcommand 'create', 'create vm'
-
-      subcommand 'destroy', 'destroy vm'
-
-      subcommand 'list', 'list vms'
-
-      subcommand 'show-config', 'show configuration'
-
-      subcommand 'ssh-keys', 'show ssh keys'
-
-      subcommand 'sizes', 'show possible sizes'
+      op.subcommand 'create', 'create vm'
+      op.subcommand 'destroy', 'destroy vm'
+      op.subcommand 'list', 'list vms'
+      op.subcommand 'show-config', 'show configuration'
+      op.subcommand 'ssh-keys', 'show ssh keys'
+      op.subcommand 'sizes', 'show possible sizes'
+      op.subcommand 'regions', 'show possible regions'
+      op.subcommand 'images', 'show images'
 
-      subcommand 'regions', 'show possible regions'
+      parsed_cfg = op.parse(args).to_h
 
-      subcommand 'images', 'show images'
+      parsed_cfg.merge! parsed_cfg[:config]
+      parsed_cfg.delete :config
 
-      parse_opts op, args
+      config = OpenStruct.new parsed_cfg
     end
 
-    unless @config.action
+    unless config.command
       puts 'please supply a command, see --help'
       exit
     end
 
-    sistero = Sistero::Instance.new({ cfg_file_path: @config.cfg_file_path })
-    case @config.action
+    sistero = Sistero::Instance.new({ cfg_file_path: config.cfg_file_path })
+    case config.command
     when 'ssh'
-      vm_name, *ssh_args = @config.args
+      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(vm_name, ssh_options: config.ssh_options)
     when 'create'
-      vms = @config.args.empty? ? [nil] : @config.args
+      vms = config.positionals.empty? ? [nil] : config.positionals
       vms.each { |vm_name| sistero.create_vm(vm_name) }
     when 'destroy'
-      vms = @config.args.empty? ? [nil] : @config.args
+      vms = config.positionals.empty? ? [nil] : config.positionals
       vms.each { |vm_name| sistero.destroy_vm(vm_name) }
     when 'list'
       sistero.list_vms()
@@ -121,4 +76,4 @@ module Sistero::Command
   end
 end
 
-Sistero::Command::run ARGV.clone
+Sistero::Command::run ARGV

data/lib/sistero/version.rb

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

data/sistero.gemspec

@@ -31,4 +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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - James Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: moister
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: Profile based digital ocean cluster management command line tool.
 email:
 - github@chilon.net