ekaranto-rubywmq 2.0.0 → 2.0.2

data/Rakefile

@@ -2,6 +2,7 @@ lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
 require 'rubygems'
+require 'rubygems/package'
 require 'rake/clean'
 require 'rake/testtask'
 require 'date'
@@ -10,15 +11,16 @@ require 'wmq/version'
 desc "Build Ruby Source gem"
 task :gem  do |t|
   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',
-    'nbproject'
+    /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/
   ]
 
   gemspec = Gem::Specification.new do |spec|
@@ -31,8 +33,8 @@ task :gem  do |t|
     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             = FileList["./**/*"].exclude(*excludes).map{|f| f.sub(/^\.\//, '')} +
-                             ['.document']
+    spec.files             = FileList["./**/*"].exclude(*excludes).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'
@@ -41,6 +43,7 @@ task :gem  do |t|
     spec.add_development_dependency 'shoulda'
     spec.requirements << 'WebSphere MQ v5.3, v6 or v7 Client or Server with Development Kit'
   end
+  p gemspec.files
   Gem::Builder.new(gemspec).build
 end
 
@@ -66,6 +69,7 @@ task :binary  do |t|
                              Dir['doc/**/*.*'] +
                              Dir['lib/**/*.rb'] +
                              ['lib/wmq/wmq.so', 'tests/test.rb', 'README', 'LICENSE']
+    spec.license           = "Apache License V2.0"
     spec.rubyforge_project = 'rubywmq'
     spec.test_file         = 'tests/test.rb'
     spec.has_rdoc          = false

data/ext/extconf.rb

@@ -11,7 +11,9 @@ if RUBY_PLATFORM =~ /win|mingw/i
   dir_config('mqm', include_path, '.')
 else
   include_path = '/opt/mqm/inc'
-  dir_config('mqm', include_path, '/opt/mqm/lib64')
+  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')

data/ext/wmq_queue_manager.c

@@ -411,9 +411,8 @@ VALUE QueueManager_connect(VALUE self)
         pqm->MQDISC(&pqm->hcon, &pqm->comp_code, &pqm->reason_code);
     }
 
-    pqm->MQCONNX(
-            RSTRING_PTR(name),      /* queue manager                  */
-            &pqm->connect_options,   /* Connection Options             */
+    pqm->MQCONN(
+            RSTRING_PTR(name),       /* queue manager                  */
             &pqm->hcon,              /* connection handle              */
             &pqm->comp_code,         /* completion code                */
             &pqm->reason_code);      /* connect reason code            */

data/lib/wmq/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ekaranto-rubywmq
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-10 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -82,12 +82,11 @@ files:
 - lib/wmq/message.rb
 - lib/wmq/queue_manager.rb
 - lib/wmq/version.rb
-- nbproject/project.properties
-- nbproject/project.xml
 - tests/test.rb
 - .document
 homepage: https://github.com/reidmorrison/rubywmq
-licenses: []
+licenses:
+- Apache License V2.0
 post_install_message: 
 rdoc_options: []
 require_paths:

data/nbproject/project.properties

@@ -1,11 +0,0 @@
-examples.dir=${file.reference.trunk-examples}
-file.reference.trunk-examples=examples
-file.reference.trunk-ext=ext
-file.reference.trunk-lib=lib
-file.reference.trunk-tests=tests
-javac.classpath=
-lib.dir=${file.reference.trunk-lib}
-main.file=
-source.encoding=UTF-8
-src.dir=${file.reference.trunk-ext}
-test.src.dir=${file.reference.trunk-tests}

data/nbproject/project.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.ruby.rubyproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/ruby-project/1">
-            <name>rubywmq</name>
-            <source-roots>
-                <root id="src.dir" name="ext"/>
-                <root id="examples.dir"/>
-                <root id="lib.dir" name="Source Files"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>