spout 0.8.0.beta13 → 0.8.0.beta14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8fa45a4222ddcbf78606e4f3e36aad831162ce3
-  data.tar.gz: 134a7e8590e72a7be9067504cd680a91e564516d
+  metadata.gz: 44da8a99f11bf9cf6c779e891428be644ed2caf8
+  data.tar.gz: 1880dbb0521218e67434e10912c0802c4b64b836
 SHA512:
-  metadata.gz: 2d74fa1bf7c3d79da5900a485961d574f07b4031ec0b39c62c62938b85cf3499d46c8bab9f570849604c2b51aaadd79e1dfaa761d8eedf26af090727a3d0abc8
-  data.tar.gz: c5bf687c4da5159804b1746bfa7580a8eb4030ed0034a72191b29b9bc3141165fd0e9ecadf0688c78a16c18d074b822a8c3a61012d18160127cda7a7d44db3b4
+  metadata.gz: 9ab9390da28670115f571beec8d1a266398a0e41906668aa926e200277b115e2f267ad2a52ed07fd492b4053590bec1effb9767aabcecc779a9bb4029243e69b
+  data.tar.gz: 246aeeec4351aa0558e10d00320d3e1317d9801f942d9a8677742b4c9be5af16596cb9da5f669d445d6b8ed4d9bb875f5c819916652fbe3be7d584e50dd549b5

data/CHANGELOG.md

@@ -14,8 +14,10 @@
 - The `spout coverage` command now lists domains that are defined in the data dictionary and not referenced by any variable
 - Added `spout outliers` command that returns a list of integer or numeric variables that contain major and minor outliers
 - Removed the deprecated `spout hybrid` command
+- Spout tests are now run using minitest in favor of test unit
 - **Gem Changes**
   - Updated to colorize 0.7.2
+  - Updated to minitest
 - Use of Ruby 2.1.2 is now recommended
 
 ### Bug Fix

data/README.md

@@ -104,7 +104,7 @@ If not, you can add the following to your `test` directory to include all Spout
 ```
 require 'spout/tests'
 
-class DictionaryTest < Test::Unit::TestCase
+class DictionaryTest < Minitest::Test
   include Spout::Tests
 end
 ```
@@ -112,7 +112,7 @@ end
 ```
 require 'spout/tests'
 
-class DictionaryTest < Test::Unit::TestCase
+class DictionaryTest < Minitest::Test
   # Or only include certain tests
   include Spout::Tests::JsonValidation
   include Spout::Tests::VariableTypeValidation

data/lib/spout/commands/exporter.rb

@@ -23,7 +23,7 @@ module Spout
         CSV.open("#{folder}/#{variables_export_file}", "wb") do |csv|
           keys = %w(id display_name description type units domain labels calculation)
           csv << ['folder'] + keys
-          Dir.glob("variables/**/*.json").each do |file|
+          Dir.glob("variables/**/*.json").sort.each do |file|
             if json = JSON.parse(File.read(file)) rescue false
               variable_folder = variable_folder_path(file)
               csv << [variable_folder] + keys.collect{|key| json[key].kind_of?(Array) ? json[key].join(';') : json[key].to_s}
@@ -35,7 +35,7 @@ module Spout
         CSV.open("#{folder}/#{domains_export_file}", "wb") do |csv|
           keys = %w(value display_name description)
           csv << ['folder', 'domain_id'] + keys
-          Dir.glob("domains/**/*.json").each do |file|
+          Dir.glob("domains/**/*.json").sort.each do |file|
             if json = JSON.parse(File.read(file)) rescue false
               domain_folder = domain_folder_path(file)
               domain_name = extract_domain_name(file)

data/lib/spout/commands/importer.rb

@@ -1,5 +1,6 @@
 require 'csv'
 require 'json'
+require 'fileutils'
 
 module Spout
   module Commands

data/lib/spout/commands/test_runner.rb

@@ -0,0 +1,35 @@
+# module Spout
+#   module Commands
+#     class TestRunner
+#       def initialize(argv)
+#         verbose = (argv.delete('--verbose') != nil)
+
+#         puts "Loaded Suite test"
+
+#         files_loaded = []
+
+
+#         Dir.chdir("test") do
+#           $:.unshift(Dir.pwd)
+#           Dir.glob(File.join("**", "*_test.rb")).each do |test_file|
+#             files_loaded << test_file
+#             require 'spout/tests'
+#             Spout::Tests.class_eval File.read(test_file)
+#             # load test_file #.gsub(/\.rb$/, '')
+#           end
+#         end
+
+#         puts files_loaded.inspect
+#         puts Spout::Tests.constants
+
+#         Spout::Tests.constants.select{|c| Spout::Tests.const_get(c).is_a? Class}.each do |klass|
+#           puts "KLASS: #{klass}"
+#           my_instance = Spout::Tests.const_get(klass).new
+#           puts my_instance.methods.select{|m| m.to_s =~ /^test\_/}.inspect
+#         end
+#         # puts Spout::Tests::JsonValidation.methods
+
+#       end
+#     end
+#   end
+# end

data/lib/spout/templates/test/dictionary_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class DictionaryTest < Test::Unit::TestCase
+class DictionaryTest < Minitest::Test
   include Spout::Tests
 
   # You may add additional tests here

data/lib/spout/tests/domain_existence_validation.rb

@@ -2,7 +2,7 @@ module Spout
   module Tests
     module DomainExistenceValidation
 
-      def assert_domain_existence(item, msg = nil)
+      def assert_domain_existence(item)
         domain_names = Dir.glob("domains/**/*.json").collect{|file| file.split('/').last.to_s.downcase.split('.json').first}
 
         result = begin
@@ -13,10 +13,9 @@ module Spout
           false
         end
 
-        full_message = build_message(msg, "The domain #{domain_name} referenced by ? does not exist.", item)
-        assert_block(full_message) do
-          result
-        end
+        message = "The domain #{domain_name} referenced by #{item} does not exist."
+
+        assert result, message
       end
 
       Dir.glob("variables/**/*.json").each do |file|

data/lib/spout/tests/domain_format.rb

@@ -2,7 +2,7 @@ module Spout
   module Tests
     module DomainFormat
 
-      def assert_domain_format(item, msg = nil)
+      def assert_domain_format(item)
         result = begin
           json = JSON.parse(File.read(item))
           if json.kind_of?(Array)
@@ -14,10 +14,9 @@ module Spout
           false
         end
 
-        full_message = build_message(msg, "Must be an array of choice hashes. Ex:\n[\n  {\n    \"value\":        \"1\",\n    \"display_name\": \"Option 1\",\n    \"description\":  \"...\"\n  },\n  { ... },\n  ...\n]")
-        assert_block(full_message) do
-          result
-        end
+        message = "Must be an array of choice hashes. Ex:\n[\n  {\n    \"value\":        \"1\",\n    \"display_name\": \"Option 1\",\n    \"description\":  \"...\"\n  },\n  { ... },\n  ...\n]"
+
+        assert result, message
       end
 
       Dir.glob("domains/**/*.json").each do |file|

data/lib/spout/tests/domain_specified.rb

@@ -4,17 +4,11 @@ module Spout
   module Tests
     module DomainSpecified
 
-      def assert_domain_specified(domain_name, msg = nil)
-        full_message = build_message(msg, "Variables of type choices need to specify a domain.")
-        assert_block(full_message) do
-          domain_name != nil
-        end
-      end
-
       Dir.glob("variables/**/*.json").each do |file|
         if json_value(file, :type) == "choices"
           define_method("test_domain_specified:"+file) do
-            assert_domain_specified json_value(file, :domain)
+            domain_name = json_value(file, :domain)
+            assert domain_name != nil, "Variables of type choices need to specify a domain."
           end
         end
       end

data/lib/spout/tests/form_existence_validation.rb

@@ -2,7 +2,7 @@ module Spout
   module Tests
     module FormExistenceValidation
 
-      def assert_form_existence(item, msg = nil)
+      def assert_form_existence(item)
         form_names = Dir.glob("forms/**/*.json").collect{|file| file.split('/').last.to_s.downcase.split('.json').first}
 
         result = begin
@@ -11,10 +11,9 @@ module Spout
           false
         end
 
-        full_message = build_message(msg, "One or more forms referenced by ? does not exist.", item)
-        assert_block(full_message) do
-          result
-        end
+        message = "One or more forms referenced by #{item} does not exist."
+
+        assert result, message
       end
 
       Dir.glob("variables/**/*.json").each do |file|

data/lib/spout/tests/json_validation.rb

@@ -9,10 +9,9 @@ module Spout
           error = e
           false
         end
-        full_message = build_message(msg, "?", error)
-        assert_block(full_message) do
-          result
-        end
+
+        message = error.to_s
+        assert result, message
       end
 
       Dir.glob("variables/**/*.json").each do |file|

data/lib/spout/tests/variable_type_validation.rb

@@ -3,11 +3,9 @@ module Spout
     module VariableTypeValidation
       VALID_VARIABLE_TYPES = ['identifier', 'choices', 'integer', 'numeric', 'string', 'text', 'date', 'time', 'file', 'datetime'].sort
 
-      def assert_variable_type(item, msg = nil)
-        full_message = build_message(msg, "? invalid variable type. Valid types: #{VALID_VARIABLE_TYPES.join(', ')}", item)
-        assert_block(full_message) do
-          VALID_VARIABLE_TYPES.include?(item)
-        end
+      def assert_variable_type(item)
+        message = "#{item} invalid variable type. Valid types: #{VALID_VARIABLE_TYPES.join(', ')}"
+        assert VALID_VARIABLE_TYPES.include?(item), message
       end
 
       Dir.glob("variables/**/*.json").each do |file|

data/lib/spout/tests.rb

@@ -1,8 +1,68 @@
-require 'turn/autorun'
-require 'test/unit'
 require 'rubygems'
 require 'json'
 
+require 'minitest/autorun'
+require 'minitest/reporters'
+require 'ansi/code'
+
+module Minitest
+  module Reporters
+    class SpoutReporter < BaseReporter
+      include ANSI::Code
+      include RelativePosition
+
+      def start
+        super
+        print(white { 'Loaded Suite test' })
+        puts
+        puts
+        puts 'Started'
+        puts
+      end
+
+      def report
+        super
+        puts 'Finished in %.5f seconds.' % total_time
+        puts
+        print(white { '%d tests' } % count)
+        print(', %d assertions, ' % assertions)
+        color = failures.zero? && errors.zero? ? :green : :red
+        print(send(color) { '%d failures, %d errors, ' } % [failures, errors])
+        print(yellow { '%d skips' } % skips)
+        puts
+        puts
+      end
+
+      def record(test)
+        super
+        if !test.skipped? && test.failure
+          print "    "
+          print_colored_status(test)
+          print "    #{test.name}"
+          puts
+          print "             "
+          print test.failure
+          puts
+          puts
+        end
+      end
+
+      protected
+
+      def before_suite(suite)
+        puts suite
+      end
+
+      def after_suite(suite)
+        puts
+      end
+    end
+  end
+end
+
+Minitest::Reporters.use! Minitest::Reporters::SpoutReporter.new
+
+
 require 'spout/tests/json_validation'
 require 'spout/tests/variable_type_validation'
 require 'spout/tests/variable_name_uniqueness'
@@ -28,17 +88,5 @@ module Spout
     include Spout::Tests::FormExistenceValidation
     include Spout::Tests::FormNameUniqueness
     include Spout::Tests::FormNameMatch
-
-    Turn.config.trace = 1
-  end
-end
-
-require 'spout/hidden_reporter'
-
-module Turn
-  class Configuration
-    def reporter
-      @reporter ||= Spout::HiddenReporter.new(ENV['HIDE_PASSING_TESTS'] == 'true')
-    end
   end
 end

data/lib/spout/version.rb

@@ -3,7 +3,7 @@ module Spout
     MAJOR = 0
     MINOR = 8
     TINY = 0
-    BUILD = "beta13" # nil, "pre", "rc", "rc2"
+    BUILD = "beta14" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/lib/spout.rb

@@ -60,8 +60,6 @@ The most common spout commands are:
                     `spout new <project_name>` creates a new
                     data dictionary in `./<project_name>`
   [t]est            Run tests and show failing tests
-  [t] --verbose     Run the tests and show passing and failing
-                    tests
   [i]mport          Import a CSV file into the JSON dictionary
   [e]xport [1.0.0]  Export the JSON dictionary to CSV format
   [c]overage        Coverage report, requires dataset CSVs
@@ -93,8 +91,9 @@ EOT
   end
 
   def self.test(argv)
-    hide_passing_tests = (argv.delete('--verbose') == nil)
-    system "bundle exec rake#{' HIDE_PASSING_TESTS=true' if hide_passing_tests}"
+    system "bundle exec rake"
+    # require 'spout/commands/test_runner'
+    # Spout::Commands::TestRunner.new(argv)
   end
 
   def self.version(argv)

data/spout.gemspec

@@ -27,7 +27,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rake"
-  spec.add_dependency "turn"
+  spec.add_dependency "minitest"
+  spec.add_dependency "minitest-reporters"
   spec.add_dependency "json"
   spec.add_dependency "colorize", "~> 0.7.2"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.8.0.beta13
+  version: 0.8.0.beta14
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,7 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -103,13 +117,13 @@ files:
 - lib/spout/commands/importer.rb
 - lib/spout/commands/outliers.rb
 - lib/spout/commands/project_generator.rb
+- lib/spout/commands/test_runner.rb
 - lib/spout/helpers/array_statistics.rb
 - lib/spout/helpers/chart_types.rb
 - lib/spout/helpers/json_loader.rb
 - lib/spout/helpers/number_helper.rb
 - lib/spout/helpers/subject_loader.rb
 - lib/spout/helpers/table_formatting.rb
-- lib/spout/hidden_reporter.rb
 - lib/spout/models/coverage_result.rb
 - lib/spout/models/outlier_result.rb
 - lib/spout/models/subject.rb

data/lib/spout/hidden_reporter.rb

@@ -1,175 +0,0 @@
-require 'turn/reporter'
-
-module Spout
-  # = Based on Pretty Reporter (by Paydro)
-  # = Modified to hide passing tests
-  #
-  # Example output:
-  #    TestCaseName:
-  #         PASS test: Succesful test case.  (0:00:02:059)
-  #        ERROR test: Bogus test case.  (0:00:02:059)
-  #         FAIL test: Failed test case.  (0:00:02:059)
-  #
-  class HiddenReporter < Turn::Reporter
-    # Second column left padding in chars.
-    TAB_SIZE = 10
-
-    # Character to put in front of backtrace.
-    TRACE_MARK = '@ '
-
-    def initialize(hide_passing_tests)
-      @io      = $stdout
-      @trace   = nil
-      @natural = nil
-      @verbose = nil
-      @mark    = 0
-      @hide_passing_tests = hide_passing_tests
-    end
-
-    # At the very start, before any testcases are run, this is called.
-    def start_suite(suite)
-      @suite  = suite
-      @time   = Time.now
-
-      io.puts Turn::Colorize.bold("Loaded Suite #{suite.name}")
-      io.puts
-      if suite.seed
-        io.puts "Started at #{Time.now} w/ seed #{suite.seed}."
-      else
-        io.puts "Started at #{Time.now}."
-      end
-      io.puts
-    end
-
-    # Invoked before a testcase is run.
-    def start_case(kase)
-      # Print case name if there any tests in suite
-      # TODO: Add option which will show all test cases, even without tests?
-      io.puts kase.name if kase.size > 0
-    end
-
-    # Invoked before a test is run.
-    def start_test(test)
-      @test_time = Time.now
-      @test = test
-    end
-
-    # Invoked when a test passes.
-    def pass(message=nil)
-      unless @hide_passing_tests
-        banner PASS
-
-        if message
-          message = Turn::Colorize.magenta(message)
-          message = message.to_s.tabto(TAB_SIZE)
-
-          io.puts(message)
-        end
-      end
-    end
-
-    # Invoked when a test raises an assertion.
-    def fail(assertion, message=nil)
-      banner FAIL
-
-      prettify(assertion, message)
-    end
-
-    # Invoked when a test raises an exception.
-    def error(exception, message=nil)
-      banner ERROR
-
-      prettify(exception, message)
-    end
-
-    # Invoked when a test is skipped.
-    def skip(exception, message=nil)
-      banner SKIP
-
-      prettify(exception, message)
-    end
-
-    # Invoked after all tests in a testcase have ben run.
-    def finish_case(kase)
-      # Print newline is there any tests in suite
-      io.puts if kase.size > 0
-    end
-
-    # After all tests are run, this is the last observable action.
-    def finish_suite(suite)
-      total      = colorize_count("%d tests", suite.count_tests, :bold)
-      passes     = colorize_count("%d passed", suite.count_passes, :pass)
-      assertions = colorize_count("%d assertions", suite.count_assertions, nil)
-      failures   = colorize_count("%d failures", suite.count_failures, :fail)
-      errors     = colorize_count("%d errors", suite.count_errors, :error)
-      skips      = colorize_count("%d skips", suite.count_skips, :skip)
-
-      io.puts "Finished in %.6f seconds." % (Time.now - @time)
-      io.puts
-
-      io.puts [ total, passes, failures, errors, skips, assertions ].join(", ")
-
-      # Please keep this newline, since it will be useful when after test case
-      # there will be other lines. For example "rake aborted!" or kind of.
-      io.puts
-    end
-
-  private
-    # Creates an optionally-colorized string describing the number of occurances an event occurred.
-    #
-    # @param [String] str A printf-style string that expects an integer argument (i.e. the count)
-    # @param [Integer] count The number of occurances of the event being described.
-    # @param [nil, Symbol] colorize_method The method on Turn::Colorize to call in order to apply color to the result, or nil
-    #   to not apply any coloring at all.
-    def colorize_count(str, count, colorize_method)
-      str= str % [count]
-      str= Turn::Colorize.send(colorize_method, str) if colorize_method and count != 0
-      str
-    end
-
-    # TODO: Could also provide % done with time info. But it's already taking up
-    #       a lot of screen realestate. Maybe use --verbose flag to offer two forms.
-
-    # Outputs test case header for given event (error, fail & etc)
-    #
-    # Example:
-    #    PASS test: Test decription.  (0.15s 0:00:02:059)
-    def banner(event)
-      name = naturalized_name(@test)
-      delta = Time.now - @test_time  # test runtime
-      if @verbose
-        out = "%18s (%0.5fs) (%s) %s" % [event, delta, ticktock, name]
-      else
-        out = "%18s (%s) %s" % [event, ticktock, name]
-      end
-      if @mark > 0 && delta > @mark
-        out[1] = Turn::Colorize.mark('*')
-      end
-      io.puts out
-    end
-
-    # Cleanups and prints test payload
-    #
-    # Example:
-    #         fail is not 1
-    #       @ test/test_runners.rb:46:in `test_autorun_with_trace'
-    #         bin/turn:4:in `<main>'
-    def prettify(raised, message=nil)
-      # Get message from raised, if not given
-      message ||= raised.message
-
-      backtrace = raised.respond_to?(:backtrace) ? raised.backtrace : raised.location
-
-      # Filter and clean backtrace
-      backtrace = clean_backtrace(backtrace)
-
-      # Add trace mark to first line.
-      backtrace.first.insert(0, TRACE_MARK)
-
-      io.puts Turn::Colorize.bold(message.tabto(TAB_SIZE))
-      io.puts backtrace.shift.tabto(TAB_SIZE - TRACE_MARK.length)
-      io.puts backtrace.join("\n").tabto(TAB_SIZE)
-      io.puts
-    end
-  end
-end