combine resoure+resources -> resource.rb

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

lib/vulcano.rb

@@ -10,7 +10,6 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'vulcano/version'
 require 'vulcano/resource'
-require 'vulcano/resources'
 require 'vulcano/rspec_json_formatter'
 require 'vulcano/rule'
 require 'vulcano/runner'

lib/vulcano/resource.rb

@@ -17,3 +17,40 @@ module Vulcano
     Vulcano::Plugins::Resource
   end
 end
+
+require 'resources/apache_conf'
+require 'resources/audit_policy'
+require 'resources/auditd_conf'
+require 'resources/auditd_rules'
+require 'resources/command'
+require 'resources/env'
+require 'resources/etc_group'
+require 'resources/file'
+require 'resources/group_policy'
+require 'resources/inetd_conf'
+require 'resources/limits_conf'
+require 'resources/login_def'
+require 'resources/mysql'
+require 'resources/mysql_conf'
+require 'resources/mysql_session'
+require 'resources/ntp_conf'
+require 'resources/parse_config'
+require 'resources/passwd'
+require 'resources/postgres'
+require 'resources/postgres_conf'
+require 'resources/postgres_session'
+require 'resources/processes'
+require 'resources/registry_key'
+require 'resources/security_policy'
+require 'resources/ssh_conf'
+
+# extend serverspec types
+module Serverspec
+  module Type
+
+    def directory(name)
+      Directory.new(name)
+    end
+
+  end
+end

lib/vulcano/resources.rb

@@ -1,39 +0,0 @@
-# encoding: utf-8
-require 'vulcano/resource'
-
-require 'resources/apache_conf'
-require 'resources/audit_policy'
-require 'resources/auditd_conf'
-require 'resources/auditd_rules'
-# require 'resources/command'
-require 'resources/env'
-require 'resources/etc_group'
-# require 'resources/file'
-# require 'resources/group_policy'
-require 'resources/inetd_conf'
-require 'resources/limits_conf'
-require 'resources/login_def'
-require 'resources/mysql'
-require 'resources/mysql_conf'
-require 'resources/mysql_session'
-require 'resources/ntp_conf'
-require 'resources/parse_config'
-require 'resources/passwd'
-require 'resources/postgres'
-require 'resources/postgres_conf'
-require 'resources/postgres_session'
-require 'resources/processes'
-require 'resources/registry_key'
-require 'resources/security_policy'
-require 'resources/ssh_conf'
-
-# extend serverspec types
-module Serverspec
-  module Type
-
-    def directory(name)
-      Directory.new(name)
-    end
-
-  end
-end