yamltest 0.5.3 → 0.7.0

data/History.txt

@@ -1,18 +1,29 @@
-== yamltest 0.5.3 2009-06-17
+== 0.7.0 2010-07-12
+
+* 1 major improvement/change
+	* :directory paths first try to resolve as absolute paths
+
+== 0.6.0 2010-05-13
+
+* 2 minor improvements
+	* Renamed 'file method' created to hold the list of tests to 'xxx_tests'
+	* Using Jeweler to manage gem
+
+== 0.5.3 2009-06-17
 
 * 1 minor improvement
 	* Added support for spaces in method names
 
-== yamltest 0.5.2 2009-05-28
+== 0.5.2 2009-05-28
 
 * 1 minor improvement
 	* Added an option to disable generating 'src' from the test title
 
-== yamltest 0.5.1 2009-02-02
+== 0.5.1 2009-02-02
 
 * Simplified gem specification (avoid hoe/newgem/etc dependency)
 
-== yamltest 0.5 2009-01-21
+== 0.5 2009-01-21
 
 * 1 major improvement
   * First release after extraction from zena (http://zenadmin.org). [gaspard]

data/Rakefile

@@ -1,123 +1,55 @@
-require "rubygems"
-require "rake/gempackagetask"
-require "rake/rdoctask"
-require 'lib/yamltest'
+require 'rubygems'
+require 'rake'
 
-task :default => :test
-
-require "rake/testtask"
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList["test/**/*_test.rb"]
-  t.verbose = true
-end
-
-# This builds the actual gem. For details of what all these options
-# mean, and other ones you can add, check the documentation here:
-#
-#   http://rubygems.org/read/chapter/20
-#
-spec = Gem::Specification.new do |s|
-  
-  # Change these as appropriate
-  s.name              = "yamltest"
-  s.version           = Yamltest::VERSION.to_s
-  s.summary           = "yamltest lets you configure unit test with yaml documents"
-  s.author            = 'Gaspard Bucher'
-  s.email             = 'gaspard@teti.ch'
-  s.homepage          = 'http://github.com/zena/yamltest/tree'
-
-  s.has_rdoc          = true
-  s.extra_rdoc_files  = %w(README.rdoc)
-  s.rdoc_options      = %w(--main README.rdoc)
-
-  # Add any extra files to include in the gem
-  s.files             = %w(History.txt Manifest.txt Rakefile README.rdoc) + Dir.glob("{test,lib}/**/*")
-   
-  s.require_paths     = ["lib"]
-  
-  # If you want to depend on other gems, add them here, along with any
-  # relevant versions
-  # s.add_dependency("some_other_gem", "~> 0.1.0")
-  
-  # If your tests use any gems, include them here
-  # s.add_development_dependency("mocha")
-
-  # If you want to publish automatically to rubyforge, you'll may need
-  # to tweak this, and the publishing task below too.
-  s.rubyforge_project = "yamltest"
-end
-
-# This task actually builds the gem. We also regenerate a static 
-# .gemspec file, which is useful if something (i.e. GitHub) will
-# be automatically building a gem for this project. If you're not
-# using GitHub, edit as appropriate.
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-  
-  # Generate the gemspec file for github.
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, "w") {|f| f << spec.to_ruby }
-end
+require(File.join(File.dirname(__FILE__), 'lib/yamltest/version'))
 
-# Generate documentation
-Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  rd.rdoc_dir = "rdoc"
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.version = Yamltest::VERSION
+    gem.name = "yamltest"
+    gem.summary = %Q{yamltest lets you configure unit test with yaml documents}
+    gem.description = %Q{yamltest lets you configure unit test with yaml documents}
+    gem.email = "gaspard@teti.ch"
+    gem.homepage = "http://github.com/zena/yamltest/tree"
+    gem.authors = ["Gaspard Bucher"]
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-desc 'Clear out RDoc and generated packages'
-task :clean => [:clobber_rdoc, :clobber_package] do
-  rm "#{spec.name}.gemspec"
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
 end
 
-# If you want to publish to RubyForge automatically, here's a simple 
-# task to help do that. If you don't, just get rid of this.
-# Be sure to set up your Rubyforge account details with the Rubyforge
-# gem; you'll need to run `rubyforge setup` and `rubyforge config` at
-# the very least.
 begin
