rubyless 0.2.0 → 0.3.0

data/tasks/spec.rake

@@ -0,0 +1,54 @@
+
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
+require 'spec/rake/verify_rcov'
+
+namespace :spec do
+
+  desc 'Run all specs with basic output'
+  Spec::Rake::SpecTask.new(:run) do |t|
+    t.ruby_opts = PROJ.ruby_opts
+    t.spec_opts = PROJ.spec.opts
+    t.spec_files = PROJ.spec.files
+    t.libs += PROJ.libs
+  end
+
+  desc 'Run all specs with text output'
+  Spec::Rake::SpecTask.new(:specdoc) do |t|
+    t.ruby_opts = PROJ.ruby_opts
+    t.spec_opts = PROJ.spec.opts + ['--format', 'specdoc']
+    t.spec_files = PROJ.spec.files
+    t.libs += PROJ.libs
+  end
+
+  if HAVE_RCOV
+    desc 'Run all specs with RCov'
+    Spec::Rake::SpecTask.new(:rcov) do |t|
+      t.ruby_opts = PROJ.ruby_opts
+      t.spec_opts = PROJ.spec.opts
+      t.spec_files = PROJ.spec.files
+      t.libs += PROJ.libs
+      t.rcov = true
+      t.rcov_dir = PROJ.rcov.dir
+      t.rcov_opts = PROJ.rcov.opts + ['--exclude', 'spec']
+    end
+
+    RCov::VerifyTask.new(:verify) do |t| 
+      t.threshold = PROJ.rcov.threshold
+      t.index_html = File.join(PROJ.rcov.dir, 'index.html')
+      t.require_exact_threshold = PROJ.rcov.threshold_exact
+    end
+
+    task :verify => :rcov
+    remove_desc_for_task %w(spec:clobber_rcov)
+  end
+
+end  # namespace :spec
+
+desc 'Alias to spec:run'
+task :spec => 'spec:run'
+
+task :clobber => 'spec:clobber_rcov' if HAVE_RCOV
+
+end  # if HAVE_SPEC_RAKE_SPECTASK
+
+# EOF

data/tasks/svn.rake

@@ -0,0 +1,47 @@
+
+if HAVE_SVN
+
+unless PROJ.svn.root
+  info = %x/svn info ./
+  m = %r/^Repository Root:\s+(.*)$/.match(info)
+  PROJ.svn.root = (m.nil? ? '' : m[1])
+end
+PROJ.svn.root = File.join(PROJ.svn.root, PROJ.svn.path) unless PROJ.svn.path.empty?
+
+namespace :svn do
+
+  # A prerequisites task that all other tasks depend upon
+  task :prereqs
+
+  desc 'Show tags from the SVN repository'
+  task :show_tags => 'svn:prereqs' do |t|
+    tags = %x/svn list #{File.join(PROJ.svn.root, PROJ.svn.tags)}/
+    tags.gsub!(%r/\/$/, '')
+    tags = tags.split("\n").sort {|a,b| b <=> a}
+    puts tags
+  end
+
+  desc 'Create a new tag in the SVN repository'
+  task :create_tag => 'svn:prereqs' do |t|
+    v = ENV['VERSION'] or abort 'Must supply VERSION=x.y.z'
+    abort "Versions don't match #{v} vs #{PROJ.version}" if v != PROJ.version
+
+    svn = PROJ.svn
+    trunk = File.join(svn.root, svn.trunk)
+    tag = "%s-%s" % [PROJ.name, PROJ.version]
+    tag = File.join(svn.root, svn.tags, tag)
+    msg = "Creating tag for #{PROJ.name} version #{PROJ.version}"
+
+    puts "Creating SVN tag '#{tag}'"
+    unless system "svn cp -m '#{msg}' #{trunk} #{tag}"
+      abort "Tag creation failed" 
+    end
+  end
+
+end  # namespace :svn
+
+task 'gem:release' => 'svn:create_tag'
+
+end  # if PROJ.svn.path
+
+# EOF

data/tasks/test.rake

@@ -0,0 +1,40 @@
+
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'rake/testtask'
+
+namespace :test do
+
+  Rake::TestTask.new(:run) do |t|
+    t.libs = PROJ.libs
+    t.test_files = if test(?f, PROJ.test.file) then [PROJ.test.file]
+                   else PROJ.test.files end
+    t.ruby_opts += PROJ.ruby_opts
+    t.ruby_opts += PROJ.test.opts
+  end
+
+  if HAVE_RCOV
+    desc 'Run rcov on the unit tests'
+    task :rcov => :clobber_rcov do
+      opts = PROJ.rcov.opts.dup << '-o' << PROJ.rcov.dir
+      opts = opts.join(' ')
+      files = if test(?f, PROJ.test.file) then [PROJ.test.file]
+              else PROJ.test.files end
+      files = files.join(' ')
+      sh "#{RCOV} #{files} #{opts}"
+    end
+
+    task :clobber_rcov do
+      rm_r 'coverage' rescue nil
+    end
+  end
+
+end  # namespace :test
+
+desc 'Alias to test:run'
+task :test => 'test:run'
+
+task :clobber => 'test:clobber_rcov' if HAVE_RCOV
+
+end
+
+# EOF

