etest 0.4.2 → 0.6.0

data/.gemspec

@@ -0,0 +1,2 @@
+      require "vex/gem"
+      Gem.spec File.dirname(__FILE__)

data/.gitignore

@@ -0,0 +1,4 @@
+coverage
+doc/rdoc
+*log
+pkg

data/Rakefile

@@ -1,3 +1,5 @@
+load "#{File.dirname __FILE__}/vex/gem.rake"
+
 task :default => :test
 
 task :test do
@@ -11,7 +13,3 @@ end
 task :rdoc do
   sh "rdoc -o doc/rdoc"
 end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| 
-  puts ext
-  load ext }

data/gem.yml

@@ -1,12 +1,14 @@
-gem:
-  description: Embedded testing
-  url: http://github.com/pboy/etest  
-  author: pboy
-  email: eno-pboy@open-lab.org  
-  ignore_pattern:
-    - "tmp/*"
-    - "**/.*"
-  # runtime_dependencies:
-  #   - nokogiri
-  #   - htmlentities
-  #   - rdiscount
+version: "0.6.0"
+description: Embedded testing
+summary: Embedded testing
+# url: http://github.com/pboy/etest  
+author: pboy
+email: eno-pboy@open-lab.org  
+# ignore_pattern:
+#   - "tmp/*"
+#   - "**/.*"
+dependencies:
+  - dlog
+#   - nokogiri
+#   - htmlentities
+#   - rdiscount

data/lib/etest/assertions.rb

@@ -169,43 +169,3 @@ end
 class MiniTest::Unit::TestCase
   include Etest::Assertions
 end
-
-unless defined?(ETEST_TEST)
-
-  module Etest::Assertions::Etest
-    #
-    # this actually tests the existance of an assertion and one successful
-    # assertion, nothing less, and nothing more...
-    def test_asserts
-      assert_respond_to "nsn", :upcase
-      assert respond_to?(:assert_invalid)
-      assert respond_to?(:assert_valid)
-    end
-
-    class TestError < RuntimeError; end
-
-    def test_assert_raises_kind_of
-      assert_raises_kind_of RuntimeError do 
-        raise TestError
-      end
-    end
-
-    def test_assert_file_exist
-      assert_file_exist __FILE__
-    end
-  
-    def test_xml
-      assert_valid_xml <<-XML
-<root>
-<p> lkhj </p>
-</root>
-XML
-  
-    assert_invalid_xml <<-XML
-<root>
-<p> lkhj </p>
-XML
-    end
-  end
-end
-

data/lib/etest/comparison_assertions.rb

@@ -29,19 +29,3 @@ end
 class MiniTest::Unit::TestCase
   include ::Etest::ComparisonAssertions
 end
-
-unless defined?(ETEST_TEST)
-
-  module Etest::ComparisonAssertions::Etest
-    # I don't know how to test asserts. This, at least, give (fake) C0 coverage
-    def test_comparision_assertions
-      assert_lt 1, 2
-      assert_le 1, 1
-      assert_ge 2, 2
-      assert_gt 2, 1
-      assert_eq 2, 2
-      assert_ne 1, 2
-    end
-  end
-
-end

data/lib/etest.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+require "dlog"
 
 begin
   require "minitest-rg"
@@ -9,7 +10,6 @@ end
 
 require File.dirname(__FILE__) + "/string_ext"
 require File.dirname(__FILE__) + "/module_ext"
-require File.dirname(__FILE__) + "/dlog_ext"
 
 #
 # Embedded test cases:
@@ -17,7 +17,6 @@ require File.dirname(__FILE__) + "/dlog_ext"
 # The Etest module contains methods to run etests.
 # 
 module Etest
-  VERSION=File.read(File.dirname(__FILE__) + "/../VERSION")
 end
 
 require File.dirname(__FILE__) + "/etest/assertions"
@@ -26,6 +25,12 @@ require File.dirname(__FILE__) + "/etest/comparison_assertions"
 class MiniTest::Unit::TestCase
   def self.run_etests(*test_cases)
     outside_etests = @@test_suites
