Skip to content

Commit

Permalink
Making code a bit more Rubyish
Browse files Browse the repository at this point in the history
Signed-off-by: mwotton <mwotton@gmail.com>
  • Loading branch information
Neurogami authored and mwotton committed Aug 11, 2009
1 parent 4c504ee commit fff7c32
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 51 deletions.
11 changes: 2 additions & 9 deletions Manifest.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,18 +4,11 @@ PostInstall.txt
README README
README.rdoc README.rdoc
Rakefile Rakefile
bin/jhc_builder.sh bin/jhc_builder
foo.hs lib/hubris.rb
lib/Hubris.rb
sample/Makefile sample/Makefile
sample/Test.hs sample/Test.hs
sample/hsload.rb sample/hsload.rb
script/console script/console
script/destroy script/destroy
script/generate script/generate
spec/Hubris_spec.rb
spec/spec.opts
spec/spec_helper.rb
tasks/rspec.rake
test/test_Hubris.rb
test/test_helper.rb
7 changes: 2 additions & 5 deletions PostInstall.txt
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,4 @@


For more information on Hubris, see http://Hubris.rubyforge.org For more information on Hubris, see http://hubris.rubyforge.org

NOTE: Change this information in PostInstall.txt
You can also delete it if you don't want it.



You should now have a bin file names jhc_builder that you can use to compile Haskell files into .so files
4 changes: 2 additions & 2 deletions README.rdoc
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if all else fails, mail mwotton@gmail.com with tales of woe.


== INSTALL: == INSTALL:


* sudo gem install Hubris * sudo gem install hubris


== LICENSE: == LICENSE:


Expand All @@ -58,4 +58,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
51 changes: 25 additions & 26 deletions Rakefile
Original file line number Original file line Diff line number Diff line change
@@ -1,26 +1,25 @@
require 'rubygems' require 'rubygems'
gem 'hoe', '>= 2.1.0' gem 'hoe', '>= 2.1.0'
require 'hoe' require 'hoe'
require 'fileutils' require 'fileutils'
require './lib/Hubris' require './lib/hubris'


Hoe.plugin :newgem Hoe.plugin :newgem
# Hoe.plugin :website # Hoe.plugin :website
# Hoe.plugin :cucumberfeatures # Hoe.plugin :cucumberfeatures


# Generate all the Rake tasks # Generate all the Rake tasks
# Run 'rake -T' to see list of generated tasks (from gem root directory) # Run 'rake -T' to see list of generated tasks (from gem root directory)
$hoe = Hoe.spec 'Hubris' do $hoe = Hoe.spec 'Hubris' do
self.developer 'FIXME full name', 'FIXME email' self.developer 'Mark Wotton, with some fixes here by James Britt', 'james@neurogami.com'
self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
self.rubyforge_name = self.name # TODO this is default value self.rubyforge_name = "hubris"
# self.extra_deps = [['activesupport','>= 2.0.2']] self.summary = 'tool to help build .so files from haskel code for use in Ruby via dl'

end
end

require 'newgem/tasks'
require 'newgem/tasks' Dir['tasks/**/*.rake'].each { |t| load t }
Dir['tasks/**/*.rake'].each { |t| load t }

# TODO - want other tests/tasks run by default? Add them to the list
# TODO - want other tests/tasks run by default? Add them to the list # remove_task :default
# remove_task :default # task :default => [:spec, :features]
# task :default => [:spec, :features]
File renamed without changes.
6 changes: 0 additions & 6 deletions lib/Hubris.rb

This file was deleted.

4 changes: 2 additions & 2 deletions script/console
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
libs = " -r irb/completion" libs = " -r irb/completion"
# Perhaps use a console_lib to store any extra methods I may want available in the cosole # Perhaps use a console_lib to store any extra methods I may want available in the cosole
# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}" # libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
libs << " -r #{File.dirname(__FILE__) + '/../lib/Hubris.rb'}" libs << " -r #{File.dirname(__FILE__) + '/../lib/hubris.rb'}"
puts "Loading Hubris gem" puts "Loading Hubris gem"
exec "#{irb} #{libs} --simple-prompt" exec "#{irb} #{libs} --simple-prompt"
File renamed without changes.
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
end end


$:.unshift(File.dirname(__FILE__) + '/../lib') $:.unshift(File.dirname(__FILE__) + '/../lib')
require 'Hubris' require 'hubris'

0 comments on commit fff7c32

Please sign in to comment.