lemon 0.8.5 → 0.9.0

data/{lib/lemon → work/deprecated}/model/test_suite.rb

@@ -1,6 +1,10 @@
 require 'lemon/model/test_case'
+require 'lemon/model/test_method'
+require 'lemon/model/test_module'
+require 'lemon/model/test_feature'
 require 'lemon/model/snapshot'
 #require 'lemon/model/main'
+require 'lemon/core_ext/kernel'
 
 module Lemon
 
@@ -23,7 +27,7 @@ module Lemon
     attr :files
 
     # Test cases in this suite.
-    attr :testcases
+    attr :cases
 
     # List of pre-test procedures that apply suite-wide.
     attr :before
@@ -47,7 +51,9 @@ module Lemon
     #end
 
     #
-    #attr :options
+    attr :options
+
+    attr :stack
 
     attr :dsl
 
@@ -56,12 +62,13 @@ module Lemon
       @files   = files.flatten
       @options = options
 
-      @testcases = []
+      @cases   = []
+      @helpers = []
 
-      @before    = {}
-      @after     = {}
+      @before  = {}
+      @after   = {}
 
-      #load_helpers
+      load_helpers
 
       #if cover? or cover_all?
       #  @coverage  = Snapshot.new
@@ -73,6 +80,16 @@ module Lemon
       load_files
     end
 
+    #
+    def cover?
+      @options[:cover]
+    end
+
+    #
+    def cover_all?
+      @options[:cover_all]
+    end
+
     #
     #class Scope < Module
     #  def initialize
@@ -80,34 +97,61 @@ module Lemon
     #  end
     #end
 
+    def to_a
+      @cases
+    end
+
     # Iterate through this suite's test cases.
     def each(&block)
-      @testcases.each(&block)
+      @cases.each(&block)
     end
 
     #
-    def cover?
-      @options[:cover]
+    def advice
+      @advice ||= TestAdvice.new
     end
 
     #
-    def cover_all?
-      @options[:cover_all]
+    def subject
+      @subject
     end
 
-    # TODO: automatic helper loading ?
-    #def load_helpers(*files)
-    #  helpers = []
-    #  filelist.each do |file|
-    #    dir = File.dirname(file)
-    #    hlp = Dir[File.join(dir, '{test_,}helper.rb')]
-    #    helpers.concat(hlp)
-    #  end
+=begin
     #
-    #  helpers.each do |hlp|
-    #    require hlp
-    #  end
-    #end
+    def start_suite
+    end
+
+    #
+    def finish_suite
+    end
+=end
+
+    #
+    def scope
+      s = Object.new
+      s.extend(dsl)
+      s
+    end
+
+    # Automatically load helpers. Helpers are any *.rb script in
+    # a `helpers` directory, relative to a test script.
+    #
+    # TODO: You can change the file pattern used to automatically
+    # load helper scripts in `.lemon`.
+    #
+    def load_helpers
+      helpers = []
+      filelist.each do |file|
+        dir = File.dirname(file)
+        hlp = Dir[File.join(dir, 'helper{s,}/*.rb')]
+        helpers.concat(hlp)
+      end
+      helpers.uniq!
+      helpers.each do |hlp|
+        require File.expand_path(hlp)
+      end
+      @helpers = helpers
+    end
 
     #
     def load_files #(*files)
@@ -155,13 +199,23 @@ module Lemon
         end.flatten
         #files = files.map{ |f| File.expand_path(f) }
         files.uniq
+        files.reject{ |f| /fixture(|s)\/(.*?)\.rb$/ =~ f }
+        files.reject{ |f| /helper(|s)\/(.*?)\.rb$/ =~ f }
+      )
+    end
+
+    # TODO: Note sure about scope creation here
+    def scope
+      @scope ||= (
+        scope = Object.new
+        scope.extend(dsl)
       )
     end
 
     class DSL < Module
       #
-      def initialize(test_suite)
-        @test_suite = test_suite
+      def initialize(suite)
+        @suite = suite
         #module_eval(&code)
       end
 
