spqr 0.2.0 → 0.2.2

data/CHANGES

@@ -1,4 +1,22 @@
-version 0.2.0
+version 0.2.2
+
+*  Methods on manageable objects now can call fail(status, message) to 
+   signal failure in the QMF method response.
+
+version 0.2.1 (f29e675e71445f63fae7e988707f07fc705c63bd)
+
+*  SPQR apps now log much less verbosely by default and allow specifying 
+   additional log options.
+
+*  Bug fix related to boolean-valued properties and statistics.
+
+*  Changed default application (and queue) name to include the process ID.
+
+*  Manageable classes can now refer to the app object in which they 
+   are running via the app member function.  This functionality should 
+   be considered experimental and may disappear in a future release.
+
+version 0.2.0 (b519a04fbc148ef10e11e3b62aba15b656900278)
 
 *  SPQR and Rhubarb are now separate projects.
 

data/Rakefile

@@ -23,14 +23,70 @@ def pkg_version
   return version.chomp
 end
 
+def name
+  return "spqr"
+end
+
+def pkg_name
+  return "ruby-" + name()
+end
+
+def pkg_spec
+  return pkg_name() + ".spec"
+end
+
+def pkg_rel
+  return `grep -i 'define rel' #{pkg_spec} | awk '{print $3}'`.chomp()
+end
+
+def pkg_source
+  return pkg_name() + "-" + pkg_version() + "-" + pkg_rel() + ".tar.gz"
+end
+
+def pkg_dir
+  return pkg_name() + "-" + pkg_version()
+end
+
+def rpm_dirs
+  return %w{BUILD BUILDROOT RPMS SOURCES SPECS SRPMS}
+end
+
 desc "create an RPM spec file"
 task :rpmspec => :build do
   sh "gem2rpm -t spqr.spec.in -o spqr.spec pkg/spqr-#{pkg_version}.gem"
 end
 
-desc "create a source RPM"
-task :srpm => :build do
-  sh "gem2rpm -t spqr.spec.in -s pkg/spqr-#{pkg_version}.gem"
+desc "create RPMs"
+task :rpms => [:build, :tarball, :gen_spec] do
+  FileUtils.cp pkg_spec(), 'SPECS'
+  sh "rpmbuild --define=\"_topdir \${PWD}\" -ba SPECS/#{pkg_spec}"
+end
+
+desc "Generate the specfile"
+task :gen_spec do
+  sh "cat #{pkg_spec}" + ".in" + "| sed 's/SPQR_VERSION/#{pkg_version}/' > #{pkg_spec}"
+end
+
+desc "Create a tarball"
+task :tarball => [:make_rpmdirs, :gen_spec] do
+  FileUtils.cp_r 'bin', pkg_dir()
+  FileUtils.cp_r 'lib', pkg_dir()
+  FileUtils.cp_r 'examples', pkg_dir()
+  FileUtils.cp ['LICENSE', 'README.rdoc', 'CHANGES', 'TODO', 'VERSION'], pkg_dir()
+  sh "tar -cf #{pkg_source} #{pkg_dir}"
+  FileUtils.mv pkg_source(), 'SOURCES'
+end
+
+desc "Make dirs for building RPM"
+task :make_rpmdirs => :clean do
+  FileUtils.mkdir pkg_dir()
+  FileUtils.mkdir rpm_dirs()
+end
+
+desc "Cleanup after an RPM build"
+task :clean do
+  require 'fileutils'
+  FileUtils.rm_r [pkg_dir(), rpm_dirs(), pkg_spec(), 'pkg', name() + ".gemspec"], :force => true
 end
 
 require 'spec/rake/spectask'

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/bin/spqr-gen.rb

@@ -3,7 +3,7 @@
 # SPQR:  Schema Processor for QMF/Ruby agents
 # spqr-gen generates a skeleton QMF agent application from a schema file.
 #
-# Copyright (c) 2009 Red Hat, Inc.
+# Copyright (c) 2009--2010 Red Hat, Inc.
 #
 # Author:  William Benton (willb@redhat.com)
 # 

data/lib/spqr/app.rb

@@ -2,7 +2,7 @@
 #
 # Application skeleton class
 #
-# Copyright (c) 2009 Red Hat, Inc.
+# Copyright (c) 2009--2010 Red Hat, Inc.
 #
 # Author:  William Benton (willb@redhat.com)
 # 
@@ -20,6 +20,8 @@ module SPQR
   class App < Qmf::AgentHandler
     class ClassMeta < Struct.new(:object_class, :schema_class) ; end
 
+    attr_reader :agent
+
     def initialize(options=nil)
       defaults = {:logfile=>STDERR, :loglevel=>Logger::WARN, :notifier=>nil, :server=>"localhost", :port=>5672}
       
@@ -36,7 +38,9 @@ module SPQR
       # fix up shorthands
       options[:loglevel] = loglevels[options[:loglevel]] if loglevels[options[:loglevel]]
 
-      @log = Logger.new(options[:logfile])
+      logger_opts = ([options[:logfile]] + [options[:logoptions]]).flatten.compact
+
+      @log = Logger.new(*logger_opts)
       @log.level = options[:loglevel]
 
       @log.info("initializing SPQR app....")
@@ -44,13 +48,13 @@ module SPQR
       @classes_by_name = {}
       @classes_by_id = {}
       @pipe = options[:notifier]
-      @app_name = (options[:appname] or "SPQR application")
+      @app_name = (options[:appname] or "SPQR application [#{Process.pid}]")
       @qmf_host = options[:server]
       @qmf_port = options[:port]
       @qmf_sendUserId = if options.has_key?(:send_user_id)
                           options[:send_user_id]
                         else
-                          (options.has_key?(:user) or options.has_key?(:password))
+                          (options.has_key?(:user) || options.has_key?(:password))
                         end
       
       @qmf_user = options[:user]
@@ -66,7 +70,10 @@ module SPQR
         schemaclass = schematize(klass)
 
         klass.log = @log
-
+        
+        @log.info("SETTING #{klass.spqr_meta.classname}.app to #{self.inspect}")
+        klass.app = self
+        
         @classes_by_id[klass.class_id] = klass
         @classes_by_name[klass.spqr_meta.classname.to_s] = ClassMeta.new(klass, schemaclass)
       end
@@ -79,10 +86,12 @@ module SPQR
 
     def method_call(context, name, obj_id, args, user_id)
       begin
+        status = 0
+        message = "OK"
         class_id = obj_id.object_num_high
         obj_id = obj_id.object_num_low
 
-        @log.debug "calling method: context=#{context} method=#{name} object_id=#{obj_id}, args=#{args}, user=#{user_id}"
+        @log.debug "calling method: context=#{context} method=#{name} object_id=#{obj_id}, user=#{user_id}"
 
         managed_object = find_object(context, class_id, obj_id)
         @log.debug("managed object is #{managed_object}")
@@ -100,13 +109,24 @@ module SPQR
         @log.debug("formals:  #{managed_method.formals_in.inspect}")
         @log.debug("actuals:  #{actuals_in.inspect}")
 
-        actuals_out = case actual_count
-          when 0 then managed_object.send(name.to_sym)
-          when 1 then managed_object.send(name.to_sym, actuals_in[0])
-          else managed_object.send(name.to_sym, *actuals_in)
-        end
+        actuals_out = []
 
-        raise RuntimeError.new("#{managed_object.class} did not return the appropriate number of return values; got '#{actuals_out.inspect}', but expected #{managed_method.types_out.inspect}") unless result_valid(actuals_out, managed_method)
+        begin
+          actuals_out = case actual_count
+            when 0 then managed_object.send(name.to_sym)
+            when 1 then managed_object.send(name.to_sym, actuals_in[0])
+            else managed_object.send(name.to_sym, *actuals_in)
+          end
+          
+          raise RuntimeError.new("#{managed_object.class} did not return the appropriate number of return values; got '#{actuals_out.inspect}', but expected #{managed_method.types_out.inspect}") unless result_valid(actuals_out, managed_method)
+          
+        rescue ::SPQR::ManageableObjectError => failure
+          @log.info "#{name} called SPQR::Manageable#fail:  #{failure}"
+          status = failure.status
+          message = failure.message || "ERROR"
+          # XXX:  failure.result is currently ignored by QMF
+          actuals_out = failure.result || managed_method.formals_out.inject([]) {|acc, val| acc << args[val]; acc}
+        end
         
         if managed_method.formals_out.size == 0
           actuals_out = [] # ignore return value in this case
