RbST 0.1.0 → 0.1.1

data/README.markdown

@@ -8,8 +8,6 @@ Python 2.3+ is required.
 
 RbST is available on [gemcutter](http://gemcutter.org/gems/RbST).
 
-    gem install gemcutter
-    gem tumble
     gem install RbST
 
 ## Usage

data/Rakefile

@@ -10,9 +10,8 @@ begin
     gem.email = "wmelody@gmail.com"
     gem.homepage = "http://rdoc.info/projects/autodata/rbst"
     gem.authors = ["William Melody"]
-    gem.add_development_dependency "thoughtbot-shoulda"
+    gem.add_development_dependency "shoulda"
     gem.add_development_dependency "mocha"
-    gem.add_dependency "open4"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
 rescue LoadError

data/RbST.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{RbST}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Melody"]
-  s.date = %q{2009-11-20}
+  s.date = %q{2009-12-02}
   s.description = %q{A simple Ruby wrapper for processing reStructuredText via Python's Docutils}
   s.email = %q{wmelody@gmail.com}
   s.extra_rdoc_files = [
@@ -50,18 +50,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<open4>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<open4>, [">= 0"])
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/rbst.rb

@@ -1,4 +1,4 @@
-require 'open4'
+require 'open3'
 
 class RbST
   
@@ -63,12 +63,12 @@ class RbST
 private
   
   def self.executable(writer = :html)
-    File.join(File.dirname(__FILE__), "rst2parts", "rst2#{writer}.py")
+    File.expand_path(File.join(File.dirname(__FILE__), "rst2parts", "rst2#{writer}.py"))
   end
   
   def execute(command)
     output = ''
-    Open4::popen4(command) do |pid, stdin, stdout, stderr| 
+    Open3::popen3(command) do |stdin, stdout, stderr| 
       stdin.puts @target 
       stdin.close
       output = stdout.read.strip 

data/test/test_rbst.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require 'test_helper'
 require 'mocha'
 
 class TestRbST < Test::Unit::TestCase
@@ -9,11 +9,12 @@ class TestRbST < Test::Unit::TestCase
         File.join(File.dirname(__FILE__), 'files', "test.#{f}")
       )
     end
+    @rst2parts_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'rst2parts'))
   end
   
   should "call bare rest2parts when passed no options" do
     converter = RbST.new(@rst_file)
-    converter.expects(:execute).with('python ./test/../lib/rst2parts/rst2html.py').returns(true)
+    converter.expects(:execute).with("python #{@rst2parts_path}/rst2html.py").returns(true)
     assert converter.convert
   end
   
@@ -30,7 +31,7 @@ class TestRbST < Test::Unit::TestCase
   [:html, :latex].each do |f|
     should "accept options on #to_#{f}" do
       converter = RbST.new(@rst_file)
-      converter.expects(:execute).with("python ./test/../lib/rst2parts/rst2#{f}.py --raw-enabled").returns(true)
+      converter.expects(:execute).with("python #{@rst2parts_path}/rst2#{f}.py --raw-enabled").returns(true)
       assert converter.send("to_#{f}", :raw_enabled)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RbST
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - William Melody
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 -06:00
+date: 2009-12-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: open4
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: A simple Ruby wrapper for processing reStructuredText via Python's Docutils
 email: wmelody@gmail.com
 executables: []