hubris 0.0.5 → 0.0.6

data/Rakefile

@@ -34,7 +34,7 @@ extraIncludeDirs = [\"#{headers}\", \"#{arch_headers}\"]"
 #  command="cd Haskell; cabal update; cabal install
   #  --extra-include-dirs=#{RbConfig::CONFIG['rubyhdrdir']}
   #  --extra-include-dirs=#{RbConfig::CONFIG['rubyhdrdir']}/#{RbConfig::CONFIG['arch']} --extra-lib-dirs=#{RbConfig::CONFIG['libdir']} --user  --enable-shared  --with-ghc=#{ghc_version}"
-  command="cd Haskell; cabal install --extra-include-dirs=#{arch_headers} --extra-include-dirs=#{headers} --extra-lib-dirs=#{lib_dir} --user  --enable-shared  --with-ghc=#{ghc_version}"
+  command="cabal update; cd Haskell; cabal install --extra-include-dirs=#{arch_headers} --extra-include-dirs=#{headers} --extra-lib-dirs=#{lib_dir} --user  --enable-shared  --with-ghc=#{ghc_version}"
   result=%x{#{command}}
   raise "ERROR: ran #{command}, got #{result}" unless $?.success? 
 end

data/hubris.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rake-compiler', '>= 0.7.6'
   s.add_development_dependency 'rspec', '2.4.0'
-  s.add_dependency 'rake'
+  s.add_dependency 'rake', '0.8.7'
+  s.add_dependency 'bundler'
   s.add_dependency 'open4'
   s.extensions =  'Rakefile' # ext/mkrf_conf.rb'
   # system "bundle exec rake compile"

data/lib/hubris/version.rb

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

data/script/ci.sh

@@ -17,7 +17,7 @@ rm `which Hubrify` || true
 rvm $ruby_version
 bundle
 gem build hubris.gemspec
-gem install hubris-0.0.4.gem # can we do these two in one step?
+gem install hubris-0.0.5.gem # can we do these two in one step?
 rspec spec
 
 #gem install bundler # i am aware how awful this is.

metadata

@@ -2,7 +2,7 @@
 name: hubris
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Mark Wotton
@@ -12,12 +12,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 +11:00
+date: 2011-07-24 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -25,10 +24,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.7.6
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -36,21 +35,21 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.4.0
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.8.7
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: open4
-  prerelease: false
+  name: bundler
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -58,7 +57,19 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: open4
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
 description: A bridge between Ruby and Haskell
 email: 
 - mwotton@gmail.com
@@ -98,7 +109,6 @@ files:
 - doc/CommonErrors.txt~HEAD
 - doc/don_feedback.txt
 - doc/haskell-hubris.tex
-- doc/new_interface.rb
 - doc/ruby-hubris.tex
 - doc/wisdom_of_ancients.txt
 - ext/hubris.rb
@@ -132,12 +142,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -1476362833093922581
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -1476362833093922581
+      segments: 
+      - 0
       version: "0"
 requirements: []
 

data/doc/new_interface.rb

@@ -1,74 +0,0 @@
-# IDEAS for new interface
-
-# option 1 (implicit method name from haskell function)
-class MyClass
-  include Hubris
-  def_haskell(code) 
-end
-
-# option 2 (explicit method name)
-class MyClass
-  def_haskell(method_name,code) 
-end
-
-# option 3 ()
-class Module
-  include Hubris
-end
-
-class MyClass
-  inline_haskell "haskell function"
-end
-
-# option 4 (more humourous)
-class Module
-  include Hubris
-end
-
-class MyClass
-  hubris "haskell function"
-end
-
-#-----------------------------------------
-# include at the module or package level
-#=========================================
-# does importing as_class make sense? no, just include the module
-# when interpreting Haskell module names replace . with ::
-
-# importing std module as a ruby module/class
-hubris :package => "containers", :module => "Data.Map", :as => "Data::Map"
-
-# importing your own module (defaults to module)
-hubris :package => "mypackage", :module => "MyModule" [, :as => "MyModule"] 
-
-# implicit package handling (haskell file in my directory)
-hubris :module => "haskell/shit/MyModule"
-
-# simpler to implement option, allows more flexibility in Ruby land
-module MyRubyModule
-  # :packages is optional, just brings in external packages.
-  hubris :module => "Data.Map", :packages => ["containers","foo"]
-  # or
-  hubris :source => "MyHaskellCode.hs" # , :packages => [ ... ]
-  # or
-  hubris :inline => "foo x = x * 2"
-end
-
-
-# alternative
-
-Hubris.import :package => "containers", :module => "Data.Map"
-
-module MyRubyModule
-  include Hubris::Data::Map
-end
-
-# alternative2
-
-module MyRubyModule
-  hubris :package => "containers", :module => "Data.Map"
-end
-
-
-6:34:58 PM Josh Price: class Module; def hubris; self.class_eval { def self.h;"hubrified!";end };end;end
-6:35:10 PM Josh Price: class B;hubris;end