mosen / spirit Goto Github PK

When trying to run rackup after following the installation instructions I encountered errors with code requiring the CFPropertyList gem. On both a clean Ruby 2.1.x and Ruby 1.9.7 VM I got the following error:

root@fa2af62d2fce:/spirit# rackup
/var/lib/gems/1.9.1/gems/backports-3.4.1/lib/backports/tools.rb:343:in `require': cannot load such file -- CFPropertyList (LoadError)

Some Googling suggested that changing the require statement to all lower case resolves this, and it did in my case. Not sure if this is masking some other problem but since these were completely clean and bare VMs and Ruby installs I wanted to point it out.

Just started by dropping in my entire Computers DB, which apparently has some plists that are just empty files. When reading one of these failed, the rest of the entries wouldn't be sent.

Below is how I wrapped the call for this case of reading a plist, but then I realized this would probably be better abstracted out of each case where plists are read, maybe into PlistModel. So I'm just logging this issue here, not sure how you would prefer to handle this.

diff --git a/lib/spirit/computer.rb b/lib/spirit/computer.rb
index abe8e4b..c66ad13 100644
--- a/lib/spirit/computer.rb
+++ b/lib/spirit/computer.rb
@@ -32,10 +32,14 @@ module Spirit
           next if entry == 'group.settings.plist'

           full_path = File.join(@path, entry)
-
-          computer = CFPropertyList::List.new(:file => full_path)
-          computer_hash = CFPropertyList.native_types(computer.value)
-          computers['computers'][computer_hash[@primary_key]] = computer_hash
+          begin
+            computer = CFPropertyList::List.new(:file => full_path)
+            computer_hash = CFPropertyList.native_types(computer.value)
+            computers['computers'][computer_hash[@primary_key]] = computer_hash
+          rescue Exception => e
+            logger.debug e.message
+            next
+          end
         end

When creating a script it is not possible to change the name of the script, attempts to name the script revert to the default name given by DS Admin. I will post a log trace in a bit when I can get at one.