rubypython 0.2.10 → 0.2.11

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.11 2010-07-12
+* Bug Fixes
+	* Fixed some issues with building the extension under ruby 1.9. Sould now be truly 1.9 compatible.
+
 == 0.2.10 2010-07-08
 * Bug Fixes
 	* Made some changes to how the native extension is configured and build.

data/Manifest.txt

@@ -4,8 +4,6 @@ Manifest.txt
 PostInstall.txt
 README.txt
 Rakefile
-config/hoe.rb
-config/requirements.rb
 ext/rubypython_bridge/cbridge.c
 ext/rubypython_bridge/cbridge.h
 ext/rubypython_bridge/config.h
@@ -36,25 +34,13 @@ lib/rubypython.rb
 lib/rubypython/session.rb
 lib/rubypython/version.rb
 lib/rubypython/wrapper_extensions.rb
-script/console
-script/destroy
-script/generate
-script/txt2html
 setup.rb
-tasks/deployment.rake
 tasks/environment.rake
 tasks/extconf.rake
 tasks/extconf/rubypython_bridge.rake
-tasks/website.rake
 test/python_helpers/objects.py
-test/python_helpers/objects.pyc
 test/test.wav
 test/test_helper.rb
 test/test_rubypython.rb
 test/test_rubypython_bridge_extn.rb
 test/test_session.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.html.erb

data/ext/rubypython_bridge/cbridge.c

@@ -1,6 +1,8 @@
 #include "cbridge.h"
 
-#import "rtop.h"
+#include "rtop.h"
+#include "ptor.h"
+#include "rp_error.h"
 
 /* Attempt to initialize the embedded python interpreter.
   Return 1 if we initialize it here and 0 if the interpreter is
@@ -8,7 +10,7 @@
 */
 int rpSafeStart()
 {
-	int here;
+	int here = 0;
 	
 	if(!Py_IsInitialized())
 	{
@@ -73,10 +75,9 @@ VALUE rpCall(PyObject* pFunc,  VALUE args)
 VALUE rpCallWithModule(VALUE module, VALUE name, VALUE args)
 {
 
-	VALUE rArgs;
 	VALUE rReturn;
 
-	PyObject *pModule, *pFunc, *pArgs, *pReturn;
+	PyObject *pModule, *pFunc;
 
 
 	// Load the requested python module

data/ext/rubypython_bridge/extconf.rb

@@ -32,12 +32,12 @@ end
 #  exit -1
 #end
 $LDFLAGS << " " + `python-config --ldflags`
+$CPPFLAGS << " " + `python-config --includes`.chomp
 
 if RUBY_VERSION=~/1\.9/ then
 	puts "Building for Ruby 1.9"
 	$CPPFLAGS += " -DRUBY_19"
 end
 
-find_header("Python.h",*`python-config --includes`.split.map{|s| s[2..-1]<<"/"})
 
 create_makefile("rubypython_bridge")

data/ext/rubypython_bridge/ptor.c

@@ -1,5 +1,10 @@
 #include "ptor.h"
 
+#include "rp_error.h"
+#include "rp_function.h"
+#include "rp_instance.h"
+#include "rp_class.h"
+
 
 /* Note:
    The conversion functions for the builtin types are just that,

data/ext/rubypython_bridge/rp_blankobject.h

@@ -6,5 +6,6 @@
 
 VALUE blank_undef_if(VALUE, VALUE);
 VALUE blank_obj_prep(VALUE);
+inline void Init_BlankObject();
 
-#endif
+#endif

data/ext/rubypython_bridge/rp_class.c

@@ -48,9 +48,9 @@ from within ruby. Most users need not concern themselves with anything about thi
 its existence.
 
 */
-void Init_RubyPyClass()
+inline void Init_RubyPyClass()
 {
 	cRubyPyClass = rb_define_class_under(mRubyPythonBridge,"RubyPyClass", cRubyPyObject);
 	rb_define_method(cRubyPyClass,"method_missing", rpModuleDelegate,- 2);
 	rb_define_method(cRubyPyClass,"new", rpClassNew,- 2);
-}
+}

data/ext/rubypython_bridge/rp_class.h

@@ -3,4 +3,5 @@
 #ifndef _RP_CLASS_H_
 #define _RP_CLASS_H_
 VALUE rpClassFromPyObject(PyObject*);
-#endif
+inline void Init_RubyPyClass();
+#endif

data/ext/rubypython_bridge/rp_error.c

@@ -1,4 +1,5 @@
 #include "rp_error.h"
+#include "ptor.h"
 
 VALUE ePythonError;
 VALUE eRubyPyError;
@@ -26,8 +27,8 @@ void rpRubyPyError(char* eString) {
 Used to pass error information back into Ruby should an error occur in the embedded Python
 interpreter.
 */
-void Init_RubyPyError()
+inline void Init_RubyPyError()
 {
 	ePythonError = rb_define_class("PythonError", rb_eException);
 	eRubyPyError = rb_define_class("RubyPyError", rb_eException);
-}
+}

data/ext/rubypython_bridge/rp_error.h

@@ -6,5 +6,6 @@
 void rpPythonError();
 
 void rpRubyPyError(char*);
+inline void Init_RubyPyError();
 
 #endif /* _RP_ERROR_H_ */

data/ext/rubypython_bridge/rp_function.c

@@ -25,7 +25,7 @@ VALUE rpFunctionFromPyObject(PyObject *pFunc)
 // This is used internally to aid RubyPyClass in delegating method calls.
 // 
 
-void Init_RubyPyFunction()
+inline void Init_RubyPyFunction()
 {
 	cRubyPyFunction = rb_define_class_under(mRubyPythonBridge,"RubyPyFunction", cRubyPyObject);
-}
+}

data/ext/rubypython_bridge/rp_function.h

@@ -3,4 +3,5 @@
 #ifndef _RP_FUNCTION_H_
 #define _RP_FUNCTION_H_
 VALUE rpFunctionFromPyObject(PyObject*);
-#endif
+inline void Init_RubyPyFunction();
+#endif

data/ext/rubypython_bridge/rp_instance.c

@@ -2,6 +2,7 @@
 
 #include "rp_object.h"
 #include "rp_function.h"
+#include "rp_util.h"
 
 RUBY_EXTERN VALUE mRubyPythonBridge;
 
@@ -39,10 +40,8 @@ VALUE rpInstanceFromPyObject(PyObject* pInst)
 static
 VALUE rpInstanceSetAttr(VALUE self, VALUE args)
 {
-	VALUE name, name_string, rClassDict, result, rInstDict;
-	VALUE ret;
+	VALUE name, name_string, rClassDict, rInstDict;
 	
-	int instance;
 	char* cname;
 	
 	PObj *pClassDict,*pInstDict,*pDict;
@@ -156,7 +155,7 @@ VALUE rpInstanceDelegate(VALUE self, VALUE args)
 }
 
 
-void Init_RubyPyInstance()
+inline void Init_RubyPyInstance()
 {
 	cRubyPyInstance = rb_define_class_under(mRubyPythonBridge,"RubyPyInstance", cRubyPyObject);
 	rb_define_method(cRubyPyInstance,"method_missing", rpInstanceDelegate,- 2);

data/ext/rubypython_bridge/rp_instance.h

@@ -3,4 +3,5 @@
 #ifndef _RP_INSTANCE_H_
 #define _RP_INSTANCE_H_
 VALUE rpInstanceFromPyObject(PyObject*);
-#endif
+inline void Init_RubyPyInstance();
+#endif

data/ext/rubypython_bridge/rp_module.c

@@ -2,6 +2,7 @@
 
 #include "rp_object.h"
 #include "rp_function.h"
+#include "rp_util.h"
 
 VALUE cRubyPyModule;
 
@@ -10,21 +11,21 @@ RUBY_EXTERN VALUE cRubyPyFunction;
 RUBY_EXTERN VALUE cRubyPyClass;
 RUBY_EXTERN VALUE cRubyPyObject;
 
-static
-VALUE rpModuleCallFunction(VALUE self, VALUE func_name, VALUE args)
-{
-	PyObject *pModule,*pFunc;
-	VALUE rReturn;
-	
-	pModule = rpObjectGetPyObject(self);
-	
-	pFunc = rpGetFunctionWithModule(pModule, func_name);
-	rReturn = rpCall(pFunc, args);
-	Py_XDECREF(pFunc);
-	
-	return rReturn;
-	
-}
+//static
+//VALUE rpModuleCallFunction(VALUE self, VALUE func_name, VALUE args)
+//{
+//	PyObject *pModule,*pFunc;
+//	VALUE rReturn;
+//	
+//	pModule = rpObjectGetPyObject(self);
+//	
+//	pFunc = rpGetFunctionWithModule(pModule, func_name);
+//	rReturn = rpCall(pFunc, args);
+//	Py_XDECREF(pFunc);
+//	
+//	return rReturn;
+//	
+//}
 
 //:nodoc:
 static
@@ -151,9 +152,9 @@ return either the equivalent attribute converted to a native Ruby type, or wrapp
 to a Python object. RubyPyModule instances should be created through the use of RubyPython.import.
 
 */
-void Init_RubyPyModule()
+inline void Init_RubyPyModule()
 {
 	cRubyPyModule = rb_define_class_under(mRubyPythonBridge,"RubyPyModule", cRubyPyObject);
 	rb_define_method(cRubyPyModule,"initialize", rpModuleInit, 1);
 	rb_define_method(cRubyPyModule,"method_missing", rpModuleDelegate,- 2);
-}
+}

data/ext/rubypython_bridge/rp_module.h

@@ -4,4 +4,5 @@
 #define _RP_MODULE_H_
 // Ruby wrapper for Python Modules
 VALUE rpModuleDelegate(VALUE, VALUE);
-#endif
+inline void Init_RubyPyModule();
+#endif

data/ext/rubypython_bridge/rp_object.h

@@ -19,4 +19,5 @@ VALUE rpObjectFromPyObject(PyObject*);
 int rpHasSymbol(VALUE, ID);
 
 VALUE rpRespondsTo(VALUE, VALUE);
-#endif
+inline void Init_RubyPyObject();
+#endif

data/ext/rubypython_bridge/rp_util.c

@@ -2,6 +2,8 @@
 
 #include "rp_object.h"
 #include "rp_function.h"
+#include "rp_instance.h"
+#include "rp_class.h"
 
 RUBY_EXTERN VALUE mRubyPythonBridge;
 RUBY_EXTERN VALUE ePythonError;

data/ext/rubypython_bridge/rtop.c

@@ -55,7 +55,7 @@ PyObject* rtopArrayToTuple(VALUE rArray)
 
 PyObject* rtopHash(VALUE rHash)
 {
-	PyObject *pDict,*pKey,*pVal;
+	PyObject *pDict;
 	VALUE rKeys;
 	VALUE rKey, rVal;
 	int i;

data/ext/rubypython_bridge/rubypython_bridge.c

@@ -10,6 +10,7 @@
 #include "rp_module.h"
 #include "rp_class.h"
 #include "rp_function.h"
+#include "rp_instance.h"
 
 VALUE mRubyPythonBridge;
 

data/lib/rubypython/version.rb

@@ -2,7 +2,7 @@ module RubyPython
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 10
+    TINY  = 11
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/tasks/extconf/rubypython_bridge.rake

@@ -38,7 +38,7 @@ namespace :extconf do
 
   file ext_so => ext_files do
     Dir.chdir(ext) do
-      sh(PLATFORM =~ /win32/ ? 'nmake' : 'make') do |ok, res|
+      sh(RUBY_PLATFORM =~ /win32/ ? 'nmake' : 'make') do |ok, res|
         if !ok
           require "fileutils"
           FileUtils.rm Dir.glob('*.{so,o,dll,bundle}')
@@ -46,4 +46,4 @@ namespace :extconf do
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubypython
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 2
-  - 10
-  version: 0.2.10
+  - 11
+  version: 0.2.11
 platform: ruby
 authors: 
 - Zach Raines
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -04:00
+date: 2010-07-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,6 @@ extra_rdoc_files:
 - Manifest.txt
 - PostInstall.txt
 - README.txt
-- website/index.txt
 files: 
 - History.txt
 - License.txt
@@ -71,8 +70,6 @@ files:
 - PostInstall.txt
 - README.txt
 - Rakefile
-- config/hoe.rb
-- config/requirements.rb
 - ext/rubypython_bridge/cbridge.c
 - ext/rubypython_bridge/cbridge.h
 - ext/rubypython_bridge/config.h
@@ -103,28 +100,16 @@ files:
 - lib/rubypython/session.rb
 - lib/rubypython/version.rb
 - lib/rubypython/wrapper_extensions.rb
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
 - setup.rb
-- tasks/deployment.rake
 - tasks/environment.rake
 - tasks/extconf.rake
 - tasks/extconf/rubypython_bridge.rake
-- tasks/website.rake
 - test/python_helpers/objects.py
-- test/python_helpers/objects.pyc
 - test/test.wav
 - test/test_helper.rb
 - test/test_rubypython.rb
 - test/test_rubypython_bridge_extn.rb
 - test/test_session.rb
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.html.erb
 has_rdoc: true
 homepage: http://rubypython.rubyforge.org
 licenses: []
@@ -143,7 +128,6 @@ rdoc_options:
 - README.txt
 require_paths: 
 - lib
-- ext/rubypyapi
 - ext/rubypython_bridge
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false

data/config/hoe.rb

@@ -1,75 +0,0 @@
-require 'rubypython/version'
-
-AUTHOR = 'Zach Raines'  
-EMAIL = "achatesavc+rubypython@gmail.com"
-DESCRIPTION = "A bridge between ruby and python"
-GEM_NAME = 'rubypython' 
-RUBYFORGE_PROJECT = 'rubypython' 
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-EXTRA_DEPENDENCIES = [
-#  ['activesupport', '>= 1.3.1']
-]    # An array of rubygem dependencies [name, version]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "sentient6"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil
-# UNCOMMENT IF REQUIRED:
-# REV = YAML.load(`svn info`)['Revision']
-VERS = RubyPython::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'rubypython documentation',
-    "--opname", "index.html",
-    "--line-numbers",
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
-    @extra_deps
-  end
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.spec(GEM_NAME) do
-  self.developer(AUTHOR, EMAIL)
-  self.description = DESCRIPTION
-  self.summary = DESCRIPTION
-  self.url = HOMEPATH
-  self.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  self.test_globs = ["test/**/test_*.rb"]
-  self.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-  self.version = VERS
-  # == Optional
-  self.changes = self.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
-
-  self.spec_extras = {
-    :requirements => ["Python, ~>2.4"]
-  }    # A hash of extra values to set in the gemspec.
-  end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-$hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""