ferocia-rubywmq 2.0.2 → 2.0.3

data/Rakefile

@@ -77,7 +77,7 @@ task :binary  do |t|
     spec.add_development_dependency 'shoulda'
     spec.requirements << 'WebSphere MQ v5.3, v6 or v7 Client or Server with Development Kit'
   end
-  Gem::Builder.new(gemspec).build
+  Gem::Package.build gemspec
 end
 
 desc "Run Test Suite"

data/ext/extconf.rb

@@ -1,32 +1,40 @@
-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/
+  puts "[rubywmq] cannot be installed on a mac"
+  puts "[rubywmq] installation will complete (so you can keep this gem in your bundles), but the gem will not function"
 
-include_path = ''
-if RUBY_PLATFORM =~ /win|mingw/i
-  include_path = 'C:\Program Files\IBM\WebSphere MQ\tools\c\include'
-  dir_config('mqm', include_path, '.')
+  # create a blank Makefile to satisfy extension install requirements
+  File.open("Makefile", "w") { |f| f << 'install:' }
 else
-  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
+  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'
 
-have_header('cmqc.h')
+  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
+    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
 
-# Check for WebSphere MQ Server library
-unless (RUBY_PLATFORM =~ /win/i) || (RUBY_PLATFORM =~ /solaris/i) || (RUBY_PLATFORM =~ /linux/i)
-  have_library('mqm')
-end
+  have_header('cmqc.h')
 
-# Generate Source Files
-GenerateReason.generate(include_path+'/')
-GenerateConst.generate(include_path+'/', File.dirname(__FILE__) + '/../lib/wmq')
-GenerateStructs.new(include_path+'/', generate_sources_path).generate
+  # Check for WebSphere MQ Server library
+  unless (RUBY_PLATFORM =~ /win/i) || (RUBY_PLATFORM =~ /solaris/i) || (RUBY_PLATFORM =~ /linux/i)
+    have_library('mqm')
+  end
 
-# Generate Makefile
-create_makefile('wmq/wmq')
+  # 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

data/ext/wmq_queue_manager.c

@@ -256,7 +256,7 @@ VALUE QueueManager_initialize(VALUE self, VALUE hash)
         {
             /*
              * Use system defined connection data rather than explicitly providing a
-             * connection name. This is used with CCDT, the MQSERVER variable or the
+             * connection name. This is used with CCDT, the MQSERVER ENV var or the
              * mqclient.ini file
              */
             pqm->connect_options.ClientConnPtr = NULL;
@@ -1188,6 +1188,12 @@ static VALUE QueueManager_singleton_connect_ensure(VALUE self)
  *   * Default Value:
  *       WMQ::MQXPT_TCP
  *
+ * * :use_system_connection_data => Boolean
+ *   * Used when you want to initialise a client connection, but you want
+ *   * to obtain the connection_name and channel_name from one of the system
+ *   * configuration methods. These being: mqclient.ini file, MQSERVER ENV
+ *   * variable or CCDT.
+ *
  * For the Advanced Client Connection parameters, please see the WebSphere MQ documentation
  *
  * Note:

data/lib/wmq/version.rb

@@ -1,3 +1,3 @@
 module WMQ #:nodoc
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ferocia-rubywmq
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda