netvbox 0.0.4 → 0.0.5

data/bin/netvbox

@@ -3,6 +3,7 @@
 require 'netvbox/vm_set_config'
 require 'netvbox/vm_set_manager'
 require 'netvbox/printing_delegator'
+require 'netvbox/wizard_delegator'
 require 'netvbox/version'
 
 NETVBOX_HOME = "#{ENV['HOME']}/.netvbox"
@@ -38,6 +39,9 @@ def print_help
   puts '         uses the default vm set'
   puts '    useset <set name>'
   puts '         uses the vm set with the specified name'
+  puts
+  puts '* Tip: You will be prompted for input if you leave out sub-command'
+  puts '       arguments (e.g. netvbox add)'
 end
 
 def expect_args(num_expected_args)
@@ -53,40 +57,50 @@ def process_args
   command = ARGV[0]
   vm_set_manager = NetVbox::VmSetManager.new(NETVBOX_HOME)
   vm_set = vm_set_manager.current_set
-  delegator = NetVbox::PrintingDelegator.new(vm_set_manager, vm_set)
-  case command
-  when 'add'
-    expect_args(6) do
-      hostname, username, password, vm_name, snapshot_name = ARGV[1..5]
-      delegator.add_vm(hostname, username, password, vm_name, snapshot_name)
-    end
-  when 'list'
-    delegator.list_vms
-  when 'load'
-    delegator.load_snapshots
-  when 'poweroff'
-    delegator.poweroff_all
-  when 'remove'
-    expect_args(5) do
-      hostname, username, vm_name, snapshot_name = ARGV[1..4]
-      delegator.remove_vm(hostname, username, vm_name, snapshot_name)
+  printing_delegator = NetVbox::PrintingDelegator.new(vm_set_manager, vm_set)
+  wizard_delegator = NetVbox::WizardDelegator.new(printing_delegator)
+  begin
+    case command
+    when 'add'
+      return wizard_delegator.add_vm if ARGV.length == 1
+      expect_args(6) do
+        hostname, username, password, vm_name, snapshot_name = ARGV[1..5]
+        printing_delegator.add_vm(hostname, username, password, vm_name, snapshot_name)
+      end
+    when 'list'
+      printing_delegator.list_vms
+    when 'load'
+      printing_delegator.load_snapshots
+    when 'poweroff'
+      printing_delegator.poweroff_all
+    when 'remove'
+      return wizard_delegator.remove_vm if ARGV.length == 1
+      expect_args(5) do
+        hostname, username, vm_name, snapshot_name = ARGV[1..4]
+        printing_delegator.remove_vm(hostname, username, vm_name, snapshot_name)
+      end
+    when 'status'
+      printing_delegator.print_status
+    when 'createset'
+      return wizard_delegator.create_set if ARGV.length == 1
+      expect_args(2) {printing_delegator.create_set ARGV[1]}
+    when 'currentset'
+      printing_delegator.print_current_set
+    when 'listsets'
+      printing_delegator.list_sets
+    when 'removeset'
+      return wizard_delegator.remove_set if ARGV.length == 1
+      expect_args(2) {printing_delegator.remove_set ARGV[1]}
+    when 'usedefaultset'
+      printing_delegator.use_default_set
+    when 'useset'
+      return wizard_delegator.use_set if ARGV.length == 1
+      expect_args(2) {printing_delegator.use_set ARGV[1]}
+    else
+      puts "Unknown command: #{command}. See help."
     end
-  when 'status'
-    delegator.print_status
-  when 'createset'
-    expect_args(2) {delegator.create_set ARGV[1]}
-  when 'currentset'
-    delegator.print_current_set
-  when 'listsets'
-    delegator.list_sets
-  when 'removeset'
-    expect_args(2) {delegator.remove_set ARGV[1]}
-  when 'usedefaultset'
-    delegator.use_default_set
-  when 'useset'
-    expect_args(2) {delegator.use_set ARGV[1]}
-  else
-    puts "Unknown command: #{command}. See help."
+  rescue Interrupt
+    puts
   end
 end
 

data/lib/netvbox/version.rb

@@ -1,3 +1,3 @@
 module NetVbox
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/netvbox/wizard_delegator.rb

@@ -0,0 +1,63 @@
+require 'netvbox/printing_delegator'
+require 'highline/import'
+
+module NetVbox
+  class WizardDelegator
+    def initialize(printing_delegator)
+      @printing_delegator = printing_delegator
+    end
+
+    def add_vm
+      hostname = get_value 'Enter hostname of VM host: '
+      username = get_value 'Enter ssh username: '
+      pw = get_password 'Enter ssh password: '
+      vm_name = get_value 'Enter VM name: '
+      snapshot_name = get_value 'Enter snapshot name: '
+      @printing_delegator.add_vm(hostname, username, pw, vm_name, snapshot_name)
+    end
+
+    def remove_vm
+      hostname = get_value 'Enter hostname of VM host: '
+      username = get_value 'Enter ssh username: '
+      vm_name = get_value 'Enter VM name: '
+      snapshot_name = get_value 'Enter snapshot name: '
+      @printing_delegator.remove_vm(hostname, username, vm_name, snapshot_name)
+    end
+
+    def create_set
+      set_name = get_value 'Enter set name: '
+      @printing_delegator.create_set set_name
+    end
+
+    def remove_set
+      set_name = get_value 'Enter set name: '
+      @printing_delegator.remove_set set_name
+    end
+
+    def use_set
+      set_name = get_value 'Enter set name: '
+      @printing_delegator.use_set set_name
+    end
+
+    private
+
+    def get_value(prompt)
+      input = ''
+      while input.empty?
+        print prompt
+        input = STDIN.gets.chomp
+        puts 'Cannot be blank' if input.empty?
+      end
+      input
+    end
+
+    def get_password(prompt)
+      pw = ''
+      while pw.empty?
+        pw = ask(prompt) {|q| q.echo = false}
+        puts 'Cannot be blank' if pw.empty?
+      end
+      pw
+    end
+  end
+end

data/netvbox.gemspec

@@ -12,8 +12,9 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   s.require_paths = ["lib"]
 
-  s.add_dependency "net-ssh"
+  s.add_dependency 'net-ssh'
+  s.add_dependency 'highline'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netvbox
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000 Z
+date: 2011-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &13997300 !ruby/object:Gem::Requirement
+  requirement: &8515500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13997300
+  version_requirements: *8515500
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &8529760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *8529760
 description: 
 email:
 - hsu.dennis@gmail.com
@@ -42,6 +53,7 @@ files:
 - lib/netvbox/vm_set.rb
 - lib/netvbox/vm_set_config.rb
 - lib/netvbox/vm_set_manager.rb
+- lib/netvbox/wizard_delegator.rb
 - netvbox.gemspec
 homepage: https://github.com/dhsu/netvbox
 licenses: []