rbgccxml 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 699364de9e76fc6e26e91c47c8e643830951ce53
-  data.tar.gz: b399c4678cc389452d0b80ac6b413d9bd60e0ea3
+  metadata.gz: 7d57c734fb4b59009c8097e88aa691c5ff32cd92
+  data.tar.gz: 7fd21e9bb073cb3cdbcae2aefba5ed61fa346601
 SHA512:
-  metadata.gz: 14d9c3f05f8add667664d04fa87407c4c79b53455e94bb1e8bad5c139ea2e49ff82dcdd15ff4ee96b1d19a2865ab197de75ef4ea42d58aa58116f2bada74b73e
-  data.tar.gz: 597c82458bb5fb5b5955a66b4d9f7d73b32636db7fd2e28a766ffe39542f5ab7d9ba8e5e1d81b302e58c6807a267190401907766d5e17802901997460604ccf7
+  metadata.gz: a2e03bafc175cdf11d2ef4ebfcf23c9d1c2520df2c838fba024b208152f138c6b95b1d5ca83d6e48c269b61f896e6373e549d070dc15ebb425cc4b54ed949086
+  data.tar.gz: 0a7aeff311c0b8ad0787ad38d92aacfe35e83f8e3c11112ac047f4ecde65fff5235b3828b42f3a095d2cb23750add6f33ff4be5c3e072077f85b2658d5c0c2ba

data/Rakefile

@@ -1,5 +1,4 @@
 require 'rdoc/task'
-require 'rake/contrib/sshpublisher'
 
 require 'rspec/core/rake_task'
 

data/lib/gccxml.rb

@@ -1,9 +1,11 @@
 class GCCXML
 
   def initialize()
-    @exe = find_exe.strip.chomp
     @includes = []
     @flags = []
+
+    @castxml_path = nil
+    @clangpp_path = nil
   end
 
   # Add an include path for parsing
@@ -16,30 +18,61 @@ class GCCXML
     @flags << flags
   end
 
+  # Set the full path to the `castxml` binary
+  def set_castxml_path(path)
+    @castxml_path = path
+  end
+
+  # Set the full path to the `clang++` binary
+  def set_clangpp_path(path)
+    @clangpp_path = path
+  end
+
   # Run gccxml on the header file(s), sending the output to the passed in
   # file.
   def parse(header_file, to_file)
     includes = @includes.flatten.uniq.map {|i| "-I#{i.chomp}"}.join(" ").chomp
     flags = @flags.flatten.join(" ").chomp
-    cmd = "#{@exe} #{includes} #{flags} #{header_file} -fxml=#{to_file}"
-    raise "Error executing gccxml command line: #{cmd}" unless system(cmd)
+    flags += " -Wno-unused-command-line-argument --castxml-cc-gnu #{find_clang} --castxml-gccxml"
+
+    exe = find_exe.strip.chomp
+    cmd = "#{exe} #{includes} #{flags} -o #{to_file} #{header_file}"
+    raise "Error executing castxml command line: #{cmd}" unless system(cmd)
   end
 
   private
 
-  def windows?
-    RUBY_PLATFORM =~ /(mswin|cygwin)/
-  end
-
   def find_exe
     ext = windows? ? ".exe" : ""
-    binary = "gccxml#{ext}"
+    binary = @castxml_path || "castxml#{ext}"
 
-    if `#{binary} --version 2>&1` =~ /GCC-XML/
+    if `#{binary} --version 2>&1` =~ /CastXML/
       binary
     else
-      raise "Unable to find the gccxml executable on your PATH."
+      path_msg =
+        if @castxml_path
+          "at #{@castxml_path}"
+        else
+          "on your PATH"
+        end
+
+      error_msg = "Unable to find a castxml executable #{path_msg}."
+      error_msg += "\nYou can set an explicit path with the `castxml_path` option to RbGCCXML.parse"
+
+      raise error_msg
+    end
+  end
+
+  def find_clang
+    if @clangpp_path
+      @clangpp_path
+    else
+      `which clang++`.strip
     end
   end
 
+  def windows?
+    RUBY_PLATFORM =~ /(mswin|cygwin)/
+  end
+
 end

