rubypython 0.5.1 → 0.5.2

data/Contributors.rdoc

@@ -7,3 +7,4 @@ RubyPython has a growing list of contributors.
 * Steeve Morin (steeve)
 * Austin Ziegler (halostatue)
 * Aman Gupta (tmm1)
+* Ben Doerr (bendoerr)

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 0.5.2 / 2011-10-21
+* Minor Enhancements:
+  * The traceback for Python exceptions is now returned usefully. [raineszm]
+* Bug Fixes:
+  * Improved the robustness of Windows DLL detection. Based on work by
+    bendoerr, raineszm, and halostatue.
+
 === 0.5.1 / 2011-03-17
 * Major Enhancements:
   * Procs and methods can be passed to Python. [raineszm]

data/Manifest.txt

@@ -33,6 +33,7 @@ spec/legacy_spec.rb
 spec/pymainclass_spec.rb
 spec/pyobject_spec.rb
 spec/python_helpers/basics.py
+spec/python_helpers/errors.py
 spec/python_helpers/objects.py
 spec/pythonerror_spec.rb
 spec/refcnt_spec.rb

data/README.rdoc

@@ -71,7 +71,7 @@ start before running the code provided in the block and stop it afterwards.
   RubyPython.start_from_virtualenv("/path/to/virtualenv")
 
   # Or verbose
-  RubyPython.start(:python => "/path/to/virtualenv/bin/python")
+  RubyPython.start(:python_exe => "/path/to/virtualenv/bin/python")
   RubyPython.activate
 
 === Iterator support
@@ -259,10 +259,10 @@ It should work with other implementations that support the Ruby FFI gem with no
 modification.
 
 === OS Support
-RubyPython has been tested on Mac OS 10.5 and 10.6, and Ubuntu 10.10 (64-bit
-Intel). If your platform has a DLL or shared object version of Python and
-supports the FFI gem, it should work. Feedback on other platforms is always
-welcome.
+RubyPython has been extensively tested on Mac OS 10.5 and 10.6, and Ubuntu
+10.10 (64-bit Intel). If your platform has a DLL or shared object version of
+Python and supports the FFI gem, it should work. Feedback on other platforms is
+always welcome.
 
 == Install
   gem install rubypython

data/Rakefile

@@ -7,7 +7,6 @@ Hoe.plugin :doofus
 Hoe.plugin :gemspec
 Hoe.plugin :git
 Hoe.plugin :hg
-Hoe.plugin :rubyforge
 
 Hoe.spec 'rubypython' do |spec|
   spec.rubyforge_name = spec.name

data/lib/rubypython.rb

@@ -15,7 +15,7 @@
 #   puts cPickle.dumps("RubyPython is awesome!").rubify
 #   RubyPython.stop
 module RubyPython
-  VERSION = '0.5.1' #:nodoc:
+  VERSION = '0.5.2' #:nodoc:
 
   # Do not load the FFI interface by default. Wait until the user asks for
   # it.
@@ -217,7 +217,7 @@ module RubyPython
     # is *strongly* discouraged as this may lead to segmentation faults.
     # This feature is highly experimental and may be disabled in the future.
     def start_from_virtualenv(virtualenv)
-      result = start(:python => File.join(virtualenv, "bin", "python"))
+      result = start(:python_exe => File.join(virtualenv, "bin", "python"))
       activate
       result
     end

data/lib/rubypython/pythonerror.rb

@@ -3,11 +3,17 @@ require 'rubypython/macros'
 
 # Raised when an error occurs in the \Python interpreter.
 class RubyPython::PythonError < RuntimeError
+  # The \Python traceback object associated with this error. This will be
+  # a RubyPython::RubyPyProxy object.
+  attr_reader :traceback
+
   # Creates the PythonError.
   # [typeName] The class name of the \Python error.
   # [msg] The message attached to the \Python error.
-  def initialize(typeName, msg)
+  # [traceback] The traceback, if any, associated with the \Python error.
+  def initialize(typeName, msg, traceback = nil)
     @type = typeName
+    @traceback = traceback
     super([typeName, msg].join(': '))
   end
 
@@ -27,10 +33,15 @@ class RubyPython::PythonError < RuntimeError
       msg = nil
     end
 
+    if not rbTraceback.null?
+      traceback = RubyPython::RubyPyProxy.new rbTraceback
+    else
+      traceback = nil
+    end
+
     # Decrease the reference count. This will happen anyway when they go out
     # of scope but might as well.
     rbValue.xDecref
-    rbTraceback.xDecref
     pyName = rbType.getAttr("__name__")
 
     rbType.xDecref