@@ -181,24 +235,51 @@ module Lemon
       alias_method :Covers, :covers
 
       # Define a test case belonging to this suite.
-      def testcase(target_class, &block)
-        raise "lemon: case target must be a class or module" unless Module === target_class
-        @test_suite.testcases << TestCase.new(@test_suite, target_class, &block)
+      def test_case(description, &block)
+        options = {
+         :description => description
+        }
+        @suite.cases << TestCase.new(@suite, options, &block)
       end
 
       #
-      alias_method :TestCase, :testcase
-      alias_method :tests, :testcase
+      alias_method :TestCase, :test_case
+
+      # Define a module test case belonging to this suite.
+      def test_module(target_module, &block)
+        raise "lemon: target must be a module" unless Module === target_module
+        options = {
+          :target => target_module
+        }
+        @suite.cases << TestModule.new(@suite, optios, &block)
+      end
+
+      # Define a class test case belonging to this suite.
+      def test_class(target_class, &block)
+        raise "lemon: case target must be a class" unless Class === target_class
+        options = {
+          :target => target_class
+        }
+        @suite.cases << TestModule.new(@suite, options, &block)
+      end
+
+      # Define a test feature.
+      def test_feature(target, &block)
+        options = {
+          :target => target
+        }
+        @suite.cases << TestFeature.new(@suite, options, &block)
+      end
 
       # Define a pre-test procedure to apply suite-wide.
       def before(*matches, &block)
-        @test_suite.before[matches] = block #<< Advice.new(match, &block)
+        @suite.before[matches] = block #<< Advice.new(match, &block)
       end
       alias_method :Before, :before
 
       # Define a post-test procedure to apply suite-wide.
       def after(*matches, &block)
-        @test_suite.after[matches] = block #<< Advice.new(match, &block)
+        @suite.after[matches] = block #<< Advice.new(match, &block)
       end
       alias_method :After, :after
 

data/work/deprecated/rake.rb

@@ -0,0 +1,103 @@
+require 'rake/tasklib'
+
+module Lemon
+
+  module Rake
+
+    # Define a lemon test rake task.
+    #
+    # The `TEST` environment variable can be used to select tests
+    # when using the task.
+    #
+    # TODO: The test task uses #fork. Maybe it should shell out instead?
+    class TestTask < ::Rake::TaskLib
+
+      #
+      DEFAULT_TESTS = [
+        'test/**/case_*.rb',
+        'test/**/*_case.rb',
+        'test/**/test_*.rb',
+        'test/**/*_test.rb'
+      ]
+
+      #
+      attr_accessor :tests
+
+      #
+      attr_accessor :loadpath
+
+      #
+      attr_accessor :requires
+
+      #
+      attr_accessor :namespaces
+
+      #
+      attr_accessor :format
+
+      #
+      def initialize(name='lemon:test', desc="run lemon tests", &block)
+        @name       = name
+        @desc       = desc
+
+        @loadpath   = ['lib']
+        @requires   = []
+        @tests      = [ENV['TEST']] || DEFAULT_TESTS
+        @format     = nil
+        @namespaces = []
+
+        block.call(self)
+
+        define_task
+      end
+
+      #
+      def define_task
+        desc @desc
+        task @name do
+          require 'open3'
+
+          @tests ||= (
+            if ENV['tests']
+              ENV['tests'].split(/[:;]/)
+            else
+              DEFAULT_TESTS
+            end
+          )
+
+          run
+        end
+      end
+
+      #
+      def run
+        fork {
+          #require 'lemon'
+          require 'lemon/controller/test_runner'
+          loadpath.each do |path|
+            $LOAD_PATH.unshift(path)
+          end
+          requires.each do |file|
+            require file
+          end
+          runner = Lemon::TestRunner.new(
+            tests,
+            :format => format,
+            :namespaces => namespaces
+          )
+          success = runner.run
+          exit -1 unless success
+        }
+        Process.wait
+      end
+
+      #
+      #def ruby_command
+      #  File.join(RbConfig::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+      #end
+
+    end
+
+  end
+
+end