data/lib/rbgccxml/node.rb

@@ -3,7 +3,7 @@ module RbGCCXML
   class NotQueryableException < RuntimeError; end
   class UnsupportedMatcherException < RuntimeError; end
 
-  # A Node is part of the C++ code as dictated by GCC-XML. This class 
+  # A Node is part of the C++ code as dictated by CastXML. This class 
   # defines all of the starting points into the querying system, along 
   # with helper methods to access data from the C++ code itself.
   #

data/lib/rbgccxml/node_cache.rb

@@ -1,6 +1,6 @@
 module RbGCCXML
 
-  # Manager of the tree of Nodes we build from GCC-XML.
+  # Manager of the tree of Nodes we build from CastXML.
   #
   # This is a static class that keeps around references to the
   # entire generated Node tree as well as other structures

data/lib/rbgccxml/nodes/enumeration.rb

@@ -19,9 +19,9 @@ module RbGCCXML
     #   };
     #
     def anonymous?
-      # The given GCC-XML name of an anon Enum is _[number]. We don't care what
+      # The given CastXML name of an anon Enum is _[number]. We don't care what
       # that number is, only that the name matches this format
-      self.name =~ /_\d+/
+      self.name =~ /_\d+/ || self.name == ""
     end
 
   end

data/lib/rbgccxml/nodes/types/array_type.rb

@@ -2,7 +2,7 @@ module RbGCCXML
 
   # Node that represents <ArrayType>, which is any static array
   # declaration.
-  # One oddity on how GCC-XML parses certain array designations:
+  # One oddity on how CastXML parses certain array designations:
   #  
   #   void func(int in[4][3]);
   #

data/lib/rbgccxml/parser.rb

@@ -20,6 +20,14 @@ module RbGCCXML
           @gccxml.add_cxxflags flags
         end
 
+        if path = config.delete(:castxml_path)
+          @gccxml.set_castxml_path path
+        end
+
+        if path = config.delete(:clangpp_path)
+          @gccxml.set_clangpp_path path
+        end
+
         validate_glob(config[:files])
       end
     end
@@ -27,14 +35,14 @@ module RbGCCXML
     # Starts the parsing process. If the parser was configured
     # with one or more header files, this includes:
     # 1. Creating a temp file for the resulting XML.
-    # 2. Finding all the files to run through GCC-XML.
+    # 2. Finding all the files to run through CastXML
     # 3. If applicable (more than one header was specified),
     #    build another temp file and #include the header files
-    #    to ensure one and only one pass into GCC-XML.
+    #    to ensure one and only one pass into CastXML.
     # 4. Build up our :: Namespace node and pass that back
     #    to the user for querying.
     #
-    # If the parser was configured for pregenerated GCC-XML
+    # If the parser was configured for pregenerated CastXML
     # output, we only have to perform step 4 above.
     def parse
       if @gccxml

data/lib/rbgccxml/rbgccxml.rb

@@ -3,11 +3,9 @@ module RbGCCXML
 
   class << self
 
-    # Starting point to any RbGCCXML parsing project. 
+    # Starting point to any RbGCCXML parsing project.
     #
-    # This method must be called *after* any calls to RbGCCXML.gccxml_path= 
-    # or RbGCCXML.add_include_paths.  Files can be one of many formats 
-    # (and should always be full directory paths):
+    # Files can be one of many formats (and should always be full directory paths):
     #
     # <tt>"/path/to/file.h"</tt>
     #
@@ -19,6 +17,11 @@ module RbGCCXML
     #
     #   includes: A single string, or an array of strings of directory includes (-I directives)
     #   cxxflags: A single string, or an array of strings of other command line flags
+    #   castxml_path: An explicit path to your castxml binary
+    #   clangpp_path: An explicit path to your clang++ binary
+    #
+    # RbGCCXML will try to find both the clang++ and castxml binaries automatically,
+    # but if this is not working, these two options are available to give the actual path.
     #
     # Returns the Namespace Node linked to the global namespace "::".
     def parse(files, options = {})
@@ -27,7 +30,7 @@ module RbGCCXML
       @parser.parse
     end
 
