rubyuno 0.3.2 → 0.3.3.1

data/ext/rubyuno/runtime.cxx

@@ -130,7 +130,7 @@ Runtime::getTypes(const Runtime &runtime, VALUE *value)
 	ID id = rb_intern("getTypes");
 	
 	if (! rb_respond_to(*value, id))
-		rb_raise(rb_eArgError, "illegal argument does not support com.sun.star.lang.XTypeProvider interface (%s)", value);
+		rb_raise(rb_eArgError, "illegal argument does not support com.sun.star.lang.XTypeProvider interface");
 	VALUE types = rb_funcall(*value, id, 0);
 	
 	long size = RARRAY_LEN(types);

data/lib/rubyuno/uno/connector.rb

@@ -44,54 +44,70 @@ module Uno
     
     # Read Professional UNO chapter of Developer's Guide about 
     # UNO Remote protocol.
-    def self.bootstrap(office="soffice", type="socket", 
-         host="localhost", port=2083, pipe_name=nil, nodelay=false)
-      url, argument = self.url_construct(type, host, port, pipe_name, nodelay)
+    def self.bootstrap(options = {})
+      options = {
+        :office => 'soffice',
+        :type => 'socket',
+        :host => '127.0.0.1',
+        :port => 2083,
+        :nodelay => false
+      }.merge(options)
+
+      url, argument = self.url_construct(options[:type], options[:host], options[:port], options[:pipe_name], options[:nodelay])
+
       r = self.resolver_get
       c = nil
       n = 0
+
       begin
         c = self.connect(url, r)
       rescue Rubyuno::Com::Sun::Star::Uno::Exception => e
-        raise e if e.uno_instance_of?(
-            Rubyuno::Com::Sun::Star::Connection::ConnectionSetupException)
+        raise e if e.instance_of?(Rubyuno::Com::Sun::Star::Connection::ConnectionSetupException)
+
         n += 1
         (raise NoConnectionError,"") if n > @@retry
-        spawn(ENV, office, argument)
+
+        if options[:spawn_cmd]
+          system options[:spawn_cmd]
+        else
+          spawn(ENV, options[:office], argument)
+        end
+
         sleep(@@sleep_time)
+
         retry
       end
+
       return c
     end
     
-    def self.connect(url, resolver=nil)
+    def self.connect(url, resolver = nil)
       resolver = self.resolver_get unless resolver
       return resolver.resolve(url)
     end
-    
-    def self.url_construct(type="socket", 
-         host="localhost", port=2083, pipe_name=nil, nodelay=false)
+
+    def self.url_construct(type = "socket", host = "127.0.0.1", port = 2083, pipe_name = nil, nodelay = false)
       case type
-      when "socket"
-        part = "socket,host=#{host},port=#{port}," +
-                  "tcpNoDelay=#{nodelay ? 1 : 0};urp;"
-        url = "uno:#{part}StarOffice.ComponentContext"
-        argument = "-accept=#{part}StarOffice.ServiceManager"
-      when "pipe"
-        pipe_name = "#{PIPE_NAME_PREFIX}#{srand * 10000}" unless pipe_name
-        part = "pipe,name=#{pipe_name};urp;"
-        url = "uno:#{part}StarOffice.ServiceManager"
-        argument = "-accept=#{part}StarOffice.ComponentContext"
-      else
-        raise ArgumentError, "Illegal connection type (#{type})"
+        when "socket"
+          part = "socket,host=#{host},port=#{port}," +
+                    "tcpNoDelay=#{nodelay ? 1 : 0};urp;"
+          url = "uno:#{part}StarOffice.ComponentContext"
+          argument = "-headless -nologo -nofirststartwizard -accept=#{part}StarOffice.ServiceManager"
+        when "pipe"
+          pipe_name = "#{PIPE_NAME_PREFIX}#{srand * 10000}" unless pipe_name
+          part = "pipe,name=#{pipe_name};urp;"
+          url = "uno:#{part}StarOffice.ServiceManager"
+          argument = "-headless -nologo -nofirststartwizard -accept=#{part}StarOffice.ComponentContext"
+        else
+          raise ArgumentError, "Illegal connection type (#{type})"
       end
+
       return url, argument
     end
-    
+
     def self.resolver_get
       ctx = Rubyuno.get_component_context
-      return ctx.getServiceManager.createInstanceWithContext(
-                      "com.sun.star.bridge.UnoUrlResolver", ctx)
+      return ctx.getServiceManager.createInstanceWithContext("com.sun.star.bridge.UnoUrlResolver", ctx)
     end
   end
 end

data/lib/rubyuno/version.rb

@@ -1,3 +1,3 @@
 module Rubyuno
-  VERSION = "0.3.2"
+  VERSION = "0.3.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyuno
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies: []
 description: Ruby-OpenOffice UNO native bridge
 email:
@@ -67,20 +67,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: rubyuno is a Ruby-UNO (Universal Network Object) bridge, used to interact