rbplusplus 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64998377ef64e53b53ac16ef3e58f12b774ef4eb
-  data.tar.gz: a81d11259a71875f068793bc6596c27f8c9e0f6d
+  metadata.gz: 02f6abce82d5c75c2de491a4a4e3c8f62d4ef907
+  data.tar.gz: ba76ec48f81e2f02f89dd70ddde10b11590b8872
 SHA512:
-  metadata.gz: 04983a3329b555383e52e5736276804fdd288559a5553234566e1d72b46a95e89d47b650d1f17e64b09e6b24a86e15c2e0369d06218b21b9cefd97ec94b47307
-  data.tar.gz: fd928903087c72d024a72df13ec8253549655a218f144155a2ca120b33b0455214c9c343d3c1e4634e5a0613ebb04232ad0ebebef53602d4c7bfaa438e432239
+  metadata.gz: f076adf0e236a54dfb592a0444ae9c8e1c4552916f6770c09c6d07b86e0e1f2190b18bcb9f9174f7f29bc78444030e70eed6726f2990c8b507d6e95ca491096c
+  data.tar.gz: d48214b92b458638c93f67387cc233d5a61ca06ab751ec5fb2c58d4ddc4da22c49841d70267fc0911f635c271a59e17fb392e1342233b5d4771a2a30ac48c581

data/Rakefile

@@ -1,5 +1,4 @@
 require 'rdoc/task'
-require 'rake/contrib/sshpublisher'
 
 task :default => :test
 
@@ -18,7 +17,7 @@ task :test do
     # the exact ruby binary that's linked to the ruby running the Rakefile. Just saying
     # "ruby" will find the system's installed ruby and be worthless
     ruby = File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["RUBY_INSTALL_NAME"])
-    sh "#{ruby} -S rspec -Itest #{file}"
+    sh "#{ruby} -Itest -S rspec #{file}"
   end
 end
 
@@ -29,28 +28,3 @@ Rake::RDocTask.new do |rd|
   rd.template = File.expand_path(File.dirname(__FILE__) + "/lib/jamis.rb")
   rd.options << '--line-numbers' << '--inline-source'
 end
-
-RUBYFORGE_USERNAME = "jameskilton"
-PROJECT_WEB_PATH = "/var/www/gforge-projects/rbplusplus"
-
-namespace :web do
-  desc "Build website"
-  task :build => :rdoc do |t|
-    unless File.directory?("publish")
-      mkdir "publish"
-    end
-
-    sh "jekyll --pygment website publish/"
-    sh "cp -r html/* publish/rbplusplus/"
-  end
-
-  desc "Update the website" 
-  task :upload => "web:build"  do |t|
-    Rake::SshDirPublisher.new("#{RUBYFORGE_USERNAME}@rubyforge.org", PROJECT_WEB_PATH, "publish").upload
-  end
-
-  desc "Clean up generated website files" 
-  task :clean do
-    rm_rf "publish"
-  end
-end

data/lib/rbplusplus/builders/class.rb

@@ -95,7 +95,7 @@ module RbPlusPlus
       # to allocate the class directly. If this code tries to use a non-public
       # constructor, we hit a compiler error.
       def check_allocation_strategies
-        # Due to the nature of GCC-XML's handling of templated classes, there are some
+        # Due to the nature of CastXML's handling of templated classes, there are some
         # classes that might not have any gcc-generated constructors or destructors.
         # We check here if we're one of those classes and completely skip this step
         return if [self.code.constructors].flatten.empty?

data/lib/rbplusplus/builders/const_converter.rb

@@ -32,7 +32,7 @@ module RbPlusPlus
         includes << "#include \"#{self.code.file}\""
 
         declarations << "template<>"
-        declarations << "Rice::Object to_ruby<#{full_name} >(#{full_name} const & a);"
+        declarations << "Rice::Object to_ruby< #{full_name} >(#{full_name} const & a);"
 
         build_as = if self.parent.is_a?(EnumerationNode)
                      "new #{full_name}(a)"
@@ -41,8 +41,8 @@ module RbPlusPlus
                    end
 
         registrations << "template<>"
-        registrations << "Rice::Object to_ruby<#{full_name} >(#{full_name} const & a) {"
-        registrations << "\treturn Rice::Data_Object<#{full_name} >(#{build_as}, Rice::Data_Type<#{full_name} >::klass(), 0, 0);"
+        registrations << "Rice::Object to_ruby< #{full_name} >(#{full_name} const & a) {"
+        registrations << "\treturn Rice::Data_Object< #{full_name} >(#{build_as}, Rice::Data_Type< #{full_name} >::klass(), 0, 0);"
         registrations << "}"
       end
 

data/lib/rbplusplus/builders/enumeration.rb