-    # Use this call to parse a pregenerated GCC-XML file.
+    # Use this call to parse a pregenerated CastXML file.
     #
     # Returns the Namespace Node linked to the global namespace "::".
     def parse_xml(filename)

data/spec/arguments_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 describe "Function and Method Arguments" do
 
   before(:all) do
-    @arguments_source = RbGCCXML.parse(full_dir("headers/functions.h")).namespaces("functions")
+    @arguments_source = RbGCCXML.parse(full_dir("headers/functions.hpp")).namespaces("functions")
   end
 
   specify "have type and to_cpp" do
@@ -20,7 +20,7 @@ describe "Function and Method Arguments" do
   specify "can have a default value" do
     test1 = @arguments_source.functions("test1")
     test1.arguments[0].value.should be_nil
-    test1.arguments[1].value.should == "3.0e+0"
+    test1.arguments[1].value.should == "3."
 
     rockin = @arguments_source.functions("rockin")
     rockin.arguments[1].value.should == "functions::test()"

data/spec/classes_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 describe "Querying for classes" do
   before do
-    @source ||= RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
+    @source ||= RbGCCXML.parse(full_dir("headers/classes.hpp")).namespaces("classes")
   end
 
   specify "can find all classes in a given namespace" do
@@ -76,14 +76,14 @@ describe "Querying for classes" do
     test1 = @source.classes("Test1")
     test4 = @source.classes("Test4")
 
-    test1.pure_virtual?.should be_false
-    test4.pure_virtual?.should be_true
+    test1.pure_virtual?.should == false
+    test4.pure_virtual?.should == true
   end
 end
 
 describe "Querying for class constructors" do
   before do
-    @source ||= RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
+    @source ||= RbGCCXML.parse(full_dir("headers/classes.hpp")).namespaces("classes")
   end
 
   specify "should have a list of constructors" do
@@ -99,38 +99,38 @@ describe "Querying for class constructors" do
     test2.constructors.size.should == 3
 
     # GCC generated copy constructors
-    copy = test2.constructors[0]
-    copy.artificial?.should be_true
+    copy = test2.constructors.detect {|c| c.artificial? }
+    copy.should_not be_nil
 
-    default = test2.constructors[1]
-    default.arguments.size.should == 0
+    default = test2.constructors.detect {|c| c.arguments.size == 0 }
+    default.should_not be_nil
 
-    specific = test2.constructors[2]
-    specific.arguments.size.should == 1
+    specific = test2.constructors.detect {|c| c.arguments.size == 1 }
+    specific.should_not be_nil
     specific.arguments[0].cpp_type.name.should == "int"
   end
 end
 
 describe "Querying for the class's deconstructor" do
   before do
-    @source ||= RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
+    @source ||= RbGCCXML.parse(full_dir("headers/classes.hpp")).namespaces("classes")
   end
 
   specify "can tell if a class has an explicit destructor" do
     test1 = @source.classes("Test1")
     test1.destructor.should_not be_nil
-    test1.destructor.artificial?.should be_false
+    test1.destructor.artificial?.should == false
 
     test2 = @source.classes("Test2")
     test2.destructor.should_not be_nil
-    test2.destructor.artificial?.should be_true
+    test2.destructor.artificial?.should == true
   end
 
 end
 
 describe "Query for class variables" do
   before do
-    @source ||= RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
+    @source ||= RbGCCXML.parse(full_dir("headers/classes.hpp")).namespaces("classes")
   end
 
   specify "find all i-vars" do
@@ -148,7 +148,7 @@ end
 
 describe "Query inheritance heirarchy" do
   before do
-    @source ||= RbGCCXML.parse(full_dir("headers/inheritance.h")).namespaces("inheritance")
+    @source ||= RbGCCXML.parse(full_dir("headers/inheritance.hpp")).namespaces("inheritance")
   end
 
   specify "can find a class's superclass" do

data/spec/enumerations_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 describe "Querying for enumerations" do
   before(:all) do
-    @enum_source = RbGCCXML.parse(full_dir("headers/enums.h")).namespaces("enums")
+    @enum_source = RbGCCXML.parse(full_dir("headers/enums.hpp")).namespaces("enums")
   end
 
   specify "can query for enumerations" do