@@ -125,7 +145,7 @@ module SPQR
           args[k] = encoded_val
         end
 
-        @agent.method_response(context, 0, "OK", args)
+        @agent.method_response(context, status, message, args)
       rescue Exception => ex
         @log.error "Error calling #{name}: #{ex}"
         @log.error "    " + ex.backtrace.join("\n    ")
@@ -136,8 +156,6 @@ module SPQR
     def get_query(context, query, user_id)
       @log.debug "query: user=#{user_id} context=#{context} class=#{query.class_name} object_num=#{query.object_id.object_num_low if query.object_id} details=#{query} haveSelect=#{query.impl and query.impl.haveSelect} getSelect=#{query.impl and query.impl.getSelect} (#{query.impl and query.impl.getSelect and query.impl.getSelect.methods.inspect})"
 
-      @log.debug "classes_by_name is #{@classes_by_name.inspect}"
-
       cmeta = @classes_by_name[query.class_name]
       objs = []
       
@@ -336,12 +354,14 @@ module SPQR
         getter = a.name.to_s
         @log.debug("setting property/statistic #{getter} to its value from #{o}: #{o.send(getter) if o.respond_to?(getter)}")
         value = o.send(getter) if o.respond_to?(getter)
-        if value
+
+        if value || a.kind == :bool
           # XXX: remove this line when/if Manageable includes an
           # appropriate impl method
           value = encode_object(value) if value.kind_of?(::SPQR::Manageable)
           qo[getter] = value
         end
+
       end
     end
   end

data/lib/spqr/codegen.rb

@@ -1,6 +1,6 @@
 # Code generation for SPQR
 #
-# Copyright (c) 2009 Red Hat, Inc.
+# Copyright (c) 2009--2010 Red Hat, Inc.
 #
 # Author:  William Benton (willb@redhat.com)
 # 
@@ -371,7 +371,6 @@ module SPQR
     # cc is the name of the variable that will hold a collection of schema classes
     def gen
       with_output_to @fn do
-        pp "require 'rubygems'"
         pp "require 'spqr/spqr'"
         pp "require 'spqr/app'"
 

data/lib/spqr/constants.rb

@@ -2,7 +2,7 @@
 
 # Constants for SQPR
 #
-# Copyright (c) 2009 Red Hat, Inc.
+# Copyright (c) 2009--2010 Red Hat, Inc.
 #
 # Author:  William Benton (willb@redhat.com)
 # 

data/lib/spqr/manageable.rb

@@ -2,7 +2,7 @@
 #
 # Manageable object mixin and support classes.
 #
-# Copyright (c) 2009 Red Hat, Inc.
+# Copyright (c) 2009--2010 Red Hat, Inc.
 #
 # Author:  William Benton (willb@redhat.com)
 # 
@@ -13,6 +13,16 @@
 #     http://www.apache.org/licenses/LICENSE-2.0
 
 module SPQR
+  class ManageableObjectError < RuntimeError
+    attr_accessor :status, :result
+
+    def initialize(status, message=nil, rval=nil)
+      super(message)
+      @status = status
+      @result = rval
+    end
+  end
+  
   class ManageableMeta < Struct.new(:classname, :package, :description, :mmethods, :options, :statistics, :properties)
     def initialize(*a)
       super *a
@@ -136,6 +146,14 @@ module SPQR
       @spqr_log || ::SPQR::Sink.new
     end
     
+    def app=(app)
+      @spqr_app = app
+    end
+    
+    def app
+      @spqr_app
+    end
+    
     # Exposes a method to QMF
     def expose(name, description=nil, options=nil, &blk)
       spqr_meta.declare_method(name, description, options, blk)
@@ -203,6 +221,30 @@ module SPQR
   end
 
   module Manageable
