knife-linode 0.2.0 → 0.3.0

data/.gitignore

@@ -1,2 +1,3 @@
 pkg/*
 Gemfile.lock
+.rspec

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 2.0.0
+script:
+#  - bundle exec rubocop .
+  - bundle exec rspec --color --format progress

data/README.md

@@ -0,0 +1,137 @@
+## Knife Linode
+
+#### Please bare with me while I get this plugin cleaned up! -[jesseadams](https://github.com/jesseadams) 07/28/2014
+#### Update 08/11/2014: Lots of big changes just got merged in. Please test master and submit issues/pull requests as necessary. Thanks!
+
+### Description
+
+This is the official Opscode Knife plugin for Linode. This plugin gives knife
+the ability to create, bootstrap, and manage Linode instances.
+
+In-depth usage instructions can be found on the [Chef Docs](http://docs.opscode.com/plugin_knife_linode.html).
+
+### Requirements
+
+* Chef 11.8.x or higher
+
+### Installation
+
+This plugin is distributed as a Ruby Gem. To install it, run:
+
+    gem install knife-linode
+
+Or use bundler:
+
+    gem 'knife-linode', '~> 0.3'
+
+Depending on your system's configuration, you may need to run this command
+with root privileges.
+
+### Configuration
+
+In order to communicate with the Linode API you will have to tell Knife about
+your Linode API Key.  The easiest way to accomplish this is to create some
+entries in your `knife.rb` file:
+
+    knife[:linode_api_key] = "Your Linode API Key"
+
+If your knife.rb file will be checked into a SCM system (ie readable by
+others) you may want to read the values from environment variables:
+
+    knife[:linode_api_key] = "#{ENV['LINODE_API_KEY']}"
+
+You also have the option of passing your Linode API Key into the individual
+knife subcommands using the `-A` (or `--linode-api-key`) command option
+
+    # Provision a new 1 GB 64 bit Ubuntu 14.04 Linode in the Dallas, TX datacenter
+    knife linode server create -r 'role[webserver]' --linode-image 124 --linode-datacenter 2 --linode-flavor 1 --linode-node-name YOUR_LINODE_NODE_NAME
+
+Additionally the following options may be set in your `knife.rb`:
+
+*   linode_flavor
+*   linode_image
+*   linode_kernel
+*   ssh_password
+*   bootstrap_version
+*   distro
+*   template_file
+
+## Sub Commands
+
+This plugin provides the following Knife subcommands.  Specific command
+options can be found by invoking the subcommand with a `--help` flag
+
+### knife linode server create
+
+Provisions a new server in Linode and then perform a Chef bootstrap (using the
+SSH protocol).  The goal of the bootstrap is to get Chef installed on the
+target system so it can run Chef Client with a Chef Server. The main
+assumption is a baseline OS installation exists (provided by the
+provisioning). It is primarily intended for Chef Client systems that talk to a
+Chef server.  By default the server is bootstrapped using the
+[ubuntu10.04-gems](https://github.com/opscode/chef/blob/master/chef/lib/chef/k
+nife/bootstrap/ubuntu10.04-gems.erb) template.  This can be overridden using
+the `-d` or `--template-file` command options.
+
+### knife linode server delete
+
+Deletes an existing server in the currently configured Linode account.
+**PLEASE NOTE** - this does not delete the associated node and client objects
+from the Chef server.
+
+### knife linode server list
+
+Outputs a list of all servers in the currently configured Linode account.
+**PLEASE NOTE** - this shows all instances associated with the account, some
+of which may not be currently managed by the Chef server.
+
+### knife linode server reboot
+
+Reboots an existing server in the currently configured Linode account.
+
+### knife linode datacenter list
+
+View a list of available data centers, listed by data center ID and location.
+
+### knife linode flavor list
+
+View a list of servers from the Linode environment, listed by ID, name, RAM,
+disk, and Price.
+
+### knife linode image list
+
+View a list of images from the Linode environment, listed by ID, name, bits,
+and image size.
+
+### knife linode kernel list
+
+View a a list of available kernels, listed by ID and name.
+
+### knife linode stackscript list
+
+View a list of Linode StackScripts that are currently being used.
+
+## License
+
+Apache License, Version 2.0
+
+Original Author: Adam Jacob (<adam@opscode.com>)
+
+Copyright (c) 2009-2014 Opscode, Inc.
+
+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.
+
+## Maintainers
+
+* Jesse R. Adams ([jesseadams](https://github.com/jesseadams))
+* You?

data/knife-linode.gemspec

@@ -5,18 +5,21 @@ require "knife-linode/version"
 Gem::Specification.new do |s|
   s.name        = "knife-linode"
   s.version     = Knife::Linode::VERSION
-  s.has_rdoc = true
-  s.authors     = ["Adam Jacob","Seth Chisamore", "Lamont Granquist"]
-  s.email       = ["adam@opscode.com","schisamo@opscode.com", "lamont@opscode.com"]
-  s.homepage = "http://wiki.opscode.com/display/chef"
-  s.summary = "Linode Support for Chef's Knife Command"
+  s.authors     = ['Adam Jacob', 'Seth Chisamore', 'Lamont Granquist']
+  s.email       = ['adam@opscode.com', 'schisamo@opscode.com', 'lamont@opscode.com']
+  s.homepage    = 'http://wiki.opscode.com/display/chef'
+  s.summary     = "Linode Support for Chef's Knife Command"
   s.description = s.summary
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
+  s.extra_rdoc_files = ['README.md', 'LICENSE']
 
   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.add_dependency "fog", "~> 1.0"
   s.require_paths = ["lib"]
 
+  s.add_runtime_dependency "fog",  "~> 1.0"
+  s.add_runtime_dependency "chef", "~> 11.8"
+
+  s.add_development_dependency "rspec",   "~> 3.0"
+  s.add_development_dependency "rubocop",    "~> 0.24"
 end

data/lib/chef/knife/linode_base.rb

@@ -55,7 +55,7 @@ class Chef
 
       def locate_config_value(key)
         key = key.to_sym
-        Chef::Config[:knife][key] || config[key]
+        config[key] || Chef::Config[:knife][key]
       end
 
       def msg_pair(label, value, color=:cyan)
@@ -70,7 +70,7 @@ class Chef
         keys.each do |k|
           pretty_key = k.to_s.gsub(/_/, ' ').gsub(/\w+/){ |w| (w =~ /(api)/i) ? w.upcase  : w.capitalize }
           if Chef::Config[:knife][k].nil?
-            errors << "You did not provided a valid '#{pretty_key}' value."
+            errors << "You did not provide a valid '#{pretty_key}' value."
           end
         end
 

data/lib/chef/knife/linode_server_create.rb

@@ -43,28 +43,28 @@ class Chef
         :long => "--linode-flavor FLAVOR",
         :description => "The flavor of server",
         :proc => Proc.new { |f| Chef::Config[:knife][:linode_flavor] = f },
-        :default => 1
+        :default => 1 # Linode 1024
 
       option :linode_image,
         :short => "-I IMAGE",
         :long => "--linode-image IMAGE",
         :description => "The image for the server",
         :proc => Proc.new { |i| Chef::Config[:knife][:linode_image] = i },
-        :default => 93
+        :default => 99 # Ubuntu 12.04 LTS
 
       option :linode_kernel,
         :short => "-k KERNEL",
         :long => "--linode-kernel KERNEL",
         :description => "The kernel for the server",
         :proc => Proc.new { |i| Chef::Config[:knife][:linode_kernel] = i },
-        :default => 138
+        :default => 138 # Latest 64 bit
 
       option :linode_datacenter,
         :short => "-D DATACENTER",
         :long => "--linode-datacenter DATACENTER",
         :description => "The datacenter for the server",
         :proc => Proc.new { |i| Chef::Config[:knife][:linode_datacenter] = i },
-        :default => 3
+        :default => 3 # Fremont, CA, USA
 
       option :linode_node_name,
         :short => "-L NAME",
@@ -111,7 +111,7 @@ class Chef
         :long => "--distro DISTRO",
         :description => "Bootstrap a distro using a template",
         :proc => Proc.new { |d| Chef::Config[:knife][:distro] = d },
-        :default => "ubuntu10.04-gems"
+        :default => "chef-full"
 
       option :template_file,
         :long => "--template-file TEMPLATE",
@@ -126,11 +126,37 @@ class Chef
         :proc => lambda { |o| o.split(/[\s,]+/) },
         :default => []
 
-      option :no_host_key_verify,
-        :long => "--no-host-key-verify",
-        :description => "Disable host key verification",
+      option :json_attributes,
+        :short => "-j JSON",
+        :long => "--json-attributes JSON",
+        :description => "A JSON string to be added to the first run of chef-client",
+        :proc => lambda { |o| JSON.parse(o) }
+
+      option :host_key_verify,
+        :long => "--[no-]host-key-verify",
+        :description => "Verify host key, enabled by default",
         :boolean => true,
-        :default => false
+        :default => true
+
+      Chef::Config[:knife][:hints] ||= {"linode" => {}}
+      option :hint,
+        :long => "--hint HINT_NAME[=HINT_FILE]",
+        :description => "Specify Ohai Hint to be set on the bootstrap target.  Use multiple --hint options to specify multiple hints.",
+        :proc => Proc.new { |h|
+           name, path = h.split("=")
+           Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new
+        }
+
+      option :secret,
+        :short => "-s SECRET",
+        :long  => "--secret ",
+        :description => "The secret key to use to encrypt data bag item values",
+        :proc => Proc.new { |s| Chef::Config[:knife][:secret] = s }
+
+      option :secret_file,
+        :long => "--secret-file SECRET_FILE",
+        :description => "A file containing the secret key to use to encrypt data bag item values",
+        :proc => Proc.new { |sf| Chef::Config[:knife][:secret_file] = sf }
 
       def tcp_test_ssh(hostname)
         Chef::Log.debug("testing ssh connection to #{hostname}")
@@ -215,6 +241,16 @@ class Chef
           puts("done")
         }
 
+        Chef::Config[:knife][:hints]['linode'] ||= Hash.new
+        Chef::Config[:knife][:hints]['linode'].merge!({
+            'server_id' => server.id.to_s,
+            'datacenter_id' => locate_config_value(:linode_datacenter),
+            'flavor_id' => locate_config_value(:linode_flavor),
+            'image_id' => locate_config_value(:linode_image),
+            'kernel_id' => locate_config_value(:linode_kernel),
+            'ip_addresses' => server.ips.map(&:ip)})
+
+        msg_pair("JSON Attributes", config[:json_attributes]) unless !config[:json_attributes] || config[:json_attributes].empty?
         bootstrap_for_node(server,fqdn).run
       end
 
@@ -228,11 +264,16 @@ class Chef
         bootstrap.config[:chef_node_name] = config[:chef_node_name] || server.id
         bootstrap.config[:prerelease] = config[:prerelease]
         bootstrap.config[:bootstrap_version] = locate_config_value(:bootstrap_version)
+        bootstrap.config[:first_boot_attributes] = locate_config_value(:json_attributes) || {}
         bootstrap.config[:distro] = locate_config_value(:distro)
         bootstrap.config[:use_sudo] = true unless config[:ssh_user] == 'root'
         bootstrap.config[:template_file] = locate_config_value(:template_file)
         bootstrap.config[:environment] = config[:environment]
-        bootstrap.config[:no_host_key_verify] = config[:no_host_key_verify]
+        bootstrap.config[:host_key_verify] = config[:host_key_verify]
+        bootstrap.config[:secret] = locate_config_value(:secret)
+        bootstrap.config[:secret_file] = locate_config_value(:secret_file)
+        bootstrap.config[:private_ip] = server.ips.reject{ |ip| ip.public }.first.ip
+        bootstrap.config[:public_ip] = server.public_ip_address
         bootstrap
       end
 

data/lib/chef/knife/linode_server_delete.rb

@@ -1,4 +1,3 @@
-
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
 # Author:: Lamont Granquist (<lamont@opscode.com>)
@@ -19,14 +18,47 @@
 #
 
 require 'chef/knife/linode_base'
- 
+
+# These two are needed for the '--purge' deletion case
+require 'chef/node'
+require 'chef/api_client'
+
 class Chef
   class Knife
     class LinodeServerDelete < Chef::Knife
 
       include Knife::LinodeBase
 
-      banner "knife linode server delete (options)"
+      banner "knife linode server delete LINODE_ID|LINODE_LABEL (options)"
+
+      option :purge,
+        :short => "-P",
+        :long => "--purge",
+        :boolean => true,
+        :default => false,
+        :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the Linode node itself.  Assumes node and client have the same name as the server (if not, add the '--node-name' option)."
+        # :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the Linode node itself. The '--node-name' option also must be set to specify the Chef node and client to be removed."
+
+      option :chef_node_name,
+        :short => "-N NAME",
+        :long => "--node-name NAME",
+        :description => "The name of the node and client to delete, if it differs from the server name.  Only has meaning when used with the '--purge' option."
+        # :description => "The name of the node and client to delete.  Only has meaning when used with the '--purge' option."
+
+      # Extracted from Chef::Knife.delete_object, because it has a
+      # confirmation step built in... By specifying the '--purge'
+      # flag (and also explicitly confirming the server destruction!)
+      # the user is already making their intent known.  It is not
+      # necessary to make them confirm two more times.
+      def destroy_item(klass, name, type_name)
+        begin
+          object = klass.load(name)
+          object.destroy
+          ui.warn("Deleted #{type_name} #{name}")
+        rescue Net::HTTPServerException
+          ui.warn("Could not find a #{type_name} named #{name} to delete!")
+        end
+      end
 
       def run
 
@@ -35,7 +67,10 @@ class Chef
         @name_args.each do |linode_id|
 
           begin
-            server = connection.servers.get(linode_id)
+            server = connection.servers.detect do |s|
+              s.id.to_s == linode_id || s.name == linode_id
+            end
+            delete_id = server.id
 
             msg_pair("Linode ID", server.id.to_s)
             msg_pair("Name", server.name)
@@ -45,9 +80,21 @@ class Chef
             puts "\n"
             confirm("Do you really want to delete this server")
 
-            connection.servers.get(linode_id).destroy
+            connection.servers.get(delete_id).destroy
+
+            ui.warn("Deleted server #{delete_id}")
 
-            ui.warn("Deleted server #{linode_id}")
+            if config[:purge]
+              if config[:chef_node_name]
+                thing_to_delete = config[:chef_node_name]
+              else
+                thing_to_delete = server.name
+              end
+              destroy_item(Chef::Node, thing_to_delete, "node")
+              destroy_item(Chef::ApiClient, thing_to_delete, "client")
+            else
+              ui.warn("Corresponding node and client for the #{linode_id} server were not deleted and remain registered with the Chef Server")
+            end
           rescue Fog::Compute::Linode::NotFound
             ui.error("Could not locate server '#{linode_id}'.")
           end

data/lib/chef/knife/linode_server_reboot.rb

@@ -1,4 +1,3 @@
-
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
 # Author:: Lamont Granquist (<lamont@opscode.com>)
@@ -26,7 +25,7 @@ class Chef
 
       include Knife::LinodeBase
 
-      banner "knife linode server reboot (options)"
+      banner "knife linode server reboot LINODE_ID (options)"
 
       def run
 

data/lib/knife-linode/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Linode
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/chef/knife/linode_datacenter_list_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'linode_datacenter_list'
+
+describe Chef::Knife::LinodeDatacenterList do
+  subject { Chef::Knife::LinodeDatacenterList.new }
+
+  let(:api_key) { 'FAKE_API_KEY' }
+
+  before :each do
+    Chef::Knife::LinodeDatacenterList.load_deps
+    Chef::Config[:knife][:linode_api_key] = api_key
+    allow(subject).to receive(:puts)
+  end
+
+  describe "#run" do
+    it "should validate the Linode config keys exist" do
+      expect(subject).to receive(:validate!)
+      subject.run
+    end
+
+    it "should output the column headers" do
+      expect(subject).to receive(:puts).with(/^ID\s+Location\s*$/)
+      subject.run
+    end
+
+    it "should output the datacenter locations" do
+      expect(subject).to receive(:puts).with(/(?:Newark|Tokyo|Dallas)/)
+      subject.run
+    end
+  end
+end

data/spec/chef/knife/linode_flavor_list_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'linode_flavor_list'
+
+describe Chef::Knife::LinodeFlavorList do
+  subject { Chef::Knife::LinodeFlavorList.new }
+
+  let(:api_key) { 'FAKE_API_KEY' }
+
+  before :each do
+    Chef::Knife::LinodeFlavorList.load_deps
+    Chef::Config[:knife][:linode_api_key] = api_key
+    allow(subject).to receive(:puts)
+  end
+
+  describe "#run" do
+    it "should validate the Linode config keys exist" do
+      expect(subject).to receive(:validate!)
+      subject.run
+    end
+
+    it "should output the column headers" do
+      expect(subject).to receive(:puts).with(/^ID\s+Name\s+RAM\s+Disk\s+Price\s*$/)
+      subject.run
+    end
+
+    it "should output a list of the available Linode flavors" do
+      expect(subject).to receive(:puts).with(/\bLinode \d+\b/)
+      subject.run
+    end
+  end
+end

data/spec/chef/knife/linode_server_create_spec.rb

@@ -0,0 +1,216 @@
+require 'spec_helper'
+require 'linode_server_create'
+
+class MockSocket < BasicSocket
+  def initialize; end
+  def gets; end
+  def close; end
+end
+
+describe Chef::Knife::LinodeServerCreate do
+  subject { Chef::Knife::LinodeServerCreate.new }
+
+  let(:api_key)     { 'FAKE_API_KEY' }
+  let(:mock_socket) { MockSocket.new }
+
+  before :each do
+    Chef::Knife::LinodeServerCreate.load_deps
+    Chef::Config[:knife][:linode_api_key] = api_key
+    allow(subject).to receive(:puts)
+    allow(subject).to receive(:print)
+  end
+
+  describe "#tcp_test_ssh" do
+    let(:empty_block) { lambda {} }
+
+    before :each do
+      allow(TCPSocket).to receive(:new).and_return(mock_socket)
+    end
+
+    it "should open a socket to the host on port 22" do
+      hostname = "foo.example.com"
+      expect(IO).to receive(:select).with([mock_socket], anything(), anything(), anything()).and_return([mock_socket])
+      expect(TCPSocket).to receive(:new).with(hostname, 22).and_return(mock_socket)
+      subject.tcp_test_ssh(hostname, &empty_block)
+    end
+
+    it "should return true if the socket is listening" do
+      allow(IO).to receive(:select).with([mock_socket], anything(), anything(), anything()).and_return([mock_socket])
+      expect(subject.tcp_test_ssh("foo.example.com", &empty_block)).to be_truthy
+    end
+
+    it "should return false if the socket is NOT listening" do
+      allow(IO).to receive(:select).with([mock_socket], anything(), anything(), anything()).and_return(nil)
+      expect(subject.tcp_test_ssh("foo.example.com", &empty_block)).to be_falsey
+    end
+
+    # TODO: Add more specs for behavior of rescue blocks
+  end
+
+  describe "#run" do
+    let(:mock_bootstrap) {
+      double("Chef::Knife::Bootstrap").tap do |mb|
+        allow(mb).to receive(:run)
+        allow(mb).to receive(:name_args=)
+        allow(mb).to receive(:config).and_return({})
+      end
+    }
+
+    let(:mock_server) {
+      double("Fog::Compute::Linode::Server").tap do |ms|
+        allow(ms).to receive(:ips).and_return([mock_ip("1.2.3.4")])
+        allow(ms).to receive(:id).and_return(42)
+        allow(ms).to receive(:name).and_return("Test Linode")
+        allow(ms).to receive(:status).and_return(1)
+        allow(ms).to receive(:public_ip_address)
+      end
+    }
+
+    let(:mock_servers) {
+      double("Fog::Collection").tap do |ms|
+        allow(subject.connection).to receive(:servers).and_return(ms)
+      end
+    }
+
+    before :each do
+      allow(Chef::Knife::Bootstrap).to receive(:new).and_return(mock_bootstrap)
+      allow(subject).to receive(:tcp_test_ssh).and_return(true)
+      allow(mock_servers).to receive(:create).and_return(mock_server)
+      allow(subject.connection).to receive(:servers).and_return(mock_servers)
+    end
+
+    it "should validate the Linode config keys exist" do
+      expect(subject).to receive(:validate!)
+      subject.run
+    end
+
+    it "should call #create on the servers collection with the correct params" do
+      skip 'fails - arg variable does not exist'
+
+      configure_chef(subject)
+
+      expect(mock_servers).to receive(:create) { |server|
+        server.each do |k,v|
+          case k
+          when :data_center, :flavor, :image, :kernel
+            expect(arg[k].id.to_i).to eq(v.id)
+          else
+            expect(arg[k]).to eq(v)
+          end
+        end
+      }.and_return(mock_server)
+
+      subject.run
+    end
+
+    it "should create a Chef::Knife::Bootstrap instance" do
+      expect(Chef::Knife::Bootstrap).to receive(:new)
+      subject.run
+    end
+
+    it "should set the bootstrap name_args to the Linode's public IP" do
+      ips = %w( 1.2.3.4 192.168.1.1 ).map { |ip| mock_ip(ip) }
+      allow(mock_server).to receive(:ips).and_return(ips)
+      expect(mock_bootstrap).to receive(:name_args=).with([ips.first.ip])
+
+      subject.run
+    end
+
+    it "should set the bootstrap config correctly" do
+      mock_config = {}
+      allow(mock_bootstrap).to receive(:config).and_return(mock_config)
+
+      chef_config = configure_chef(subject)
+
+      params = [
+        :run_list, :ssh_user, :identity_file, :ssh_password, :chef_node_name,
+        :prerelease, :bootstrap_version, :distro, :use_sudo, :template_file,
+        :environment, :no_host_key_verify
+      ]
+
+      subject.run
+
+      params.each do |param|
+        case param
+        when :use_sudo
+          expect(mock_config[:use_sudo]).to be_falsey
+        else
+          expectation = chef_config[param]
+          actual = mock_config[param]
+
+          if actual != expectation
+            $stderr.puts "#{param}: #{actual.inspect} should have been #{expectation.inspect}"
+          end
+
+          expect(actual).to eq(expectation)
+        end
+      end
+    end
+  end
+end
+
+def mock_ip(ip)
+  OpenStruct.new(:ip => ip)
+end
+
+def configure_chef(subject)
+  connection = subject.connection
+  server = {
+    :data_center   => connection.data_centers.first,
+    :flavor        => connection.flavors.first,
+    :image         => connection.images.first,
+    :kernel        => connection.kernels.first,
+    :type          => "ext3",
+    :payment_terms => 1,
+    :stack_script  => nil,
+    :name          => "test_node",
+    :password      => nil,
+  }
+
+  chef_config = {
+    :ssh_user       => "root",
+    :run_list       => [],
+    :identity_file  => "~/.ssh/id_dsa",
+    :chef_node_name => "test_node",
+    :environment    => "_test",
+  }
+
+  server_params = {}
+  server.each do |k,v|
+    case k
+    when :data_center
+      server_params[:datacenter] = v.id
+    when :data_center, :flavor, :image, :kernel
+      server_params[k] = v.id
+    else
+      server_params[k] = v
+    end
+  end
+
+  # setup the config before we call #run
+  server_params.each do |k,v|
+    case k
+    when :name
+      Chef::Config[:knife][:linode_node_name] = v
+    when :password
+      Chef::Config[:knife][:ssh_password] = v
+    when :type, :payment_terms, :stack_script
+      # these are hard-coded in the plugin, so don't add them to the Config
+    when :name
+      Chef::Config[:knife][:linode_node_name] = v
+      Chef::Config[:knife][:chef_node_name] = v
+    when :datacenter, :flavor, :image, :kernel
+      Chef::Config[:knife]["linode_#{k}".to_sym] = v
+    else
+      Chef::Config[:knife][k] = v
+    end
+  end
+
+  cli_config = subject.config.dup
+  chef_config.each do |k,v|
+    cli_config[k] = v
+  end
+  allow(subject).to receive(:config).and_return(cli_config)
+  #cli_config.merge(Chef::Config[:knife].dup)
+  cli_config
+end

data/spec/chef/knife/linode_server_list_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+require 'linode_server_list'
+
+describe Chef::Knife::LinodeServerList do
+  subject { Chef::Knife::LinodeServerList.new }
+
+  let(:api_key) { 'FAKE_API_KEY' }
+
+  before :each do
+    Chef::Knife::LinodeServerList.load_deps
+    Chef::Config[:knife][:linode_api_key] = api_key
+    allow(subject).to receive(:puts)
+  end
+
+  describe "#run" do
+    it "should validate the Linode config keys exist" do
+      expect(subject).to receive(:validate!)
+      subject.run
+    end
+
+    it "should output the column headers" do
+      expect(subject).to receive(:puts).with(/^Linode ID\s+Name\s+IPs\s+Status\s+Backups\s+Datacenter\s*$/)
+      subject.run
+    end
+
+    it "should output a list of the server labels" do
+      expect(subject).to receive(:puts).with(/\btest_\d+\b/)
+      subject.run
+    end
+
+    it "should output a list of the server IPs" do
+      expect(subject).to receive(:puts).with(/\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/)
+      subject.run
+    end
+
+    it "should output the running state of the servers" do
+      expect(subject).to receive(:puts).with(/\bRunning\b/)
+      subject.run
+    end
+
+    it "should output the datacenter location of the servers" do
+      expect(subject).to receive(:puts).with(/\bNewark, NJ, USA\b/)
+      subject.run
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require 'rspec'
+require 'fog'
+
+Fog.mock!
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib', 'chef', 'knife'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-linode
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &70126029154420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,7 +23,60 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70126029154420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '11.8'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.24'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.24'
 description: Linode Support for Chef's Knife Command
 email:
 - adam@opscode.com
@@ -32,13 +85,14 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 - LICENSE
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - knife-linode.gemspec
 - lib/chef/knife/linode_base.rb
@@ -52,6 +106,11 @@ files:
 - lib/chef/knife/linode_server_reboot.rb
 - lib/chef/knife/linode_stackscript_list.rb
 - lib/knife-linode/version.rb
+- spec/chef/knife/linode_datacenter_list_spec.rb
+- spec/chef/knife/linode_flavor_list_spec.rb
+- spec/chef/knife/linode_server_create_spec.rb
+- spec/chef/knife/linode_server_list_spec.rb
+- spec/spec_helper.rb
 homepage: http://wiki.opscode.com/display/chef
 licenses: []
 post_install_message: 
@@ -61,19 +120,24 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Linode Support for Chef's Knife Command
-test_files: []
+test_files:
+- spec/chef/knife/linode_datacenter_list_spec.rb
+- spec/chef/knife/linode_flavor_list_spec.rb
+- spec/chef/knife/linode_server_create_spec.rb
+- spec/chef/knife/linode_server_list_spec.rb
+- spec/spec_helper.rb

data/README.rdoc

@@ -1,85 +0,0 @@
-= Knife Linode
-
-= DESCRIPTION:
-
-This is the official Opscode Knife plugin for Linode. This plugin gives knife the ability to create, bootstrap, and manage Linode instances.
-
-= INSTALLATION:
-
-Be sure you are running the latest version Chef. Versions earlier than 0.10.0 don't support plugins:
-
-    gem install chef
-
-This plugin is distributed as a Ruby Gem. To install it, run:
-
-    gem install knife-linode
-
-Depending on your system's configuration, you may need to run this command with root privileges.
-
-= CONFIGURATION:
-
-In order to communicate with the Linode API you will have to tell Knife about your Linode API Key.  The easiest way to accomplish this is to create some entries in your <tt>knife.rb</tt> file:
-
-    knife[:linode_api_key] = "Your Linode API Key"
-
-If your knife.rb file will be checked into a SCM system (ie readable by others) you may want to read the values from environment variables:
-
-    knife[:linode_api_key] = "#{ENV['LINODE_API_KEY']}"
-
-You also have the option of passing your Linode API Key into the individual knife subcommands using the <tt>-A</tt> (or <tt>--linode-api-key</tt>) command option
-
-    # provision a new m1.small Ubuntu 10.04 webserver  # FIXME: change from EC2 to linode
-    knife ec2 server create 'role[webserver]' -I ami-7000f019 -f m1.small -A 'Your AWS Access Key ID' -K "Your AWS Secret Access Key"
-
-Additionally the following options may be set in your `knife.rb`:
-
-* linode_flavor
-* linode_image
-* linode_kernel
-* ssh_password
-* bootstrap_version
-* distro
-* template_file
-
-= SUBCOMMANDS:
-
-This plugin provides the following Knife subcommands.  Specific command options can be found by invoking the subcommand with a <tt>--help</tt> flag
-
-== knife linode server create
-
-Provisions a new server in Linode and then perform a Chef bootstrap (using the SSH protocol).  The goal of the bootstrap is to get Chef installed on the target system so it can run Chef Client with a Chef Server. The main assumption is a baseline OS installation exists (provided by the provisioning). It is primarily intended for Chef Client systems that talk to a Chef server.  By default the server is bootstrapped using the {ubuntu10.04-gems}[https://github.com/opscode/chef/blob/master/chef/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb] template.  This can be overridden using the <tt>-d</tt> or <tt>--template-file</tt> command options.
-
-== knife linode server delete
-
-Deletes an existing server in the currently configured Linode account.  <b>PLEASE NOTE</b> - this does not delete the associated node and client objects from the Chef server.
-
-== knife linode server list
-
-Outputs a list of all servers in the currently configured Linode account.  <b>PLEASE NOTE</b> - this shows all instances associated with the account, some of which may not be currently managed by the Chef server.
-
-== knife linode server reboot
-
-== knife linode datacenter list
-== knife linode flavor list
-== knife linode image list
-== knife linode kernel list
-== knife linode stackscript list
-
-= LICENSE:
-
-Author:: Adam Jacob (<adam@opscode.com>)
-Copyright:: Copyright (c) 2009-2011 Opscode, Inc.
-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.
-