spqr 0.2.3 → 0.2.4

data/CHANGES

@@ -1,3 +1,12 @@
+version 0.2.4
+
+*  Workaround for a crash in qmfengine when running on 32-bit machines
+
+version 0.2.3
+
+*  Fixed a crash that occurred sometimes when attempting to return a 
+   value from a failing method.
+
 version 0.2.2
 
 *  Methods on manageable objects now can call fail(status, message) to 

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/examples/{examples/codegen → codegen}/EchoAgent.rb

@@ -1,17 +1,14 @@
-require 'spqr/spqr'
-
 module Examples
   module Codegen
     class EchoAgent
-      include ::SPQR::Manageable
+      include SPQR::Manageable
       
-      qmf_package_name 'examples.codegen'
-      qmf_class_name 'EchoAgent'
+      spqr_package 'examples.codegen'
+      spqr_class 'EchoAgent'
       # Find method (NB:  you must implement this)
       def EchoAgent.find_by_id(objid)
         EchoAgent.new
       end
-      
       # Find-all method (NB:  you must implement this)
       def EchoAgent.find_all
         [EchoAgent.new]
@@ -21,17 +18,14 @@ module Examples
       # echo returns its argument
       # * arg (lstr/IO)
       # 
-      def echo(arg)
+      def echo(args)
         # Print values of in/out parameters
-        log.debug "echo: arg => #{arg.inspect}"
+        log.debug "arg => #{args["arg"]}" # 
         # Assign values to in/out parameters
-        arg ||= ""
-        # Return value
-        log.debug "echo:  returning #{arg.inspect}"
-        return arg
+        args["arg"] = args["arg"]
       end
       
-      expose :echo do |args|
+      spqr_expose :echo do |args|
         args.declare :arg, :lstr, :inout, {}
       end
     end

data/lib/spqr/manageable.rb

@@ -255,7 +255,8 @@ module SPQR
         result = object_id
       end
       
-      result & 0x7fffffff
+      # XXX:  this foolishly assumes that we are running on a 64-bit machine or a 32-bit machine
+      result & (0.size == 8 ? 0x7fffffff : 0x3fffffff)
     end
 
     def qmf_id
@@ -287,7 +288,9 @@ module SPQR
         def other.class_id
           package_list = spqr_meta.package.to_s.split(".")
           cls = spqr_meta.classname.to_s or self.name.to_s
-          ((package_list.map {|pkg| pkg.capitalize} << cls).join("::")).hash & 0x7fffffff
+          
+          # XXX:  this foolishly assumes that we are running on a 64-bit machine or a 32-bit machine
+          ((package_list.map {|pkg| pkg.capitalize} << cls).join("::")).hash & (0.size == 8 ? 0x7fffffff : 0x3fffffff)
         end
       end
 

data/ruby-spqr.spec.in

@@ -68,7 +68,10 @@ rm -rf %{buildroot}
 
 %changelog
 
-* Mon Apr 5 2010  <willb@redhat> - 0.2.2-2
+* Mon Apr 12 2010  <willb@redhat> - 0.2.4-1
+- updated to version 0.2.4-1
+
+* Mon Apr 5 2010  <willb@redhat> - 0.2.3-1
 - updated to version 0.2.3-1
 
 * Thu Mar 4 2010  <willb@redhat> - 0.2.2-2

data/test/example-apps.rb

@@ -198,3 +198,38 @@ class Failbot
   qmf_package_name :example
   qmf_class_name :Failbot
 end
+
+class QmfListArg
+  include ::SPQR::Manageable 
+
+
+  def qmf_oid
+    1234
+  end
+
+  def spqr_object_id
+    1234
+  end
+ 
+  def QmfListArg.find_by_id(oid)
+    @objs ||= [QmfListArg.new]
+    @objs[0]
+  end
+  
+  def QmfListArg.find_all
+    @objs ||= [QmfListArg.new]
+    @objs
+  end
+  
+  def double(ls)
+    ls.map {|x| 2 * x}
+  end
+
+  expose :double do |args|
+    args.declare :input, :list, :in
+    args.declare :ls, :list, :out
+  end
+  
+  qmf_class_name :QmfListArg
+  qmf_package_name :example
+end

data/test/test_spqr_listarg.rb

@@ -0,0 +1,24 @@
+require 'helper'
+require 'set'
+require 'example-apps'
+
+class TestListArg < Test::Unit::TestCase
+  include QmfTestHelpers
+
+  def setup
+    @child_pid = nil
+  end
+
+  def test_property_identities
+    app_setup QmfListArg
+
+    somenats = (0..16).to_a
+
+    obj = $console.object(:class=>"QmfListArg")
+
+    ls = obj.double(somenats).ls
+    
+    assert_equal ls.size, somenats.size
+    somenats.zip(ls).each {|n,n2| assert_equal(n*2, n2) }
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spqr
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - William Benton
@@ -9,19 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -05:00
+date: 2010-04-12 00:00:00 -05:00
 default_executable: spqr-gen.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 description: SPQR makes it very simple to expose methods on Ruby objects over QMF.  You must install ruby-qmf in order to use SPQR.
 email: willb@redhat.com
 executables: 
@@ -65,6 +74,7 @@ files:
 - test/test_spqr_dummyprop.rb
 - test/test_spqr_hello.rb
 - test/test_spqr_integerprop.rb
+- test/test_spqr_listarg.rb
 has_rdoc: true
 homepage: http://git.fedorahosted.org/git/grid/spqr.git
 licenses: []
@@ -78,18 +88,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "SPQR:  {Schema Processor|Straightforward Publishing} for QMF agents in Ruby"
@@ -98,6 +110,7 @@ test_files:
 - spec/spec_helper.rb
 - test/example-apps.rb
 - test/test_spqr_dummyprop.rb
+- test/test_spqr_listarg.rb
 - test/generic-agent.rb
 - test/helper.rb
 - test/test_failbot.rb
@@ -105,7 +118,6 @@ test_files:
 - test/test_spqr_clicker.rb
 - test/test_spqr_integerprop.rb
 - test/test_spqr_hello.rb
-- examples/agent-app.rb
-- examples/examples/codegen/EchoAgent.rb
 - examples/hello.rb
+- examples/codegen/EchoAgent.rb
 - examples/logservice.rb

data/examples/agent-app.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'spqr/spqr'
-require 'spqr/app'
-
-require 'examples/codegen/EchoAgent'
-
-app = SPQR::App.new(:loglevel => :debug)
-app.register Examples::Codegen::EchoAgent
-
-app.main