ferocia-rubywmq 1.1.3 → 2.0.2

data/lib/wmq/version.rb

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

data/tests/test.rb

@@ -1,15 +1,14 @@
-# Shift include path to use locally built copy of rubywmq - For testing dev builds only
-#$:.unshift '../lib'
+# Allow test to be run in-place without requiring a gem install
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
 require 'rubygems'
-require 'wmq/wmq'
-require 'wmq/wmq_const_admin'
+require 'wmq'
 require 'test/unit'
 class TestTest < Test::Unit::TestCase
 
   def setup
     puts '****** setup: start ******'
-    @queue_manager = WMQ::QueueManager.new(:q_mgr_name => 'REID') #, :connection_name=>'localhost(1414)')
+    @queue_manager = WMQ::QueueManager.new(:q_mgr_name => 'TEST') #, :connection_name=>'localhost(1414)')
     @queue_manager.connect
 
     # Create Queue and clear any messages from the queue
@@ -161,7 +160,7 @@ class TestTest < Test::Unit::TestCase
       count = count + 1
     end
   end
-  
+
   def test_dlh
     puts '****** test_dlh ******'
     dlh = {:header_type     =>:dead_letter_header,
@@ -205,7 +204,7 @@ class TestTest < Test::Unit::TestCase
             }
     verify_header(cics, WMQ::MQFMT_NONE)
   end
-  
+
   def test_ims
     puts '****** test_ims ******'
     ims = {:header_type      =>:ims,
@@ -214,7 +213,7 @@ class TestTest < Test::Unit::TestCase
           }
     verify_header(ims, WMQ::MQFMT_STRING)
   end
-  
+
   def test_transmission_header
     puts '****** test_transmission_header ******'
     xqh = {:header_type     =>:xmit_q_header,
@@ -225,45 +224,45 @@ class TestTest < Test::Unit::TestCase
           }
     verify_header(xqh, WMQ::MQFMT_STRING)
   end
-  
+
   def test_rf_header
     puts '****** test_rf_header ******'
     rfh = {:header_type =>:rf_header,
-           :name_value  => {' name   s' => '  v a "l" u e 1  ', 
-                            'n a m e 2 ' => 'v a l u e  2', 
+           :name_value  => {' name   s' => '  v a "l" u e 1  ',
+                            'n a m e 2 ' => 'v a l u e  2',
                             '' => ['"', '""', '"""', '""""', ''],
                             'name3'=>['"value3"', '', '"',' value 43"']},
           }
     verify_header(rfh, WMQ::MQFMT_STRING)
   end
-  
+
   def test_rf_header_2
     puts '****** test_rf_header_2 ******'
     rfh2 = {:header_type =>:rf_header_2,
-            :xml => ['<hello>to the world</hello>', 
+            :xml => ['<hello>to the world</hello>',
                      '<another>xml like string</another>'],
            }
     verify_header(rfh2, WMQ::MQFMT_STRING)
   end
-  
+
   def test_multiple_headers
     puts '****** test_multiple_headers ******'
     headers = [{:header_type      => :rf_header_2,
-                :xml              => ['<hello>to the world</hello>', 
+                :xml              => ['<hello>to the world</hello>',
                                       '<another>xml like string</another>'],},
-                
+
                {:header_type      => :rf_header,
-                :name_value       => {' name   s' => '  v a l u e 1  ', 
-                                      'n a m e 2 ' => 'v a l u e  2', 
+                :name_value       => {' name   s' => '  v a l u e 1  ',
+                                      'n a m e 2 ' => 'v a l u e  2',
                                       'name3'=>['value3', '', 'value 43']} },
-                
+
                {:header_type      => :ims,
                 :l_term_override  => 'LTERM',
                 :reply_to_format  => WMQ::MQFMT_STRING},
-                
+
                {:header_type      => :rf_header,
-                :name_value       => {' name   s' => '  v a l u e 1  ', 
-                                      'n a m e 2 ' => 'v a l u e  2', 
+                :name_value       => {' name   s' => '  v a l u e 1  ',
+                                      'n a m e 2 ' => 'v a l u e  2',
                                       'name3'=>['value3', '', 'value 43']} },
 
                {:header_type      => :cics,
@@ -273,16 +272,16 @@ class TestTest < Test::Unit::TestCase
 
                {:header_type      => :rf_header_2,
                 :xml              => ['<hello>to the world</hello>', '<another>xml like string</another>'],},
-                
+
                {:header_type      => :xmit_q_header,
                 :remote_q_name    => 'SOME_REMOTE_QUEUE',
                 :remote_q_mgr_name=> 'SOME_REMOTE_Q_MGR',
                 :msg_type         => WMQ::MQMT_REQUEST,
                 :msg_id           => 'my message Id'},
-              ]              
+              ]
     verify_multiple_headers(headers, WMQ::MQFMT_STRING)
   end
-  
+
   def test_xmit_multiple_headers
     puts '****** test_xmit_q_header with ims header ******'
     headers = [{:header_type      => :xmit_q_header,
@@ -290,39 +289,30 @@ class TestTest < Test::Unit::TestCase
                 :remote_q_mgr_name=> 'SOME_REMOTE_Q_MGR',
                 :msg_type         => WMQ::MQMT_REQUEST,
                 :msg_id           => 'my message Id'},
-                
+
                {:header_type      => :ims,
                 :l_term_override  => 'LTERM',
                 :reply_to_format  => WMQ::MQFMT_STRING},
               ]
     verify_multiple_headers(headers, WMQ::MQFMT_STRING)
   end
-  
+
   def test_message_grouping
     puts '****** test_message_grouping ******'
     # Clear out queue of any messages
     @in_queue.each { |message| }
-    
+
     msg = WMQ::Message.new
     msg.data = 'First'
     msg.descriptor[:msg_flags] = WMQ::MQMF_MSG_IN_GROUP
     assert_equal(@out_queue.put(:message=>msg, :options => WMQ::MQPMO_LOGICAL_ORDER), true)
-    
+
     msg.data = 'Second'
     assert_equal(@out_queue.put(:message=>msg, :options => WMQ::MQPMO_LOGICAL_ORDER), true)
-    
+
     msg.data = 'Last'
     msg.descriptor[:msg_flags] = WMQ::MQMF_LAST_MSG_IN_GROUP
     assert_equal(@out_queue.put(:message=>msg, :options => WMQ::MQPMO_LOGICAL_ORDER), true)
-
-    # Now retrieve the messages destructively
-    message = WMQ::Message.new
-    test_sizes.each do |size|
-      assert_equal(true, @in_queue.get(:message=>message, :match=>WMQ::MQMO_NONE))
-      assert_equal(size, message.data.length)
-      str = '0123456789ABCDEF' * (size/16) + '0123456789ABCDEF'[0,size%16]
-      assert_equal(str, message.data)
-    end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ferocia-rubywmq
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -36,6 +36,9 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- README.md
+- Rakefile
 - examples/each_a.rb
 - examples/each_b.rb
 - examples/each_header.rb
@@ -60,8 +63,6 @@ files:
 - examples/q_to_files.rb
 - examples/request.rb
 - examples/server.rb
-- ext/build.bat
-- ext/build.sh
 - ext/decode_rfh.c
 - ext/decode_rfh.h
 - ext/extconf.rb
@@ -70,34 +71,23 @@ files:
 - ext/generate/generate_reason.rb
 - ext/generate/generate_structs.rb
 - ext/generate/wmq_structs.erb
-- ext/lib/wmq_temp.rb
 - ext/wmq.c
 - ext/wmq.h
 - ext/wmq_message.c
 - ext/wmq_mq_load.c
 - ext/wmq_queue.c
 - ext/wmq_queue_manager.c
+- lib/rubywmq.rb
 - lib/wmq.rb
-- LICENSE
-- Manifest.txt
-- README
-- rubywmq.binary.gemspec
-- rubywmq.gemspec
+- lib/wmq/message.rb
+- lib/wmq/queue_manager.rb
+- lib/wmq/version.rb
 - tests/test.rb
 - .document
 homepage: https://github.com/reidmorrison/rubywmq
 licenses:
 - Apache License V2.0
-post_install_message: ! '* ferocia-rubywmq builds against the WMQ libs, which aren''t
-  available for OS X.
-
-  * The gem will still install, but the build will be skipped, producing a
-
-  * non-functional gem, so you''ll need stubs. (You can skip the build elsewhere by
-
-  * setting the DISABLE_RUBYWMQ environment variable.)
-
-'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib

data/LICENSE

@@ -1,13 +0,0 @@
-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.

data/Manifest.txt

@@ -1,20 +0,0 @@
-.document
-lib/wmq.rb
-ext/lib/wmq_temp.rb
-ext/decode_rfh.h
-ext/decode_rfh.c
-ext/wmq.h
-ext/wmq.c
-ext/wmq_message.c
-ext/wmq_mq_load.c
-ext/wmq_queue.c
-ext/wmq_queue_manager.c
-ext/extconf.rb
-ext/extconf_client.rb
-ext/build.bat
-ext/build.sh
-ext/generate/generate_const.rb
-ext/generate/generate_reason.rb
-ext/generate/generate_structs.rb
-ext/generate/wmq_structs.erb
-examples/files_to_q.cfg

data/README

@@ -1,73 +0,0 @@
-== Description
-   rubywmq - RubyWMQ is a Ruby interface into WebSphere MQ, previously called MQSeries
-
-== Synopsis
-   require 'wmq'
-
-   WMQ::QueueManager.connect(:q_mgr_name=>'REID') do |qmgr|
-     qmgr.put(:q_name=>'TEST.QUEUE', :data => 'Hello World')
-   end
-
-== Building Ruby WMQ
-   Building Ruby WMQ on UNIX/Linux
-   -------------------------------
-   The following is required to build from source code
-   * A 'C' compiler
-   * The WebSphere MQ Software development toolkit
-
-   Extracting the source code package:
-   * unzip package.zip
-   * tar -xvf package.tar
-
-   cd ext/wmq
-   Edit the file build.sh and edit the location of WebSphere MQ (if not in /opt/mqm)
-   Also edit extconf.rb and extconf_client.rb with the location of WebSphere MQ (if not in /opt/mqm)
-
-   Run build.sh
-
-   For any questions, or to report build errors, submit a new Support Request:
-   http://rubywmq.rubyforge.org
-
-   Building Ruby WMQ on Windows
-   ----------------------------
-   The following is required to build from source code
-   * The Visual C++ 6.0 compiler
-   * The WebSphere MQ Software development toolkit
-
-   cd ext\wmq
-   Edit the file build.bat and edit the location of WebSphere MQ
-   (if not in C:\Program Files\IBM\WebSphere MQ)
-   and the location of Visual C++ 6 (if not C:\Program Files\Microsoft Visual Studio\VC98)
-   Also edit extconf.rb and extconf_client.rb with the location of WebSphere MQ (if not in C:\Program Files\IBM\WebSphere MQ)
-
-   Run build.bat
-
-== Support
-   For any questions, or to report build errors, submit a new Support Request:
-   http://rubywmq.rubyforge.org
-
-== Future Plans
-   Add more formatting option contants and related methods.
-
-== License
-   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.
-
-== Copyright
-   (C) 2006 J. Reid Morrison. Dimension Solutions, Inc.
-   All Rights Reserved
-
-== Author
-   Reid Morrison
-   rubywmq at gmail dot com

data/ext/build.bat

@@ -1,3 +0,0 @@
-call "C:\Program Files\Microsoft Visual Studio\VC98\Bin\VCVARS32.BAT"
-ruby extconf.rb --with-mqm-include="C:\Program Files\IBM\WebSphere MQ\Tools\c\include"
-nmake

data/ext/build.sh

@@ -1,6 +0,0 @@
-ruby extconf.rb --with-mqm-include=/opt/mqm/inc --with-mqm-lib=/opt/mqm/lib
-make
-# Uncomment the following lines for platforms other than Solaris, Windows and Linux
-#ruby extconf_client.rb --with-mqm-include=/opt/mqm/inc --with-mqm-lib=/opt/mqm/lib
-#make
-

data/rubywmq.binary.gemspec

@@ -1,32 +0,0 @@
-require 'fileutils'
-require 'rubygems'
-
-if $0 == __FILE__
-  FileUtils.mkdir_p('lib/wmq')
-  Dir['ext/lib/*.rb'].each{|file| FileUtils.copy(file, File.join('lib/wmq', File.basename(file)))}
-  FileUtils.copy('ext/wmq.so', 'lib/wmq/wmq.so')
-end
-
-spec = Gem::Specification.new do |s|
-  s.name = 'rubywmq'
-  s.version = '1.1.0'
-  s.author = 'Reid Morrison'
-  s.email = 'rubywmq@gmail.com'
-  s.homepage = 'http://www.reidmorrison.com/rubywmq'
-  s.platform = Gem::Platform::CURRENT
-  s.summary = 'Ruby interface into WebSphere MQ (MQSeries)'
-  s.description = 'RubyWMQ is a Ruby interface into WebSphere MQ, previously called MQSeries'
-  s.files = Dir['examples/**/*.rb'] + 
-            Dir['examples/**/*.cfg'] + 
-            Dir['doc/**/*.*'] + 
-            Dir['lib/**/*.rb'] + 
-            ['lib/wmq/wmq.so', 'tests/test.rb', 'README', 'LICENSE'] 
-  s.rubyforge_project = 'rubywmq'
-  s.test_file = 'tests/test.rb'
-  s.has_rdoc = false
-  s.required_ruby_version = '>= 1.8.3'
-  s.requirements << 'WebSphere MQ v5.3, v6 or v7 Client or Server'
-end
-if $0 == __FILE__
-  Gem::Builder.new(spec).build
-end

data/rubywmq.gemspec

@@ -1,33 +0,0 @@
-$:.unshift File.expand_path('../lib', __FILE__)
-
-Gem::Specification.new do |spec|
-
-  excludes = [/lib.wmq.constants\.rb/, /lib.wmq.constants_admin\.rb/, /ext.wmq_structs\.c/, /ext.wmq_reason\.c/, /ext.Makefile/, /ext.*\.o/, /ext.wmq\.so/, /\.gem$/, /\.log$/, /nbproject/]
-
-  spec.name              = 'ferocia-rubywmq'
-  spec.version           = "1.1.3"
-  spec.platform          = Gem::Platform::RUBY
-  spec.authors           = ['Reid Morrison', 'Edwin Fine']
-  spec.email             = ['reidmo@gmail.com']
-  spec.homepage          = 'https://github.com/reidmorrison/rubywmq'
-  spec.date              = Date.today.to_s
-  spec.summary           = "Native Ruby interface into WebSphere MQ"
-  spec.description       = "RubyWMQ is a high performance native Ruby interface into WebSphere MQ."
-  spec.files             = Dir.glob("./**/*").reject {|p| excludes.any? {|e| p[e] } }.map {|f| f.sub(/^\.\//, '')} + ['.document']
-  spec.license           = "Apache License V2.0"
-  spec.extensions        << 'ext/extconf.rb'
-  spec.rubyforge_project = 'rubywmq'
-  spec.test_file         = 'tests/test.rb'
-  spec.has_rdoc          = true
-  spec.required_ruby_version = '>= 1.8.4'
-  spec.add_development_dependency 'shoulda'
-  spec.requirements << 'WebSphere MQ v5.3, v6 or v7 Client or Server with Development Kit'
-
-  spec.post_install_message = <<-MESSAGE
-* ferocia-rubywmq builds against the WMQ libs, which aren't available for OS X.
-* The gem will still install, but the build will be skipped, producing a
-* non-functional gem, so you'll need stubs. (You can skip the build elsewhere by
-* setting the DISABLE_RUBYWMQ environment variable.)
-  MESSAGE
-end
-