r2corba 1.5.4 → 1.5.5

data/lib/corba/svcs/ins/ins.rb

@@ -65,7 +65,7 @@ module R2CORBA
           end
 
           begin
-            File.open(self.pidfile, File::CREAT|File::EXCL|File::WRONLY) do |f|
+            File.open(self.pidfile, File::CREAT | File::EXCL | File::WRONLY) do |f|
               f.write Process.pid
             end
             report "INS - PID \##{Process.pid} written to '#{self.pidfile}'"
@@ -217,7 +217,7 @@ module R2CORBA
             end
 
             begin
-              File.open(self.pidfile, File::CREAT|File::EXCL|File::WRONLY) do |f|
+              File.open(self.pidfile, File::CREAT | File::EXCL | File::WRONLY) do |f|
                 f.write Process.pid
               end
               report "INS - PID \##{Process.pid} written to '#{self.pidfile}'"
@@ -385,12 +385,12 @@ module R2CORBA
     def INS.parse_arg
       script_name = File.basename($0, '.bat')
       if not script_name =~ /rins/
-        script_name = "ruby "+$0
+        script_name = "ruby " + $0
       end
 
       @@command = ARGV.shift.to_sym unless ARGV.empty?
       unless COMMANDS.include?(@@command)
-        STDERR.puts "ERROR: Invalid command [#{command}]!\n"+
+        STDERR.puts "ERROR: Invalid command [#{command}]!\n" +
                     "Usage: #{script_name} #{COMMANDS.join('|')} [options]\n"
         exit 1
       end
@@ -429,42 +429,42 @@ module R2CORBA
 
             opts.on("-i FILE", "--ior=FILE", String,
                     "Specifies filename (incl. path) to write IOR to.",
-                    "Default: ./ins.ior") { |v| OPTIONS[:iorfile]=v }
+                    "Default: ./ins.ior") { |v| OPTIONS[:iorfile] = v }
             unless IS_WIN32
               opts.on("-p DIR", "--pid=DIR", String,
                       "Specifies path to write pidfile to.",
-                      "Default: ./") { |v| OPTIONS[:piddir]=v }
+                      "Default: ./") { |v| OPTIONS[:piddir] = v }
               unless IS_JRUBY
                 opts.on("-o DIR", "--output=DIR", String,
                         "Specifies filename to write logfile to.",
-                        "Default: <piddir>") { |v| OPTIONS[:logdir]=v }
+                        "Default: <piddir>") { |v| OPTIONS[:logdir] = v }
               end
             else
               opts.on("-o DIR", "--output=DIR", String,
                       "Specifies path to write logfile to.",
-                      "Default: ./") { |v| OPTIONS[:logdir]=v }
+                      "Default: ./") { |v| OPTIONS[:logdir] = v }
             end
             opts.on("-l PORTNUM", "--listen=PORTNUM", Integer,
                     "Specifies port number for service endpoint.",
-                    "Default: none") { |v| OPTIONS[:port]=v }
-            if (IS_JRUBY or R2CORBA::TAO::RUBY_THREAD_SUPPORT)
+                    "Default: none") { |v| OPTIONS[:port] = v }
+            if IS_JRUBY or R2CORBA::TAO::RUBY_THREAD_SUPPORT
               opts.on("-t THREADNUM", "--threads=THREADNUM", Integer,
                       "Specifies (minimum) number of threads for service.",
-                      "Default: 5") { |v| OPTIONS[:threads]=v }
+                      "Default: 5") { |v| OPTIONS[:threads] = v }
             end
 
             unless IS_JRUBY || !INS.daemons_installed
               opts.on("-d", "--daemon",
                       "Run as daemon.",
-                      "Default: off") { |v| OPTIONS[:daemon]=v }
+                      "Default: off") { |v| OPTIONS[:daemon] = v }
             end
             opts.on("-v", "--verbose",
                     "Run verbose.",
-                    "Default: off") { |v| OPTIONS[:verbose]=v }
+                    "Default: off") { |v| OPTIONS[:verbose] = v }
 
             opts.on("--debug=LVL", Integer,
                     "Specifies debug level.",
-                    "Default: 0") { |v| OPTIONS[:debug]=v }
+                    "Default: 0") { |v| OPTIONS[:debug] = v }
 
             opts.separator ""
 