data/tasks/zentest.rake

@@ -0,0 +1,36 @@
+if HAVE_ZENTEST
+
+# --------------------------------------------------------------------------
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'autotest'
+
+namespace :test do
+  task :autotest do
+    Autotest.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'test:autotest'
+
+end  # if test
+
+# --------------------------------------------------------------------------
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
+require 'autotest/rspec'
+
+namespace :spec do
+  task :autotest do
+    load '.autotest' if test(?f, '.autotest')
+    Autotest::Rspec.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'spec:autotest'
+
+end  # if rspec
+
+end  # if HAVE_ZENTEST
+
+# EOF

data/test/RubyLess/basic.yml

@@ -18,6 +18,14 @@ dynamic_string_again:
   src: "now.strftime(\"#{name}\")"
   tem: "Time.now.strftime(\"#{var1.name}\")"
 
+symbol:
+  src: ":foobar"
+  sxp: 's(:lit, :foobar)'
+
+hash_access:
+  src: "dictionary[:key]"
+  tem: "get_dict[:key]"
+
 rewrite_variables:
   src: "!prev.ancestor?(main) && !node.ancestor?(main)"
   tem: "(not previous.ancestor?(@node) and not var1.ancestor?(@node))"
@@ -49,12 +57,12 @@ method_on_method:
   src: "project.name.to_s"
   tem: "var1.project.name.to_s"
   res: 'project'
-  
+
 comp_ternary_op:
   src: "1 > 2 ? 'foo' : 'bar'"
   tem: "(1>2) ? \"foo\" : \"bar\""
   res: "bar"
-  
+
 method_ternary_op:
   src: "id > 2 ? 'foo' : 'bar'"
   tem: "(var1.zip>2) ? \"foo\" : \"bar\""
@@ -63,15 +71,15 @@ method_ternary_op:
 method_argument_can_be_nil:
   src: "vowel_count(spouse.name)"
   tem: "(var1.spouse ? vowel_count(var1.spouse.name) : nil)"
-  
+
 multi_arg_method_argument_can_be_nil:
   src: "log_info(spouse, 'foobar')"
   tem: "(var1.spouse ? log_info(var1.spouse, \"foobar\") : nil)"
-  
+
 multi_arg_method_arguments_can_be_nil:
   src: "log_info(husband, spouse.name)"
   tem: "((var1.husband && var1.spouse) ? log_info(var1.husband, var1.spouse.name) : nil)"
-  
+
 multi_arg_method_arguments_can_be_nil_same_condition:
   src: "log_info(spouse, spouse.name)"
   tem: "(var1.spouse ? log_info(var1.spouse, var1.spouse.name) : nil)"

data/test/RubyLess/errors.yml

@@ -17,4 +17,16 @@ looping:
 
 add_two_strings:
   src: "name + 14"
-  res: "'var1.name' does not respond to '+(14)'."
+  res: "'var1.name' does not respond to '+(Number)'."
+
+two_arguments_in_hash:
+  src: "dictionary[:one, :two]"
+  res: "'get_dict' does not respond to '[](Symbol, Symbol)'."
+
+number_argument:
+  src: "dictionary[43]"
+  res: "'get_dict' does not respond to '[](Number)'."
+
+string_argument:
+  src: "dictionary[spouse.name]"
+  res: "'get_dict' does not respond to '[](String)'."

data/test/RubyLess_test.rb

@@ -1,6 +1,11 @@
 require 'date'
 require File.dirname(__FILE__) + '/test_helper.rb'
 
+class StringDictionary
+  include RubyLess::SafeClass
+  safe_method [:[], Symbol] => {:class => String, :nil => true}
+end
+
 class SimpleHelper < Test::Unit::TestCase
   attr_reader :context
   yamltest :src_from_title => false
@@ -10,12 +15,13 @@ class SimpleHelper < Test::Unit::TestCase
   safe_method :node => lambda {|h| {:class => h.context[:node_class], :method => h.context[:node]}}
   safe_method :now   => {:class => Time,  :method => "Time.now"}
   safe_method :birth => {:class => Time, :method => "Date.parse('2009-06-02 18:44')"}
-  safe_method [:vowel_count, String]    => RubyLess::Number
+  safe_method :dictionary => {:class => StringDictionary, :method => 'get_dict'}
+  safe_method [:vowel_count, String]    => Number
   safe_method [:log_info, Dummy, String]    => String
-  safe_method_for String, [:==, String] => RubyLess::Boolean
+  safe_method_for String, [:==, String] => Boolean
   safe_method_for String, [:to_s] => String
   safe_method_for Time, [:strftime, String] => String