+    # fail takes either (up to) three arguments or a hash
+    # the three arguments are:
+    #   * =status= (an integer failure code)
+    #   * =message= (a descriptive failure message, defaults to nil)
+    #   * =result= (a value to return, defaults to nil; currently ignored by QMF)
+    # the hash simply maps from keys =:status=, =:message=, and =:result= to their respective values.  Only =:status= is required.
+    def fail(*args)
+      unless args.size <= 3 && args.size >= 1
+        raise RuntimeError.new("SPQR::Manageable#fail takes at least one parameter but not more than three; received #{args.inspect}")
+      end
+      
+      if args.size == 1 and args[0].class = Hash
+        failhash = args[0]
+        
+        unless failhash[:status] && failhash[:status].is_a?(Fixnum)
+          raise RuntimeError.new("SPQR::Manageable#fail requires a Fixnum-valued :status parameter when called with keyword arguments; received #{failhash[:status].inspect}")
+        end
+        
+        raise ManageableObjectError.new(failhash[:status], failhash[:message], failhash[:result])
+      end
+      
+      raise ManageableObjectError.new(*args)
+    end
+    
     def qmf_oid
       result = 0
       if self.respond_to? :spqr_object_id 

data/lib/spqr/spqr.rb

@@ -1,6 +1,6 @@
 # SPQR:  Schema Processor for QMF/Ruby agents
 #
-# Copyright (c) 2009 Red Hat, Inc.
+# Copyright (c) 2009--2010 Red Hat, Inc.
 #
 # Author:  William Benton (willb@redhat.com)
 # 

data/lib/spqr/utils.rb

@@ -1,6 +1,6 @@
 # Utility functions and modules for SPQR
 #
-# Copyright (c) 2009 Red Hat, Inc.
+# Copyright (c) 2009--2010 Red Hat, Inc.
 #
 # Author:  William Benton (willb@redhat.com)
 # 

data/ruby-spqr.spec.in

@@ -0,0 +1,81 @@
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
+%define rel 1.0
+
+Summary: SPQR:  {Schema Processor|Straightforward Publishing} for QMF agents in Ruby
+Name: ruby-spqr
+Version: SPQR_VERSION
+Release: %{rel}%{?dist}
+Group: Applications/System
+License: ASL 2.0
+URL: http://git.fedorahosted.org/git/grid/spqr.git
+Source0: %{name}-%{version}-%{rel}.tar.gz
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires: ruby(abi) = 1.8
+Requires: ruby
+Requires: ruby-qmf
+BuildRequires: ruby
+BuildArch: noarch
+
+%description
+SPQR makes it very simple to expose methods on Ruby objects over QMF.
+
+%package -n spqr-gen
+Summary: Generates an spqr app from an xml schema
+Group: Applications/System
+Requires: ruby-spqr
+Requires: ruby(abi) = 1.8
+Requires: ruby
+
+%description -n spqr-gen
+A tool that will generate an spqr application from an xml schema file
+
+%prep
+%setup -q
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{ruby_sitelib}/spqr
+cp -f lib/spqr/app.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -f lib/spqr/codegen.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -f lib/spqr/constants.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -f lib/spqr/manageable.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -f lib/spqr/spqr.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -f lib/spqr/utils.rb %{buildroot}/%{ruby_sitelib}/spqr
+cp -f bin/spqr-gen.rb %{buildroot}/%{_bindir}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-, root, root, -)
+%doc LICENSE README.rdoc CHANGES TODO VERSION
+%doc examples
+%{ruby_sitelib}/spqr/app.rb
+%{ruby_sitelib}/spqr/codegen.rb
+%{ruby_sitelib}/spqr/constants.rb
+%{ruby_sitelib}/spqr/manageable.rb
+%{ruby_sitelib}/spqr/spqr.rb
+%{ruby_sitelib}/spqr/utils.rb
+
+%files -n spqr-gen
+%defattr(-, root, root, -)
+%doc LICENSE
+%defattr(755, root, root, -)
+%{_bindir}/spqr-gen.rb
+
+%changelog
+
+* Tue Feb 24 2010  <willb@redhat> - 0.2.1-1.0
+- updated to version 0.2.1 (which is not released as a gem at the moment)
+
+* Fri Feb 19 2010  <willb@redhat> - 0.2.0-0.3
+- The SPQR application object is now exposed to managed classes
+
+* Fri Feb  5 2010  <rrati@redhat> - 0.2.0-0.2
+- Fixed packaging issues
+
+* Tue Feb  2 2010  <rrati@redhat> - 0.2.0-0.1
+- Initial package

