Merge pull request #56 from bkw/resurrectChefSolo

bring back support for chef-solo

Author: chris-rock

recipes/server.rb

@@ -97,8 +97,16 @@
   notifies :restart, 'service[sshd]'
 end
 
+def chef_solo_search_installed?
+  klass = ::Search.const_get('Helper')
+  return klass.is_a?(Class)
+rescue NameError
+  return false
+end
+
 # authorized_key management will be deprecated in the next major release:
 def get_key_from(field)
+  return [] if Chef::Config[:solo] && !chef_solo_search_installed?
   return [] unless Chef::DataBag.list.key?('users')
   search('users', "#{field}:*").map do |v| # ~FC003 ignore footcritic violation
     Chef::Log.info "ssh_server: installing ssh-keys for root access of user #{v['id']}"

spec/recipes/client_spec.rb

@@ -290,4 +290,14 @@
       end
     end
   end
+
+  context 'chef-solo' do
+    cached(:chef_run) do
+      ChefSpec::SoloRunner.new.converge(described_recipe)
+    end
+
+    it 'does not raise an error' do
+      expect { chef_run }.not_to raise_error
+    end
+  end
 end

spec/recipes/default_spec.rb

@@ -33,4 +33,13 @@
     expect(chef_run).to include_recipe('ssh-hardening::client')
   end
 
+  context 'chef-solo' do
+    cached(:chef_run) do
+      ChefSpec::SoloRunner.new.converge(described_recipe)
+    end
+
+    it 'does not raise an error' do
+      expect { chef_run }.not_to raise_error
+    end
+  end
 end

spec/recipes/server_spec.rb

@@ -391,4 +391,14 @@
       expect(chef_run).not_to write_log('deprecated-databag')
     end
   end
+
+  context 'chef-solo' do
+    cached(:chef_run) do
+      ChefSpec::SoloRunner.new.converge(described_recipe)
+    end
+
+    it 'does not raise an error' do
+      expect { chef_run }.not_to raise_error
+    end
+  end
 end