@@ -28,13 +28,13 @@ describe "Querying for enumerations" do
   specify "properly prints out fully qualified C++ identifier for enum values" do
     enum = @enum_source.enumerations("TestEnum")
     enum.values.length.should == 3
-    enum.values[0].qualified_name.should == "enums::VALUE1"
-    enum.values[1].qualified_name.should == "enums::VALUE2"
-    enum.values[2].qualified_name.should == "enums::VALUE3"
+    enum.values[0].qualified_name.should == "::enums::VALUE1"
+    enum.values[1].qualified_name.should == "::enums::VALUE2"
+    enum.values[2].qualified_name.should == "::enums::VALUE3"
 
     enum = @enum_source.classes("Inner").enumerations("InnerEnum")
-    enum.values[0].qualified_name.should == "enums::Inner::INNER_1"
-    enum.values[1].qualified_name.should == "enums::Inner::INNER_2"
+    enum.values[0].qualified_name.should == "::enums::Inner::INNER_1"
+    enum.values[1].qualified_name.should == "::enums::Inner::INNER_2"
   end
 
   specify "knows if an enumeration is anonymous" do

data/spec/function_pointers_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 describe "Function pointers" do
   before(:all) do
-    @fp_source = RbGCCXML.parse(full_dir("headers/types.h")).namespaces("types")
+    @fp_source = RbGCCXML.parse(full_dir("headers/types.hpp")).namespaces("types")
   end
 
   specify "have arguments" do

data/spec/functions_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 describe "Querying for functions" do
 
   before(:all) do
-    @functions_source = RbGCCXML.parse(full_dir("headers/functions.h")).namespaces("functions")
+    @functions_source = RbGCCXML.parse(full_dir("headers/functions.hpp")).namespaces("functions")
   end
 
   specify "should be able to find all functions" do

data/spec/methods_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 describe "Querying for class methods" do
   before(:all) do
-    @adder_source = RbGCCXML.parse(full_dir("headers/Adder.h")).namespaces("classes")
+    @adder_source = RbGCCXML.parse(full_dir("headers/Adder.hpp")).namespaces("classes")
   end
 
   specify "should be able to get the methods on a class" do
@@ -46,7 +46,7 @@ end
 
 describe "Properties on Methods" do
   before(:all) do
-    @classes_source = RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
+    @classes_source = RbGCCXML.parse(full_dir("headers/classes.hpp")).namespaces("classes")
   end
 
   specify "should be able to tell if a given method is static or not" do

data/spec/namespaces_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 describe "Querying for namespaces" do
 
   before do
-    @source ||= RbGCCXML.parse(full_dir("headers/namespaces.h"))
+    @source ||= RbGCCXML.parse(full_dir("headers/namespaces.hpp"))
   end
 
   specify "can find a namespace" do
@@ -26,6 +26,6 @@ describe "Querying for namespaces" do
   specify "handles namespace aliases" do
     takes_class = @source.functions.find(:name => "takes_class")
     aliased_arg = takes_class.arguments.first
-    aliased_arg.cpp_type.to_cpp.should == "upper::inner2::NamespacedClass"
+    aliased_arg.cpp_type.to_cpp.should == "::upper::inner2::NamespacedClass"
   end
 end

data/spec/node_test.rb

@@ -3,40 +3,40 @@ require "test_helper"
 describe "Qualified name generation" do
 
   specify "for namespaces" do
-    source = RbGCCXML.parse(full_dir("headers/namespaces.h"))
+    source = RbGCCXML.parse(full_dir("headers/namespaces.hpp"))
 
     upper = source.namespaces.find(:name => "upper")
-    upper.qualified_name.should == "upper"
+    upper.qualified_name.should == "::upper"
 
     inner2 = upper.namespaces("inner2")
-    inner2.qualified_name.should == "upper::inner2"
+    inner2.qualified_name.should == "::upper::inner2"
   end
 
   specify "for classes" do
-    source = RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
+    source = RbGCCXML.parse(full_dir("headers/classes.hpp")).namespaces("classes")
 
     test1 = source.classes.find(:name => "Test1")
-    test1.qualified_name.should == "classes::Test1"
+    test1.qualified_name.should == "::classes::Test1"
     
     inner1 = test1.classes("Inner1")
-    inner1.qualified_name.should == "classes::Test1::Inner1"
+    inner1.qualified_name.should == "::classes::Test1::Inner1"
     
     inner2 = inner1.classes("Inner2")
-    inner2.qualified_name.should == "classes::Test1::Inner1::Inner2"
+    inner2.qualified_name.should == "::classes::Test1::Inner1::Inner2"
   end
 
   specify "for functions" do
-    source = RbGCCXML.parse(full_dir("headers/functions.h")).namespaces("functions")
+    source = RbGCCXML.parse(full_dir("headers/functions.hpp")).namespaces("functions")
     test1 = source.functions("test1")
-    test1.qualified_name.should == "functions::test1"
+    test1.qualified_name.should == "::functions::test1"
   end
 
   specify "for methods in classes" do
-    source = RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
+    source = RbGCCXML.parse(full_dir("headers/classes.hpp")).namespaces("classes")
     inner = source.classes("Test1").classes("Inner1")
     func = inner.methods("innerFunc")
 
-    func.qualified_name.should == "classes::Test1::Inner1::innerFunc"
+    func.qualified_name.should == "::classes::Test1::Inner1::innerFunc"
   end
 
 end
@@ -44,7 +44,7 @@ end
 describe "Misc access methods" do
 
   specify "can tell if something is public, protected, and private" do
-    source = RbGCCXML.parse(full_dir("headers/misc.h"))
+    source = RbGCCXML.parse(full_dir("headers/misc.hpp"))
     access = source.namespaces("misc").classes("AccessSettings")
 
     access.methods("privateMethod").should be_private
@@ -53,12 +53,12 @@ describe "Misc access methods" do
   end
 
   specify "can get the full file path of a node" do
-    source = RbGCCXML.parse(full_dir("headers/enums.h")).namespaces("enums")
-    source.enumerations("TestEnum").file.should match(%r{enums.h})
+    source = RbGCCXML.parse(full_dir("headers/enums.hpp")).namespaces("enums")
+    source.enumerations("TestEnum").file.should match(%r{enums.hpp})
   end
 
   specify "returns nil if no file node is found" do
-    source = RbGCCXML.parse(full_dir("headers/enums.h")).namespaces("enums")
+    source = RbGCCXML.parse(full_dir("headers/enums.hpp")).namespaces("enums")
     source.file.should be_nil
   end
 

data/spec/parser_test.rb

@@ -3,45 +3,34 @@ require "test_helper"
 describe "Default parsing configuration" do
 
   specify "can be given a raw XML file" do
-    lambda do
-      RbGCCXML.parse_xml(full_dir("parsed/Adder.xml"))
-    end.should_not raise_error
+    RbGCCXML.parse_xml(full_dir("parsed/Adder.xml"))
   end
 
   specify "can parse a single header file" do
-    lambda do
-      RbGCCXML.parse(full_dir("headers/Adder.h"))
-    end.should_not raise_error
+    RbGCCXML.parse(full_dir("headers/Adder.hpp"))
   end
 
   specify "can parse a glob" do
-    lambda do
-      RbGCCXML.parse(full_dir("headers/*.hpp"))
-    end.should_not raise_error
+    RbGCCXML.parse(full_dir("headers/*.hpp"))
   end
 
   specify "can parse all files in a directory" do
-    lambda do
-      RbGCCXML.parse(full_dir("headers"),
-                    :includes => full_dir("headers/include"),
-                    :cxxflags => "-DMUST_BE_DEFINED")
-    end.should_not raise_error
+    RbGCCXML.parse(full_dir("headers"),
+                  :includes => full_dir("headers/include"),
+                  :cxxflags => "-DMUST_BE_DEFINED")
   end
 
   specify "can take an array of files" do