+
+    if test_cases.empty?
+      dlog.warn "Found no etest test_cases"
+      return
+    end
+
     reset
     
     MiniTest::Unit::TestCase.reset
@@ -64,10 +69,10 @@ module Etest
   end
 
   def self.run(*etests)
-    dlog "Running", etests
     #
     # convert all Etest modules into a test case
     test_cases = etests.map { |etest|
+      dlog "Running", etest
       to_test_case etest
     }
     

data/lib/string_ext.rb

@@ -12,19 +12,3 @@ class String
     gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
   end
 end
-
-unless defined?(TEST_ETEST)
-  
-  module String::Etest
-    def test_camelize
-      assert_equal "x", "X".underscore
-      assert_equal "xa_la_nder", "XaLaNder".underscore
-    end
-
-    def test_underscore
-      assert_equal "X", "x".camelize
-      assert_equal "XaLaNder", "xa_la_nder".camelize
-    end
-  end
-
-end

data/test/etest_assertions.rb

@@ -1,3 +1,14 @@
+module Etest::ComparisonAssertions::Etest
+  # I don't know how to test asserts. This, at least, give (fake) C0 coverage
+  def test_comparision_assertions
+    assert_lt 1, 2
+    assert_le 1, 1
+    assert_ge 2, 2
+    assert_gt 2, 1
+    assert_eq 2, 2
+    assert_ne 1, 2
+  end
+end
 
 module Etest::Assertions::Etest
   #

data/test/etest_string.rb

@@ -1,4 +1,3 @@
-
 module String::Etest
   def test_camelize
     assert_equal "x", "X".underscore
@@ -10,4 +9,3 @@ module String::Etest
     assert_equal "XaLaNder", "xa_la_nder".camelize
   end
 end
-

data/vex/gem.rake

@@ -0,0 +1,36 @@
+def sys(*args)
+  STDERR.puts "#{args.join(" ")}"
+  system *args
+end
+
+namespace :gem do
+  task :build => :spec do
+    options = []
+    sys "gem build .gemspec #{options.join(" ")} && mkdir -p pkg && mv *.gem pkg"
+  end
+
+  task :spec do
+    File.open ".gemspec", "w" do |file|
+      file.write <<-TXT
+      require "vex/gem"
+      Gem.spec File.dirname(__FILE__)
+TXT
+    end
+  end
+  
+  task :install => :build do
+    file = Dir.glob("pkg/*.gem").sort.last
+    sys "gem install #{file}"
+  end
+  
+  task :push => :build do
+    file = Dir.glob("pkg/*.gem").sort.last
+    puts "To push the gem to gemcutter please run"
+    puts
+    puts "\tgem push #{file}"
+  end
+end
+
+desc "Build gem"
+# task :gem => %w(test gem:install)
+task :gem => %w(gem:install gem:push)

data/vex/gem.rb

