Merge pull request choria-legacy#9 from MaxMartin/master

Resourcefile reading + general cleanup

agent/puppetral/agent/puppetral.ddl

@@ -41,34 +41,35 @@ action "find", :description => "Get the value of a resource" do
           :optional    => false,
           :maxlength   => 90
 
-    input :name,
-          :prompt      => "Resource name",
+    input :title,
+          :prompt      => "Resource title",
           :description => "Name of resource to check",
           :type        => :string,
           :validation  => '.',
           :optional    => true,
           :maxlength   => 90
 
     output :type,
-           :description => "Type of the inspected resource",
-           :display_as  => "Type"
+          :description => "Type of the inspected resource",
+          :display_as  => "Type"
+
+    output :title,
+          :description => "Title of the inspected resource",
+          :display_as  => "Title"
 
-    ouput :title,
-    	  :description => "Title of the inspected resource",
-	  :display_as  => "Title"
-
     output :tags,
-    	   :description => "Tags of the inspected resource",
-	   :display_as  => "Tags"
+          :description => "Tags of the inspected resource",
+          :display_as  => "Tags"
 
     output :exported,
-       	   :description => "Boolean flag indicating export status",
-	   :display_as  => "Exported"
+          :description => "Boolean flag indicating export status",
+          :display_as  => "Exported"
 
     output :parameters,
-    	   :description => "Parameters of the inspected resource",
-	   :display_as  => "Parameters"
+          :description => "Parameters of the inspected resource",
+          :display_as  => "Parameters"
 end
+
 action "search", :description => "Get the value of all resources of a certain type" do
     display :always
 

agent/puppetral/agent/puppetral.rb

@@ -41,19 +41,26 @@ class Puppetral<RPC::Agent
 
       action "find" do
         type = request[:type]
-        name = request[:name]
+        title = request[:title]
         typeobj = Puppet::Type.type(type) or raise "Could not find type #{type}"
 
         if typeobj
-          result = Puppet::Resource.indirection.find([type, name].join('/')).to_pson_data_hash
+          result = Puppet::Resource.indirection.find([type, title].join('/')).to_pson_data_hash
 
           result.each { |k,v| reply[k] = v }
+
+          begin
+            managed_resources = File.readlines(Puppet[:resourcefile])
+            managed_resources = managed_resources.map{|r|r.chomp}
+            reply[:managed] = managed_resources.include?("#{type}[#{title}]")
+          rescue
+            reply[:managed] = "unknown"
+          end
         end
       end
 
       action "search" do
         type = request[:type]
-        name = request[:name]
         typeobj = Puppet::Type.type(type) or raise "Could not find type #{type}"
 
         if typeobj

agent/puppetral/spec/puppetral_spec.rb

@@ -12,7 +12,7 @@
 
   describe "#find" do
     before :all do
-      @result = @agent.call(:find, :type => 'User', :name => 'bob')
+      @result = @agent.call(:find, :type => 'User', :title => 'bob')
     end
 
     it "should retrieve information about the type and title passed" do