sorcerer 0.0.5 → 0.0.6

data/Rakefile

@@ -4,6 +4,8 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+require 'lib/sorcerer/version'
+
 begin
   require 'rubygems'
   require 'rake/gempackagetask'
@@ -13,7 +15,7 @@ end
 
 PROJ = 'sorcerer'
 RUBY = ENV['RUBY19'] || 'ruby19'
-PKG_VERSION = '0.0.5'
+PKG_VERSION = Sorcerer::VERSION
 
 PKG_FILES = FileList[
   'README.textile',
@@ -32,19 +34,6 @@ BASE_RDOC_OPTIONS = [
 
 task :default => :test
 
-# Modify the TestTask to allow running ruby19 for the tests
-class Ruby19TestTask < Rake::TestTask
-  def ruby(*args)
-    sh "#{RUBY} #{args.join(' ')}"
-  end
-end
-
-Ruby19TestTask.new(:test) do |t|
-  t.warning = true
-  t.verbose = false
-  t.test_files = FileList["test/#{PROJ}/*_test.rb"]
-end
-
 rd = Rake::RDocTask.new("rdoc") do |rdoc|
   rdoc.rdoc_dir = 'html'
   rdoc.template = 'doc/jamis.rb'

data/lib/sorcerer/resource.rb

@@ -21,7 +21,7 @@ module Sorcerer
     
     def resource(sexp)
       return unless sexp
-      handler = Handlers[sexp.first]
+      handler = HANDLERS[sexp.first]
       raise NoHandlerError.new(sexp.first) unless handler
       if @debug
         puts "----------------------------------------------------------"
@@ -98,11 +98,13 @@ module Sorcerer
     
     VOID_STATEMENT = [:stmts_add, [:stmts_new], [:void_stmt]]
     VOID_BODY = [:body_stmt, VOID_STATEMENT, nil, nil, nil]
+    VOID_BODY2 = [:bodystmt, VOID_STATEMENT, nil, nil, nil]
     
     def void?(sexp)
       sexp.nil? ||
         sexp == VOID_STATEMENT ||
-        sexp == VOID_BODY
+        sexp == VOID_BODY ||
+        sexp == VOID_BODY2
     end
     
     NYI = lambda { |src, sexp| src.nyi(sexp) }
@@ -113,7 +115,7 @@ module Sorcerer
     PASS2 = lambda { |src, sexp| src.resource(sexp[2]) }
     EMIT1 = lambda { |src, sexp| src.emit(sexp[1]) }
     
-    Handlers = {
+    HANDLERS = {
       # parser keywords
       
       :BEGIN => lambda { |src, sexp|
@@ -258,7 +260,7 @@ module Sorcerer
       :call => lambda { |src, sexp|
         src.resource(sexp[1])
         src.emit(sexp[2])
-        src.resource(sexp[3])
+        src.resource(sexp[3]) unless sexp[3] == :call
       },
       :case => lambda { |src, sexp|
         src.emit("case ")
@@ -707,6 +709,7 @@ module Sorcerer
       :@words_beg => NYI,
       :@words_sep => NYI,
     }
+    HANDLERS[:bodystmt] = HANDLERS[:body_stmt]
   end
   
 end

data/lib/sorcerer/version.rb

@@ -0,0 +1,11 @@
+module Sorcerer
+  VERSION_MAJOR = 0
+  VERSION_MINOR = 0
+  VERSION_BUILD = 6
+  VERSION_BETA  = 0
+
+  VERSION_NUMBERS = [VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD] +
+    (VERSION_BETA > 0 ? [VERSION_BETA] : [])
+
+  VERSION = VERSION_NUMBERS.join('.')
+end

data/rakelib/git.rake

@@ -5,9 +5,60 @@ namespace "git" do
     sh "git tag #{PROJ}-#{PKG_VERSION}"
   end
 
+  desc "Fail if the current project is not clean"
+  task :ensure_clean do
+    out = `git status | grep "nothing to commit"`
+    if out == ''
+      fail "Repo is not clean"
+    end
+  end
+end
+
+namespace "gem" do
   desc "Build and Push the current gem"
   task :push => :gem do
+    fail "Can't push beta versions (#{PKG_VERSION})" if
+      Sorcerer::VERSION_NUMBERS.size > 3
     sh "gem push pkg/#{PROJ}-#{PKG_VERSION}.gem"
   end
-   
 end
+
+task "version" do
+  puts PKG_VERSION
+end
+
+module Version
+  def self.write(build, beta)
+    open("lib/sorcerer/version.rb", "w") do |out|
+      out.puts "module Sorcerer"
+      out.puts "  VERSION_MAJOR = #{Sorcerer::VERSION_MAJOR}"
+      out.puts "  VERSION_MINOR = #{Sorcerer::VERSION_MINOR}"
+      out.puts "  VERSION_BUILD = #{build}"
+      out.puts "  VERSION_BETA  = #{beta}"
+      out.puts
+      out.puts "  VERSION_NUMBERS = [VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD] +"
+      out.puts "    (VERSION_BETA > 0 ? [VERSION_BETA] : [])"
+      out.puts
+      out.puts "  VERSION = VERSION_NUMBERS.join('.')"
+      out.puts "end"
+    end
+  end
+end
+
+namespace "version" do
+  desc "Cut a new version"
+  task "cut" => [:test, "git:ensure_clean", "git:tag", "gem:push"]
+
+  namespace "bump" do
+    desc "Bump the Beta version"
+    task "beta" do
+      Version.write(Sorcerer::VERSION_BUILD, Sorcerer::VERSION_BETA+1)
+    end
+
+    desc "Bump the Build version"
+    task "build" do
+      Version.write(Sorcerer::VERSION_BUILD+1, 0)
+    end
+  end
+end
+

data/rakelib/testing.rake

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+# Modify the TestTask to allow running ruby19 for the tests
+class Ruby19TestTask < Rake::TestTask
+  def ruby(*args)
+    sh "#{RUBY} #{args.join(' ')}"
+  end
+end
+
+Ruby19TestTask.new(:test) do |t|
+  t.warning = true
+  t.verbose = false
+  t.test_files = FileList["test/#{PROJ}/*_test.rb"]
+end
+

data/test/sorcerer/{sorcerer_test.rb → resource_test.rb}

@@ -132,6 +132,13 @@ class SourcerTest < Test::Unit::TestCase
     assert_resource "->(a) { b }"
   end
 
+  def test_can_source_dot_calls
+    if RUBY_VERSION >= "1.9.2"
+      # This causes a bus fault on version 1.9.1
+      assert_resource "p.(a)"
+    end
+  end
+  
   def test_can_source_numbers
     assert_resource "1"
     assert_resource "3.14"
@@ -193,7 +200,7 @@ class SourcerTest < Test::Unit::TestCase
     assert_resource "/\./"
     assert_resource "/[a-z]/"
     assert_resource "/\[a-z\]/"
-    assert_resource "/#{name}/"
+    assert_resource '/#{name}/'
   end
 
   def test_can_source_range
@@ -466,7 +473,7 @@ class SourcerTest < Test::Unit::TestCase
     assert_resource "def f(a); x; y; end"
   end
 
-  def test_can_source_class
+  def test_can_source_class_without_parent
     assert_resource "class X; end"
     assert_resource "class X; x; end"
     assert_resource "class X; def f(); end; end"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sorcerer
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jim Weirich
@@ -27,10 +27,12 @@ files:
 - doc/jamis.rb
 - rakelib/git.rake
 - rakelib/readme.rake
+- rakelib/testing.rake
 - lib/sorcerer/resource.rb
 - lib/sorcerer/subexpression.rb
+- lib/sorcerer/version.rb
 - lib/sorcerer.rb
-- test/sorcerer/sorcerer_test.rb
+- test/sorcerer/resource_test.rb
 - test/sorcerer/subexpression_test.rb
 has_rdoc: true
 homepage: http://github.com/jimweirich/sorcerer