@@ -38,7 +49,7 @@ class RubyPython::PythonError < RuntimeError
     pyName.xDecref
 
     RubyPython::PythonError.clear
-    RubyPython::PythonError.new(rbName, msg)
+    RubyPython::PythonError.new(rbName, msg, traceback)
   end
 
   # A wrapper to the \Python C API +PyErr_Fetch+ function. Returns an array

data/lib/rubypython/pythonexec.rb

@@ -15,11 +15,15 @@ class RubyPython::PythonExec
     @python = python_executable || "python"
     @python = %x(#{@python} -c "import sys; print sys.executable").chomp
 
-    @version = run_command 'import sys; print "%d.%d" % sys.version_info[:2]'
+    @version = run_command "import sys; print '%d.%d' % sys.version_info[:2]"
 
+    @dirname = File.dirname(@python)
     @realname = @python.dup
-    if @realname !~ /#{@version}$/
+    if (@realname !~ /#{@version}$/ and @realname !~ /\.exe$/)
       @realname = "#{@python}#{@version}"
+    else
+      basename = File.basename(@python, '.exe')
+      @realname = File.join(@dirname, "#{basename}#{@version.gsub(/\./, '')}")
     end
     @basename = File.basename(@realname)
 
@@ -62,6 +66,20 @@ class RubyPython::PythonExec
       end
     end
 
+    if FFI::Platform.windows?
+      # On Windows, the appropriate DLL is usually be found in
+      # %SYSTEMROOT%\system or %SYSTEMROOT%\system32; as a fallback we'll
+      # use C:\Windows\system{,32} as well as the install directory and the
+      # install directory + libs.
+      system_root = File.expand_path(ENV['SYSTEMROOT']).gsub(/\\/, '/')
+      locations << File.join(system_root, 'system', libname)
+      locations << File.join(system_root, 'system32', libname)
+      locations << File.join("C:/WINDOWS", "System", libname)
+      locations << File.join("C:/WINDOWS", "System32", libname)
+      locations << File.join(@dirname, libname)
+      locations << File.join(@dirname, 'libs', libname)
+    end
+
     # Let's add alternative extensions; again, just in case.
     locations.dup.each do |location|
       path = File.dirname(location)
@@ -96,12 +114,12 @@ class RubyPython::PythonExec
   attr_reader :sys_prefix
   # The Python library.
   attr_reader :library
-  #  The version
+  # The Python version
   attr_reader :version
 
   # Run a Python command-line command.
   def run_command(command)
-    %x(#{@python} -c '#{command}').chomp if @python
+    %x(#{@python} -c "#{command}").chomp if @python
   end
 
   def to_s

data/spec/python_helpers/errors.py

@@ -0,0 +1,2 @@
+def nested_error():
+  return 1 / 0

data/spec/pythonerror_spec.rb

@@ -35,4 +35,18 @@ describe RubyPython::PythonError do
       rbType.getAttr("__name__").rubify.should == "ImportError"
     end
   end
+
+  describe ".last_traceback" do
+    it "should make availble the Python traceback of the last error" do
+      traceback = RubyPython.import 'traceback'
+      errors = RubyPython.import 'errors'
+      begin
+        errors.nested_error
+      rescue RubyPython::PythonError => exc
+        tb = exc.traceback
+        list = traceback.format_tb(tb)
+        list.rubify[0].should =~ /1 \/ 0/
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubypython
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Steeve Morin
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -04:00
-default_executable: 
+date: 2011-10-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -53,26 +52,10 @@ dependencies:
         version: 2.1.2.3
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rubyforge
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 0
-        - 4
-        version: 2.0.4
-  type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -83,11 +66,11 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: tilt
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -98,23 +81,22 @@ dependencies:
         - 0
         version: "1.0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 27
         segments: 
         - 2
-        - 9
-        - 1
-        version: 2.9.1
+        - 12
+        version: "2.12"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 description: |-
   RubyPython is a bridge between the Ruby and Python interpreters. It embeds a
   running Python interpreter in the Ruby application's process using FFI and
@@ -178,6 +160,7 @@ files:
 - spec/pymainclass_spec.rb
 - spec/pyobject_spec.rb
 - spec/python_helpers/basics.py
+- spec/python_helpers/errors.py
 - spec/python_helpers/objects.py
 - spec/pythonerror_spec.rb
 - spec/refcnt_spec.rb
@@ -186,7 +169,6 @@ files:
 - spec/rubypython_spec.rb
 - spec/spec_helper.rb
 - .gemtest
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -217,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - Python, ~> 2.4
 rubyforge_project: rubypython
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RubyPython is a bridge between the Ruby and Python interpreters