sistero 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adc5b3b7bea1e58657bbf47ddffd5e3efa69c6c1
-  data.tar.gz: c77fbaf01f32c5833db5960c6cb52b7acc0f92fe
+  metadata.gz: 4080a3d41d94a1fc0bf76f4119ee171345ffeac0
+  data.tar.gz: 011f83fc73f1089f652443f107f1ecd3e1aee9f7
 SHA512:
-  metadata.gz: faec4b54c8ff3d797f16c00d67e6d21598d69ade190ed600205f07823849f0ba104eace69870cc2a2be5de8b5413ac5f89b3132e1cb391c3d0179548e23ab14e
-  data.tar.gz: 7e0e6901c61589863bbf1a6f23f81e9dbc607b17e04f749ac91a61deccb950ac49722a39d90107b6fd708611b1860d1ce5801db06eb535773eadc4ea88242064
+  metadata.gz: b440ed4172f0f1fea35cabb912e3f05f3e6ad6e203f3b5e2ec848e5d2193b8409e1145b7c1ef122ba0242825a32377d3d741f90d0836e8bbf1834235d322863e
+  data.tar.gz: 13ef1838719c35eeebfade47f3ae52eaa2289b6fee33d7198c93587d672ee002e50976dba22df501b7e71e663481e7129d6b154b22ee5967d6cf367f632bd6f9

data/README.md

@@ -38,7 +38,7 @@ Then to create a VM in new york called default-vm:
 sistero create
 ```
 
-Or to create a VM called london-vm in london:
+Or to create a VM called `london-vm` in london:
 ```
-sistero -n london create
+sistero create london
 ```

data/bin/sistero

@@ -2,23 +2,15 @@
 
 require 'bundler/setup'
 require 'sistero'
-require 'optparse/subcommand'
 
 module Sistero::Command
   @config = OpenStruct.new
-  @config.profile_name = 'default'
 
-  @subcommands = []
+  @subcommands = {}
   @op = nil
 
-  def self.subcommand name, banner
-    @subcommands.push({ name: name, banner: banner })
-    @op.subcommand name do |subop|
-      @config.action = name
-      subop.banner = banner
-      with_help subop
-      yield subop if block_given?
-    end
+  def self.subcommand name, banner, &block
+    @subcommands[name] = { name: name, banner: banner, parse_cmdline: block }
   end
 
   def self.with_help help_op
@@ -28,17 +20,35 @@ module Sistero::Command
     end
   end
 
+  def self.parse_opts op
+    op.order!
+
+    action = ARGV[0]
+    subcmd_meta = @subcommands[action]
+    raise "invalid subcommand #{action}" unless @subcommands.has_key? action
+    ARGV.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!
+    @config.action_arg = ARGV[0]
+  end
+
   def self.run
     OptionParser.new do |op|
       @op = op
 
       op.banner = 'usage: sistero [global options] command [command options]'
       op.on '-h', '--help', 'show this help message' do
-        max_len = @subcommands.map { |subcommand| subcommand[:name].length }.max
+        max_len = @subcommands.values.map { |subcommand| subcommand[:name].length }.max
 
         puts op
         puts "\ncommands:"
-        @subcommands.each do |subcommand|
+        @subcommands.values.each do |subcommand|
           prefix = subcommand[:name]
           prefix += ' ' * (max_len - prefix.length + 2)
           puts "    #{prefix}  #{subcommand[:banner]}"
@@ -46,10 +56,6 @@ module Sistero::Command
         exit
       end
 
-      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|
         subop.on '-o val', 'add ssh options' do |ssh_options|
           @config.ssh_options = ssh_options
@@ -64,7 +70,7 @@ module Sistero::Command
 
       subcommand 'show-config', 'show configuration'
 
-      op.parse!
+      parse_opts op
     end
 
     unless @config.action
@@ -72,7 +78,7 @@ module Sistero::Command
       exit
     end
 
-    vm_name = @config.vm_name
+    vm_name = @config.action_arg
 
     begin
       sistero = Sistero::Instance.new

data/lib/sistero/version.rb

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

data/sistero.gemspec

@@ -31,5 +31,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
 
   spec.add_development_dependency "droplet_kit", "~> 1.3"
-  spec.add_development_dependency "optparse-subcommand"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sistero
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Pike
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: optparse-subcommand
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Profile based digital ocean cluster management command line tool.
 email:
 - github@chilon.net