-  
+
   # Example to dynamically rewrite method calls during compilation
   def safe_method_type(signature)
     unless res = self.class.safe_method_type(signature)
@@ -27,26 +33,26 @@ class SimpleHelper < Test::Unit::TestCase
     end
     res
   end
-  
+
   def var1
     Dummy.new
   end
-  
+
   def vowel_count(str)
     str.tr('^aeiouy', '').size
   end
-  
+
   def log_info(obj, msg)
     "[#{obj.name}] #{msg}"
   end
-  
+
   def yt_do_test(file, test, context = yt_get('context',file,test))
     @@test_strings[file][test].keys.each do |key|
       next if ['src', 'context'].include?(key)
       yt_assert yt_get(key,file,test), parse(key, file, test, context)
     end
   end
-  
+
   def parse(key, file, test, opts)
     @context = {:node => 'var1', :node_class => Dummy}
     source = yt_get('src', file, test)
@@ -55,6 +61,8 @@ class SimpleHelper < Test::Unit::TestCase
       source ? RubyLess.translate(source, self) : yt_get('tem', file, test)
     when 'res'
       eval(source ? RubyLess.translate(source, self) : yt_get('tem', file, test)).to_s
+    when 'sxp'
+      RubyParser.new.parse(source).inspect
     else
       "Unknown key '#{key}'. Should be 'tem' or 'res'."
     end
@@ -63,6 +71,6 @@ class SimpleHelper < Test::Unit::TestCase
     # puts err.backtrace
     err.message
   end
-  
+
   yt_make
 end

data/test/mock/dummy_class.rb

@@ -4,14 +4,15 @@ class Dummy < RubyLess::ActiveRecordMock
   attr_reader :name
   include RubyLess::SafeClass
   
-  safe_method [:ancestor?, Dummy]  => RubyLess::Boolean
-  safe_method :parent              => {:class => 'Dummy', :special_option => 'foobar'},
-              :children            => ['Dummy'],
-              :project             => 'Dummy',
-              :spouse              => {:class => 'Dummy', :nil => true},
-              :husband             => {:class => 'Dummy', :nil => true},
-              :id                  => {:class => RubyLess::Number, :method => :zip},
-              :name                => String
+  safe_method  [:ancestor?, Dummy]  => Boolean
+  safe_method  :parent              => {:class => 'Dummy', :special_option => 'foobar'},
+               :children            => ['Dummy'],
+               :project             => 'Dummy',
+               :id                  => {:class => Number, :method => :zip},
+               :name                => String
+  safe_method  :defaults => {:nil => true},
+               :spouse        => 'Dummy',
+               :husband       => {:class => 'Dummy'}
              
   safe_attribute :age, :friend_id, :log_at, :format
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubyless
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,43 +9,98 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 +02:00
+date: 2009-10-03 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
-description: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ruby_parser
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: sexp_processor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: bones
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.5.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yamltest
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.3
+    version: 
+description: |-
+  RubyLess is an interpreter for "safe ruby". The idea is to transform some "unsafe" ruby code into safe, type checked
+  ruby, eventually rewriting some variables or methods.
 email: gaspard@teti.ch
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+- History.txt
+- README.txt
 files: 
 - History.txt
+- README.txt
 - Rakefile
-- README.rdoc
+- lib/basic_types.rb
+- lib/processor.rb
+- lib/rubyless.rb
+- lib/safe_class.rb
+- lib/typed_string.rb
 - rubyless.gemspec
-- test/mock
-- test/mock/active_record_mock.rb
-- test/mock/dummy_class.rb
-- test/RubyLess
+- tasks/ann.rake
+- tasks/bones.rake
+- tasks/gem.rake
+- tasks/git.rake
+- tasks/notes.rake
+- tasks/post_load.rake
+- tasks/rdoc.rake
+- tasks/rubyforge.rake
+- tasks/setup.rb
+- tasks/spec.rake
+- tasks/svn.rake
+- tasks/test.rake
+- tasks/zentest.rake
 - test/RubyLess/active_record.yml
 - test/RubyLess/basic.yml
 - test/RubyLess/errors.yml
 - test/RubyLess_test.rb
+- test/mock/active_record_mock.rb
+- test/mock/dummy_class.rb
 - test/test_helper.rb
-- lib/basic_types.rb
-- lib/processor.rb
-- lib/rubyless.rb
-- lib/safe_class.rb
-- lib/typed_string.rb
 has_rdoc: true
 homepage: http://zenadmin.org/546
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
-- README.rdoc
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -63,9 +118,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubyless
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: RubyLess is an interpreter for "safe ruby". The idea is to transform some "unsafe" ruby code into safe, type checked ruby, eventually rewriting some variables or methods
-test_files: []
-
+specification_version: 3
+summary: RubyLess is an interpreter for "safe ruby"
+test_files: 
+- test/test_helper.rb