knife-vagrant 0.0.3 → 0.0.4

data/README.md

@@ -24,24 +24,35 @@ Usage
 knife vagrant test (options)
 
     -b, --box BOX                    Name of vagrant box to be provisioned
-
     -U, --box-url URL                URL of pre-packaged vbox template.  Can be a local path or an HTTP URL.  Defaults to ./package.box
-
     -l, --chef-loglevel LEVEL        Logging level for the chef-client process that runs inside the provisioned VM.  Default is INFO
-
+    -s, --server-url URL             Chef Server URL
+    -k, --key KEY                    API Client Key
+        --[no-]color                 Use colored output, defaults to enabled
+    -c, --config CONFIG              The configuration file to use
+        --defaults                   Accept default values for all questions
     -x, --destroy                    Destroy vagrant box and delete chef node/client when finished
-
+    -d, --disable-editing            Do not open EDITOR, just accept the data as is
+    -e, --editor EDITOR              Set the editor to use for interactive commands
     -E, --environment ENVIRONMENT    Set the Chef environment
-
+    -F, --format FORMAT              Which format to use for output
     -H, --hostname HOSTNAME          Hostname to be set as hostname on vagrant box when provisioned
-
     -m, --memsize MEMORY             Amount of RAM to allocate to provisioned VM, in MB.  Defaults to 1024
-
-    -D, --vagrant-dir PATH           Path to vagrant project directory.  Defaults to cwd (/home/mgarrett/knife-vagrant) if not specified
-
+    -u, --user USER                  API Client Username
+    -p, --port-forward PORTS         Port forwarding.  Host port, VM port separated by a colon.  E.G. to forward 80 on the 
+                                     host machine to 8080 on the VM, -p 80:8080.  
+                                     To list multiple forwards separate with a comma, e.g. "-p 80:8080,22:2222"
+        --print-after                Show the data after a destructive operation
+    -D, --vagrant-dir PATH           Path to vagrant project directory.  Defaults to cwd (/Users/mgarrett/vagrant) if not specified
     -r, --vagrant-run-list RUN_LIST  Comma separated list of roles/recipes to apply
-
+    -V, --verbose                    More verbose output. Use twice for max verbosity
+    -v, --version                    Show chef version
     -y, --yes                        Say yes to all prompts for confirmation
+    -h, --help                       Show this message
+
+#### Example
+
+    knife vagrant test -b base -H vagrant-mgarrett01 -r role[vagrant] -m 2048 -p 22:2222,8080:8080 -b box64 -U http://files.vagrantup.com/lucid64.box -xy
 
 Disclaimer
 -------------------

data/lib/chef/knife/vagrant_test.rb

@@ -14,14 +14,19 @@ module KnifePlugins
       require 'chef/node'
       require 'chef/api_client'
     end
+
+    option :port_forward,
+      :short => '-p PORTS',
+      :long => '--port-forward PORTS',
+      :description => "Port forwarding.  Host port, VM port separated by a colon.  E.G. to forward 80 on the host machine to 8080 on the VM, -p 80:8080.  To list multiple forwards separate with a comma, e.g. \"-p 80:8080,22:2222\"",
+      :proc => lambda { |o| Hash[o.split(/,/).collect { |a| a.split(/:/) }] },
+      :default => {}
  
-    # Default is nil here because if :cwd passed to the Vagrant::Environment object is nil,
-    # it defaults to Dir.pwd, which is the cwd of the running process.
     option :vagrant_dir,
       :short => '-D PATH',
       :long => '--vagrant-dir PATH',
       :description => "Path to vagrant project directory.  Defaults to cwd (#{Dir.pwd}) if not specified",
-      :default => nil
+      :default => Dir.pwd
       
     option :vagrant_run_list,
       :short => "-r RUN_LIST",
@@ -71,11 +76,15 @@ module KnifePlugins
       runlist.collect { |i| "\"#{i}\"" }.join(",\n")
     end
 
+    def build_port_forwards(ports)
+      ports.collect { |k, v| "config.vm.forward_port(#{k}, #{v})" }.join("\n")
+    end
+
     # TODO:  see if there's a way to pass this whole thing in as an object or hash or something, instead of writing a file to disk.
     def build_vagrantfile
       file = <<-EOF
         Vagrant::Config.run do |config|
-          config.vm.forward_port(22, 2222)
+          #{build_port_forwards(config[:port_forward])}
           config.vm.box = "#{config[:box]}"
           config.vm.host_name = "#{config[:hostname]}"
           config.vm.customize [ "modifyvm", :id, "--memory", #{config[:memsize]} ]
@@ -120,9 +129,9 @@ module KnifePlugins
       ensure
         if config[:destroy]
           ui.confirm("Destroy vagrant box #{config[:box]} and delete chef node and client")
-          config[:yes] = true
           args = %w[ destroy --force ]
           @vagrant_env.cli(args)
+          config[:yes]
           delete_object(Chef::Node, config[:hostname])
           delete_object(Chef::ApiClient, config[:hostname])
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: