Merge pull request #38 from tejaycar/master

Version 0.10.2

Author: tejaycar

.kitchen.yml

@@ -3,7 +3,7 @@ driver:
   name: vagrant
 
 driver_config:
-  require_chef_omnibus: true
+  require_chef_omnibus: '11.16.4'
   box: opscode-ubuntu-12.04
   box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
 

Berksfile

@@ -1,7 +1,7 @@
-source "https://supermarket.getchef.com"
+source 'https://supermarket.getchef.com'
 
 metadata
 
 group :test do
-  cookbook "ssh_test", :path => "./test/cookbooks/ssh_test"
+  cookbook 'ssh_test', :path => './test/cookbooks/ssh_test'
 end

Berksfile.lock

@@ -1,4 +1,11 @@
 # CHANGELOG for ssh
+## 0.10.2
+* Update the README
+* Fix some spec tests
+* Fix bug in `config` that did not allow `HostName` directive
+
+## 0.10.0
+* MAJOR rewrite, but no breaking changes known of.
 
 ## 0.6.5
 

CHANGELOG.md

@@ -0,0 +1,42 @@
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
+require 'foodcritic'
+require 'kitchen'
+
+# lint tests. Rubocop and Foodcritic
+namespace :lint do
+  desc 'Run Ruby lint checks'
+  RuboCop::RakeTask.new(:ruby)
+
+  desc 'Run Chef lint checks'
+  FoodCritic::Rake::LintTask.new(:chef) do |t|
+    t.options = {
+      :fail_tags => %w(any)
+    }
+  end
+end
+
+desc 'Run all style checks'
+task :lint => %w(lint:chef lint:ruby)
+
+# Rspec and ChefSpec
+desc 'Run ChefSpec examples'
+RSpec::Core::RakeTask.new(:spec)
+
+# Integration tests. Kitchen.ci
+desc 'Run Test Kitchen'
+task :integration do
+  Kitchen.logger = Kitchen.default_file_logger
+  Kitchen::Config.new.instances.each do |instance|
+    instance.test(:always)
+  end
+end
+
+# Default
+task :default => %w(all)
+
+desc 'Run only the reasonably fast tests (lint, spec, and fast kitchen tests'
+task :fast => %w(lint spec)
+
+desc 'Run everything we have'
+task :all => %w(lint spec integration)

Rakefile

@@ -19,19 +19,12 @@ def parse_file(path)
         IO.foreach(path) do |line|
           next if line.match(/^\s*(#|\r?\n|\s*$)/) # skip lines with only comments or whitespace
 
-          matchdata = line.match(/^\s*([h|H]ost\s+)(.*$)/)
-          if matchdata
-            name = matchdata.captures[1].strip
-            entries[name] = {}
-            next
-          end
+          check_name = parse_name(line)
+          next if check_name && (name = check_name) && (entries[name] = {})
 
-          matchdata = line.match(/^\s*(\w+)(.*$)/)
-          unless matchdata
-            Chef::Log.error("Line |#{line}| does not parse correctly")
-            next
-          end
-          entries[name][matchdata.captures[0]] = matchdata.captures[1].strip
+          key, entry = parse_line(line)
+          next unless entry
+          entries[name][key] = entry
         end
         entries
       end
@@ -46,6 +39,19 @@ def to_config(existing_entries)
           ["Host #{name}", body].join("\n")
         end.join("\n\n") + "\n"
       end
+
+      def parse_name(line)
+        matchdata = line.match(/^\s*([h|H]ost\s+)(.*$)/)
+        matchdata ? matchdata.captures[1].strip : false
+      end
+
+      def parse_line(line)
+        matchdata = line.match(/^\s*(\w+)(.*$)/)
+        return matchdata.captures[0], matchdata.captures[1].strip if matchdata
+
+        Chef::Log.error("Line |#{line}| does not parse correctly")
+        return nil, nil
+      end
     end
   end
 end

libraries/ssh_config_helpers.rb

@@ -4,4 +4,4 @@
 license          'Apache 2.0'
 description      'LWRPs for managing SSH known_hosts and config files'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.10.0'
+version          '0.10.2'

metadata.rb

@@ -67,7 +67,8 @@ def load_key_if_needed
   return if new_resource.action.is_a?(Array) ? new_resource.action.include?(:remove) : new_resource.action == :remove
 
   keyscan = Mixlib::ShellOut.new(
-    "ssh-keyscan #{new_resource.hashed ? '-H ' : ''} -p #{new_resource.port.to_i} #{Shellwords.escape(new_resource.host)}"
+    "ssh-keyscan #{new_resource.hashed ? '-H ' : ''} "\
+    "-p #{new_resource.port.to_i} #{Shellwords.escape(new_resource.host)}"
   )
   keyscan.run_command
   keyscan.error! # this will raise an error if the command failed for any reason.

providers/known_hosts.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'ssh_config resource' do
-
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(:step_into => :ssh_config)
     runner.converge('ssh_test::config')
@@ -81,7 +80,12 @@
     allow(IO).to partial_start.reduce(receive(:foreach).with(default_config), :and_yield)
     allow(IO).to partial_start.reduce(receive(:foreach).with(test_config), :and_yield)
 
-    allow(Etc).to receive(:getpwnam)
+    allow(Etc).to receive(:getgrgid).and_raise(Exception.new('This should not happen'))
+    allow(Etc).to receive(:getgrgid).with(200).and_return(Struct.new(:name).new('vagrant'))
+    allow(Etc).to receive(:getgrgid).with(100).and_return(Struct.new(:name).new('someone'))
+    allow(Etc).to receive(:getgrgid).with(0).and_return(Struct.new(:name).new('root'))
+
+    allow(Etc).to receive(:getpwnam).and_raise(Exception.new('This should not happen'))
     allow(Etc).to receive(:getpwnam).with('vagrant').and_return(
       Struct.new(:gid, :dir).new(200, '/home/vagrant')
     )
@@ -169,7 +173,7 @@
   it 'can create user ssh configs' do
     expect(chef_run).to create_file(vagrant_config).with(
       :owner => 'vagrant',
-      :group => 200,
+      :group => 'vagrant',
       :mode => 00600
     ).with_content(
       (common_end + github_and_partial_end).join("\n")
@@ -179,7 +183,7 @@
   it 'can create the global ssh config' do
     expect(chef_run).to create_file(default_config).with(
       :owner => 'root',
-      :group => 0,
+      :group => 'root',
       :mode => 00644
     ).with_content(
       (common_end + github_and_partial_end).join("\n")
@@ -189,15 +193,15 @@
   it 'creates the /etc/ssh directory if it is missing' do
     expect(chef_run).to create_directory(::File.dirname(default_config)).with(
       :owner => 'root',
-      :group => 0,
+      :group => 'root',
       :mode => 00755
     )
   end
 
   it "creates vagrant's ~/.ssh/config file" do
     expect(chef_run).to create_directory(::File.dirname(vagrant_config)).with(
       :owner => 'vagrant',
-      :group => 200,
+      :group => 'vagrant',
       :mode => 00700
     )
   end

spec/provider_tests/config_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'ssh_config resource' do
-
   let(:chef_run) do
     runner = ChefSpec::SoloRunner.new(:step_into => :ssh_config)
     runner.converge('ssh_test::known_hosts')
@@ -24,7 +23,5 @@
     )
   end
 
-  it 'works' do
-    pending 'I can not think of any spec tests that make sense'
-  end
+  pending 'I can not think of any spec tests that make sense'
 end