knife-server 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-## 0.2.2.dev (unreleased)
+## 0.2.3.dev (unreleased)
+
+
+## 0.2.2 (July 4, 2012)
+
+### New features
+
+* Add `knife server bootstrap standalone` subcommand to setup any server
+  accessible via SSH. ([@fnichol][])
+
+### Improvements
+
+* Add Code Climate badge to README. ([@fnichol][])
 
 
 ## 0.2.1 (July 3, 2012)

data/README.md

@@ -1,4 +1,4 @@
-# <a name="title"></a> Knife::Server [![Build Status](https://secure.travis-ci.org/fnichol/knife-server.png?branch=master)](http://travis-ci.org/fnichol/knife-server) [![Dependency Status](https://gemnasium.com/fnichol/knife-server.png)](https://gemnasium.com/fnichol/knife-server)
+# <a name="title"></a> Knife::Server [![Build Status](https://secure.travis-ci.org/fnichol/knife-server.png?branch=master)](http://travis-ci.org/fnichol/knife-server) [![Dependency Status](https://gemnasium.com/fnichol/knife-server.png)](https://gemnasium.com/fnichol/knife-server) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/fnichol/knife-server)
 
 An Opscode Chef knife plugin to manage Chef Servers. Bootstrapping new Chef
 Servers (currently on Amazon's EC2) and node data backup is supported.
@@ -13,6 +13,22 @@ $ knife server bootstrap ec2 --ssh-user ubuntu \
   --node-name chefapalooza.example.com
 ```
 
+Or maybe you want to try out a Chef Server using [Vagrant][vagrant_site]?
+
+```bash
+$ cat <<VAGRANTFILE > Vagrantfile
+Vagrant::Config.run do |config|
+  config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+  config.vm.network :hostonly, "192.168.33.11"
+  config.vm.customize ["modifyvm", :id, "--memory", 2048]
+end
+VAGRANTFILE
+$ vagrant up
+$ knife server bootstrap standalone --ssh-user vagrant \
+  --node-name chefapalooza.example.com --host 192.168.33.11
+```
+
 Taking a backup of all node, role, data bag, and environment data is also a
 snap:
 
@@ -251,6 +267,21 @@ The size of the EBS volume in GB, for EBS-backed instances.
 
 Do not delete EBS volumn on instance termination.
 
+### <a name="knife-server-bootstrap-standalone"></a> knife server bootstrap standalone
+Provisions a standalone server that is reachable on the network and sets up
+an Open Source Chef Server as described [above](#knife-server-bootstrap). You
+are responsible for providing the server so it could be a physical machine,
+Vagrant VM with host-only or bridged networking, or a cloud server instance
+with a known IP address or host name.
+
+#### Configuration
+
+##### --host FQDN_OR_IP (-H)
+
+Host name or IP address of the host to bootstrap.
+
+This option is **required**.
+
 ### <a name="knife-server-backup"></a> knife server backup
 
 Pulls Chef data primitives from a Chef Server as JSON for backup. Backups can
@@ -304,6 +335,13 @@ chef_server_url   = "https://api.opscode.com/organizations/coolinc"
 then a backup directory of
 `/var/chef/backups/api.opscode.com_20120401T084711-0000` would be created.
 
+##### --ssh-password PASSWORD (-P)
+
+The SSH password used (if needed) when bootstrapping the Chef Server node. If
+this option is not explicitly set and key based authentication fails, you will
+be prompted to enter a password in an interactive prompt. In other words,
+you may omit typing your password on the command line and defer to a prompt.
+
 ## <a name="roadmap"></a> Roadmap
 
 * Support for other platforms (alternative bootstrap templates)
@@ -349,4 +387,5 @@ Apache License, Version 2.0 (see [LICENSE][license])
 [jtimberman]:               https://github.com/jtimberman
 [knife-ec2]:                https://github.com/opscode/knife-ec2
 [stevendanna]:              https://github.com/stevendanna
+[vagrant_site]:             http://vagrantup.com/
 [wiki_knife]:               http://wiki.opscode.com/display/chef/Knife#Knife-Knifeconfiguration

data/lib/chef/knife/server_bootstrap_base.rb

@@ -0,0 +1,119 @@
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+# Copyright:: Copyright (c) 2012 Fletcher Nichol
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+
+class Chef
+  class Knife
+    module ServerBootstrapBase
+
+      def self.included(included_class)
+        included_class.class_eval do
+
+          deps do
+            require 'chef/knife/ssh'
+            require 'net/ssh'
+          end
+
+          option :chef_node_name,
+            :short => "-N NAME",
+            :long => "--node-name NAME",
+            :description => "The name of your new Chef Server"
+
+          option :platform,
+            :short => "-P PLATFORM",
+            :long => "--platform PLATFORM",
+            :description => "The platform type that will be bootstrapped (debian)",
+            :default => "debian"
+
+          option :ssh_user,
+            :short => "-x USERNAME",
+            :long => "--ssh-user USERNAME",
+            :description => "The ssh username",
+            :default => "root"
+
+          option :ssh_port,
+            :short => "-p PORT",
+            :long => "--ssh-port PORT",
+            :description => "The ssh port",
+            :default => "22",
+            :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
+
+          option :identity_file,
+            :short => "-i IDENTITY_FILE",
+            :long => "--identity-file IDENTITY_FILE",
+            :description => "The SSH identity file used for authentication"
+
+          option :prerelease,
+            :long => "--prerelease",
+            :description => "Install the pre-release chef gem"
+
+          option :bootstrap_version,
+            :long => "--bootstrap-version VERSION",
+            :description => "The version of Chef to install",
+            :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
+
+          option :template_file,
+            :long => "--template-file TEMPLATE",
+            :description => "Full path to location of template to use",
+            :proc => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
+            :default => false
+
+          option :distro,
+            :short => "-d DISTRO",
+            :long => "--distro DISTRO",
+            :description => "Bootstrap a distro using a template; default is 'chef-server-<platform>'"
+
+          option :webui_password,
+            :long => "--webui-password SECRET",
+            :description => "Initial password for WebUI admin account, default is 'chefchef'",
+            :default => "chefchef"
+
+          option :amqp_password,
+            :long => "--amqp-password SECRET",
+            :description => "Initial password for AMQP, default is 'chefchef'",
+            :default => "chefchef"
+        end
+      end
+
+      private
+
+      def fetch_validation_key
+        credentials_client.install_validation_key
+      end
+
+      def install_client_key
+        credentials_client.install_client_key(
+          Chef::Config[:node_name], Chef::Config[:client_key])
+      end
+
+      def create_root_client
+        ui.msg(credentials_client.create_root_client)
+      end
+
+      def bootstrap_distro
+        config[:distro] || "chef-server-#{config[:platform]}"
+      end
+
+      def credentials_client
+        @credentials_client ||= ::Knife::Server::Credentials.new(
+          ssh_connection, Chef::Config[:validation_key])
+      end
+    end
+  end
+end

data/lib/chef/knife/server_bootstrap_ec2.rb

@@ -16,85 +16,25 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require 'chef/knife/server_bootstrap_base'
 
 class Chef
   class Knife
     class ServerBootstrapEc2 < Knife
 
+      include Knife::ServerBootstrapBase
+
       deps do
-        require 'knife/server/ec2_security_group'
         require 'knife/server/ssh'
         require 'knife/server/credentials'
+        require 'knife/server/ec2_security_group'
         require 'chef/knife/ec2_server_create'
         require 'fog'
-        require 'net/ssh'
         Chef::Knife::Ec2ServerCreate.load_deps
       end
 
       banner "knife server bootstrap ec2 (options)"
 
-      option :chef_node_name,
-        :short => "-N NAME",
-        :long => "--node-name NAME",
-        :description => "The name of your new Chef Server"
-
-      option :platform,
-        :short => "-P PLATFORM",
-        :long => "--platform PLATFORM",
-        :description => "The platform type that will be bootstrapped (debian)",
-        :default => "debian"
-
-      option :ssh_user,
-        :short => "-x USERNAME",
-        :long => "--ssh-user USERNAME",
-        :description => "The ssh username",
-        :default => "root"
-
-      option :ssh_port,
-        :short => "-p PORT",
-        :long => "--ssh-port PORT",
-        :description => "The ssh port",
-        :default => "22",
-        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key }
-
-      option :identity_file,
-        :short => "-i IDENTITY_FILE",
-        :long => "--identity-file IDENTITY_FILE",
-        :description => "The SSH identity file used for authentication"
-
-      option :prerelease,
-        :long => "--prerelease",
-        :description => "Install the pre-release chef gem"
-
-      option :bootstrap_version,
-        :long => "--bootstrap-version VERSION",
-        :description => "The version of Chef to install",
-        :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
-
-      option :template_file,
-        :long => "--template-file TEMPLATE",
-        :description => "Full path to location of template to use",
-        :proc => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
-        :default => false
-
-      option :distro,
-        :short => "-d DISTRO",
-        :long => "--distro DISTRO",
-        :description => "Bootstrap a distro using a template; default is 'chef-server-<platform>'"
-
-      option :webui_password,
-        :long => "--webui-password SECRET",
-        :description => "Initial password for WebUI admin account, default is 'chefchef'",
-        :default => "chefchef"
-
-      option :amqp_password,
-        :long => "--amqp-password SECRET",
-        :description => "Initial password for AMQP, default is 'chefchef'",
-        :default => "chefchef"
-
-      # aws/ec2 options
-
       option :aws_access_key_id,
         :short => "-A ID",
         :long => "--aws-access-key-id KEY",
@@ -106,7 +46,6 @@ class Chef
         :long => "--aws-secret-access-key SECRET",
         :description => "Your AWS API Secret Access Key",
         :proc => Proc.new { |key| Chef::Config[:knife][:aws_secret_access_key] = key }
-
       option :region,
         :long => "--region REGION",
         :description => "Your AWS region",
@@ -219,28 +158,6 @@ class Chef
           merge({"Role" => "chef_server"}).map { |k,v| "#{k}=#{v}" }
       end
 
-      def bootstrap_distro
-        config[:distro] || "chef-server-#{config[:platform]}"
-      end
-
-      def credentials_client
-        @credentials_client ||= ::Knife::Server::Credentials.new(
-          ssh_connection, Chef::Config[:validation_key])
-      end
-
-      def fetch_validation_key
-        credentials_client.install_validation_key
-      end
-
-      def install_client_key
-        credentials_client.install_client_key(
-          Chef::Config[:node_name], Chef::Config[:client_key])
-      end
-
-      def create_root_client
-        ui.msg(credentials_client.create_root_client)
-      end
-
       def ssh_connection
         ::Knife::Server::SSH.new(
           :host => server_dns_name,

data/lib/chef/knife/server_bootstrap_standalone.rb

@@ -0,0 +1,100 @@
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+# Copyright:: Copyright (c) 2012 Fletcher Nichol
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/server_bootstrap_base'
+
+class Chef
+  class Knife
+    class ServerBootstrapStandalone < Knife
+
+      include Knife::ServerBootstrapBase
+
+      deps do
+        require 'knife/server/ssh'
+        require 'knife/server/credentials'
+        require 'chef/knife/bootstrap'
+        Chef::Knife::Bootstrap.load_deps
+      end
+
+      banner "knife server bootstrap standalone (options)"
+
+      option :host,
+        :short => "-H FQDN_OR_IP",
+        :long => "--host FQDN_OR_IP",
+        :description => "Hostname or IP address of host to bootstrap"
+
+      option :ssh_password,
+        :short => "-P PASSWORD",
+        :long => "--ssh-password PASSWORD",
+        :description => "The ssh password"
+
+      def run
+        validate!
+        check_ssh_connection
+        standalone_bootstrap.run
+        fetch_validation_key
+        create_root_client
+        install_client_key
+      end
+
+      def standalone_bootstrap
+        ENV['WEBUI_PASSWORD'] = config[:webui_password]
+        ENV['AMQP_PASSWORD'] = config[:amqp_password]
+        bootstrap = Chef::Knife::Bootstrap.new
+        bootstrap.name_args = [ config[:host] ]
+        [ :chef_node_name, :ssh_user, :ssh_password, :ssh_port, :identity_file
+        ].each { |attr| bootstrap.config[attr] = config[attr] }
+        bootstrap.config[:distro] = bootstrap_distro
+        bootstrap.config[:use_sudo] = true unless config[:ssh_user] == "root"
+        bootstrap
+      end
+
+      private
+
+      def validate!
+        if config[:chef_node_name].nil?
+          ui.error "You did not provide a valid --node-name value."
+          exit 1
+        end
+        if config[:host].nil?
+          ui.error "You did not provide a valid --host value."
+          exit 1
+        end
+      end
+
+      def check_ssh_connection
+        ssh_connection.exec! "hostname -f"
+      rescue Net::SSH::AuthenticationFailed
+        ui.warn("Failed to authenticate #{config[:ssh_user]} - " +
+                "trying password auth")
+        config[:ssh_password] = ui.ask(
+          "Enter password for #{config[:ssh_user]}@#{config[:host]}: "
+        ) { |q| q.echo = false }
+      end
+
+      def ssh_connection
+        ::Knife::Server::SSH.new(
+          :host => config[:host],
+          :user => config[:ssh_user],
+          :password => config[:ssh_password],
+          :port => config[:ssh_port]
+        )
+      end
+    end
+  end
+end

data/lib/knife/server/version.rb

@@ -18,6 +18,6 @@
 
 module Knife
   module Server
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

data/spec/chef/knife/server_bootstrap_ec2_spec.rb

@@ -17,10 +17,10 @@
 #
 
 require 'chef/knife/server_bootstrap_ec2'
-require 'chef/knife/ec2_server_create'
-require 'fog'
-require 'net/ssh'
+require 'chef/knife/ssh'
 require 'fakefs/spec_helpers'
+require 'net/ssh'
+Chef::Knife::ServerBootstrapEc2.load_deps
 
 describe Chef::Knife::ServerBootstrapEc2 do
   include FakeFS::SpecHelpers

data/spec/chef/knife/server_bootstrap_standalone_spec.rb

@@ -0,0 +1,251 @@
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+# Copyright:: Copyright (c) 2012 Fletcher Nichol
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/server_bootstrap_standalone'
+require 'chef/knife/ssh'
+require 'fakefs/spec_helpers'
+require 'net/ssh'
+Chef::Knife::ServerBootstrapStandalone.load_deps
+
+describe Chef::Knife::ServerBootstrapStandalone do
+  include FakeFS::SpecHelpers
+
+  before do
+    Chef::Log.logger = Logger.new(StringIO.new)
+    @knife = Chef::Knife::ServerBootstrapStandalone.new
+    @stdout = StringIO.new
+    @knife.ui.stub!(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    @knife.ui.stub!(:stderr).and_return(@stderr)
+    @knife.config[:chef_node_name] = "yakky"
+  end
+
+  describe "#standalone_bootstrap" do
+    before do
+      @knife.config[:host] = "172.0.10.21"
+      @knife.config[:chef_node_name] = "shave.yak"
+      @knife.config[:ssh_user] = "jdoe"
+      @knife.config[:ssh_password] = "nevereverguess"
+      @knife.config[:ssh_port] = "2222"
+      @knife.config[:identity_file] = "~/.ssh/mykey_dsa"
+      @knife.config[:security_groups] = %w{x y z}
+      @knife.config[:tags] = %w{tag1=val1 tag2=val2}
+      @knife.config[:distro] = "distro-praha"
+      @knife.config[:ebs_size] = "42"
+      @knife.config[:webui_password] = "daweb"
+      @knife.config[:amqp_password] = "queueitup"
+
+      ENV['_SPEC_WEBUI_PASSWORD'] = ENV['WEBUI_PASSWORD']
+      ENV['_SPEC_AMQP_PASSWORD'] = ENV['AMQP_PASSWORD']
+    end
+
+    after do
+      ENV['WEBUI_PASSWORD'] = ENV.delete('_SPEC_WEBUI_PASSWORD')
+      ENV['AMQP_PASSWORD'] = ENV.delete('_SPEC_AMQP_PASSWORD')
+    end
+
+    let(:bootstrap) { @knife.standalone_bootstrap }
+
+    it "returns a Bootstrap instance" do
+      bootstrap.should be_a(Chef::Knife::Bootstrap)
+    end
+
+    it "configs the bootstrap's chef_node_name" do
+      bootstrap.config[:chef_node_name].should eq("shave.yak")
+    end
+
+    it "configs the bootstrap's ssh_user" do
+      bootstrap.config[:ssh_user].should eq("jdoe")
+    end
+
+    it "configs the bootstrap's ssh_password" do
+      bootstrap.config[:ssh_password].should eq("nevereverguess")
+    end
+
+    it "does not config the bootstrap's ssh_password if not given" do
+      @knife.config.delete(:ssh_password)
+
+      bootstrap.config[:ssh_password].should be_nil
+    end
+
+    it "configs the bootstrap's ssh_port" do
+      bootstrap.config[:ssh_port].should eq("2222")
+    end
+
+    it "configs the bootstrap's identity_file" do
+      bootstrap.config[:identity_file].should eq("~/.ssh/mykey_dsa")
+    end
+
+    it "configs the bootstrap's distro" do
+      bootstrap.config[:distro].should eq("distro-praha")
+    end
+
+    it "configs the bootstrap's distro to chef-server-debian by default" do
+      @knife.config.delete(:distro)
+
+      bootstrap.config[:distro].should eq("chef-server-debian")
+    end
+
+    it "configs the bootstrap's distro value driven off platform value" do
+      @knife.config.delete(:distro)
+      @knife.config[:platform] = "freebsd"
+
+      bootstrap.config[:distro].should eq("chef-server-freebsd")
+    end
+
+    it "configs the bootstrap's ENV with the webui password" do
+      bootstrap
+      ENV['WEBUI_PASSWORD'].should eq("daweb")
+    end
+
+    it "configs the bootstrap's ENV with the amqp password" do
+      bootstrap
+      ENV['AMQP_PASSWORD'].should eq("queueitup")
+    end
+
+    it "configs the bootstrap's name_args with the host" do
+      bootstrap.name_args.should eq([ "172.0.10.21" ])
+    end
+
+    it "configs the bootstrap's use_sudo to true if ssh-user is not root" do
+      bootstrap.config[:use_sudo].should be_true
+    end
+
+    it "configs the bootstrap's use_sudo to false if ssh-user is root" do
+      @knife.config[:ssh_user] = "root"
+
+      bootstrap.config[:use_sudo].should_not be_true
+    end
+  end
+
+  describe "#run" do
+    before do
+      @before_config = Hash.new
+      [:node_name, :client_key].each do |attr|
+        @before_config[attr] = Chef::Config[attr]
+      end
+      Chef::Config[:node_name] = "smithers"
+      Chef::Config[:client_key] = "/var/tmp/myclientkey.pem"
+
+      @knife.config[:host] = "192.168.0.1"
+      @knife.config[:ssh_port] = "2345"
+      Chef::Knife::Bootstrap.stub(:new) { bootstrap }
+      Knife::Server::SSH.stub(:new) { ssh }
+      Knife::Server::Credentials.stub(:new) { credentials }
+      credentials.stub(:install_validation_key)
+      credentials.stub(:create_root_client)
+    end
+
+    after do
+      [:node_name, :client_key].each do |attr|
+        Chef::Config[attr] = @before_config[attr]
+      end
+    end
+
+    let(:bootstrap) do
+      stub(:run => true, :config => Hash.new, :name_args= => true)
+    end
+
+    let(:ssh)         { stub(:exec! => true) }
+    let(:credentials) { stub.as_null_object }
+
+    it "exits if node_name option is missing" do
+      @knife.config.delete(:chef_node_name)
+
+      expect { @knife.run }.to raise_error SystemExit
+    end
+
+    it "exits if host option is missing" do
+      @knife.config.delete(:host)
+
+      expect { @knife.run }.to raise_error SystemExit
+    end
+
+    it "bootstraps a standalone server" do
+      bootstrap.should_receive(:run)
+      @knife.run
+    end
+
+    it "create a root client key" do
+      credentials.should_receive(:create_root_client)
+
+      @knife.run
+    end
+
+    it "installs a client key" do
+      credentials.should_receive(:install_client_key).
+        with("smithers", "/var/tmp/myclientkey.pem")
+
+      @knife.run
+    end
+
+    it "installs a new validation.pem key from the server" do
+      Knife::Server::Credentials.should_receive(:new).
+        with(ssh, "/etc/chef/validation.pem")
+      credentials.should_receive(:install_validation_key)
+
+      @knife.run
+    end
+
+    context "when an ssh password is missing" do
+      it "creates an SSH connection without a password" do
+        Knife::Server::SSH.should_receive(:new).with({
+          :host => "192.168.0.1", :port => "2345",
+          :user => "root", :password => nil
+        })
+
+        @knife.run
+      end
+    end
+
+    context "when an ssh password is provided" do
+      before do
+        @knife.config[:ssh_password] = "snoopy"
+      end
+
+      it "creates an SSH connection with a password" do
+        Knife::Server::SSH.should_receive(:new).with({
+          :host => "192.168.0.1", :port => "2345",
+          :user => "root", :password => "snoopy"
+        })
+
+        @knife.run
+      end
+    end
+
+    context "when key-based ssh authentication fails" do
+      before do
+        ssh.stub(:exec!).
+          with("hostname -f") { raise ::Net::SSH::AuthenticationFailed }
+        @knife.ui.stub(:ask)  { "hellacool" }
+      end
+
+      it "sends a authentication failure message" do
+        @knife.ui.should_receive(:warn).with(/Failed to authenticate/i)
+
+        @knife.run
+      end
+
+      it "sets the :ssh_password config from user input" do
+        @knife.run
+
+        @knife.config[:ssh_password].should eq("hellacool")
+      end
+    end
+  end
+end

data/spec/knife/server/ssh_spec.rb

@@ -43,7 +43,8 @@ describe Knife::Server::SSH do
 
   it "sets default user to root" do
     ssh_options.delete(:user)
-    Net::SSH.should_receive(:start).with(anything, "root", anything)
+    Net::SSH.should_receive(:start).
+      with(anything, "root", anything)
 
     Knife::Server::SSH.new(ssh_options).exec!("wat")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-server
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2156639540 !ruby/object:Gem::Requirement
+  requirement: &2164645740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2156639540
+  version_requirements: *2164645740
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &2156638860 !ruby/object:Gem::Requirement
+  requirement: &2164645080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156638860
+  version_requirements: *2164645080
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &2156637980 !ruby/object:Gem::Requirement
+  requirement: &2164644240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.10.10
   type: :runtime
   prerelease: false
-  version_requirements: *2156637980
+  version_requirements: *2164644240
 - !ruby/object:Gem::Dependency
   name: knife-ec2
-  requirement: &2156637180 !ruby/object:Gem::Requirement
+  requirement: &2164643440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.12
   type: :runtime
   prerelease: false
-  version_requirements: *2156637180
+  version_requirements: *2164643440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156636480 !ruby/object:Gem::Requirement
+  requirement: &2164642700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *2156636480
+  version_requirements: *2164642700
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2156635860 !ruby/object:Gem::Requirement
+  requirement: &2164642100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2156635860
+  version_requirements: *2164642100
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2156635340 !ruby/object:Gem::Requirement
+  requirement: &2164641600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *2156635340
+  version_requirements: *2164641600
 description: Chef Knife plugin to bootstrap Chef Servers
 email:
 - fnichol@nichol.ca
@@ -106,7 +106,9 @@ files:
 - knife-server.gemspec
 - lib/chef/knife/bootstrap/chef-server-debian.erb
 - lib/chef/knife/server_backup.rb
+- lib/chef/knife/server_bootstrap_base.rb
 - lib/chef/knife/server_bootstrap_ec2.rb
+- lib/chef/knife/server_bootstrap_standalone.rb
 - lib/knife-server.rb
 - lib/knife/server/credentials.rb
 - lib/knife/server/ec2_security_group.rb
@@ -114,6 +116,7 @@ files:
 - lib/knife/server/version.rb
 - spec/chef/knife/server_backup_spec.rb
 - spec/chef/knife/server_bootstrap_ec2_spec.rb
+- spec/chef/knife/server_bootstrap_standalone_spec.rb
 - spec/knife/server/credientials_spec.rb
 - spec/knife/server/ec2_security_group_spec.rb
 - spec/knife/server/ssh_spec.rb
@@ -144,6 +147,7 @@ summary: Chef Knife plugin to bootstrap Chef Servers
 test_files:
 - spec/chef/knife/server_backup_spec.rb
 - spec/chef/knife/server_bootstrap_ec2_spec.rb
+- spec/chef/knife/server_bootstrap_standalone_spec.rb
 - spec/knife/server/credientials_spec.rb
 - spec/knife/server/ec2_security_group_spec.rb
 - spec/knife/server/ssh_spec.rb