data/test/example-apps.rb

@@ -123,4 +123,78 @@ class QmfIntegerProp
   qmf_package_name :example
 end
 
+class QmfBoolProp
+  include ::SPQR::Manageable 
+
+  SIZE = 7
+
+  def initialize(oid)
+    @int_id = oid
+  end
 
+  def spqr_object_id
+    @int_id
+  end
+ 
+  def QmfBoolProp.gen_objects(ct)
+    objs = []
+    ct.times do |x|
+      objs << (new(x))
+    end
+    objs
+  end
+  
+  def QmfBoolProp.find_by_id(oid)
+    puts "calling QBP::find_by_id"
+    @qmf_bps ||= gen_objects(SIZE)
+    @qmf_bps[oid]
+  end
+  
+  def QmfBoolProp.find_all
+    puts "calling QBP::find_all"
+    @qmf_bps ||= gen_objects(SIZE)
+    @qmf_bps
+  end
+  
+  def is_id_even
+    @int_id % 2 == 0
+  end
+  
+  qmf_property :int_id, :int, :index=>true
+  qmf_property :is_id_even, :bool
+  
+  qmf_class_name :QmfBoolProp
+  qmf_package_name :example
+end
+
+class Failbot
+  include ::SPQR::Manageable
+  
+  def Failbot.find_by_id(oid)
+    @failbots ||= [Failbot.new]
+    @failbots[0]
+  end
+  
+  def Failbot.find_all
+    @failbots ||= [Failbot.new]
+    @failbots
+  end
+
+  def fail_with_no_result
+    fail 42, "This method should not succeed, with failure code 42"
+  end
+
+  expose :fail_with_no_result do |args|
+  end
+  
+  def fail_without_expected_result
+    fail 17, "This method should not succeed, with failure code 17, and should return some garbage value"
+  end
+
+  expose :fail_without_expected_result do |args|
+    args.declare :result, :uint64, :out
+  end  
+  
+  qmf_package_name :example
+  qmf_class_name :Failbot
+end

data/test/generic-agent.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+require 'spqr/spqr'
+require 'spqr/app'
+require 'example-apps'
+
+klasses = ARGV.map {|klass| Kernel.const_get(klass)}
+
+DEBUG = (::ENV["SPQR_TESTS_DEBUG"] and ::ENV["SPQR_TESTS_DEBUG"].downcase == "yes")
+
+app = SPQR::App.new(:loglevel => (DEBUG ? :debug : :fatal), :appname=>"#{klasses.join("")}[#{Process.pid}]")
+app.register *klasses
+while true
+  app.main rescue nil
+end
+
+sleep

data/test/helper.rb

@@ -1,4 +1,4 @@
-require 'rubygems'
+require 'rubygems' rescue nil
 require 'test/unit'
 require 'qmf'
 require 'timeout'
@@ -23,7 +23,7 @@ module QmfTestHelpers
     end
 
     def agent_added(agent)
-      puts "GOT AN AGENT:  #{agent}" if DEBUG
+      puts "GOT AN AGENT:  #{agent} at #{Time.now.utc}" if DEBUG
       @q << agent
     end
   end
@@ -35,33 +35,45 @@ module QmfTestHelpers
       $console = Qmf::Console.new($notify_handler)
       $broker = $console.add_connection($connection)
     end
-      
-    @app = SPQR::App.new(:loglevel => (DEBUG ? :debug : :fatal))
-    @app.register *classes
+    
+    sleep 0.5
+    $broker.wait_for_stable
+        
     @child_pid = fork do 
+      sleep 0.5
       unless DEBUG
         # replace stdin/stdout/stderr
         $stdin.reopen("/dev/null", "r")
         $stdout.reopen("/dev/null", "w")
         $stderr.reopen("/dev/null", "w")