-  require "rake/contrib/sshpublisher"
-  namespace :rubyforge do
-    
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-    
-    namespace :release do
-      desc "Release a new version of this gem"
-      task :gem => [:package] do
-        require 'rubyforge'
-        rubyforge = RubyForge.new
-        rubyforge.configure
-        rubyforge.login
-        rubyforge.userconfig['release_notes'] = spec.summary
-        path_to_gem = File.join(File.dirname(__FILE__), "pkg", "#{spec.name}-#{spec.version}.gem")
-        puts "Publishing #{spec.name}-#{spec.version.to_s} to Rubyforge..."
-        rubyforge.add_release(spec.rubyforge_project, spec.name, spec.version.to_s, path_to_gem)
-      end
-    
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
- 
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/yamltest/" # Should be the same as the rubyforge project name
-        local_dir = 'rdoc'
- 
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
   end
 rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
 end
 
-desc 'Generate the gemspec to serve this Gem from Github'
-task :github do
-  file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-  File.open(file, 'w') {|f| f << spec.to_ruby }
-  puts "Created gemspec: #{file}"
-end
+task :test => :check_dependencies
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "yamltest #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/lib/yamltest.rb

@@ -1,27 +1,25 @@
 require 'test/unit'
 require 'yaml'
-
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+require 'yamltest/version'
 
 module Yamltest
-  VERSION = '0.5.3'
+
   module Helper
     def self.included(obj)
       obj.extend Yamltest::ClassMethods
     end
   end
-  
+
   module ClassMethods
-    
+
     # build an array of file_name, file_path, options
     def file_list(caller_path, opts)
       directories = opts[:directories] || [opts[:directory] || :default]
-      
+
       if files = opts[:files]
         files.map!{|f| f.to_s}
       end
-      
+
       directories = directories.map do |dir|
         if dir == :default
           if caller_path.split('/').last =~ /^(.*)_test.rb/ || caller_path.split('/').last =~ /^test_(.*).rb/
@@ -31,13 +29,18 @@ module Yamltest
             directories = [File.dirname(caller_path)]
           end
         else
-          # relative to caller
-          Dir[File.join(File.dirname(caller_path),dir)]
+          # GLOB absolute path
+          list = Dir[dir]
+          if list.empty?
+            # relative to caller
+            list = Dir[File.join(File.dirname(caller_path),dir)]
+          end
+          list
         end
-      end.flatten
+      end.flatten.uniq
 
       file_list = []
-      
+
       directories.each do |dir|
         Dir.foreach(dir) do |f|
           next unless f =~ /^([\w_-]+).yml/
@@ -45,11 +48,11 @@ module Yamltest
           file_list << [$1, File.join(dir, "#{$1}.yml"), opts[$1] || opts[$1.to_sym] || {}]
         end
       end
-      
+
       file_list
     end
-    
-    
+
+
     # Setup yaml testing.
     # usage:
     # class SuperTest < Test::Unit::TestCase
@@ -75,14 +78,14 @@ module Yamltest
       #   attr_accessor test_strings
       # end
       # and then use "self.test_strings"
-      
+
       class_eval %Q{
         @@test_strings = {}
         @@test_methods = {}
         @@test_options = {}
         @@test_files = []
         @@file_list  = file_list(#{caller[0].inspect}, #{opts.inspect})
-        
+
         @@file_list.each do |file_name, file_path, opts|
           strings = {}
           test_methods = []
@@ -98,7 +101,7 @@ module Yamltest
             raise err
           end
           class_eval "
-            def \#{file_name}
+            def \#{file_name}_tests
               @@test_strings['\#{file_name}']
             end
           "
@@ -106,19 +109,19 @@ module Yamltest
           @@test_methods[file_name] = test_methods
           @@test_files << file_name
         end
-        
+
         # Override this in your test class
         def yt_parse(key, source, context)
           source
         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), yt_parse(key, yt_get('src',file,test), context)
           end
         end
-        
+
         protected
           def yt_assert(test_res, res)
             if test_res.kind_of?(String) && test_res[0..1] == '!/'
@@ -129,7 +132,7 @@ module Yamltest
               assert_equal test_res, res
             end
           end
-          
+
           def yt_get(key, file, test)
             case key
             when 'context', :context
@@ -144,7 +147,7 @@ module Yamltest
           end
       }
     end