-    files = [full_dir("headers/Adder.h"),
+    files = [full_dir("headers/Adder.hpp"),
               full_dir("headers/Subtracter.hpp")]
-    lambda do
-      RbGCCXML.parse(files)
-    end.should_not raise_error
+
+    RbGCCXML.parse(files)
   end
 
   specify "can take an array of globs" do
-    files = [full_dir("headers/*.h"),
-              full_dir("headers/*.hpp")]
-    lambda do
-      RbGCCXML.parse(files, :includes => full_dir("headers/include"))
-    end.should_not raise_error
+    files = [full_dir("headers/*.hpp")]
+
+    RbGCCXML.parse(files, :includes => full_dir("headers/include"))
   end
 
   specify "should throw an error if files aren't found" do
@@ -65,15 +54,27 @@ end
 
 describe "Configurable parsing configuration" do
   specify "can give extra include directories for parsing" do
-    found = RbGCCXML.parse full_dir("headers/with_includes.h"),
+    found = RbGCCXML.parse full_dir("headers/with_includes.hpp"),
       :includes => full_dir("headers/include")
     found.namespaces("code").should_not be_nil
   end
 
   specify "can be given extra cxxflags for parsing" do
+    RbGCCXML.parse full_dir("headers/requires_define.hxx"),
+      :cxxflags => "-DMUST_BE_DEFINED"
+  end
+
+  specify "can give an explicit path to castxml" do
+    lambda do
+      RbGCCXML.parse full_dir("headers/requires_define.hxx"),
+        :castxml_path => "/not/here/castxml"
+    end.should raise_error(RuntimeError, %r{/not/here/castxml})
+  end
+
+  specify "can give an explicit path to clang++" do
     lambda do
       RbGCCXML.parse full_dir("headers/requires_define.hxx"),
-        :cxxflags => "-DMUST_BE_DEFINED"
-    end.should_not raise_error
+        :clangpp_path => "/not/here/clang++"
+    end.should raise_error(RuntimeError, %r{/not/here/clang++})
   end
 end

data/spec/pointer_to_member_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 describe "Pointer to member function or member variable" do
   before(:all) do
     @ptm_source = RbGCCXML.parse(
-      full_dir("headers/pointer_to_member.h")).namespaces("pointer_to_member")
+      full_dir("headers/pointer_to_member.hpp")).namespaces("pointer_to_member")
   end
 
   specify "finds the test struct" do

data/spec/query_results_test.rb

@@ -18,7 +18,7 @@ describe "Managing Query results" do
     obj1 = MyObj.new
     obj2 = MyObj.new
 
-    q = RbGCCXML::QueryResult.new  
+    q = RbGCCXML::QueryResult.new
     q << obj1 << obj2
 
     q.call_me
@@ -52,7 +52,7 @@ end
 describe "QueryResult#find :name" do
 
   before(:all) do
-    @query_source = RbGCCXML.parse(full_dir("headers/queryable.h")).namespaces("query")
+    @query_source = RbGCCXML.parse(full_dir("headers/queryable.hpp")).namespaces("query")
   end
 
   specify "can find by regular name" do
@@ -72,7 +72,7 @@ end
 describe "QueryResult#find :arguments" do
 
   before(:all) do
-    @query_source = RbGCCXML.parse(full_dir("headers/queryable.h")).namespaces("query")
+    @query_source = RbGCCXML.parse(full_dir("headers/queryable.hpp")).namespaces("query")
   end
 
   specify "no arguments" do
@@ -135,7 +135,7 @@ end
 describe "QueryResult#find :returns" do
 
   before(:all) do
-    @query_source = RbGCCXML.parse(full_dir("headers/queryable.h")).namespaces("query")
+    @query_source = RbGCCXML.parse(full_dir("headers/queryable.hpp")).namespaces("query")
   end
 
   specify "by return type" do
@@ -175,7 +175,7 @@ end
 describe "QueryResult#find access type" do
 
   specify "can find according to public / private / protected" do
-    @query_source = RbGCCXML.parse(full_dir("headers/queryable.h")).namespaces("query")
+    @query_source = RbGCCXML.parse(full_dir("headers/queryable.hpp")).namespaces("query")
     klass = @query_source.classes("AccessTester")
     m = klass.methods.find(:access => :public)
     m.name.should == "publicMethod"
@@ -192,7 +192,7 @@ end
 describe "QueryResult#find multiple options" do
 
   specify "by both return type and arguments (AND form, not OR)" do