+      else
+        ENV['QPID_TRACE'] = "1"
       end
 
+      exec("#{File.dirname(__FILE__)}/generic-agent.rb", *classes.map {|cl| cl.to_s})
+      exit! 127
+
+      @app = SPQR::App.new(:loglevel => (DEBUG ? :debug : :fatal), :appname=>"#{classes.join("")}[#{Process.pid}]")
+      @app.register *classes
+
       @app.main
     end
     
-    $broker.wait_for_stable
-
-    Timeout.timeout(5) do
-      k = ""
-      begin
-        @ag = $notify_handler.queue.pop
-        k = @ag.key
-        puts "GOT A KEY:  #{k}" if DEBUG
-      end until k != "1.0"
+    begin
+      Timeout.timeout(12) do
+        k = ""
+        begin
+          @ag = $notify_handler.queue.pop
+          k = @ag.key
+          puts "GOT A KEY:  #{k} at #{Time.now.utc}" if DEBUG
+        end until k != "1.0"
 
-      # XXX
-      sleep 0.45
-      puts "ESCAPING FROM TIMEOUT" if DEBUG
+        # XXX
+        puts "ESCAPING FROM TIMEOUT at #{Time.now.utc}" if DEBUG
+      end
+    rescue Timeout::Error
+      puts "QUEUE SIZE WAS #{$notify_handler.queue.size} at #{Time.now.utc}" if DEBUG
+      raise
     end
 
   end

data/test/test_failbot.rb

@@ -0,0 +1,19 @@
+require 'helper'
+require 'set'
+require 'example-apps'
+
+class TestFailbot < Test::Unit::TestCase
+  include QmfTestHelpers
+
+  def setup
+    @child_pid = nil
+  end
+
+  def test_basic_failure
+    app_setup Failbot
+    failbot = $console.object(:class=>"Failbot", :agent=>@ag)
+    method_response = failbot.fail_with_no_result
+    assert_equal 42, method_response.status
+    assert_match /This method should not succeed/, method_response.text
+  end
+end

data/test/test_spqr_boolprop.rb

@@ -0,0 +1,31 @@
+require 'helper'
+require 'set'
+require 'example-apps'
+
+class TestBoolProp < Test::Unit::TestCase
+  include QmfTestHelpers
+
+  def setup
+    @child_pid = nil
+  end
+
+  def test_property_identities
+    app_setup QmfBoolProp
+
+    objs = $console.objects(:class=>"QmfBoolProp")
+    ids = Set.new
+
+    assert_equal QmfBoolProp::SIZE, objs.size
+
+    objs.each do |obj|
+      assert_equal((obj.int_id % 2 == 0), obj.is_id_even)
+      ids << obj[:int_id]
+    end
+
+    assert_equal objs.size, ids.size
+    
+    objs.size.times do |x|
+      assert ids.include?(x), "ids should include #{x}, which is less than #{objs.size}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spqr
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors: 
 - William Benton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-02 00:00:00 -06:00
+date: 2010-03-04 00:00:00 -06:00
 default_executable: spqr-gen.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,12 +51,16 @@ files:
 - lib/spqr/manageable.rb
 - lib/spqr/spqr.rb
 - lib/spqr/utils.rb
+- ruby-spqr.spec.in
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spqr_spec.rb
 - spqr.spec.in
 - test/example-apps.rb
+- test/generic-agent.rb
 - test/helper.rb
+- test/test_failbot.rb
+- test/test_spqr_boolprop.rb
 - test/test_spqr_clicker.rb
 - test/test_spqr_dummyprop.rb
 - test/test_spqr_hello.rb
@@ -94,7 +98,10 @@ test_files:
 - spec/spec_helper.rb
 - test/example-apps.rb
 - test/test_spqr_dummyprop.rb
+- test/generic-agent.rb
 - test/helper.rb
+- test/test_failbot.rb
+- test/test_spqr_boolprop.rb
 - test/test_spqr_clicker.rb
 - test/test_spqr_integerprop.rb
 - test/test_spqr_hello.rb