@@ -0,0 +1,95 @@
+module Gem
+  (class << self; self; end).class_eval do
+    def default_attributes
+      %w(name version date files executables)
+    end
+    
+    def set_root(root)
+      @root = File.expand_path(root)
+      @name = File.basename(@root)
+      @conf ||= YAML.load File.read("#{@root}/gem.yml")
+      @attributes ||= (default_attributes + @conf.keys.map(&:to_s)).uniq
+    end
+    
+    # attr_reader :root, :conf, :attributes, 
+    attr_reader :name
+
+    def attribute(name)
+      if @conf.key?(name) && !%w(dependencies).include?(name)
+        @conf[name]
+      else
+        self.send(name)
+      end
+    end
+
+    #
+    # create a new Gem::Specification object for this gem.
+    def spec(root)
+      self.set_root root
+    
+      Gem::Specification.new do |s|
+        @attributes.each do |attr|
+          v = attribute(attr)
+          next if v.nil?
+          
+          log attr, v
+          
+          s.send attr + "=", v
+        end
+        
+        %w(pre_uninstall post_install).each do |hook|
+          next unless File.exists?("#{root}/hooks/#{hook}.rb")
+          log hook, "yes"
+          Gem.send(hook) {
+            load "hooks/#{hook}.rb"
+          }
+        end
+      end
+    end
+    
+    def log(attr, v)
+      v = case attr
+      when "files" then "#{v.length} files"
+      else              v.inspect
+      end
+      
+      STDERR.puts "#{"%20s" % attr}:\t#{v}"
+    end
+    
+    def dependencies
+      return nil unless @conf["dependencies"]
+
+      @conf["dependencies"].map do |d|
+        Gem::Dependency.new d, ">= 0"
+      end
+    end
+    
+    def head(file)
+      File.open(file) do |f|
+        f.readline
+      end
+    end
+    
+    def executables
+      r = Dir.glob("#{@root}/bin/**/*").map do |file|
+        next unless head(file) =~ /^#!/
+        file[@root.length + 5 .. -1]
+      end.compact
+      
+      return nil if r.empty?
+      r
+    end
+
+    #
+    # get files from git
+    def files
+      r = `git ls-files`.split("\n")
+    end
+
+    #
+    # return the date
+    def date
+      Date.today.to_s
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: etest
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - pboy
@@ -15,32 +15,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 +02:00
+date: 2010-12-08 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: dlog
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: Embedded testing
 email: eno-pboy@open-lab.org
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- lib/dlog_ext.rb
-- lib/etest.rb
-- lib/etest/assertions.rb
-- lib/etest/comparison_assertions.rb
-- lib/etest/grep.rb
-- lib/module_ext.rb
-- lib/string_ext.rb
-- tasks/echoe.rake
+extra_rdoc_files: []
+
 files: 
-- "#Rakefile#"
+- .gemspec
+- .gitignore
 - Rakefile
-- VERSION
 - gem.yml
 - init.rb
-- lib/dlog_ext.rb
 - lib/etest.rb
 - lib/etest/assertions.rb
 - lib/etest/comparison_assertions.rb
@@ -49,23 +54,19 @@ files:
 - lib/string_ext.rb
 - script/console
 - script/rebuild
-- tasks/echoe.rake
 - test/assertions.rb
 - test/etest_assertions.rb
 - test/etest_string.rb
 - test/test.rb
-- Manifest
-- etest.gemspec
+- vex/gem.rake
+- vex/gem.rb
 has_rdoc: true
-homepage: http://github.com/pboy/etest
+homepage: 
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Etest
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -82,14 +83,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 11
+      hash: 3
       segments: 
-      - 1
-      - 2
-      version: "1.2"
+      - 0
+      version: "0"
 requirements: []
 
-rubyforge_project: etest
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3

data/#Rakefile#

@@ -1,18 +0,0 @@
-task :default => :test
-
-task :test do
-	sh "ruby test/test.rb"
-end
-
-task :rcov do
-  sh "cd test; rcov -o ../coverage -x ruby/.*/gems -x ^test.rb test.rb"
-end
-
-task :rdoc do
-  sh "rdoc -o doc/rdoc"
-end
-
-Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| 
-  puts ext
-
-2B  load ext }

data/Manifest

@@ -1,20 +0,0 @@
-#Rakefile#
-Rakefile
-VERSION
-gem.yml
-init.rb
-lib/dlog_ext.rb
-lib/etest.rb
-lib/etest/assertions.rb
-lib/etest/comparison_assertions.rb
-lib/etest/grep.rb
-lib/module_ext.rb
-lib/string_ext.rb
-script/console
-script/rebuild
-tasks/echoe.rake
-test/assertions.rb
-test/etest_assertions.rb
-test/etest_string.rb
-test/test.rb
-Manifest

data/VERSION

@@ -1 +0,0 @@
-0.4.2

data/etest.gemspec

@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{etest}
-  s.version = "0.4.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["pboy"]
-  s.date = %q{2010-07-29}
-  s.description = %q{Embedded testing}
-  s.email = %q{eno-pboy@open-lab.org}
-  s.extra_rdoc_files = ["lib/dlog_ext.rb", "lib/etest.rb", "lib/etest/assertions.rb", "lib/etest/comparison_assertions.rb", "lib/etest/grep.rb", "lib/module_ext.rb", "lib/string_ext.rb", "tasks/echoe.rake"]
-  s.files = ["#Rakefile#", "Rakefile", "VERSION", "gem.yml", "init.rb", "lib/dlog_ext.rb", "lib/etest.rb", "lib/etest/assertions.rb", "lib/etest/comparison_assertions.rb", "lib/etest/grep.rb", "lib/module_ext.rb", "lib/string_ext.rb", "script/console", "script/rebuild", "tasks/echoe.rake", "test/assertions.rb", "test/etest_assertions.rb", "test/etest_string.rb", "test/test.rb", "Manifest", "etest.gemspec"]
-  s.homepage = %q{http://github.com/pboy/etest}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Etest"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{etest}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Embedded testing}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end

data/lib/dlog_ext.rb

@@ -1,81 +0,0 @@
-module Dlog
-  def dlog(*args)
-  end
-end
-
-if !ENV["NO_DLOG"]
-
-module Dlog
-  ROOT = if defined?(RAILS_ROOT)
-    RAILS_ROOT
-  else
-    File.expand_path(Dir.getwd) 
-  end
-  
-  HOME = ENV["HOME"] + "/"
-  
-  def self.release!
-    @release = true
-  end
-
-  def self.release?
-    @release
-  end
-      
-  def self.debug!
-    @release = false
-  end
-
-  def self.debug?
-    !@release
-  end
-
-  def self.quiet!
-    @quiet = true
-  end
-
-  def self.quiet?
-    @quiet
-  end
-
-  def dlog(*args)
-    return if Dlog.quiet?
-    
-    msg = ""
-    was_string = true
-    args.map do |s|
-      msg += was_string ? " " : ", " unless msg.empty?
-      msg += ((was_string = s.is_a?(String)) ? s : s.inspect)
-    end
-    STDERR.puts "#{Dlog.release? ? rlog_caller : dlog_caller} #{msg}"
-  end
-
-  def rlog_caller
-    if caller[1] =~ /^(.*):(\d+)/
-      file, line = $1, $2
-      "[" + File.basename(file).sub(/\.[^\.]*$/, "") + "]"
-    else
-      "[log]"
-    end
-  end
-
-  def dlog_caller
-    if caller[1] =~ /^(.*):(\d+)/
-      file, line = $1, $2
-      file = File.expand_path(file)
-
-      file.gsub!(ROOT, ".") or
-      file.gsub!(HOME, "~/")
-    
-      "#{file}(#{line}):"
-    else
-      "<dlog>:"
-    end
-  end
-end
-
-end
-
-class Object
-  include Dlog
-end

data/tasks/echoe.rake

@@ -1,31 +0,0 @@
-#
-# GEM settings
-#
-GEM_ROOT = File.expand_path("#{File.dirname(__FILE__)}/..")
-if gem_config = YAML.load(File.read("#{GEM_ROOT}/gem.yml"))["gem"]
-  require 'echoe'  
-
-  GEM_NAME = File.basename(GEM_ROOT)
-  Echoe.new(File.basename(GEM_ROOT), File.read("#{GEM_ROOT}/VERSION")) do |p|  
-    gem_config.each do |k,v|
-      p.send "#{k}=",v
-    end
-  end
-
-  desc "Rebuild and install the gem"
-  task :rebuild => %w(manifest default build_gemspec package) do
-    gem = Dir.glob("pkg/*.gem").sort_by do |filename|
-      File.new(filename).mtime
-    end.last
-
-    puts "============================================="
-    puts "Installing gem..."
-
-    system "gem install #{gem} > /dev/null 2>&1"
-
-    puts ""
-    puts "I built and installed the gem for you. To upload, run "
-    puts
-    puts "    gem push #{gem}"
-  end
-end