data/{test → work/deprecated/test}/case_test_case_dsl.rb

@@ -6,7 +6,7 @@ testcase Lemon::TestCase::DSL do
 
   setup "Modules included in a test case are accessible by the unit tests" do
     ts = Lemon::TestSuite.new(@files)
-    tc = ts.testcases.first  # the only one
+    tc = ts.test_cases.first  # the only one
     tc.dsl
   end
 
@@ -28,7 +28,7 @@ testcase Lemon::TestCase::DSL do
 
   setup "Test cases are augmented by before and afters procedures" do
     ts = Lemon::TestSuite.new(@files)
-    tc = ts.testcases.first  # the only one
+    tc = ts.test_cases.first  # the only one
     tc.dsl
   end
 

data/work/old-tests/case_example.rb

@@ -0,0 +1,15 @@
+Test.case "Example Case" do
+
+  test "Example Test" do
+    "example".assert == "example"
+  end
+
+  context "Example Context" do
+
+    test do
+      "example".assert == "example"
+    end
+
+  end
+
+end

data/work/old-tests/feature_example.rb

@@ -0,0 +1,40 @@
+Test::Feature "Addition" do
+  To "avoid silly mistakes"
+  As "a math idiot"
+  We "need to calculate the sum of numbers"
+
+  Scenario "Add two numbers" do
+    Given "I have a calculator"
+    Given "I have entered 50 into the calculator"
+    Given "I have entered 70 into the calculator"
+    When  "I press add"
+    Then  "the result should be 120 on the screen"
+  end
+
+  Scenario "Add three numbers" do
+    Given "I have a calculator"
+    Given "I have entered 50 into the calculator"
+    Given "I have entered 70 into the calculator"
+    Given "I have entered 90 into the calculator"
+    When  "I press add"
+    Then  "the result should be 210 on the screen"
+  end
+
+  Given 'I have a calculator' do
+    require 'calculator'
+    @calculator = Calculator.new
+  end
+
+  Given 'I have entered (((\d+))) into the calculator' do |n|
+    @calculator.push n.to_i
+  end
+
+  When 'I press add' do
+    @result = @calculator.add
+  end
+
+  Then 'the result should be (((\d+))) on the screen' do |n|
+    @result.assert == n.to_i
+  end
+end
+

data/work/reference/dsl2.rb

@@ -125,6 +125,10 @@ def after(which, &block)
   Lemon.suite.after(which, &block)
 end
 
+# @example
+#     unit Example, :foo, "desciption" do
+#       ...
+#     end
 #
 def unit(mod, meth, desc=nil, &blk)
   Lemon.suite.unit(mod, meth, desc, &blk)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lemon
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-16 00:00:00.000000000 Z
+date: 2011-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ae
-  requirement: &20838840 !ruby/object:Gem::Requirement
+  name: test
+  requirement: &23343340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,43 +21,32 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20838840
-- !ruby/object:Gem::Dependency
-  name: ansi
-  requirement: &21079500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: *21079500
+  version_requirements: *23343340
 - !ruby/object:Gem::Dependency
-  name: detroit
-  requirement: &21077760 !ruby/object:Gem::Requirement
+  name: ae
+  requirement: &23342680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *21077760
+  version_requirements: *23342680
 - !ruby/object:Gem::Dependency
-  name: reap
-  requirement: &21076220 !ruby/object:Gem::Requirement
+  name: ansi
+  requirement: &23341660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.3'
+  type: :runtime
   prerelease: false
-  version_requirements: *21076220
+  version_requirements: *23341660
 - !ruby/object:Gem::Dependency
-  name: qed
-  requirement: &21075560 !ruby/object:Gem::Requirement
+  name: detroit
+  requirement: &23340760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21075560
+  version_requirements: *23340760
 - !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &21074540 !ruby/object:Gem::Requirement
+  name: reap
+  requirement: &23339940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21074540
+  version_requirements: *23339940
 - !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: &21073840 !ruby/object:Gem::Requirement
+  name: qed
+  requirement: &19924040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,20 +76,20 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21073840
+  version_requirements: *19924040
 description: Lemon is a unit testing framework that tightly correlates class to test
   case and method to test unit.
 email:
 - transfire@gmail.com
 executables:
-- lemon
+- lemonade
 extensions: []
 extra_rdoc_files:
 - HISTORY.rdoc
-- README.rdoc
 - COPYING.rdoc
+- README.md
 files:
-- .config/cucumber.yml
+- .gemspec
 - .gitignore
 - .reap/digest
 - .reap/test.reap
@@ -110,63 +99,45 @@ files:
 - HISTORY.rdoc
 - MANIFEST
 - PROFILE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
-- bin/lemon
-- demo/case_example_error.rb
-- demo/case_example_fail.rb
-- demo/case_example_pass.rb
-- demo/case_example_pending.rb
-- demo/case_example_untested.rb
-- demo/fixture/example-use.rb
-- demo/fixture/example.rb
-- features/coverage.feature
-- features/generate.feature
-- features/step_definitions/coverage_steps.rb
-- features/support/ae.rb
-- features/support/aruba.rb
-- features/test.feature
-- lemon.gemspec
+- bin/lemonade
 - lib/lemon.rb
 - lib/lemon.yml
+- lib/lemon/ae.rb
 - lib/lemon/cli.rb
-- lib/lemon/controller/coverage_analyzer.rb
-- lib/lemon/controller/scaffold_generator.rb
-- lib/lemon/controller/test_runner.rb
-- lib/lemon/model/ae.rb
-- lib/lemon/model/cover_unit.rb
-- lib/lemon/model/main.rb
-- lib/lemon/model/pending.rb
-- lib/lemon/model/snapshot.rb
-- lib/lemon/model/source_parser.rb
-- lib/lemon/model/test_case.rb
-- lib/lemon/model/test_context.rb
-- lib/lemon/model/test_suite.rb
-- lib/lemon/model/test_unit.rb
-- lib/lemon/view/cover_reports/abstract.rb
-- lib/lemon/view/cover_reports/compact.rb
-- lib/lemon/view/cover_reports/outline.rb
-- lib/lemon/view/cover_reports/verbose.rb
-- lib/lemon/view/cover_reports/yaml.rb
-- lib/lemon/view/test_reports/abstract.rb
-- lib/lemon/view/test_reports/dotprogress.rb
-- lib/lemon/view/test_reports/html.rb
-- lib/lemon/view/test_reports/outline.rb
-- lib/lemon/view/test_reports/summary.rb
-- lib/lemon/view/test_reports/tap.rb
-- lib/lemon/view/test_reports/tapj.rb
-- lib/lemon/view/test_reports/tapy.rb
-- lib/lemon/view/test_reports/verbose.rb
+- lib/lemon/cli/base.rb
+- lib/lemon/cli/coverage.rb
+- lib/lemon/cli/generate.rb
+- lib/lemon/cli/test.rb
+- lib/lemon/core_ext.rb
+- lib/lemon/core_ext/kernel.rb
+- lib/lemon/core_ext/omission.rb
+- lib/lemon/coverage/analyzer.rb
+- lib/lemon/coverage/cover_unit.rb
+- lib/lemon/coverage/formats/abstract.rb
+- lib/lemon/coverage/formats/compact.rb
+- lib/lemon/coverage/formats/outline.rb
+- lib/lemon/coverage/formats/verbose.rb
+- lib/lemon/coverage/formats/yaml.rb
+- lib/lemon/coverage/snapshot.rb
+- lib/lemon/coverage/source_parser.rb
+- lib/lemon/generator.rb
+- lib/lemon/test_advice.rb
+- lib/lemon/test_case.rb
+- lib/lemon/test_class.rb
+- lib/lemon/test_method.rb
+- lib/lemon/test_module.rb
+- lib/lemon/test_proc.rb
+- lib/lemon/test_setup.rb
+- lib/lemon/test_world.rb
 - notes/2010-05-05-coverage.rdoc
