hubris 0.0.4 → 0.0.5

data/Haskell/Language/Ruby/Hubris/Binding.hsc

@@ -169,9 +169,9 @@ instance Enum RubyConst where
   toEnum 12 = RUBY_Qnil
 -- {# enum ruby_special_consts as RubyConst {} deriving (Eq,Show) #}
 
-str2cstr str = rb_str2cstr str 0
+-- str2cstr str = rb_str2cstr str
 type Value = CULong -- FIXME, we'd prefer to import the type VALUE directly
-foreign import ccall safe "ruby.h rb_str2cstr"    rb_str2cstr    :: Value -> CInt -> IO CString
+
 foreign import ccall safe "ruby.h rb_str_new2"    rb_str_new2    :: CString -> IO Value
 foreign import ccall safe "ruby.h rb_str_new2"    rb_str_new_    :: CString -> Int -> IO Value 
 foreign import ccall safe "ruby.h rb_ary_new2"    rb_ary_new2    :: CLong -> IO Value
@@ -186,7 +186,7 @@ rb_str_new = uncurry rb_str_new_
 -- we're being a bit filthy here - the interface is all macros, so we're digging in to find what it actually is
 foreign import ccall safe "rshim.h rb_ary_len" rb_ary_len :: Value -> CUInt
 foreign import ccall safe "rshim.h rtype"      rtype      :: Value -> Int
-
+foreign import ccall safe "rshim.h str2cstr"   str2cstr    :: Value -> IO CString
 foreign import ccall safe "rshim.h int2fix"    int2fix    :: Int -> Value
 foreign import ccall safe "rshim.h fix2int"    fix2int    :: Value -> Int
 foreign import ccall safe "rshim.h num2dbl"    num2dbl    :: Value -> Double  -- technically CDoubles, but jhc promises they're the same

data/Haskell/cbits/rshim.c

@@ -44,3 +44,6 @@ VALUE buildException(char * message) {
   return errobj;
 }
 
+char * str2cstr(VALUE v) {
+  StringValuePtr(v);
+}

data/Haskell/cbits/rshim.h

@@ -11,6 +11,7 @@ double num2dbl(VALUE x);
 unsigned int rb_ary_len(VALUE x);
 VALUE keys(VALUE hash);
 VALUE buildException(char *);
+char * str2cstr(VALUE v);
 // argh, and again
 enum RubyType {
  RT_NONE     = T_NONE,

data/lib/hubris/version.rb

@@ -1,3 +1,3 @@
 module Hubris
-  VERSION='0.0.4'
+  VERSION='0.0.5'
 end

data/script/ci.sh

@@ -14,9 +14,11 @@ cabal install zlib --user  --enable-shared # needed for tests
 # delete old haskell stuff
 ghc-pkg-$ghc_version unregister hubris || true
 rm `which Hubrify` || true
-rvm 1.9.1
+rvm $ruby_version
+bundle
 gem build hubris.gemspec
 gem install hubris-0.0.4.gem # can we do these two in one step?
+rspec spec
 
 #gem install bundler # i am aware how awful this is.
 #bundle install

data/spec/hubris_spec.rb

@@ -385,9 +385,6 @@ describe 'Realworld' do
 end
 
 describe 'Performance' do
-  def be_quick
-    simple_matcher("a small duration") { |given| given < 0.1 }
-  end
 
   it "caches its output" do
     # only relevant for inlining
@@ -401,7 +398,7 @@ describe 'Performance' do
     end
     after = Time.now    
 
-    (after-before).should be_quick
+    (after-before).should < 0.1
   end
 
   it "behaves memory-wise" do

data/spec/spec_helper.rb

@@ -1,10 +1,11 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  gem 'rspec'
-  require 'spec'
-end
+#begin
+#  require 'spec'
+#rescue LoadError
+#  require 'rubygems' unless ENV['NO_RUBYGEMS']
+#  gem 'rspec'
+#  require 'spec'
+#end
+require 'rspec'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'hubris'

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: hubris
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - Mark Wotton
@@ -17,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +11:00
+date: 2011-03-14 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,11 +23,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 7
-        - 6
         version: 0.7.6
   type: :runtime
   version_requirements: *id001
@@ -44,11 +34,6 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
         version: 2.4.0
   type: :development
   version_requirements: *id002
@@ -60,9 +45,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -74,9 +56,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -91,7 +70,6 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
-- .rvmrc
 - Gemfile
 - HISTORY.markdown
 - Haskell/Hubrify.hs
@@ -154,25 +132,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: Hubris
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A bridge between Ruby and Haskell
-test_files: []
-
+test_files: 
+- spec/hubris_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb

data/.rvmrc

@@ -1,2 +0,0 @@
-rvm_install_on_use_flag=1
-rvm 1.9.1