ferocia-rubywmq 1.1.3 → 2.0.2

data/ext/extconf.rb

@@ -1,52 +1,32 @@
-################################################################################
-#  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-################################################################################
+require 'mkmf'
+generate_sources_path = File.join(File.dirname(__FILE__), 'generate')
+$LOAD_PATH.unshift generate_sources_path
+require 'generate_reason'
+require 'generate_const'
+require 'generate_structs'
 
-if RUBY_PLATFORM =~ /darwin/ || ENV['DISABLE_RUBYWMQ']
-   # do nothing on a mac, this is so people developing applications using this
-   # gem on a mac (using stubs for development) can still keep the gem in their
-   # Gemfile
-   # create a blank Makefile to satisfy extension install requirements
-   File.open("Makefile", "w") { |f| f << 'install:' }
+include_path = ''
+if RUBY_PLATFORM =~ /win|mingw/i
+  include_path = 'C:\Program Files\IBM\WebSphere MQ\tools\c\include'
+  dir_config('mqm', include_path, '.')
 else
-  require 'mkmf'
-  require_relative 'generate/generate_reason'
-  require_relative 'generate/generate_const'
-  require_relative 'generate/generate_structs'
-
-  include_path = ''
-  if RUBY_PLATFORM =~ /mswin32/
-    include_path = 'C:\Program Files\IBM\WebSphere MQ\Tools\c\include'
-    dir_config('mqm', include_path, '.')
-  else
-    include_path = '/opt/mqm/inc'
-    #dir_config('mqm', include_path, '/opt/mqm/lib')
-  end
+  include_path = '/opt/mqm/inc'
+  lib64_path   = '/opt/mqm/lib64'
+  lib_path     = File.directory?(lib64_path) ? lib64_path : '/opt/mqm/lib'
+  dir_config('mqm', include_path, lib_path)
+end
 
-  have_header('cmqc.h')
+have_header('cmqc.h')
 
-  # Check for WebSphere MQ Server library
-  unless (RUBY_PLATFORM =~ /win/i) || (RUBY_PLATFORM =~ /solaris/i) || (RUBY_PLATFORM =~ /linux/i)
-    have_library('mqm')
-  end
+# Check for WebSphere MQ Server library
+unless (RUBY_PLATFORM =~ /win/i) || (RUBY_PLATFORM =~ /solaris/i) || (RUBY_PLATFORM =~ /linux/i)
+  have_library('mqm')
+end
 
-  # Generate Source Files
-  GenerateReason.generate(include_path+'/')
-  GenerateConst.generate(include_path+'/', 'lib')
-  GenerateStructs.new(include_path+'/', 'generate').generate
+# Generate Source Files
+GenerateReason.generate(include_path+'/')
+GenerateConst.generate(include_path+'/', File.dirname(__FILE__) + '/../lib/wmq')
+GenerateStructs.new(include_path+'/', generate_sources_path).generate
 
-  # Generate Makefile
-  create_makefile('wmq/wmq')
-end
+# Generate Makefile
+create_makefile('wmq/wmq')

data/ext/extconf_client.rb

@@ -1,21 +1,5 @@
-################################################################################
-#  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
 #
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-################################################################################
-
-#
-# NOTE:  Do NOT use this file unless the platform being requested is not supported
+# NOTE:  Do NOT use this file unless the platform being used is not supported
 #        directly by Ruby WMQ. Ruby WMQ already supports automatic dynamic loading on
 #        Windows, Solaris and Linux
 #
