knife-linode 0.3.2 → 0.3.3

data/Rakefile

@@ -1,56 +1,35 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2008, 2010 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.
-#
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+task default: %i{style spec}
 
-require 'bundler'
 Bundler::GemHelper.install_tasks
 
-# require 'rubygems'
-# require 'rake/gempackagetask'
-require 'rake/rdoctask'
+desc "Run specs"
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = "spec/**/*_spec.rb"
+end
 
 begin
-  require 'sdoc'
-
-  Rake::RDocTask.new do |rdoc|
-    rdoc.title = "Chef Ruby API Documentation"
-    rdoc.main = "README.rdoc"
-    rdoc.options << '--fmt' << 'shtml' # explictly set shtml generator
-    rdoc.template = 'direct' # lighter template
-    rdoc.rdoc_files.include("README.rdoc", "LICENSE", "spec/tiny_server.rb", "lib/**/*.rb")
-    rdoc.rdoc_dir = "rdoc"
+  require "chefstyle"
+  require "rubocop/rake_task"
+  RuboCop::RakeTask.new(:style) do |task|
+    task.options += ["--display-cop-names", "--no-color"]
   end
 rescue LoadError
-  puts "sdoc is not available. (sudo) gem install sdoc to generate rdoc documentation."
+  puts "chefstyle/rubocop is not available. bundle install first to make sure all dependencies are installed."
 end
 
 begin
-  require 'rspec/core/rake_task'
-
-  task :default => :spec
-
-  desc "Run all specs in spec directory"
-  RSpec::Core::RakeTask.new(:spec) do |t|
-    t.pattern = 'spec/unit/**/*_spec.rb'
-  end
-
+  require "yard"
+  YARD::Rake::YardocTask.new(:docs)
 rescue LoadError
-  STDERR.puts "\n*** RSpec not available. (sudo) gem install rspec to run unit tests. ***\n\n"
+  puts "yard is not available. bundle install first to make sure all dependencies are installed."
 end
 
+task :console do
+  require "irb"
+  require "irb/completion"
+  ARGV.clear
+  IRB.start
+end

data/VERSION

@@ -0,0 +1 @@
+0.3.3

data/knife-linode.gemspec

@@ -5,21 +5,19 @@ require "knife-linode/version"
 Gem::Specification.new do |s|
   s.name        = "knife-linode"
   s.version     = Knife::Linode::VERSION
-  s.authors     = ['Adam Jacob', 'Seth Chisamore', 'Lamont Granquist', 'Jesse R. Adams']
-  s.email       = ['adam@opscode.com', 'schisamo@opscode.com', 'lamont@opscode.com', 'jesse@techno-geeks.org']
-  s.homepage    = 'http://wiki.opscode.com/display/chef'
+  s.authors     = ["Adam Jacob", "Seth Chisamore", "Lamont Granquist", "Jesse R. Adams"]
+  s.email       = ["adam@chef.io", "schisamo@chef.io", "lamont@chef.io", "jesse@techno-geeks.org"]
+  s.license     = "Apache-2.0"
+  s.homepage    = "https://github.com/chef/knife-linode"
   s.summary     = "Linode Support for Chef's Knife Command"
   s.description = s.summary
-  s.extra_rdoc_files = ['README.md', 'LICENSE']
+  s.extra_rdoc_files = ["README.md", "LICENSE"]
 
+  s.required_ruby_version = ">= 2.2.2"
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_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"
+  s.add_runtime_dependency "fog", "~> 1.0"
 end

data/lib/chef/knife/linode_base.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright (c) 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife'
+require "chef/knife"
 
 class Chef
   class Knife
@@ -30,9 +30,9 @@ class Chef
         includer.class_eval do
 
           deps do
-            require 'fog'
-            require 'readline'
-            require 'chef/json_compat'
+            require "fog"
+            require "readline"
+            require "chef/json_compat"
           end
 
           option :linode_api_key,
@@ -47,7 +47,7 @@ class Chef
       def connection
         @connection ||= begin
           connection = Fog::Compute.new(
-            :provider => 'Linode',
+            :provider => "Linode",
             :linode_api_key => Chef::Config[:knife][:linode_api_key]
           )
         end
@@ -58,23 +58,23 @@ class Chef
         config[key] || Chef::Config[:knife][key]
       end
 
-      def msg_pair(label, value, color=:cyan)
+      def msg_pair(label, value, color = :cyan)
         if value && !value.empty?
           puts "#{ui.color(label, color)}: #{value}"
         end
       end
 
-      def validate!(keys=[:linode_api_key])
+      def validate!(keys = [:linode_api_key])
         errors = []
 
         keys.each do |k|
-          pretty_key = k.to_s.gsub(/_/, ' ').gsub(/\w+/){ |w| (w =~ /(api)/i) ? w.upcase  : w.capitalize }
+          pretty_key = k.to_s.tr("_", " ").gsub(/\w+/) { |w| (w =~ /(api)/i) ? w.upcase : w.capitalize }
           if Chef::Config[:knife][k].nil?
-            errors << "You did not provide a valid '#{pretty_key}' value."
+            errors << "You did not provide a valid '#{pretty_key}' value in your knife as #{k}."
           end
         end
 
-        if errors.each{|e| ui.error(e)}.any?
+        if errors.each { |e| ui.error(e) }.any?
           exit 1
         end
       end
@@ -101,4 +101,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/linode_datacenter_list.rb

@@ -1,8 +1,8 @@
 
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright (c) 2010-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife/linode_base'
+require "chef/knife/linode_base"
 
 class Chef
   class Knife
@@ -29,11 +29,10 @@ class Chef
       banner "knife linode datacenter list (options)"
 
       def run
-
         validate!
         server_list = [
-          ui.color('ID', :bold),
-          ui.color('Location', :bold),
+          ui.color("ID", :bold),
+          ui.color("Location", :bold),
         ]
 
         connection.data_centers.each do |datacenter|
@@ -42,7 +41,6 @@ class Chef
         end
 
         puts ui.list(server_list, :columns_across, 2)
-
       end
     end
   end

data/lib/chef/knife/linode_flavor_list.rb

@@ -1,8 +1,8 @@
 
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright (c) 2010-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife/linode_base'
+require "chef/knife/linode_base"
 
 class Chef
   class Knife
@@ -29,15 +29,14 @@ class Chef
       banner "knife linode flavor list (options)"
 
       def run
-
         validate!
 
         server_list = [
-          ui.color('ID', :bold),
-          ui.color('Name', :bold),
-          ui.color('RAM', :bold),
-          ui.color('Disk', :bold),
-          ui.color('Price', :bold),
+          ui.color("ID", :bold),
+          ui.color("Name", :bold),
+          ui.color("RAM", :bold),
+          ui.color("Disk", :bold),
+          ui.color("Price", :bold),
         ]
 
         connection.flavors.each do |flavor|
@@ -49,7 +48,6 @@ class Chef
         end
 
         puts ui.list(server_list, :columns_across, 5)
-
       end
     end
   end

data/lib/chef/knife/linode_image_list.rb

@@ -1,8 +1,8 @@
 
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright (c) 2010-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife/linode_base'
+require "chef/knife/linode_base"
 
 class Chef
   class Knife
@@ -29,14 +29,13 @@ class Chef
       banner "knife linode image list (options)"
 
       def run
-
         validate!
 
         server_list = [
-          ui.color('ID', :bold),
-          ui.color('Name', :bold),
-          ui.color('Bits', :bold),
-          ui.color('Image Size', :bold),
+          ui.color("ID", :bold),
+          ui.color("Name", :bold),
+          ui.color("Bits", :bold),
+          ui.color("Image Size", :bold),
         ]
 
         connection.images.each do |image|
@@ -47,7 +46,6 @@ class Chef
         end
 
         puts ui.list(server_list, :columns_across, 4)
-
       end
     end
   end

data/lib/chef/knife/linode_kernel_list.rb

@@ -1,8 +1,8 @@
 
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright (c) 2010-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife/linode_base'
+require "chef/knife/linode_base"
 
 class Chef
   class Knife
@@ -29,12 +29,11 @@ class Chef
       banner "knife linode kernel list (options)"
 
       def run
-
         validate!
 
         server_list = [
-          ui.color('ID', :bold),
-          ui.color('Name', :bold),
+          ui.color("ID", :bold),
+          ui.color("Name", :bold),
         ]
 
         connection.kernels.each do |kernel|
@@ -43,7 +42,6 @@ class Chef
         end
 
         puts ui.list(server_list, :columns_across, 2)
-
       end
     end
   end

data/lib/chef/knife/linode_server_create.rb

@@ -1,8 +1,8 @@
 
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Author:: Lamont Granquist (<lamont@opscode.com>)
-# Copyright:: Copyright (c) 2010-2011 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Author:: Lamont Granquist (<lamont@chef.io>)
+# Copyright:: Copyright (c) 2010-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require 'chef/knife/linode_base'
+require "chef/knife/linode_base"
 
 class Chef
   class Knife
@@ -26,13 +26,13 @@ class Chef
 
       include Knife::LinodeBase
 
-       deps do
-         require 'fog'
-         require 'readline'
-         require 'chef/json_compat'
-         require 'chef/knife/bootstrap'
-         Chef::Knife::Bootstrap.load_deps
-       end
+      deps do
+        require "fog"
+        require "readline"
+        require "chef/json_compat"
+        require "chef/knife/bootstrap"
+        Chef::Knife::Bootstrap.load_deps
+      end
 
       banner "knife linode server create (options)"
 
@@ -83,7 +83,7 @@ class Chef
         :default => "root"
 
       chars = ("a".."z").to_a + ("1".."9").to_a + ("A".."Z").to_a
-      @@defpass = Array.new(20, '').collect{chars[rand(chars.size)]}.push('A').push('a').join
+      @@defpass = Array.new(20, "").collect { chars[rand(chars.size)] }.push("A").push("a").join
 
       option :ssh_password,
         :short => "-P PASSWORD",
@@ -138,13 +138,13 @@ class Chef
         :boolean => true,
         :default => true
 
-      Chef::Config[:knife][:hints] ||= {"linode" => {}}
+      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.",
+        :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
+          name, path = h.split("=")
+          Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new
         }
 
       option :secret,
@@ -201,6 +201,8 @@ class Chef
 
         validate!
 
+        raise "You must provide linode_node_name via the CLI or knife.rb config. See help for details" if locate_config_value(:linode_node_name).nil?
+
         datacenter_id = locate_config_value(:linode_datacenter).to_i
         datacenter = connection.data_centers.select { |dc| dc.id == datacenter_id }.first
 
@@ -226,7 +228,7 @@ class Chef
                     :password => locate_config_value(:ssh_password)
                  )
 
-        connection.linode_update(server.id, {:lpm_displaygroup => config[:display_group]}) if config[:display_group]
+        connection.linode_update(server.id, { :lpm_displaygroup => config[:display_group] }) if config[:display_group]
 
         fqdn = server.ips.select { |lip| !( lip.ip =~ /^192\.168\./ || lip.ip =~ /^10\./ || lip.ip =~ /^172\.(1[6-9]|2[0-9]|3[0-1])\./ ) }.first.ip
 
@@ -243,25 +245,25 @@ class Chef
 
         print "\n#{ui.color("Waiting for sshd", :magenta)}"
 
-        print(".") until tcp_test_ssh(fqdn) {
+        print(".") until tcp_test_ssh(fqdn) do
           sleep @initial_sleep_delay ||= 10
           puts("done")
-        }
+        end
 
-        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)})
+        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
+        bootstrap_for_node(server, fqdn).run
       end
 
-      def bootstrap_for_node(server,fqdn)
+      def bootstrap_for_node(server, fqdn)
         bootstrap = Chef::Knife::Bootstrap.new
         bootstrap.name_args = [fqdn]
         bootstrap.config[:run_list] = config[:run_list]
@@ -273,13 +275,13 @@ class Chef
         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[:use_sudo] = true unless config[:ssh_user] == "root"
         bootstrap.config[:template_file] = locate_config_value(:template_file)
         bootstrap.config[:environment] = config[:environment]
         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[:private_ip] = server.ips.reject { |ip| ip.public }.first.ip
         bootstrap.config[:public_ip] = server.public_ip_address
         bootstrap
       end