Merge 268a01f into 8ba4f0e

lib/health_inspector/checklists/roles.rb

@@ -15,7 +15,7 @@ def load_item(name)
         Role.new(@context,
                  name: name,
                  server: load_item_from_server(name),
-                 local: load_item_from_local(name)
+                 local: local_items(name)
         )
       end
 
@@ -24,8 +24,17 @@ def server_items
       end
 
       def local_items
-        Dir["#{@context.repo_path}/roles/**/*.{rb,json,js}"].map do |e|
-          File.basename(e, '.*')
+        @local_items ||= Dir["#{@context.repo_path}/roles/**/*.{rb,json,js}"].inject({}) do |h, filename|
+          case filename
+          when /\.json$/
+            role = Chef::JSONCompat.from_json(IO.read(filename))
+          when /\.rb$/
+            role = Chef::Role.new
+            role.from_file(filename)
+            role = role.to_hash
+          end
+          h[role['name']] = role
+          h
         end
       end
 
@@ -35,10 +44,6 @@ def load_item_from_server(name)
       rescue
         nil
       end
-
-      def load_item_from_local(name)
-        load_ruby_or_json_from_local(Chef::Role, 'roles', name)
-      end
     end
   end
 end

spec/chef-repo/roles/role_one.json

@@ -0,0 +1,3 @@
+{
+    "name": "role_one"
+}

spec/chef-repo/roles/role_two.rb

@@ -0,0 +1 @@
+name 'role_two'

spec/chef-repo/roles/subdir/role_from_subdir.json

@@ -0,0 +1,3 @@
+{
+    "name": "role_from_subdir"
+}

spec/health_inspector/checklists/roles_spec.rb

@@ -24,7 +24,7 @@
 
   describe '#local_items' do
     it 'returns a list of roles from the chef repo' do
-      expect(checklist.local_items.sort)
+      expect(checklist.local_items.keys.sort)
         .to eq %w(role_from_subdir role_one role_two)
     end
   end