@@ -483,18 +483,18 @@ module R2CORBA
             unless IS_WIN32
               opts.on("-p DIR", "--pid=DIR", String,
                       "Specifies path where pidfile is stored.",
-                      "Default: ./") { |v| OPTIONS[:piddir]=v }
+                      "Default: ./") { |v| OPTIONS[:piddir] = v }
             end
 
             unless @@command == 'status'
               OPTIONS[:daemon] = true unless IS_JRUBY || !INS.daemons_installed
               opts.on("--[no-]daemon",
                       "Do not run in daemon mode.",
-                      "Default: #{OPTIONS[:daemon] ? 'on' : 'off'}") { |v| OPTIONS[:daemon]=v }
+                      "Default: #{OPTIONS[:daemon] ? 'on' : 'off'}") { |v| OPTIONS[:daemon] = v }
             end
             opts.on("-v", "--verbose",
                     "Run verbose.",
-                    "Default: off") { |v| OPTIONS[:verbose]=v }
+                    "Default: off") { |v| OPTIONS[:verbose] = v }
 
             opts.separator ""
 

data/lib/corba/svcs/ins/naming_service.rb

@@ -35,7 +35,7 @@ module R2CORBA
         #
         if defined?(JRUBY_VERSION)
           @options[:orbprop]['jacorb.poa.thread_pool_min'] = @options[:threads]
-          @options[:orbprop]['jacorb.poa.thread_pool_max'] = @options[:threads]*4
+          @options[:orbprop]['jacorb.poa.thread_pool_max'] = @options[:threads] * 4
           if @options[:debug] > 0
             @options[:orbprop]['jacorb.log.default.verbosity'] = case
             when @options[:debug] < 2
@@ -93,7 +93,7 @@ module R2CORBA
 
       def run
         STDERR.puts "INS - starting service run" if @options[:verbose]
-        if (defined?(JRUBY_VERSION) or !R2CORBA::TAO::RUBY_THREAD_SUPPORT)
+        if defined?(JRUBY_VERSION) or !R2CORBA::TAO::RUBY_THREAD_SUPPORT
           STDERR.puts "INS - running ORB" if @options[:verbose]
           @orb.run
         else

data/lib/ridlbe/ruby/config.rb

@@ -31,7 +31,7 @@ module IDL
     private
     def RIDL.merge_params(params)
       opts = IDL::OPTIONS.dup
-      params.each do |k,v|
+      params.each do |k, v|
         case opts[k]
         when Array
           opts[k] = opts[k] + (Array === v ? v : [v])
@@ -50,7 +50,7 @@ module IDL
       parser.parse(src)
       s = ::IDL::StrOStream.new
       s.clear
-      IDL::Ruby.process_input(parser,params,s)
+      IDL::Ruby.process_input(parser, params, s)
       s
     end
     def RIDL.parse(src, params)
@@ -194,7 +194,7 @@ module IDL
       #   in options - initialized option hash
       #
       becfg.on_process_input do |parser, options|
-        IDL::Ruby.process_input(parser,options)
+        IDL::Ruby.process_input(parser, options)
       end # becfg.on_process_input
 
     end # Backend.configure
@@ -205,7 +205,7 @@ module IDL
 
       # determine output file path for client stub code
       unless fixed_output || options[:idlfile].nil?
-        options[:output] = options[:outputdir]+'/'+File.basename(options[:idlfile], '.idl')+options[:stub_pfx]+'.rb'
+        options[:output] = options[:outputdir] + '/' + File.basename(options[:idlfile], '.idl') + options[:stub_pfx] + '.rb'
       end
       # generate client stubs if requested
       if options[:client_stubs]
@@ -231,7 +231,7 @@ module IDL
             options[:srv_output] = if fixed_output
                 options[:output]
               else
-                options[:outputdir]+'/'+File.basename(options[:idlfile], '.idl')+options[:srv_pfx]+'.rb'
+                options[:outputdir] + '/' + File.basename(options[:idlfile], '.idl') + options[:srv_pfx] + '.rb'
               end
             if fixed_output && options[:client_stubs]
               co
