@@ -1,3 +1,2 @@ -.DS_Store coverage/ pkg/ .gitignore @@ -1,12 +1,11 @@ -require 'rubygems' require 'rake' require 'echoe' Echoe.new('simplesem', '0.1.3') do |p| - p.summary = "SIMPLESEM Interpreter" - p.description = "Interpreter for parsing and executing SIMPLESEM programs" - p.url = "http://github.com/robolson/simplesem" - p.author = "Rob Olson" - p.email = "rob@thinkingdigitally.com" + p.summary = "SIMPLESEM Interpreter" + p.description = "Interpreter for parsing and executing SIMPLESEM programs" + p.url = "http://github.com/robolson/simplesem" + p.author = "Rob Olson" + p.email = "rob@thinkingdigitally.com" p.runtime_dependencies = ["treetop >=1.2.4"] end Rakefile @@ -14,12 +14,16 @@ # if it is also specified. # -require 'rubygems' require 'rdoc/usage' require 'getoptlong' -$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib")) -require 'simplesem' +# The gem packager will properly add the lib dir to LOAD_PATH when +# executing the gem but load path manipulation is needed during development +unless $LOAD_PATH.include?(File.expand_path('../../lib', __FILE__)) + $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__)) +end + +require 'simplesem' # must execute after manipulating the load path opts = GetoptLong.new( [ '-h', '--help', GetoptLong::NO_ARGUMENT ], @@ -52,4 +56,4 @@ if (verbosity == 1) puts "\nDATA: \n" + ssp.inspect_data elsif (verbosity == 2) puts "\nDATA: \n" + ssp.inspect_data_with_history -end \ No newline at end of file +end bin/simplesem @@ -1,2 +1 @@ -dir = File.dirname(__FILE__) -require "#{dir}/simplesem/simplesem_program" \ No newline at end of file +require 'simplesem/simplesem_program' lib/simplesem.rb @@ -1,9 +1,8 @@ -require 'rubygems' require 'treetop' +require 'simplesem/arithmetic_node_classes' dir = File.dirname(__FILE__) -require File.expand_path("#{dir}/arithmetic_node_classes") -Treetop.load File.expand_path("#{dir}/arithmetic") -Treetop.load File.expand_path("#{dir}/simple_sem") +Treetop.load File.expand_path(File.join(dir, 'arithmetic')) +Treetop.load File.expand_path(File.join(dir, 'simple_sem')) class ProgramHalt < Exception end @@ -54,4 +53,4 @@ class SimpleSemProgram @data.each_with_index {|loc, i| res += "#{i}: #{loc.inspect}\n" } res end -end \ No newline at end of file +end lib/simplesem/simplesem_program.rb @@ -9,4 +9,4 @@ jumpt 10, D[1] < D[0] // if(m < n) set 1, D[1]-D[0] jump 11 set 0, D[0]-D[1] -jump 6 \ No newline at end of file +jump 6 sample_programs/gcd.txt @@ -2,4 +2,4 @@ set 0, 0 set write, "hello world!" set 0, D[0]+1 jumpt ip-3, D[0] < 5 -halt \ No newline at end of file +halt sample_programs/hello-world.txt @@ -11,4 +11,4 @@ jump 3 set write, D[0] set write, D[1] set write, D[2] -halt \ No newline at end of file +halt sample_programs/while-loop.txt @@ -1,7 +1,5 @@ -dir = File.dirname(__FILE__) -require File.expand_path("#{dir}/test_helper") -libdir = dir + "/../lib" -require File.expand_path("#{libdir}/simplesem") +require 'test_helper' +require 'simplesem' class SimpleSemParserTest < Test::Unit::TestCase include ParserTestHelper @@ -135,4 +133,4 @@ class SimpleSemParserTest < Test::Unit::TestCase parse('halt').execute(@ssp) end end -end \ No newline at end of file +end test/simplesem_test.rb @@ -1,6 +1,5 @@ require 'test/unit' require 'stringio' -require 'rubygems' require 'treetop' module ParserTestHelper test/test_helper.rb b602cfa98c1f31f7138860ec3b4f8d00180f0a97 Rob Olson rob@thinkingdigitally.com http://github.com/robolson/simplesem/commit/300a5b9e9aee72aeff1abd42ee3efc9522511c10 300a5b9e9aee72aeff1abd42ee3efc9522511c10 2009-09-26T23:58:11-07:00 2009-09-26T18:25:04-07:00 Remove all requires of 'rubygems'. Removed all requires to Rubygems and made better use of the load path as discussed on the Riding Rails blog: http://weblog.rubyonrails.org/2009/9/1/gem-packaging-best-practices a3bca81d608ec6f3003c16fbd2201dd59f049cf4 Rob Olson rob@thinkingdigitally.com