@@ -29,12 +13,12 @@ unless (RUBY_PLATFORM =~ /win/i) || (RUBY_PLATFORM =~ /solaris/i) || (RUBY_PLATF
   include_path = '/opt/mqm/inc'
   dir_config('mqm', include_path, '/opt/mqm/lib')
   have_library('mqic')
-  
+
   # Generate Source Files # Could check if not already present
   GenerateReason.generate(include_path+'/')
   GenerateConst.generate(include_path+'/', '../../lib/wmq')
   GenerateStructs.new(include_path+'/', '../../generate').generate
-  
+
   have_header('cmqc.h')
   create_makefile('wmq_client')
 end

data/ext/generate/generate_const.rb

@@ -1,6 +1,7 @@
+# Extract Constants from the WebSphere MQ header files
 class GenerateConst
-  
-  #Extract Constants from Header files  
+
+  # Extract Constants from Header files
   def GenerateConst.extract_const(filename, const_prefix, start_exp=nil, end_exp=nil)
     @constants = []
     active = if start_exp then false else true end    # Sure there is a better way
@@ -23,8 +24,8 @@ class GenerateConst
     end
     @constants
   end
-  
-  #Extract MQ Constants from Header files  
+
+  # Extract MQ Constants from Header files
   def GenerateConst.rb_const(filename, const_prefix, exclude_exp=nil)
     str = ''
     GenerateConst.extract_const(filename, const_prefix).each do |item|
@@ -42,7 +43,7 @@ class GenerateConst
     end
     str
   end
-  
+
   def GenerateConst.config(filename, prefix)
     str = "# WMQ::QueueManager execute commands\n"
     str << "execute_commands:\n"
@@ -55,24 +56,10 @@ class GenerateConst
     end
     str
   end
-  
+
   def GenerateConst.wmq_const(path)
     str = <<END_OF_STRING
 ################################################################################
-#  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-################################################################################
 #
 #  WARNING: DO NOT MODIFY THIS FILE
 #
@@ -81,18 +68,18 @@ class GenerateConst
 ################################################################################
 module WMQ
 END_OF_STRING
-    [ ['Connect Options','cmqc.h','MQCNO_',/(VERSION)|(CONN_TAG)|(HANDLE_SHARE)/],
+    [ ['Connect Options','cmqc.h','MQCNO_',/(VERSION)|(CONN_TAG)|(HANDLE_SHARE)|(_LENGTH)/],
       ['Open Options', 'cmqc.h','MQOO_' ],
       ['Close Options', 'cmqc.h','MQCO_'],
       ['Match Options', 'cmqc.h','MQMO_'],
       ['Message Format Options', 'cmqc.h','MQFMT_',/(_ARRAY)/],
-      ['Get Message Options', 'cmqc.h','MQGMO_',/(VERSION)/],
+      ['Get Message Options', 'cmqc.h','MQGMO_',/(VERSION)|(LENGTH)|(MQGMO_BROWSE_HANDLE)|(MQGMO_BROWSE_CO_OP)/],
       ['Transport Types', 'cmqxc.h','MQXPT_'] ,
       ['Report Options', 'cmqc.h', 'MQRO_'],
       ['Message Types', 'cmqc.h', 'MQMT_'],
       ['Expiry', 'cmqc.h', 'MQEI_'],
       ['Feedback Values', 'cmqc.h', 'MQFB_'],
-      ['Encoding Values', 'cmqc.h', 'MQENC_'],
+      ['Encoding Values', 'cmqc.h', 'MQENC_',/(MQENC_NORMAL)|(MQENC_REVERSED)|(MQENC_S390)|(MQENC_TNS)/],
       ['Coded Character Set Identifiers', 'cmqc.h', 'MQCCSI_'],
       ['Priority', 'cmqc.h', 'MQPRI_'],
       ['Persistence', 'cmqc.h', 'MQPER_'],
@@ -108,24 +95,10 @@ END_OF_STRING
     end
     str << "end\n"
   end
-  
+
   def GenerateConst.admin_consts(path)
     str = <<END_OF_STRING
 ################################################################################
-#  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-################################################################################
 #
 #  WARNING: DO NOT MODIFY THIS FILE
 #
@@ -142,7 +115,7 @@ END_OF_STRING
       str << "\n# #{item[0]}\n"
       str << GenerateConst.rb_const("#{path}/#{item[1]}", item[2], item[3])
     end
-    GenerateConst.extract_const(path+'cmqc.h', 'MQ', /Queue\sAttributes/, /typedef/).each do |item|
+    GenerateConst.extract_const(path+'cmqc.h', 'MQ', /Queue\s+Attributes/, /General\s+Constants/).each do |item|
       str << "   %-30s = #{item[1]}\n" % item[0]
     end
     str << "# Admin constants from cmqcfc.h\n"
@@ -151,14 +124,14 @@ END_OF_STRING
     end
     str << "end\n"
   end
-  
+
   def self.generate(path, target_path='')
-    File.open(File.join(target_path,'wmq_const_admin.rb'), 'w') {|file| file.write(GenerateConst.admin_consts(path))}
+    File.open(File.join(target_path,'constants_admin.rb'), 'w') {|file| file.write(GenerateConst.admin_consts(path))}
     puts 'Generated wmq_const_admin.rb'
-    File.open(File.join(target_path,'wmq_const.rb'), 'w') {|file| file.write(GenerateConst.wmq_const(path))}
+    File.open(File.join(target_path,'constants.rb'), 'w') {|file| file.write(GenerateConst.wmq_const(path))}
     puts 'Generated wmq_const.rb'
   end
-end  
+end
 
 if $0 == __FILE__
   path = ARGV[0] || raise("Mandatory parameter: 'WebSphere MQ Include path' is missing")

data/ext/generate/generate_reason.rb

@@ -1,6 +1,6 @@
 class GenerateReason
 
-  #Extract Error Code Constants from Header files  
+  # Extract Error Code Constants from Header files
   def GenerateReason.extract_const(filename, const_prefix)
     @constants = []
     File.open(filename) do |file|
@@ -16,8 +16,8 @@ class GenerateReason
     end
     @constants
   end
-  
-  #Extract Error Code Constants from Header files  
+
+  # Extract Error Code Constants from Header files
   # Uses lazy print to collect duplicate values
   def GenerateReason.reason_case(filename, prefix)
     last_rc = nil
@@ -36,8 +36,8 @@ class GenerateReason
     end
     str
   end
-  
-# The WebSphere MQ header files have several duplicate values, 
+
+# The WebSphere MQ header files have several duplicate values,
 # so need to exclude duplicates.
   def GenerateReason.selector_case(filename, prefix, excludes=nil, &block)
     GenerateReason.extract_const(filename,prefix).each do |item|
@@ -46,24 +46,10 @@ class GenerateReason
       block.call item
     end
   end
-  
+
   def GenerateReason.wmq_reason(path)
     str = <<END_OF_STRING
 /* --------------------------------------------------------------------------
- *  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * --------------------------------------------------------------------------
  *
  *  WARNING: DO NOT MODIFY THIS FILE
  *
@@ -97,9 +83,10 @@ END_OF_STRING
     [['cmqc.h', 'MQIA_'],
      ['cmqcfc.h', 'MQIACF_', ['MQIACF_ERROR_ID',
                               'MQIACF_QUIESCE']],
-     ['cmqcfc.h', 'MQIACH_', ['MQIACH_CURRENT_SEQ_NUMBER', 
-                              'MQIACH_BYTES_RCVD', 
-                              'MQIACH_BUFFERS_RCVD']],
+     ['cmqcfc.h', 'MQIACH_', ['MQIACH_CURRENT_SEQ_NUMBER',
+                              'MQIACH_BYTES_RCVD',
+                              'MQIACH_BUFFERS_RCVD',
+                              'MQIACH_MSGS_RCVD']],
      ['cmqcfc.h', 'MQIAMO_'],
      ['cmqcfc.h', 'MQIAMO64_',  ['MQIAMO64_AVG_Q_TIME',
                                                     'MQIAMO64_Q_TIME_AVG',
@@ -125,7 +112,7 @@ END_OF_STRING
         str_switch << "        case %-30s: return ID_#{id};\n" % const[0]
         str_id_init << "    ID_%-25s = rb_intern(\"#{id}\");\n" % id
         str << "static ID ID_#{id};\n"
-      end        
+      end
     end
 
     str << <<END_OF_STRING
@@ -156,8 +143,8 @@ END_OF_STRING
     [['cmqc.h',   'MQIA_'],
      ['cmqcfc.h', 'MQIACF_', ['MQIACF_ERROR_ID',
                                               'MQIACF_QUIESCE']],
-     ['cmqcfc.h', 'MQIACH_', ['MQIACH_CURRENT_SEQ_NUMBER', 
-                                              'MQIACH_BYTES_RCVD', 
+     ['cmqcfc.h', 'MQIACH_', ['MQIACH_CURRENT_SEQ_NUMBER',
+                                              'MQIACH_BYTES_RCVD',
                                               'MQIACH_BUFFERS_RCVD']],
      ['cmqcfc.h', 'MQIAMO_'],
      ['cmqcfc.h', 'MQIAMO64_',  ['MQIAMO64_AVG_Q_TIME',
@@ -169,8 +156,8 @@ END_OF_STRING
     ].each do |item|
       str << "    /* Consteants #{item[1]}* from #{item[0]} */\n"
       GenerateReason.selector_case(path+item[0], item[1], item[2]) do |const|
-        str << "    if(selector_id == %-32s{ *selector = #{const[0]}; return;}\n" % "ID_#{const[0].gsub(item[1],'').downcase})" 
-      end        
+        str << "    if(selector_id == %-32s{ *selector = #{const[0]}; return;}\n" % "ID_#{const[0].gsub(item[1],'').downcase})"
+      end
     end
     str << "\n    *selector_type = MQIT_STRING;\n\n"
 # Character Selectors for Object Attributes
@@ -182,16 +169,16 @@ END_OF_STRING
 #     ['cmqc.h', 'MQBA_'],
 #     ['cmqcfc.h', 'MQBACF_'],
 # Group Selectors for Object Attributes
-#     ['cmqcfc.h', 'MQGACF_'] 
+#     ['cmqcfc.h', 'MQGACF_']
     ].each do |item|
       str << "    /* Constants #{item[1]}* from #{item[0]} */\n"
       GenerateReason.selector_case(path+item[0], item[1], item[2]) do |const|
-        str << "    if(selector_id == %-32s{ *selector = #{const[0]}; return;}\n" % "ID_#{const[0].gsub(item[1],'').downcase})" 
-      end        
+        str << "    if(selector_id == %-32s{ *selector = #{const[0]}; return;}\n" % "ID_#{const[0].gsub(item[1],'').downcase})"
+      end
     end
 
     str << <<END_OF_STRING
-    
+
     rb_raise(rb_eArgError, "WMQ::QueueManager#execute [wmq_selector] Unknown selector supplied");
 }
 
@@ -208,9 +195,9 @@ END_OF_STRING
         end
         id = const[0].gsub('MQCMD_','').downcase
         str_id_init << "    ID_%-25s = rb_intern(\"#{id}\");\n" % id
-        str_if << "if(command_id == %-28s{ command = #{const[0]}; }\n" % "ID_#{const[0].gsub('MQCMD_','').downcase})" 
+        str_if << "if(command_id == %-28s{ command = #{const[0]}; }\n" % "ID_#{const[0].gsub('MQCMD_','').downcase})"
         str << "static ID ID_#{id};\n"
-      end        
+      end
     str << <<END_OF_STRING
 
 void QueueManager_command_id_init()
@@ -221,7 +208,7 @@ void QueueManager_command_id_init()
 MQLONG wmq_command_lookup(ID command_id)
 {
     MQLONG command = 0;
-#{str_if}    
+#{str_if}
     else
     {
         rb_raise(rb_eArgError, "WMQ::QueueManager#execute [wmq_command_lookup] Unknown command supplied");
@@ -232,7 +219,7 @@ MQLONG wmq_command_lookup(ID command_id)
 END_OF_STRING
   str
   end
-  
+
   def self.generate(path)
     File.open('wmq_reason.c', 'w') {|file| file.write(GenerateReason.wmq_reason(path))}
     puts 'Generated wmq_reason.c'

data/ext/generate/generate_structs.rb

@@ -1,30 +1,15 @@
-################################################################################
-#  Copyright 2006 J. Reid Morrison. Dimension Solutions, Inc.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-################################################################################
 require 'erb'
 
 class GenerateStructs
-  
+
   @@field_ignore_list = [ 'StrucId', 'Version' , 'StrucLength']
-  
+
   # Store path to WebSphere MQ Structures
   def initialize(wmq_includepath, templates_path='.')
     @path = wmq_includepath
     @templates_path = templates_path
   end
-  
+
   def extract_struct (filename, struct_name)
     properties_list = []
     line_number = 0
@@ -51,7 +36,7 @@ class GenerateStructs
     end
     properties_list
   end
-  
+
   def rubyize_name(name)
     name.gsub(/::/, '/').
     gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
@@ -59,7 +44,7 @@ class GenerateStructs
     tr("-", "_").
     downcase
   end
-  
+
   def self.test_rubyize_name
     test = self.new
     [['a', 'a'],
@@ -75,11 +60,11 @@ class GenerateStructs
       raise("rubyize_name('#{item[0]}') == #{str} != '#{item[1]})") if str != item[1]
     end
   end
-  
+
   def generate_structs(erb)
     erb.result(binding)
   end
-  
+
   def generate(target_filename = 'wmq_structs.c')
     erb = nil
     File.open(@templates_path+'/wmq_structs.erb') { |file| erb = ERB.new(file.read) }