@@ -11,7 +11,7 @@ module RbPlusPlus
         # See ClassNode
         add_global_child ConstConverterNode.new(self.code, self)
 
-        self.rice_variable_type = "Rice::Enum<#{code.qualified_name}>"
+        self.rice_variable_type = "Rice::Enum< #{code.qualified_name} >"
         self.rice_variable = "rb_e#{code.name}"
 
         Logger.info "Wrapping enumeration #{code.qualified_name}"
@@ -21,7 +21,7 @@ module RbPlusPlus
         second = parent.rice_variable ? ", #{parent.rice_variable}" : ""
 
         registrations << "\t#{rice_variable_type} #{rice_variable} = " \
-          "Rice::define_enum<#{code.qualified_name}>(\"#{code.name}\"#{second});"
+          "Rice::define_enum< #{code.qualified_name} >(\"#{code.name}\"#{second});"
 
         code.values.each do |v|
           registrations << "\t#{rice_variable}.define_value(\"#{v.name}\", #{v.qualified_name});"

data/lib/rbplusplus/builders/method_base.rb

@@ -150,7 +150,7 @@ module RbPlusPlus
 
       # See http://www.gccxml.org/Bug/view.php?id=9234
       #
-      # Basically due to inconsistencies within gcc, GCC-XML parses default arguments
+      # Basically due to inconsistencies within gcc, CastXML parses default arguments
       # with having enumeration values exactly as they are in the code. This means
       # that if the C++ doesn't fully namespace the enumeration, extension compilation
       # will fail because g++ can't find the enumeration.
@@ -163,9 +163,10 @@ module RbPlusPlus
       # for an example.
       def fix_enumeration_value(enum, default_value)
         enum_values = [enum.values].flatten
+        just_base_name = default_value.split("::").last
         found =
           enum_values.select do |enum_value|
-            enum_value.name == default_value
+            enum_value.name == default_value || enum_value.name == just_base_name
           end.first
 
         found ? found.qualified_name : default_value

data/lib/rbplusplus/extension.rb

@@ -3,7 +3,7 @@ require 'optparse'
 module RbPlusPlus
 
   # This is the starting class for Rb++ wrapping. All Rb++ projects start as such:
-  #   
+  #
   #   Extension.new "extension_name" do |e|
   #     ...
   #   end
@@ -18,8 +18,8 @@ module RbPlusPlus
   #
   # The following calls are required in both formats:
   #
-  #   e.sources - The directory / array / name of C++ header files to parse. 
-  #   
+  #   e.sources - The directory / array / name of C++ header files to parse.
+  #
   # In the non-block format, the following calls are required:
   #
   #   e.working_dir - Specify the directory where the code will be generated. This needs
@@ -32,8 +32,8 @@ module RbPlusPlus
   #
   #   e.write - Writes out the generated code into files
   #
-  #   e.compile - Compiles the generated code into a Ruby extension. 
-  #   
+  #   e.compile - Compiles the generated code into a Ruby extension.
+  #
   class Extension
 
     # Where will the generated code be put
@@ -45,14 +45,14 @@ module RbPlusPlus
     # Various options given by the user to help with
     # parsing, linking, compiling, etc.
     #
-    # See #sources for a list of the possible options 
+    # See #sources for a list of the possible options
     attr_accessor :options
 
     # Create a new Ruby extension with a given name. This name will be
     # the actual name of the extension, e.g. you'll have name.so and you will
     # call require 'name' when using your new extension.
     #
-    # This constructor can be standalone or take a block. 
+    # This constructor can be standalone or take a block.
     def initialize(name, &block)
       @name = name
       @modules = []
@@ -99,14 +99,22 @@ module RbPlusPlus
     # * <tt>:ldflags</tt> - Flag(s) to be added to command line for linking
     # * <tt>:includes</tt> -  Header file(s) to include at the beginning of each .rb.cpp file generated.
     # * <tt>:include_source_files</tt> - C++ source files that need to be compiled into the extension but not wrapped.
-    # * <tt>:include_source_dir</tt> - A combination option for reducing duplication, this option will 
-    #   query the given directory for source files, adding all to <tt>:include_source_files</tt> and 
-    #   adding all h/hpp files to <tt>:includes</tt> 
+    # * <tt>:include_source_dir</tt> - A combination option for reducing duplication, this option will
+    #   query the given directory for source files, adding all to <tt>:include_source_files</tt> and
+    #   adding all h/hpp files to <tt>:includes</tt>
     #
     def sources(dirs, options = {})
-      parser_options = {}
+      parser_options = {
+        :includes => [],
+        :cxxflags => [
+          # Force castxml into C++ mode
+          "-x c++",
+          # Allow things like `<::`
+          "-fpermissive"
+        ]
+      }
 
-      if (code_dir = options.delete(:include_source_dir)) 
+      if (code_dir = options.delete(:include_source_dir))
         options[:include_source_files] ||= []
         options[:includes] ||= []
         Dir["#{code_dir}/*"].each do |f|
@@ -118,11 +126,11 @@ module RbPlusPlus
 
       if (paths = options.delete(:include_paths))
         @options[:include_paths] << paths
-        parser_options[:includes] = paths
+        parser_options[:includes] << paths
       end
 
       if (lib_paths = options.delete(:library_paths))
-        @options[:library_paths] << lib_paths 
+        @options[:library_paths] << lib_paths
       end
 
       if (libs = options.delete(:libraries))
@@ -131,7 +139,7 @@ module RbPlusPlus
 
       if (flags = options.delete(:cxxflags))
         @options[:cxxflags] << flags
-        parser_options[:cxxflags] = flags
+        parser_options[:cxxflags] << flags
       end
 
       if (flags = options.delete(:ldflags))
@@ -146,7 +154,7 @@ module RbPlusPlus
           options[:includes] << f if File.extname(f) =~ /hpp/i || File.extname(f) =~ /h/i
         end
       end
-      
+
       if (flags = options.delete(:includes))
         includes = Dir.glob(flags)
         if(includes.length == 0)
@@ -195,8 +203,8 @@ module RbPlusPlus
       raise "Unknown writer mode #{mode}" unless [:multiple, :single].include?(mode)
       @writer_mode = mode
     end
-    
-    # Start the code generation process. 
+
+    # Start the code generation process.
     def build
       raise ConfigurationError.new("Must specify working directory") unless @working_dir
       raise ConfigurationError.new("Must specify which sources to wrap") unless @parser
@@ -217,7 +225,7 @@ module RbPlusPlus
       Logger.info "Writing code to files"
       prepare_working_dir
       process_other_source_files
-      
+
       # Create the code
       writer_class = @writer_mode == :multiple ? Writers::MultipleFilesWriter : Writers::SingleFileWriter
       writer_class.new(@builder, @working_dir).write
@@ -257,7 +265,7 @@ module RbPlusPlus
           exit
         end
 
-        opts.on("-v", "--verbose", "Show all progress messages (INFO, DEBUG, WARNING, ERROR)") do 
+        opts.on("-v", "--verbose", "Show all progress messages (INFO, DEBUG, WARNING, ERROR)") do
           Logger.verbose = true
         end
 
@@ -307,7 +315,7 @@ module RbPlusPlus
 
     # Cool little eval / binding hack, from need.rb
     def build_working_dir(&block)
-      file_name = 
+      file_name =
         if block.respond_to?(:source_location)
           block.source_location[0]
         else
@@ -331,7 +339,7 @@ module IRB # :nodoc:
       ARGV.replace(args)
       @__initialized = true
     end
-    
+
     workspace = WorkSpace.new(binding)
 
     irb = Irb.new(workspace)

data/test/allocation_strategies_test.rb

@@ -15,19 +15,13 @@ describe "Allocation Strategies" do
   # instantiate an object with a non-public constructor
   # and it all dies.
   specify "properly figures out what allocation to do" do
-    lambda do
-      require 'alloc_strats'
-    end.should_not raise_error(LoadError)
+    require 'alloc_strats'
 
     # Private constructor, public destructor
-    lambda do
-      NoConstructor
-    end.should_not raise_error(NameError)
+    NoConstructor
 
     # Private constructor and destructor
-    lambda do
-      Neither
-    end.should_not raise_error(NameError)
+    Neither
   end
 
   specify "can get access to Neither object" do

data/test/class_methods_encapsulate_test.rb

@@ -22,7 +22,7 @@ describe "Correct handling of encapsulated methods" do
       ext.protected_method
     end.should raise_error(NoMethodError)
   end
-  
+
   specify "should handle virtual methods" do
     ext_factory = ExtendedFactory.new
     ext = ext_factory.new_instance
@@ -42,18 +42,14 @@ describe "Correct handling of encapsulated methods" do
       arg.wrap_me_protected
     end.should raise_error(NoMethodError)
 
-    lambda do
-      arg.wrap_me_public ArgumentAccess::PublicStruct.new
-    end.should_not raise_error(NoMethodError)
-    
+    arg.wrap_me_public ArgumentAccess::PublicStruct.new
+
     # Multiple argument methods
     lambda do
       arg.wrap_me_many_no
     end.should raise_error(NoMethodError)
 
-    lambda do
-      arg.wrap_me_many_yes(1, 2.0, ArgumentAccess::PublicStruct.new)
-    end.should_not raise_error(NoMethodError)
+    arg.wrap_me_many_yes(1, 2.0, ArgumentAccess::PublicStruct.new)
   end
 end
 

data/test/classes_test.rb

@@ -22,10 +22,6 @@ describe "Extension with wrapped classes" do
     require 'adder'
   end
 
-  specify "should make classes available as Ruby runtime constants" do
-    lambda { Adder }.should_not raise_error
-  end
-
   specify "should make wrapped classes constructable" do
     a = Adder.new
     a.should_not be_nil
@@ -46,15 +42,15 @@ describe "Extension with wrapped classes" do
   end
 
   specify "should use typedefs when findable" do
-    lambda { IntAdder }.should_not raise_error
+    IntAdder
   end
 
   specify "finds and uses multi-nested typedefs" do
-    lambda { ShouldFindMe }.should_not raise_error
+    ShouldFindMe
   end
 
   specify "can turn off typedef lookup for certain classes" do
-    lambda { DontFindMeBro }.should raise_error
+    lambda { DontFindMeBro }.should raise_error(NameError)
   end
 
   specify "makes class constants available" do
@@ -62,7 +58,7 @@ describe "Extension with wrapped classes" do
   end
 
   specify "can ignore constants" do
-    lambda { Adder::HideMe }.should raise_error
+    lambda { Adder::HideMe }.should raise_error(NameError)
   end
 
   specify "makes public instance variables accessible" do
@@ -84,7 +80,7 @@ describe "Extension with wrapped classes" do
 
     lambda do
       a.const_var = "This is a value!"
-    end.should raise_error
+    end.should raise_error(NoMethodError)
 
     a.const_var.should == 14
   end
@@ -104,9 +100,5 @@ describe "Extension with wrapped classes" do
     a.add_integers(3, 7).should == 21
     a.add_strings("piz", "owned").should == "pizownedwoot"
   end
-
-  specify "should not wrap incomplete types" do
-    lambda { Forwarder }.should raise_error
-  end
 end
 

data/test/compiling_test.rb

@@ -121,29 +121,25 @@ describe "Compiler settings" do
   end
 
   specify "should pass cxxflags to rbgccxml" do
-    lambda do
-      e = Extension.new "parsing_test" 
-      e.working_dir = full_dir("generated")
-      e.sources full_dir("headers/requires_define.h"),
-        :cxxflags => "-DMUST_BE_DEFINED"
-      e.build
-      e.write
-    end.should_not raise_error
+    e = Extension.new "parsing_test" 
+    e.working_dir = full_dir("generated")
+    e.sources full_dir("headers/requires_define.h"),
+      :cxxflags => "-DMUST_BE_DEFINED"
+    e.build
+    e.write
   end
 
   specify "should be able to add additional headers as needed" do
-    lambda do
-      e = Extension.new "external" 
-      e.working_dir = full_dir("generated")
-      e.sources full_dir("headers/external_mapping.h"), 
-        :includes => full_dir("headers/*rice.h")
-      e.build
-      e.write
-
-      file = full_dir("generated/external.rb.cpp")
-      contents = File.read(file)
-      contents.should =~ %r(headers/external_mapping_rice.h)
-    end.should_not raise_error
+    e = Extension.new "external" 
+    e.working_dir = full_dir("generated")
+    e.sources full_dir("headers/external_mapping.h"), 
+      :includes => full_dir("headers/*rice.h")
+    e.build
+    e.write
+
+    file = full_dir("generated/external.rb.cpp")
+    contents = File.read(file)
+    contents.should =~ %r(headers/external_mapping_rice.h)
   end
 
   specify "can specify other source files to be compiled into the extension" do

data/test/constructors_test.rb

@@ -15,14 +15,12 @@ describe "Extension with constructors out the whazoo" do
 
     require 'constructors'
 
-    lambda do
-      # Test complex constructors
-      d = DoubleStringHolder.new("one", "two")
-      one = d.get_one
-      d.get_one.should == "one"
-      d.get_two.should == "two"
-    end.should_not raise_error(NameError)
-    
+    # Test complex constructors
+    d = DoubleStringHolder.new("one", "two")
+    one = d.get_one
+    d.get_one.should == "one"
+    d.get_two.should == "two"
+
     lambda do
       PrivateConstructor.new
     end.should raise_error(TypeError)

data/test/director_test.rb

@@ -58,9 +58,7 @@ describe "Director proxy generation" do
       end
     end
 
-    lambda do
-      SuperGoodWorker.new.do_something(10).should == 50
-    end.should_not raise_error(NotImplementedError)
+    SuperGoodWorker.new.do_something(10).should == 50
   end
 
   specify "can specify a default return value in the wrapper" do
@@ -86,12 +84,12 @@ describe "Director proxy generation" do
   specify "properly adds all constructor arguments" do
     v = VirtualWithArgs.new 14, true
     v.process_a("hi").should == 16
-    v.process_b.should be_true
+    v.process_b.should eq(true)
   end
 
   specify "takes into account renamed methods / classes" do
     c = BetterNamedClass.new
-    c.x_ok?.should_not be_true
+    c.x_ok?.should_not eq(true)
 
     c.do_processing.should == 14
   end
@@ -162,9 +160,6 @@ describe "Director proxy generation" do
   end
 
   specify "multiple files writer properly handles directors and nested nodes" do
-    lambda { Worker::ZeeEnum }.should_not raise_error(NameError)
-    lambda { Worker::ZeeEnum::VALUE }.should_not raise_error(NameError)
-
     Worker::ZeeEnum::VALUE.to_i.should == 4
   end
 

data/test/enumerations_test.rb

@@ -17,8 +17,6 @@ describe "Wrapping enumerations" do
   end
 
   specify "should wrap up enums properly" do
-    lambda { TestEnum }.should_not raise_error(NameError)
-
     TestEnum::VALUE1.to_i.should == 0
     TestEnum::VALUE2.to_i.should == 1
     TestEnum::VALUE3.to_i.should == 2
@@ -30,16 +28,12 @@ describe "Wrapping enumerations" do
   end
 
   specify "should wrap up enumerations at proper nesting" do
-    lambda { Tester::MyEnum }.should_not raise_error(NameError)
-
     Tester::MyEnum::I_LIKE_MONEY.to_i.should == 3
     Tester::MyEnum::YOU_LIKE_MONEY_TOO.to_i.should == 4
     Tester::MyEnum::I_LIKE_YOU.to_i.should == 7
   end
 
   specify "should work in user-defined modules" do
-    lambda { Mod::InnerEnum }.should_not raise_error(NameError)
-
     Mod::InnerEnum::INNER_1.to_i.should == 0
     Mod::InnerEnum::INNER_2.to_i.should == 1
   end
@@ -63,11 +57,6 @@ describe "Wrapping enumerations" do
   end
 
   specify "anonymous enumerations' values are added as constants to the parent class" do
-    lambda { Tester::ANON_ENUM_VAL1 }.should_not raise_error(NameError)
-    lambda { Tester::ANON_ENUM_VAL2 }.should_not raise_error(NameError)
-    lambda { Tester::ANON_ENUM_VAL3 }.should_not raise_error(NameError)
-    lambda { Tester::ANON_ENUM_VAL4 }.should_not raise_error(NameError)
-
     Tester::ANON_ENUM_VAL1.should == 1
     Tester::ANON_ENUM_VAL2.should == 2
     Tester::ANON_ENUM_VAL3.should == 5
@@ -75,11 +64,6 @@ describe "Wrapping enumerations" do
   end
 
   specify "top-level anonymous enumerations' values are added to the global scope" do
-    lambda { OUTER_ANON_1 }.should_not raise_error(NameError)
-    lambda { OUTER_ANON_2 }.should_not raise_error(NameError)
-    lambda { FOURTY_TWO }.should_not raise_error(NameError)
-    lambda { SEPERATE_OUTER_VALUE }.should_not raise_error(NameError)
-
     OUTER_ANON_1.should == 0
     OUTER_ANON_2.should == 1
     FOURTY_TWO.should == 42

data/test/extension_test.rb

@@ -8,9 +8,7 @@ describe "Ruby Extension creation" do
       e.writer_mode :single
     end
 
-    lambda do
-      require "ext_test"
-    end.should_not raise_error(LoadError)
+    require "ext_test"
   end
 
   specify "should create a valid Ruby extension without a block" do
@@ -22,22 +20,18 @@ describe "Ruby Extension creation" do
     e.write
     e.compile
 
-    lambda do
-      require "ext_test"
-    end.should_not raise_error(LoadError)
+    require "ext_test"
   end
 
   specify "should properly build working dir as deep as needed" do
-    lambda do
-      path = File.join(File.expand_path(File.dirname(__FILE__)), "generated", "path1", "path2")
-      Extension.new "extension" do |e|
-        e.sources full_dir("headers/empty.h")
-        e.working_dir = path
-        e.writer_mode :single
-      end
-
-      File.exists?(File.join(path, "extconf.rb")).should be_true
-    end.should_not raise_error(Errno::ENOENT)
+    path = File.join(File.expand_path(File.dirname(__FILE__)), "generated", "path1", "path2")
+    Extension.new "extension" do |e|
+      e.sources full_dir("headers/empty.h")
+      e.working_dir = path
+      e.writer_mode :single
+    end
+
+    File.exists?(File.join(path, "extconf.rb")).should eq(true)
   end
 end
 

data/test/file_writers_test.rb

@@ -26,15 +26,15 @@ describe "Multiple file writer (default)" do
       extconf.rb
       _Mod.rb.cpp
       _Mod.rb.hpp
-      _classes_Adder.rb.cpp
-      _classes_Adder.rb.hpp
-      _classes_IntAdder.rb.cpp
-      _classes_IntAdder.rb.hpp
-      _classes_ShouldFindMe.rb.hpp
-      _classes_ShouldFindMe.rb.cpp
+      __classes_Adder.rb.cpp
+      __classes_Adder.rb.hpp
+      __classes_IntAdder.rb.cpp
+      __classes_IntAdder.rb.hpp
+      __classes_ShouldFindMe.rb.hpp
+      __classes_ShouldFindMe.rb.cpp
       adder.rb.cpp
     ).each do |wants|
-      files.find {|got| File.basename(got) == wants }.should_not be_nil
+      files.find {|got| File.basename(got) == wants }.should_not be_nil, "Expected #{wants} to exist"
     end
   end
 
@@ -116,8 +116,6 @@ describe "Single file writer with to_from_ruby" do
   end
 
   specify "should have compiled properly" do
-    lambda do
-      require 'to_from_ruby'
-    end.should_not raise_error(LoadError)
+    require 'to_from_ruby'
   end
 end

data/test/function_pointer_test.rb

@@ -20,7 +20,7 @@ describe "properly handles and wraps function pointer arguments" do
 
     call_callback
 
-    proc_called.should be_true
+    proc_called.should eq(true)
   end
 
   specify "arguments, no return" do

data/test/functions_test.rb

@@ -10,7 +10,7 @@ describe "Extension with globally available functions" do
 
     require 'functions'
 
-    lambda { test1 }.should_not raise_error(NameError)
+    test1
 
     test2(2.0).should be_within(0.001).of(1.0)
 

data/test/generated/extconf.rb

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'mkmf-rice'
+
+# Add the arguments to the linker flags.
+def append_ld_flags(flags)
+  flags = [flags] unless flags.is_a?(Array)
+  with_ldflags("#{$LDFLAGS} #{flags.join(' ')}") { true }
+end
+
+$CPPFLAGS += " -I'/Users/jroelofs/Development/rbplusplus/test/generated'  "
+$LDFLAGS += "   "
+
+if RUBY_PLATFORM =~ /darwin/
+  # In order to link the shared library into our bundle with GCC 4.x on OSX, we have to work around a bug:
+  #   GCC redefines symbols - which the -fno-common prohibits.  In order to keep the -fno-common, we
+  #   remove the flat_namespace (we now have two namespaces, which fixes the GCC clash).  Also, we now lookup
+  #   symbols in both the namespaces (dynamic_lookup).
+
+  $LDSHARED_CXX.gsub!('suppress', 'dynamic_lookup')
+  $LDSHARED_CXX.gsub!('-flat_namespace', '')
+  
+  append_ld_flags '-all_load'
+end
+
+create_makefile("ui")

data/test/headers/Adder.h