-- notes/2010-05-06-files_not_classes.rdoc
-- notes/2010-07-11-acid_testing.rdoc
+- notes/2010-05-06-files-not-classes.rdoc
+- notes/2010-07-11-acid-testing.rdoc
 - notes/2010-08-02-enforcing-the-unit.md
 - notes/2010-08-03-new-api.md
-- qed/applique/fs.rb
-- qed/coverage/01_complete.rdoc
-- qed/coverage/02_incomplete.rdoc
-- qed/coverage/03_extensions.rdoc
+- notes/2011-07-07-nailing-down-the-nomenclature.md
 - site/.rsync-filter
 - site/assets/images/cut-lemon.png
 - site/assets/images/forkme.png
@@ -184,24 +155,56 @@ files:
 - site/assets/styles/reset.css
 - site/assets/styles/site.css
 - site/index.html
-- test/case_coverage_analyzer.rb
-- test/case_test_case_dsl.rb
-- test/fixtures/case_complete.rb
-- test/fixtures/case_inclusion.rb
-- test/fixtures/case_incomplete.rb
-- test/fixtures/example.rb
-- test/fixtures/helper.rb
-- test/runner
+- spec/applique/fs.rb
+- spec/coverage/01_complete.rdoc
+- spec/coverage/02_incomplete.rdoc
+- spec/coverage/03_extensions.rdoc
+- spec/coverage/applique/lemon.rb
+- try/.test
+- try/case_error.rb
+- try/case_fail.rb
+- try/case_pass.rb
+- try/case_pending.rb
+- try/case_singleton.rb
+- try/case_untested.rb
+- try/fixtures/calculator.rb
+- try/fixtures/example-use.rb
+- try/fixtures/example.rb
+- try/helpers/loadpath.rb
 - work/deprecated/command/abstract.rb
 - work/deprecated/command/coverage.rb
 - work/deprecated/command/generate.rb
 - work/deprecated/command/test.rb
+- work/deprecated/cucumber.yml
+- work/deprecated/features/coverage.feature
+- work/deprecated/features/generate.feature
+- work/deprecated/features/step_definitions/coverage_steps.rb
+- work/deprecated/features/support/ae.rb
+- work/deprecated/features/support/aruba.rb
+- work/deprecated/features/test.feature
+- work/deprecated/model/dsl/advice.rb
+- work/deprecated/model/dsl/subject.rb
+- work/deprecated/model/main.rb
+- work/deprecated/model/test.rb
+- work/deprecated/model/test_base_dsl.rb
+- work/deprecated/model/test_clause.rb
+- work/deprecated/model/test_context.rb
+- work/deprecated/model/test_feature.rb
+- work/deprecated/model/test_scenario.rb
+- work/deprecated/model/test_suite.rb
+- work/deprecated/rake.rb
+- work/deprecated/test/case_coverage_analyzer.rb
+- work/deprecated/test/case_test_case_dsl.rb
+- work/deprecated/test/fixtures/case_complete.rb
+- work/deprecated/test/fixtures/case_inclusion.rb
+- work/deprecated/test/fixtures/case_incomplete.rb
+- work/deprecated/test/fixtures/example.rb
+- work/deprecated/test/fixtures/helper.rb
+- work/deprecated/test/runner
+- work/old-tests/case_example.rb
+- work/old-tests/feature_example.rb
 - work/reference/dsl2.rb
 - work/reference/dynamic_constant_lookup.rb
-- work/sandbox/lib/sample.rb
-- work/sandbox/test/sample_case.rb
-- work/trash/example-cover.rb
-- work/trash/example.rb
 homepage: http://rubyworks.github.com/lemon
 licenses: []
 post_install_message: