knife-server 1.0.1 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6ac23ba3967334f48e3bad6406358d0653812228
+  data.tar.gz: b1a1d3dd1f2616444e7a9fbe1bd3dde52a696091
+SHA512:
+  metadata.gz: 9a19382e580ef0d6336bb74f5bef965641785c6f81c327a84d459195e82a67783181805cb6d4e2f9dc34077b13eb2ce2e504d5718e35380a7173cd770a2b171a
+  data.tar.gz: bb62f7d5d3c90f81e071aa975abfa9fc9be7625c6b9e1af375978a5cd689bc57e03400559a37e00785b074e35ea06c38f476e57e442679c3e8c11b3244e68a93

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
 - 2.0.0
 - 1.9.2
 - ruby-head
-- 1.8.7
 
 env:
 - "CHEF_VERSION=11.4.0"

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.1.0 / 2013-07-26
+
+### New features
+
+* Pull request [#42][]: Add support for Linode (via the knife-linode gem). ([@fnichol][])
+
+### Improvements
+
+* Pull request [#41][]: Add new option pretty_print for knife server backup. ([@sawanoboly][])
+
 ## 1.0.1 / 2013-04-11
 
 ### Bug fixes
@@ -5,7 +15,7 @@
 * Pull request [#29][]: Fix README typo in ssh password argument. ([@ranjib][])
 * Pull request [#34][]: Fix AMQP_PASSWORD propagation. ([@erikh][])
 
-### Improvement
+### Improvements
 
 * Pull request [#35][]: Add VPC support. ([@jssjr][])
 * Pull request [#34][]: Provide better information when the package can't be
@@ -141,25 +151,28 @@ The initial release.
 
 
 <!--- The following link definition list is generated by PimpMyChangelog --->
-[#2]: https://github.com/fnichol/knife/issues/2
-[#3]: https://github.com/fnichol/knife/issues/3
-[#5]: https://github.com/fnichol/knife/issues/5
-[#7]: https://github.com/fnichol/knife/issues/7
-[#8]: https://github.com/fnichol/knife/issues/8
-[#9]: https://github.com/fnichol/knife/issues/9
-[#10]: https://github.com/fnichol/knife/issues/10
-[#11]: https://github.com/fnichol/knife/issues/11
-[#13]: https://github.com/fnichol/knife/issues/13
-[#15]: https://github.com/fnichol/knife/issues/15
-[#29]: https://github.com/fnichol/knife/issues/29
-[#34]: https://github.com/fnichol/knife/issues/34
-[#35]: https://github.com/fnichol/knife/issues/35
+[#2]: https://github.com/fnichol/knife-server/issues/2
+[#3]: https://github.com/fnichol/knife-server/issues/3
+[#5]: https://github.com/fnichol/knife-server/issues/5
+[#7]: https://github.com/fnichol/knife-server/issues/7
+[#8]: https://github.com/fnichol/knife-server/issues/8
+[#9]: https://github.com/fnichol/knife-server/issues/9
+[#10]: https://github.com/fnichol/knife-server/issues/10
+[#11]: https://github.com/fnichol/knife-server/issues/11
+[#13]: https://github.com/fnichol/knife-server/issues/13
+[#15]: https://github.com/fnichol/knife-server/issues/15
+[#29]: https://github.com/fnichol/knife-server/issues/29
+[#34]: https://github.com/fnichol/knife-server/issues/34
+[#35]: https://github.com/fnichol/knife-server/issues/35
+[#41]: https://github.com/fnichol/knife-server/issues/41
+[#42]: https://github.com/fnichol/knife-server/issues/42
 [@danryan]: https://github.com/danryan
 [@erikh]: https://github.com/erikh
 [@fnichol]: https://github.com/fnichol
 [@iafonov]: https://github.com/iafonov
 [@jssjr]: https://github.com/jssjr
 [@ranjib]: https://github.com/ranjib
+[@sawanoboly]: https://github.com/sawanoboly
 [@stormsilver]: https://github.com/stormsilver
 [@wpeterson]: https://github.com/wpeterson
-[@xdissent]: https://github.com/xdissent
+[@xdissent]: https://github.com/xdissent

data/README.md

@@ -4,8 +4,9 @@
 [![Code Climate](https://codeclimate.com/github/fnichol/knife-server.png)](https://codeclimate.com/github/fnichol/knife-server)
 
 An Opscode Chef knife plugin to manage Chef Servers. Bootstrap a new Chef
-Server on Amazon's EC2 or a standalone server. Backup and restore your Chef
-Server or Hosted Chef's node, role, data bag, and environment JSON data.
+Server on Amazon's EC2, Linode or a standalone server. Backup and restore
+your Chef Server or Hosted Chef's node, role, data bag, and environment JSON
+data.
 
 ## <a name="usage"></a> Usage
 
@@ -36,15 +37,30 @@ $ knife server bootstrap ec2 \
   --ssh-user ubuntu
 ```
 
+To spin up your Chef Server on Linode:
+
+```bash
+knife server bootstrap linode \
+  --node-name linny.example.com \
+  --linode-node-name linny \
+  --linode-api-key $LINODE_API_KEY \
+  --linode-datacenter 3 \
+  --linode-flavor 1 \
+  --linode-image 99 \
+  --ssh-password 'testing1234'
+```
+
 Or maybe you want to try out a Chef Server using [Vagrant][vagrant_site]?
 
 ```bash
 $ cat <<VAGRANTFILE > Vagrantfile
-Vagrant::Config.run do |config|
+Vagrant.configure("2") do |config|
   config.vm.box = "precise64"
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"
-  config.vm.network :hostonly, "192.168.33.10"
-  config.vm.customize ["modifyvm", :id, "--memory", 2048]
+  config.vm.network :private_network, ip: "192.168.33.10"
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--memory", 2048]
+  end
 end
 VAGRANTFILE
 $ vagrant up
@@ -92,11 +108,12 @@ Add this line to your application's Gemfile:
 gem 'knife-server'
 ```
 
-**Note** If you want to use the `bootstrap ec2` subcommand you will need to
-explicitly add this to your Gemfile with:
+**Note** If you want to use the `bootstrap ec2` or `bootstrap linode`
+subcommands you will need to explicitly add this to your Gemfile with:
 
 ```ruby
 gem 'knife-ec2'
+gem 'knife-linode'
 ```
 
 Finally execute:
@@ -111,8 +128,8 @@ Or install it yourself as:
 $ gem install knife-server
 ```
 
-(Don't forget a `gem install knife-ec2` if using the `bootstrap ec2`
-subcommand).
+(Don't forget a `gem install knife-ec2` or `gem install knife-linode` if using
+the `bootstrap ec2` or `bootstrap linode` subcommands).
 
 Next, you **must** set up a [knife.rb configuration](#installation-knife) so
 that the shipped Knife subcommands know where to place and modify key files,
@@ -156,11 +173,15 @@ add some of the common configuration to your `~/.chef/knife.rb` or your
 projects `.chef/knife.rb` file like so:
 
 ```ruby
+# for aws/ec2
 knife[:aws_access_key_id] = "MY_KEY"
 knife[:aws_secret_access_key] = "MY_SECRET"
 knife[:region] = "us-west-2"
 knife[:availability_zone] = "us-west-2a"
 knife[:flavor] = "t1.micro"
+
+# for linode
+knife[:linode_api_key] = "MY_KEY"
 ```
 
 Better yet, why not try a more generic [knife.rb][chef_bootstrap_knife_rb] file
@@ -373,6 +394,69 @@ The resulting set will include:
 * `"Node=#{config[:chef_node_name]}"`
 * `"Role=chef_server"`
 
+### <a name="knife-server-bootstrap-linode"></a> knife server bootstrap linode
+
+**Note:** You must install the [knife-linode gem][knife-linode] to use this
+subcommand. This was done to keep the dependencies of this library lighter and
+to make future cloud adapter support easier to add.
+
+Provisions a Linode instance and sets up an Open Source Chef Server as
+described [above](#knife-server-bootstrap).
+
+#### Configuration
+
+This subcommand imports all relavent options from the knife-linode gem. For
+detailed documentation relating to these options, please visit the [docs
+page][docs_knife_linode].
+
+##### --linode-api-key KEY (-A)
+
+Your Linode API Key.
+
+This option is **required**.
+
+##### --linode-datacenter DATACENTER (-D)
+
+The datacenter for the server.
+
+The default value is `3` (Use `knife linode datacenter list` for a list of
+choices)
+
+##### --linode-flavor FLAVOR (-f)
+
+The flavor of server.
+
+The default value is `1`. (Use `knife linode flavor list` for a list of
+choices)
+
+##### --linode-image IMAGE (-i)
+
+The image for the server.
+
+The default value is `93`. (Use `knife linode image list` for a list of
+choices)
+
+##### --linode-kernel KERNEL (-k)
+
+The kernel for the server.
+
+The default value is `138`. (Use `knife linode kernel list` for a list of
+choices)
+
+##### --linode-node-name NAME (-L)
+
+The Linode node name for your new node.
+
+This option is **required**.
+
+##### --ssh-password PASSWORD (-P)
+
+The ssh password. If a password is not provided, then a random password will be
+generated and echoed in logging output. It is recommended that you specify a
+password so that you know how to connect later.
+
+The default value is a random password.
+
 ### <a name="knife-server-bootstrap-standalone"></a> knife server bootstrap standalone
 
 Provisions a standalone server that is reachable on the network and sets up
@@ -533,8 +617,10 @@ Apache License, Version 2.0 (see [LICENSE][license])
 [chef_bootstrap_repo]:      https://github.com/fnichol/chef-bootstrap-repo/
 [docs_knife]:               http://docs.opscode.com/config_rb_knife.html
 [docs_knife_ec2]:           http://docs.opscode.com/plugin_knife_ec2.html
+[docs_knife_linode]:        http://docs.opscode.com/plugin_knife_linode.html
 [jtimberman]:               https://github.com/jtimberman
 [install_chef]:             http://www.opscode.com/chef/install/
 [knife-ec2]:                https://github.com/opscode/knife-ec2
+[knife-linode]:             https://github.com/opscode/knife-linode
 [stevendanna]:              https://github.com/stevendanna
 [vagrant_site]:             http://vagrantup.com/

data/knife-server.gemspec

@@ -15,13 +15,16 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Knife::Server::VERSION
 
+  gem.required_ruby_version = ">= 1.9.2"
+
   gem.add_dependency "fog",       "~> 1.3"
   gem.add_dependency "net-ssh"
   gem.add_dependency "chef",      ">= 0.10.10"
 
   gem.add_development_dependency "knife-ec2", ">= 0.5.12"
+  gem.add_development_dependency "knife-linode"
 
-  gem.add_development_dependency "rspec", "~> 2.10"
+  gem.add_development_dependency "rspec", "~> 2.13.0"
   gem.add_development_dependency "fakefs", "~> 0.4.0"
   gem.add_development_dependency "timecop", "~> 0.3"
 end

data/lib/chef/knife/server_backup.rb

@@ -35,6 +35,11 @@ class Chef
         :long => "--backup-dir DIR",
         :description => "The directory to host backup files"
 
+      option :pretty_print,
+        :short => "-P",
+        :long => "--pretty_print",
+        :description => "Generate Pretty JSON for file."
+
       def run
         validate!
         components = name_args.empty? ? COMPONENTS.keys : name_args
@@ -91,7 +96,11 @@ class Chef
         obj = c[:klass].load(name)
         ui.msg "Backing up #{c[:singular]}[#{name}]"
         ::File.open(::File.join(dir_path, "#{name}.json"), "wb") do |f|
-          f.write(obj.to_json)
+          if config[:pretty_print]
+            f.write(JSON.pretty_generate(obj))
+          else
+            f.write(obj.to_json)
+          end
         end
       end
 
@@ -103,7 +112,11 @@ class Chef
           obj = Chef::DataBagItem.load(name, item_name)
           ui.msg "Backing up #{c[:singular]}[#{name}][#{item_name}]"
           ::File.open(::File.join(item_path, "#{item_name}.json"), "wb") do |f|
-            f.write(obj.to_json)
+            if config[:pretty_print]
+              f.write(JSON.pretty_generate(obj))
+            else
+              f.write(obj.to_json)
+            end
           end
         end
       end

data/lib/chef/knife/server_bootstrap_linode.rb

@@ -0,0 +1,117 @@
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+# Copyright:: Copyright (c) 2013 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 ServerBootstrapLinode < Knife
+
+      banner "knife server bootstrap linode (options)"
+
+      include Knife::ServerBootstrapBase
+
+      deps do
+        require 'knife/server/ssh'
+        require 'knife/server/credentials'
+
+        begin
+          require 'chef/knife/linode_server_create'
+          require 'fog'
+          Chef::Knife::LinodeServerCreate.load_deps
+
+          current_options = self.options
+          self.options = Chef::Knife::LinodeServerCreate.options.dup
+          self.options.merge!(current_options)
+        rescue LoadError => ex
+          ui.error [
+            "Knife plugin knife-linode could not be loaded.",
+            "Please add the knife-linode gem to your Gemfile or",
+            "install the gem manually with `gem install knife-linode'.",
+            "(#{ex.message})"
+          ].join(" ")
+          exit 1
+        end
+      end
+
+      def run
+        validate!
+        linode_bootstrap.run
+        fetch_validation_key
+        create_root_client
+        install_client_key
+      end
+
+      def linode_bootstrap
+        ENV['WEBUI_PASSWORD'] = config_val(:webui_password)
+        ENV['AMQP_PASSWORD'] = config_val(:amqp_password)
+        ENV['NO_TEST'] = "1" if config[:no_test]
+        bootstrap = Chef::Knife::LinodeServerCreate.new
+        Chef::Knife::LinodeServerCreate.options.keys.each do |attr|
+          bootstrap.config[attr] = config_val(attr)
+        end
+        bootstrap.config[:distro] = bootstrap_distro
+        bootstrap
+      end
+
+      def linode_connection
+        @linode_connection ||= Fog::Compute.new(
+          :provider => 'Linode',
+          :linode_api_key => config_val(:linode_api_key)
+        )
+      end
+
+      def server_ip_address
+        server = linode_connection.servers.find do |s|
+          s.status == 1 && s.name == config_val(:linode_node_name)
+        end
+
+        server && server.public_ip_address
+      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_val(:platform) == "auto"
+          ui.error "Auto platform mode cannot be used with knife-linode plugin"
+          exit 1
+        end
+      end
+
+      def ssh_connection
+        opts = {
+          :host     => server_ip_address,
+          :user     => config_val(:ssh_user),
+          :port     => "22",
+          :keys     => [config_val(:identity_file)].compact,
+          :password => config_val(:ssh_password)
+        }
+        if config_val(:host_key_verify) == false
+          opts[:user_known_hosts_file] = "/dev/null"
+          opts[:paranoid] = false
+        end
+
+        ::Knife::Server::SSH.new(opts)
+      end
+    end
+  end
+end

data/lib/knife/server/version.rb

@@ -18,6 +18,6 @@
 
 module Knife
   module Server
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/spec/chef/knife/server_bootstrap_linode_spec.rb

@@ -0,0 +1,273 @@
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
+# Copyright:: Copyright (c) 2013 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_linode'
+require 'chef/knife/ssh'
+require 'fakefs/spec_helpers'
+require 'net/ssh'
+Chef::Knife::ServerBootstrapLinode.load_deps
+
+describe Chef::Knife::ServerBootstrapLinode do
+  include FakeFS::SpecHelpers
+
+  before do
+    Chef::Log.logger = Logger.new(StringIO.new)
+    @knife = Chef::Knife::ServerBootstrapLinode.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"
+    @knife.config[:platform] = "omnibus"
+    @knife.config[:ssh_user] = "root"
+  end
+
+  let(:connection) { mock(Fog::Compute::AWS) }
+
+  describe "#linode_bootstrap" do
+
+    before do
+      @knife.config[:chef_node_name] = "shave.yak"
+      @knife.config[:ssh_user] = "jdoe"
+      @knife.config[:identity_file] = "~/.ssh/mykey_dsa"
+      @knife.config[:linode_api_key] = "linode123"
+      @knife.config[:distro] = "distro-praha"
+      @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.linode_bootstrap }
+
+    it "returns a LinodeServerCreate instance" do
+      bootstrap.should be_a(Chef::Knife::LinodeServerCreate)
+    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 identity_file" do
+      bootstrap.config[:identity_file].should eq("~/.ssh/mykey_dsa")
+    end
+
+    it "configs the bootstrap's linode_api_key" do
+      bootstrap.config[:linode_api_key].should eq("linode123")
+    end
+
+    it "configs the bootstrap's distro" do
+      bootstrap.config[:distro].should eq("distro-praha")
+    end
+
+    it "configs the bootstrap's distro to chef11/omnibus by default" do
+      @knife.config.delete(:distro)
+
+      bootstrap.config[:distro].should eq("chef11/omnibus")
+    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("chef11/freebsd")
+    end
+
+    it "configs the bootstrap's distro based on bootstrap_version and platform" do
+      @knife.config.delete(:distro)
+      @knife.config[:platform] = "freebsd"
+      @knife.config[:bootstrap_version] = "10"
+
+      bootstrap.config[:distro].should eq("chef10/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
+  end
+
+  describe "#linode_connection" do
+
+    before do
+      @before_config = Hash.new
+      @before_config[:knife] = Hash.new
+      @before_config[:knife][:linode_api_key] =
+        Chef::Config[:knife][:linode_api_key]
+
+      Chef::Config[:knife][:linode_api_key] = "key"
+    end
+
+    after do
+      Chef::Config[:knife][:linode_api_key] =
+        @before_config[:knife][:linode_api_key]
+    end
+
+    it "constructs a connection" do
+      Fog::Compute.should_receive(:new).with({
+        :provider => 'Linode',
+        :linode_api_key => 'key'
+      })
+
+      @knife.linode_connection
+    end
+  end
+
+  describe "#server_ip_address" do
+
+    before do
+      @knife.config[:linode_node_name] = 'yak'
+      @knife.stub(:linode_connection) { connection }
+    end
+
+    context "when server is found" do
+
+      before do
+        connection.stub(:servers) { [server] }
+      end
+
+      let(:server) do
+        stub(:name => 'yak', :status => 1, :public_ip_address => '10.11.12.13')
+      end
+
+      it "returns the provisioned ip address" do
+        @knife.server_ip_address.should eq('10.11.12.13')
+      end
+
+      it "ignores terminated instances" do
+        server.stub(:status) { 0 }
+
+        @knife.server_ip_address.should be_nil
+      end
+    end
+
+    context "when server is not found" do
+      before do
+        connection.stub(:servers) { [] }
+      end
+
+      it "returns nil" do
+        @knife.server_ip_address.should be_nil
+      end
+    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[:validation_key] = "/var/tmp/validation.pem"
+      @knife.config[:identity_file] = "~/.ssh/mykey_dsa"
+      @knife.config[:ssh_password] = "booboo"
+      @knife.stub(:linode_connection)  { connection }
+      @knife.stub(:server_ip_address)  { "11.11.11.13" }
+      Chef::Knife::LinodeServerCreate.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)   { stub(:run => true, :config => Hash.new) }
+    let(:ssh)         { stub }
+    let(:credentials) { stub.as_null_object }
+
+    it "exits if node_name option is missing" do
+      @knife.config.delete(:chef_node_name)
+
+      lambda { @knife.run }.should raise_error(SystemExit)
+    end
+
+    it "exits if platform is set to auto" do
+      @knife.config[:platform] = "auto"
+
+      lambda { @knife.run }.should raise_error(SystemExit)
+    end
+
+    it "bootstraps a linode server" do
+      bootstrap.should_receive(:run)
+
+      @knife.run
+    end
+
+    it "installs a new validation.pem key from the chef 10 server" do
+      @knife.config[:bootstrap_version] = "10"
+      Knife::Server::SSH.should_receive(:new).with({
+        :host => "11.11.11.13", :user => "root",
+        :port => "22", :keys => ["~/.ssh/mykey_dsa"], :password => "booboo"
+      })
+      Knife::Server::Credentials.should_receive(:new).
+        with(ssh, "/etc/chef/validation.pem", {})
+      credentials.should_receive(:install_validation_key)
+
+      @knife.run
+    end
+
+    it "installs a new validation.pem key from the omnibus server" do
+      Knife::Server::SSH.should_receive(:new).with({
+        :host => "11.11.11.13", :user => "root",
+        :port => "22", :keys => ["~/.ssh/mykey_dsa"], :password => "booboo"
+      })
+      Knife::Server::Credentials.should_receive(:new).
+        with(ssh, "/etc/chef/validation.pem", {:omnibus => true})
+      credentials.should_receive(:install_validation_key)
+
+      @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
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: knife-server
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,71 +27,76 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.10.10
 - !ruby/object:Gem::Dependency
   name: knife-ec2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.12
+- !ruby/object:Gem::Dependency
+  name: knife-linode
+  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.10'
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -151,6 +150,7 @@ files:
 - 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_linode.rb
 - lib/chef/knife/server_bootstrap_standalone.rb
 - lib/chef/knife/server_restore.rb
 - lib/knife-server.rb
@@ -160,6 +160,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_linode_spec.rb
 - spec/chef/knife/server_bootstrap_standalone_spec.rb
 - spec/chef/knife/server_restore_spec.rb
 - spec/knife/server/credientials_spec.rb
@@ -167,37 +168,31 @@ files:
 - spec/knife/server/ssh_spec.rb
 homepage: http://fnichol.github.com/knife-server
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -2573931868041806838
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2573931868041806838
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 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_linode_spec.rb
 - spec/chef/knife/server_bootstrap_standalone_spec.rb
 - spec/chef/knife/server_restore_spec.rb
 - spec/knife/server/credientials_spec.rb