@@ -282,13 +282,13 @@ module IDL
               IDL::AST::Member,
               IDL::AST::UnionMember
             # member names
-            ret = ret[0,1].downcase + ret[1,ret.size].to_s
-            ret = 'r_'+ret if IDL::Ruby::LeafMixin::RESERVED_RUBY_MEMBER.include?(ret)
+            ret = ret[0, 1].downcase + ret[1, ret.size].to_s
+            ret = 'r_' + ret if IDL::Ruby::LeafMixin::RESERVED_RUBY_MEMBER.include?(ret)
           else
             # class/module names
-            ret = ret[0,1].upcase + ret[1,ret.size].to_s
+            ret = ret[0, 1].upcase + ret[1, ret.size].to_s
             is_scoped = @enclosure && !@enclosure.scopes.empty?
-            ret = 'R_'+ret if !is_scoped && IDL::Ruby::LeafMixin::RESERVED_RUBY_CONST.include?(ret)
+            ret = 'R_' + ret if !is_scoped && IDL::Ruby::LeafMixin::RESERVED_RUBY_CONST.include?(ret)
           end
           @lm_name = ret
         end
@@ -319,7 +319,7 @@ module IDL
 
       def chk_identifier(ident)
         # prefix Ruby keywords with 'r_'
-        RUBYKW.include?(ident.to_sym) ? 'r_'+ident : ident
+        RUBYKW.include?(ident.to_sym) ? 'r_' + ident : ident
       end
 
     end # module ScannerMixin

data/lib/ridlbe/ruby/walker.rb

@@ -79,7 +79,7 @@ module IDL
     end
 
     def visit_include(node)
-      printiln(format("require '%s'", node.filename.sub(/\.[^\.]*$/,@params[:stub_pfx])))
+      printiln(format("require '%s'", node.filename.sub(/\.[^\.]*$/, @params[:stub_pfx])))
       println()
     end
 
@@ -133,7 +133,7 @@ module IDL
         println()
         @nest += 1
 
-        if node.bases.size>0
+        if node.bases.size > 0
           node.bases.each do |n|
             printiln("include #{n.scoped_rubyname}")
           end
@@ -146,7 +146,7 @@ module IDL
           println(",")
           printi("        'IDL:omg.org/CORBA/AbstractBase:1.0'")
         end
-        if node.bases.size>0
+        if node.bases.size > 0
           node.bases.each do |n|
             println(",")
             printi("        #{n.scoped_rubyname}::Id")
@@ -519,7 +519,7 @@ module IDL
 
           ##  validate data for IN/INOUT args
           ##
-          if _parm.size>0
+          if _parm.size > 0
             _parm.each do |p|
               if p.attribute != IDL::AST::Parameter::OUT
                 printiln("#{p.rubyname} = #{get_typecode(p.idltype)}.validate(#{p.rubyname})")
@@ -536,7 +536,7 @@ module IDL
           end
 
           newln = ""
-          if _parm.size>0
+          if _parm.size > 0
             println(newln)
             nest do
               printi(":arg_list => [")
@@ -565,7 +565,7 @@ module IDL
             newln = ","
           end
 
