ridl 2.5.5 → 2.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 487ad002804614ca82ead17a468922b304642d64
-  data.tar.gz: 419cd1417bbdd7498f589c245bf26ce50bb60b10
+  metadata.gz: 314694ac1e00cdc3cbc8d6afdc18e1e7e3884670
+  data.tar.gz: 9899c45caa2b63b1ac39c444e9e4a6c3adce1bfa
 SHA512:
-  metadata.gz: faf5353bc1a577cccf62034414744a012de908d8373bf38102edb5b6de39e970f223c140374278a2e7c86b6b00453351f9b123d20c4a93541a2c10cf35615e78
-  data.tar.gz: 6b3660bc7debee36367f8118c8114d49e6d05b7a9100902f567a59f8eb6d864adda462f838110b5fa5eec9b37143219933a023ddba2bc5617ca8e328a6b03d80
+  metadata.gz: 0d0dbd35ff3af48b46bc0fc8f3a0c34c136ce65a8a62e3a2314563af00ed73efa96938d16a7fa12526a6817b9dbb125781b7d36cdc5a166a483a79a3a2156bbf
+  data.tar.gz: 51ac6bf5289b2e18e87bc3f0389c43a980f0d3188f2c97c0cbccc315cb0f6bdecd72cc103bd2599d219a1ee5e6b1f4fe083d9dfda10719d434db0bbb228bb0da

data/LICENSE

@@ -46,4 +46,4 @@ IN NO EVENT WILL REMEDY IT OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE
 FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
 DAMAGES, EVEN IF REMEDY IT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-RIDL is Copyright Remedy IT. Nijkerk, The Netherlands, 2006-2013.
+RIDL is Copyright Remedy IT. Nijkerk, The Netherlands, 2006-2015.

data/README.rdoc

@@ -30,7 +30,7 @@ If you find a bug, please report it at the RIDL project's
 
 == License
 
-RIDL is Copyright (c) 2007-2013 Remedy IT Expertise BV, The Netherlands.
+RIDL is Copyright (c) 2007-2015 Remedy IT Expertise BV, The Netherlands.
 
 It is free software, and may be redistributed under the terms specified in
 the LICENSE file.

data/lib/ridl/runner.rb

@@ -119,7 +119,7 @@ module IDL
 
           input_base = File.basename(argv.first)
           if (input_base != argv.first)
-            options[:xincludepaths] << File.dirname(argv.first)
+            options[:xincludepaths] << (File.dirname(argv.first)+'/')
           end
 
           return !parse("#include \"#{input_base}\"", options).nil?
@@ -196,7 +196,7 @@ module IDL
                      _fname
                    else
                      _fp = _opts[:includepaths].find do |_p|
-                       _f = _p + "/" + _fname
+                       _f = _p + _fname
                        File.file?(_f) && File.readable?(_f)
                      end
                      _opts[:outputdir] = _fp unless _fp.nil? || !_opts[:outputdir].nil?
@@ -205,7 +205,7 @@ module IDL
                    end
           _arg = _fpath unless _fpath.nil?
         end
-        _opts[:xincludepaths] << File.dirname(_arg)
+        _opts[:xincludepaths] << (File.dirname(_arg)+'/')
 
         _opts[:outputdir] ||= '.'
 
@@ -235,7 +235,7 @@ module IDL
       opts.separator ""
       opts.on("-I PATH", "--include=PATH", String,
               "Adds include searchpath.",
-              "Default: nil") { |v| @options[:includepaths] << v }
+              "Default: none") { |v| @options[:includepaths] << (v.end_with?('\\','/') ? v : v+'/') }
       opts.on('-Dmacro=[value]', String, 'defines preprocessor macro') { |v|
         name, value = v.split('=')
         @options[:macros][name] = (value ? value : true)
@@ -252,7 +252,7 @@ module IDL
       opts.on('--stdidl',
               'Adds include path to standard IDL files provided with RIDL.',
               'Default: not set') { |v|
-        @options[:includepaths] << File.expand_path(File.join(File.dirname(__FILE__), '..', 'idl'))
+        @options[:includepaths] << (File.expand_path(File.join(File.dirname(__FILE__), '..', 'idl'))+'/')
       }
       opts.on("--search-includepath",
               "Use include paths to find main IDL source.",

data/lib/ridl/scanner.rb

@@ -266,21 +266,23 @@ module IDL
         # search transient include paths if allowed (quoted includes)
         fp = if all then
                @xincludepaths.find do |p|
-                 f = p + '/' + fname
-                 File.file?(f) && File.readable?(f)
+                 check_include(p, fname)
                end
              else
                nil
              end
         # search system include paths if still needed
         fp = @includepaths.find do |p|
-          f = p + '/' + fname
-          File.file?(f) && File.readable?(f)
+          check_include(p, fname)
         end unless fp
-        fp += '/' + fname if fp
+        fp += fname if fp
         fp
       end
     end
+    def check_include(path, fname)
+      fp = path + fname
+      File.file?(fp) && File.readable?(fp)
+    end
 
     def position
       @in.position
@@ -296,7 +298,7 @@ module IDL
         end
         @stack << [:include, @prefix, @ifdef, @in, @ifskip]
         # record file dir as new searchpath
-        @xincludepaths << File.dirname(fpath)
+        @xincludepaths << (File.dirname(fpath)+'/')
         @prefix = nil
         @ifdef = Array.new
         @in = In.new(File.open(fpath, 'r'), fpath)

data/lib/ridl/version.rb

@@ -15,7 +15,7 @@ module IDL
 
   RIDL_VERSION_MAJOR = 2.freeze
   RIDL_VERSION_MINOR = 5.freeze
-  RIDL_VERSION_RELEASE = 5.freeze
+  RIDL_VERSION_RELEASE = 6.freeze
   RIDL_VERSION = "#{RIDL_VERSION_MAJOR}.#{RIDL_VERSION_MINOR}.#{RIDL_VERSION_RELEASE}"
   RIDL_COPYRIGHT = "Copyright (c) 2007-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridl
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.5.6
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies: []
 description: OMG v. 3.3 compliant native Ruby IDL compiler frontend with support for
   pluggable (and stackable) backends.