-    @query_source = RbGCCXML.parse(full_dir("headers/queryable.h")).namespaces("query")
+    @query_source = RbGCCXML.parse(full_dir("headers/queryable.hpp")).namespaces("query")
     func = @query_source.functions.find(:returns => :int, :arguments => [nil, nil])
     func.should be_a_kind_of(RbGCCXML::Function)
     func.name.should == "test4"
@@ -203,7 +203,7 @@ end
 describe "QueryResult#find :all - Flag full source search" do
 
   before(:all) do
-    @query_source = RbGCCXML.parse(full_dir("headers/queryable.h")).namespaces("query")
+    @query_source = RbGCCXML.parse(full_dir("headers/queryable.hpp")).namespaces("query")
   end
 
   specify "can find all :names regardless of nesting" do
@@ -215,7 +215,7 @@ describe "QueryResult#find :all - Flag full source search" do
     func = @query_source.functions.find(:all, :arguments => ["MyType", "MyType"])
     func.name.should == "nestedMyTypeArg"
   end
-  
+
   specify "can find according to :returns " do
     funcs = @query_source.functions.find(:all, :returns => "MyType")
     funcs.size.should == 3

data/spec/structs_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 describe "Querying for structs" do
   before(:all) do
-    @structs_source = RbGCCXML.parse(full_dir("headers/structs.h")).namespaces("structs")
+    @structs_source = RbGCCXML.parse(full_dir("headers/structs.hpp")).namespaces("structs")
   end
 
   specify "can find all structs in a given namespace" do
@@ -28,7 +28,7 @@ end
 
 describe "Querying for struct constructors" do
   before(:all) do
-    @structs_source = RbGCCXML.parse(full_dir("headers/structs.h")).namespaces("structs")
+    @structs_source = RbGCCXML.parse(full_dir("headers/structs.hpp")).namespaces("structs")
   end
 
   specify "should have a list of constructors" do

data/spec/test_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'rspec'
 require 'rbgccxml'
+require 'pry'
 
 module FileDirectoryHelpers
   def full_dir(path)
@@ -10,4 +11,8 @@ end
 
 RSpec.configure do |config|
   config.include(FileDirectoryHelpers)
+  config.expect_with(:rspec) { |c| c.syntax = :should }
 end
+
+# Don't complain about blank `raise_error` usage right now
+RSpec::Expectations.configuration.on_potential_false_positives = :nothing

data/spec/types_test.rb

@@ -3,14 +3,15 @@ require "test_helper"
 describe "Proper Type handling" do
 
   before(:all) do
-    @types_source = RbGCCXML.parse(full_dir("headers/types.h")).namespaces("types")
+    @types_source = RbGCCXML.parse(full_dir("headers/types.hpp")).namespaces("types")
   end
 
   specify "fundamental types" do
     @types_source.functions.find(:returns => "int").length.should == 2
     @types_source.functions.find(:returns => "float").name.should == "returnsFloat"
 
-    @types_source.functions("noReturnWithSizeT").arguments[0].to_cpp.should == "std::size_t arg"
+    output = @types_source.functions("noReturnWithSizeT").arguments[0].to_cpp
+    (output == "::std::size_t arg" || output == "::size_t arg").should == true
   end
 
   specify "typedefs" do
@@ -72,9 +73,9 @@ describe "Proper Type handling" do
 end
 
 describe "Printing types" do
-  
+
   before(:all) do
-    @types_source = RbGCCXML.parse(full_dir("headers/types.h")).namespaces("types")
+    @types_source = RbGCCXML.parse(full_dir("headers/types.hpp")).namespaces("types")
   end
 
   specify "types should print back properly into string format" do
@@ -87,30 +88,30 @@ describe "Printing types" do
     @types_source.functions("returnsIntPointer").return_type.to_cpp.should == "int*"
 
     # references
-    @types_source.functions("returnStructReference").return_type.to_cpp.should == "types::struct_type&"
+    @types_source.functions("returnStructReference").return_type.to_cpp.should == "::types::struct_type&"
     @types_source.functions("returnStructReference").return_type.to_cpp(false).should == "struct_type&"
-    
+
     # printout full from the global namespace
-    @types_source.functions("returnsString").return_type.to_cpp.should == "others::string"
+    @types_source.functions("returnsString").return_type.to_cpp.should == "::others::string"
     @types_source.functions("returnsString").return_type.to_cpp(false).should == "string"
 
     # const
     @types_source.functions("returnConstInt").return_type.to_cpp.should == "const int"
-    
+
     # const pointers
     @types_source.functions("returnConstIntPointer").return_type.to_cpp.should == "const int*"
 
     # const references
-    @types_source.functions("returnConstUserTypeRef").return_type.to_cpp.should == "const types::user_type&"
+    @types_source.functions("returnConstUserTypeRef").return_type.to_cpp.should == "const ::types::user_type&"
     @types_source.functions("returnConstUserTypeRef").return_type.to_cpp(false).should == "const user_type&"
 
     # const const
-    @types_source.functions("withConstPtrConst").arguments[0].to_cpp.should == "const types::user_type* const arg1"
+    @types_source.functions("withConstPtrConst").arguments[0].to_cpp.should == "const ::types::user_type* const arg1"
     @types_source.functions("withConstPtrConst").arguments[0].to_cpp(false).should == "const user_type* const arg1"
 
     # Enumerations
     @types_source.functions("returnMyEnum").return_type.name.should == "myEnum"
-    @types_source.functions("returnMyEnum").return_type.to_cpp.should == "types::myEnum"
+    @types_source.functions("returnMyEnum").return_type.to_cpp.should == "::types::myEnum"
 
     # Array Types
     @types_source.functions("usesIntArray").arguments[0].name.should == "input"
@@ -126,14 +127,14 @@ describe "Printing types" do
     @types_source.classes("user_type").variables("var1").cpp_type.name.should == "int"
     @types_source.classes("user_type").variables("var2").cpp_type.name.should == "float"
 
-    @types_source.structs("struct_type").variables("myType").cpp_type.to_cpp.should == "types::user_type"
+    @types_source.structs("struct_type").variables("myType").cpp_type.to_cpp.should == "::types::user_type"
   end
 
 end
 
 describe "Type comparitors" do
   specify "can tell of a given type is a const" do
-    @types_source ||= RbGCCXML.parse(full_dir("headers/types.h")).namespaces("types")
+    @types_source ||= RbGCCXML.parse(full_dir("headers/types.hpp")).namespaces("types")
     @types_source.functions("returnConstUserTypeRef").return_type.should be_const
     @types_source.functions("returnConstIntPointer").return_type.should be_const
     @types_source.functions("returnsUserType").return_type.should_not be_const

data/spec/variables_test.rb

@@ -3,7 +3,7 @@ require "test_helper"
 describe "Querying for variables" do
 
   before(:all) do
-    @variables_source ||= RbGCCXML.parse(full_dir("headers/classes.h")).namespaces("classes")
+    @variables_source ||= RbGCCXML.parse(full_dir("headers/classes.hpp")).namespaces("classes")
   end
 
   specify "find global variables and constants" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbgccxml
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Jason Roelofs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.7.0
 description: |
   Rbgccxml is a library that parses out GCCXML (http://www.gccxml.org) output
   and provides a simple but very powerful querying API for finding exactly
@@ -110,23 +104,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rbplusplus
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby interface to GCCXML
 test_files:
-- spec/arguments_test.rb
-- spec/classes_test.rb
-- spec/enumerations_test.rb
-- spec/function_pointers_test.rb
+- spec/variables_test.rb
+- spec/node_test.rb
 - spec/functions_test.rb
 - spec/methods_test.rb
-- spec/namespaces_test.rb
-- spec/node_test.rb
-- spec/parser_test.rb
-- spec/pointer_to_member_test.rb
 - spec/query_results_test.rb
 - spec/structs_test.rb
-- spec/test_helper.rb
+- spec/classes_test.rb
 - spec/types_test.rb
-- spec/variables_test.rb
+- spec/function_pointers_test.rb
+- spec/parser_test.rb
+- spec/namespaces_test.rb
+- spec/test_helper.rb
+- spec/arguments_test.rb
+- spec/enumerations_test.rb
+- spec/pointer_to_member_test.rb