-    
+
     def yt_make
       class_eval %q{
         return unless @@test_methods

data/lib/yamltest/version.rb

@@ -1,13 +1,3 @@
 module Yamltest
-  module Version
-    
-    MAJOR = 0
-    MINOR = 5
-    TINY  = 3
-    
-    def self.to_s # :nodoc:
-      [MAJOR, MINOR, TINY].join('.')
-    end
-    
-  end
+  VERSION = '0.7.0'
 end

data/test/gem_test/simple_test.rb

@@ -6,10 +6,10 @@ require 'yamltest'
 
 class TestYamltestGem < Test::Unit::TestCase
   yamltest :directory => '.'
-  
+
   def yt_parse(key, source, context)
     source.split(//).reverse.join
   end
-  
+
   yt_make
 end

data/test/yamltest/other_folder/bar.yml

@@ -0,0 +1,7 @@
+default:
+  src: "other_folder_default"
+  res: 20
+
+hello_world:
+  src: "other_folder_hello_world"
+  res: 24

data/test/yamltest_test.rb

@@ -13,23 +13,23 @@ end
 
 class TestDefaultFolder < Test::Unit::TestCase
   yamltest
-  
+
   def yt_parse(key, source, context)
     eval(source)
   end
-  
+
   def test_to_make_sure_tests_are_valid
     assert (respond_to?('test_simple_default') and
              (method('test_simple_default').arity == 0 ||
               method('test_simple_default').arity == -1))
   end
-  
+
   yt_make
 end
 
 class TestCustomKeys < Test::Unit::TestCase
   yamltest :directory => 'zoo', :src_from_title => true
-  
+
   def yt_parse(key, source, context)
     res = source.gsub('o', 'a')
     case key
@@ -43,13 +43,34 @@ class TestCustomKeys < Test::Unit::TestCase
       "bad test key #{key.inspect}"
     end
   end
-  
+
   # This test will not be redefined by 'make_tests'
   def test_complicated_animal
     context = yt_get('context', 'complicated', 'animal')
     context['foo'] = 'bozo'
     yt_do_test('complicated', 'animal', context)
   end
-  
+
+  yt_make
+end
+
+class TestCustomFolder < Test::Unit::TestCase
+  yamltest :directory => File.join(File.dirname(__FILE__), 'yamltest', 'other_folder')
+
+  def yt_parse(key, source, context)
+    puts source
+    case key
+    when 'res'
+      source.length
+    else
+      "bad test key #{key.inspect}"
+    end
+  end
+
+  def test_to_make_sure_tests_are_valid
+    assert respond_to?('test_bar_default')
+    assert respond_to?('test_bar_hello_world')
+  end
+
   yt_make
 end

data/yamltest.gemspec

@@ -0,0 +1,56 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{yamltest}
+  s.version = "0.7.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Gaspard Bucher"]
+  s.date = %q{2010-07-22}
+  s.description = %q{yamltest lets you configure unit test with yaml documents}
+  s.email = %q{gaspard@teti.ch}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "Manifest.txt",
+     "README.rdoc",
+     "Rakefile",
+     "lib/yamltest.rb",
+     "lib/yamltest/version.rb",
+     "test/gem_test/foo.yml",
+     "test/gem_test/simple_test.rb",
+     "test/test_helper.rb",
+     "test/yamltest/other_folder/bar.yml",
+     "test/yamltest/simple.yml",
+     "test/yamltest_test.rb",
+     "test/zoo/complicated.yml",
+     "yamltest.gemspec"
+  ]
+  s.homepage = %q{http://github.com/zena/yamltest/tree}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{yamltest lets you configure unit test with yaml documents}
+  s.test_files = [
+    "test/gem_test/simple_test.rb",
+     "test/test_helper.rb",
+     "test/yamltest_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: yamltest
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 +02:00
+date: 2010-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: 
+description: yamltest lets you configure unit test with yaml documents
 email: gaspard@teti.ch
 executables: []
 
@@ -22,48 +27,52 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- .gitignore
 - History.txt
 - Manifest.txt
-- Rakefile
 - README.rdoc
-- test/gem_test
+- Rakefile
+- lib/yamltest.rb
+- lib/yamltest/version.rb
 - test/gem_test/foo.yml
 - test/gem_test/simple_test.rb
 - test/test_helper.rb
-- test/yamltest
+- test/yamltest/other_folder/bar.yml
 - test/yamltest/simple.yml
 - test/yamltest_test.rb
-- test/zoo
 - test/zoo/complicated.yml
-- lib/yamltest
-- lib/yamltest/version.rb
-- lib/yamltest.rb
+- yamltest.gemspec
 has_rdoc: true
 homepage: http://github.com/zena/yamltest/tree
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: yamltest
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: yamltest lets you configure unit test with yaml documents
-test_files: []
-
+test_files: 
+- test/gem_test/simple_test.rb
+- test/test_helper.rb
+- test/yamltest_test.rb