@@ -5,8 +5,6 @@
 using namespace std;
 
 namespace classes {
-  class Forwarder;
-
   class Adder {
     public:
       Adder();

data/test/implicit_cast_test.rb

@@ -6,7 +6,7 @@ describe "Specify types to allow implicit casting" do
     Extension.new "implicit_cast" do |e|
       e.sources full_dir("headers/implicit_cast.h")
       e.writer_mode :single
-        
+
       node = e.namespace "implicit_cast"
 
       # Can flag individual constructors
@@ -25,16 +25,16 @@ describe "Specify types to allow implicit casting" do
   end
 
   specify "can use Degree in place of Radian" do
-    is_obtuse(Degree.new(75)).should be_false
+    is_obtuse(Degree.new(75)).should eq(false)
   end
 
   specify "can use Radian in place of Degree" do
-    is_acute(Radian.new(2.0)).should be_false
+    is_acute(Radian.new(2.0)).should eq(false)
   end
 
   specify "pointers also work fine" do
-    is_right(Degree.new(90)).should be_true
-    is_right(Radian.new(2.0)).should be_false
+    is_right(Degree.new(90)).should eq(true)
+    is_right(Radian.new(2.0)).should eq(false)
   end
 end
 

data/test/modules_test.rb

@@ -42,28 +42,21 @@ describe "Extension with modules" do
   end
 
   specify "should be able to generate a module definition" do
-    lambda { Empty }.should_not raise_error(NameError)
-
     Empty.class.should == Module
   end
 
   specify "should wrap up C++ classes under the namespace as requested" do
-    lambda { Adder }.should raise_error(NameError)
-    lambda { Wrapper::Adder }.should_not raise_error(NameError)
-
     a = Wrapper::Adder.new
     a.get_class_name.should == "Adder"
   end
 
   specify "should wrap up C++ functions in the module" do
-    lambda { Functions }.should_not raise_error(NameError)
     Functions::test2(2).should be_within(0.001).of(1.0)
     Functions::test3(4, 6).should == 4
   end
 
   specify "should be able to nest modules and related definitions" do
     lambda { Subtracter }.should raise_error(NameError)
-    lambda { Nested::Nested::Inner::Subtracter }.should_not raise_error(NameError)
 
     s = Nested::Nested::Inner::Subtracter.new
     s.get_class_name.should == "Subtracter"

data/test/nested_test.rb

@@ -11,12 +11,6 @@ describe "Wrapping Classes within classes" do
   end
 
   specify "should properly make nested classes available" do
-    lambda do 
-      Kernel.const_get(TestClass) 
-      Kernel.const_get(TestClass::InnerClass) 
-      Kernel.const_get(TestClass::InnerClass::Inner2) 
-    end.should_not raise_error(NameError)
-
     TestClass.new.should_not be_nil
     TestClass::InnerClass.new.should_not be_nil
     TestClass::InnerClass::Inner2.new.should_not be_nil

data/test/overloading_test.rb

@@ -19,26 +19,21 @@ describe "Extension with overloaded methods" do
     require 'overload'
 
     #Constructor overloading is broken in rice
-    #math = Mathy.new 
+    #math = Mathy.new
     math = Mathy.new(1)
-    
+
     math.times.should == 1
     math.times_1(3).should == 3
     math.times_2(3,2).should == 6
     math.times_3(3,2,3).should == 18
-    
-    lambda do
-      math.nothing_0
-      math.nothing_1(1)
-    end.should_not raise_error(NameError)
 
-    # Should properly handle const overloads as well
-    lambda do
-      math.const_method_0(1)
-      math.const_method_1(1)
-      math.const_method_string("love")
-    end.should_not raise_error(NameError)
+    math.nothing_0
+    math.nothing_1(1)
 
+    # Should properly handle const overloads as well
+    math.const_method_0(1)
+    math.const_method_1(1)
+    math.const_method_string("love")
   end
 
 end

data/test/subclass_test.rb

@@ -25,14 +25,9 @@ describe "Extension with class hierachies" do
     # Template superclasses shouldn't cause problems
     TemplateSub.new.zero.should == TemplateSub.new.custom
 
-    lambda do
-      TemplatePtr.new.custom
-    end.should_not raise_error(NameError)
-
-    lambda do
-      Multiple.new
-    end.should_not raise_error(NameError)
-
+    # Shouldn't throw exceptions
+    TemplatePtr.new.custom
+    Multiple.new
     Multiple.superclass.should == Base2
   end
 

data/test/test_helper.rb

@@ -32,6 +32,10 @@ RSpec.configure do |config|
   config.include(FileDirectoryHelpers)
   config.include(TestHelpers)
 
+  config.expect_with(:rspec) do |c|
+    c.syntax = :should
+  end
+
   config.before(:all) do
     test_setup
   end

data/test/wrap_as_test.rb

@@ -61,48 +61,36 @@ describe "Ugly interfaces cleaner" do
       ui_add(1,2)
     end.should raise_error(NoMethodError)
 
-    lambda do
-      UI::Math::add(1,2).should == 3
-    end.should_not raise_error(NoMethodError)
+    UI::Math::add(1,2).should == 3
 
     lambda do
       ui_subtract(2,1)
     end.should raise_error(NoMethodError)
 
-    lambda do
-      UI::Math::subtract(2,1).should == 1
-    end.should_not raise_error(NoMethodError)
+    UI::Math::subtract(2,1).should == 1
 
     lambda do
       C_UIVector.new
     end.should raise_error(NameError)
 
-    lambda do
-      v = UI::Vector.new
-      v.x = 3
-      v.x.should == 3
-    end.should_not raise_error(NameError)
+    v = UI::Vector.new
+    v.x = 3
+    v.x.should == 3
 
     lambda do
       UI::DMath::divide(1.0,2.0)
     end.should raise_error(NameError)
 
-    lambda do
-      UI::Modulus.mod(3,2).should == 1
-    end.should_not raise_error(NameError)
+    UI::Modulus.mod(3,2).should == 1
 
     UI::Modulus.new.method_mod(4, 3).should == 1
 
-    lambda do
-      UI::Math::divide(2,1).should == 2
-    end.should_not raise_error(NoMethodError)
+    UI::Math::divide(2,1).should == 2
 
     lambda do
       UI::NoConstructor.new
     end.should raise_error(TypeError)
 
-    lambda do
-      UI::Outside::Inside.new
-    end.should_not raise_error(NoMethodError)
+    UI::Outside::Inside.new
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbplusplus
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jason Roelofs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2017-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbgccxml
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rice
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - test/function_pointer_test.rb
 - test/function_pointers_classes_test.rb
 - test/functions_test.rb
+- test/generated/extconf.rb
 - test/headers/Adder.cpp
 - test/headers/Adder.h
 - test/headers/Subtracter.hpp
@@ -148,7 +149,7 @@ files:
 - test/test_helper.rb
 - test/to_from_ruby_test.rb
 - test/wrap_as_test.rb
-homepage: http://rbplusplus.rubyforge.org
+homepage: https://github.com/jasonroelofs/rbplusplus
 licenses:
 - MIT
 metadata: {}
@@ -168,66 +169,67 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rbplusplus
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby library to generate Rice wrapper code
 test_files:
-- test/allocation_strategies_test.rb
+- test/generated/extconf.rb
 - test/class_methods_encapsulate_test.rb
-- test/class_methods_test.rb
-- test/classes_test.rb
-- test/compiling_test.rb
+- test/wrap_as_test.rb
+- test/director_test.rb
+- test/overloading_test.rb
+- test/default_arguments_test.rb
+- test/to_from_ruby_test.rb
+- test/include_source_files_test.rb
 - test/constructors_test.rb
+- test/allocation_strategies_test.rb
+- test/modules_test.rb
+- test/functions_test.rb
+- test/classes_test.rb
 - test/custom_code_test.rb
-- test/default_arguments_test.rb
-- test/director_test.rb
-- test/enumerations_test.rb
+- test/function_pointers_classes_test.rb
 - test/extension_test.rb
-- test/file_writers_test.rb
+- test/class_methods_test.rb
 - test/function_pointer_test.rb
-- test/function_pointers_classes_test.rb
-- test/functions_test.rb
-- test/implicit_cast_test.rb
-- test/include_source_dir_test.rb
-- test/include_source_files_test.rb
-- test/modules_test.rb
 - test/nested_test.rb
-- test/overloading_test.rb
+- test/test_helper.rb
+- test/file_writers_test.rb
 - test/struct_test.rb
 - test/subclass_test.rb
-- test/test_helper.rb
-- test/to_from_ruby_test.rb
-- test/wrap_as_test.rb
-- test/headers/Adder.cpp
-- test/headers/Adder.h
-- test/headers/alloc_strats.h
+- test/enumerations_test.rb
+- test/implicit_cast_test.rb
+- test/compiling_test.rb
+- test/include_source_dir_test.rb
+- test/headers/function_pointers.h
+- test/headers/with_includes.h
+- test/headers/requires_define.h
+- test/headers/director.h
 - test/headers/class_methods.h
+- test/headers/external_mapping_rice.h
+- test/headers/needs_code.h
+- test/headers/ugly_interface_ns.h
+- test/headers/to_from_ruby_source.cpp
+- test/headers/overload.h
+- test/headers/include/helper.h
+- test/headers/Adder.cpp
+- test/headers/complex_static_methods.h
+- test/headers/code/my_type.hpp
 - test/headers/code/custom_to_from_ruby.cpp
 - test/headers/code/custom_to_from_ruby.hpp
-- test/headers/code/my_type.hpp
-- test/headers/complex_static_methods.h
+- test/headers/Subtracter.hpp
+- test/headers/external_mapping.h
 - test/headers/constructors.h
 - test/headers/default_arguments.h
-- test/headers/director.h
+- test/headers/alloc_strats.h
 - test/headers/empty.h
+- test/headers/implicit_cast.h
 - test/headers/enums.h
-- test/headers/external_mapping.h
-- test/headers/external_mapping_rice.h
-- test/headers/function_pointers.h
+- test/headers/Adder.h
+- test/headers/ugly_interface.h
+- test/headers/nested_struct.h
 - test/headers/function_pointers_class.h
 - test/headers/functions.h
-- test/headers/implicit_cast.h
-- test/headers/include/helper.h
-- test/headers/needs_code.h
-- test/headers/nested_classes.h
-- test/headers/nested_struct.h
-- test/headers/overload.h
-- test/headers/requires_define.h
 - test/headers/subclass.h
-- test/headers/Subtracter.hpp
+- test/headers/nested_classes.h
 - test/headers/to_from_ruby.h
-- test/headers/to_from_ruby_source.cpp
-- test/headers/ugly_interface.h
-- test/headers/ugly_interface_ns.h
-- test/headers/with_includes.h