-          if node.raises.size>0
+          if node.raises.size > 0
             println(newln)
             nest {
               printi(":exc_list => [")
@@ -612,7 +612,7 @@ module IDL
 
           printiln("_ret = self._invoke('_get_#{node.name}', {")
           nest { printi(":result_type => #{get_typecode(node.idltype)}") }
-          if node.get_raises.size>0
+          if node.get_raises.size > 0
             println(',')
             nest {
               printi(":exc_list => [")
@@ -656,7 +656,7 @@ module IDL
                 printiln("['val', CORBA::ARG_IN, #{get_typecode(node.idltype)}, val]],");
               }
               printi(":result_type => CORBA._tc_void")
-              if node.set_raises.size>0
+              if node.set_raises.size > 0
                 println(',')
                 printi(":exc_list => [")
                 pfx = ""
@@ -689,7 +689,7 @@ module IDL
         s = _type.class.name.split("::") # IDL::Type::Octet -> [IDL, Type, Octet]
         s = s[s.length - 1]
         s.downcase!
-        format("CORBA._tc_%s",s)
+        format("CORBA._tc_%s", s)
 
       when Type::Object
         "CORBA._tc_Object"
@@ -712,7 +712,7 @@ module IDL
         scoped_type = _type.node.idltype
         if scoped_type.is_a?(IDL::Type::Interface) && scoped_type.node.is_forward?()
           node = scoped_type.node
-          "(CORBA::TypeCode.typecode_for_id('#{node.repository_id}') || "+
+          "(CORBA::TypeCode.typecode_for_id('#{node.repository_id}') || " +
             "CORBA::TypeCode::ObjectRef.new('#{node.repository_id}', '#{node.rubyname}', #{node.scoped_rubyname}))"
         else
           _type.node.scoped_rubyname + '._tc'
@@ -893,7 +893,7 @@ module IDL
         printiln(format("attr_accessor :%s", m.rubyname))
       end
 
-      if struct_members_.size>0
+      if struct_members_.size > 0
         printiln('def initialize(*param_)')
         nest {
           struct_members_.each do |m|
@@ -934,7 +934,7 @@ module IDL
         printiln(format("@@tc_%s ||= CORBA::TypeCode::Union.new('%s'.freeze, '%s',",
                       node.rubyname, node.repository_id, node.rubyname))
         printi("    #{get_typecode(node.switchtype)}")
-        if node.members.size>0
+        if node.members.size > 0
           pfx = "   ["
           node.members.each do |m|
             m.labels.each do |lbl|
@@ -958,7 +958,7 @@ module IDL
       printiln("end")
       printiln("self._tc  # register typecode");
       ix = 0
-      if node.members.size>0
+      if node.members.size > 0
         node.members.each do |m|
           printiln(format("def %s; @value; end", m.rubyname))
           printiln(format("def %s=(val); _set_value(%d, val); end", m.rubyname, ix))
@@ -1123,7 +1123,7 @@ module IDL
       idleval = @params[:idl_eval] || false
       println("require 'corba/poa.rb'") if @params[:libinit]
       if !@params[:expand_includes]
-        println("require '"+@params[:idlfile].sub(/\.[^\.]*$/,@params[:stub_pfx])+"'")
+        println("require '" + @params[:idlfile].sub(/\.[^\.]*$/, @params[:stub_pfx]) + "'")
       end
       println()
       printiln("module POA")
@@ -1147,7 +1147,7 @@ module IDL
     end
 
     def visit_include(node)
-      printiln(format("require '%s'", node.filename.sub(/\.[^\.]*$/,@params[:srv_pfx])))
+      printiln(format("require '%s'", node.filename.sub(/\.[^\.]*$/, @params[:srv_pfx])))
       println()
     end
 
@@ -1207,7 +1207,7 @@ module IDL
         printiln("Id = Intf::Id")
         println()
 
-        if node.bases.size>0
+        if node.bases.size > 0
           node.bases.each do |n|
             printiln("include_interface(#{n.scoped_rubyname}::Intf)")
           end
@@ -1264,7 +1264,7 @@ module IDL
 
       printi("Operations.store(:#{node.name}, {")
       newln = ""
-      if _parm.size>0
+      if _parm.size > 0
         println(newln)
         nest do
           printi(":arg_list => [")
@@ -1289,7 +1289,7 @@ module IDL
         newln = ","
       end
 
-      if node.raises.size>0
+      if node.raises.size > 0
         println(newln)
         nest {
           printi(":exc_list => [")
@@ -1339,7 +1339,7 @@ module IDL
       nest {
         nest {
           printiln(":result_type => #{get_typecode(node.idltype)},")
-          if node.get_raises.size>0
+          if node.get_raises.size > 0
             printi(":exc_list => [")
             pfx = ""
             nest {
@@ -1374,7 +1374,7 @@ module IDL
               printiln("['val', CORBA::ARG_IN, #{get_typecode(node.idltype)}]],");
             }
             printiln(":result_type => CORBA._tc_void,")
-            if node.set_raises.size>0
+            if node.set_raises.size > 0
               printi(":exc_list => [")
               pfx = ""
               nest {
@@ -1414,7 +1414,7 @@ module IDL
         s = _type.class.name.split("::") # IDL::Type::Octet -> [IDL, Type, Octet]
         s = s[s.length - 1]
         s.downcase!
-        format("CORBA._tc_%s",s)
+        format("CORBA._tc_%s", s)
 
       when Type::Object
         "CORBA._tc_Object"

data/mkrf_conf_srcgem.rb

@@ -33,7 +33,7 @@ require 'optparse'
 
 if defined?(JRUBY_VERSION)
 
-  usage_text =<<-__EOT
+  usage_text = <<-__EOT
 Make sure you have provided a JACORB_HOME definition pointing at a valid JacORB installation
 with all required .jar files located at JACORB_HOME\lib. You can do this either by setting
 the JACORB_HOME environment variable or by providing the --jacorb-home buildflag to the
@@ -51,13 +51,13 @@ __EOT
 
   # check for proper JacORB installation
   if jacorb_home
-    jar_files = Dir.glob(File.join(jacorb_home, 'lib', 'jacorb.jar'))+
+    jar_files = Dir.glob(File.join(jacorb_home, 'lib', 'jacorb.jar')) +
                 Dir.glob(File.join(jacorb_home, 'lib', 'jacorb-services.jar')) +
                 Dir.glob(File.join(jacorb_home, 'lib', 'slf4j*.jar')) +
                 Dir.glob(File.join(jacorb_home, 'lib', 'antlr*.jar'))
     if jar_files.size == 5
       # run configure with appropriate settings
-      puts "Valid JacORB installation found.\n"+
+      puts "Valid JacORB installation found.\n" +
            "Running 'ruby -S rake -- configure --without-jacorb --jacorb-home=#{jacorb_home}'"
       unless system("ruby -S rake -- configure --without-jacorb --jacorb-home=#{jacorb_home}")
         puts 'Failed to configure R2CORBA'
@@ -90,7 +90,7 @@ else
     COMMON_HEADERS.slice!(/./)
   end
 
-  usage_txt =<<-__EOT
+  usage_txt = <<-__EOT
 Please define a valid ACE/TAO build environment either by defining the ACE_ROOT and (optionally)
 the TAO_ROOT (defaults to ACE_ROOT/TAO) and MPC_ROOT (defaults to ACE_ROOT/MPC) environment
 variable OR by providing the --aceroot and (optionally) --taoroot and --mpcroot build flags to
@@ -138,7 +138,7 @@ __EOT
     end
     inst = Gem::DependencyInstaller.new
     begin
-      inst.install "taosource", ">= 6.5.7"
+      inst.install "taosource", ">= 7.0.0"
     rescue
       $stderr.puts 'Failed to install taosource gem.'
       exit(1)

data/rakelib/bin.rake

@@ -44,7 +44,7 @@ namespace :r2corba do
       R2CORBA::Bin.binaries.each do |bin|
         if File.exist?(File.join('bin', bin))
           content = IO.read(File.join('bin', bin))
-          rm_f(File.join('bin', bin)) unless content == R2CORBA::Bin.__send__(bin.gsub('.','_').to_sym)
+          rm_f(File.join('bin', bin)) unless content == R2CORBA::Bin.__send__(bin.gsub('.', '_').to_sym)
         end
       end
     end

data/rakelib/bin.rb

@@ -18,7 +18,7 @@ module R2CORBA
 
     def self.ridlc
       <<_SH_TXT
-#!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
+#!#{Config.is_win32 ? '/bin/' : (`which env`).strip + ' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
 #---------------------------------
 # This file is generated
 #---------------------------------
@@ -86,7 +86,7 @@ _BAT_TXT
 
     def self.rins
       <<_SH_TXT
-#!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
+#!#{Config.is_win32 ? '/bin/' : (`which env`).strip + ' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
 #---------------------------------
 # This file is generated
 #---------------------------------
@@ -98,7 +98,7 @@ _SH_TXT
 
     def self.r2corba
       <<_SH_TXT
-#!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
+#!#{Config.is_win32 ? '/bin/' : (`which env`).strip + ' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
 #---------------------------------
 # This file is generated
 #---------------------------------