spout 0.2.0 → 0.3.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b17c5cb1d0059611bb4ebb9807ffb83f5015a765
-  data.tar.gz: 3c3e5d7493590ecfffcb6a7534d73b4ce0f56bee
+  metadata.gz: ac53c71982fc81b63947e6de99639a70f1a4c0e9
+  data.tar.gz: 4f13cfb9b25c7a07acec482ddf6ee57bb72cc7d2
 SHA512:
-  metadata.gz: 50846a11d41e8654a283a5836bd9d5496745bdf4c0707e2a7494ceca86633ac743ac2f9fda054185a5ebe6f0c72bf218414c4b7d71fa05deda1541ab368f2bad
-  data.tar.gz: 08da58a7d5533b2210144e66d30158e825131a24f968f956cd7d64aae584084b3c97aed6acdb00d47351132158ca44dbab0aa9862874681d010ba4d08438d8b3
+  metadata.gz: a81fcf660ba4a79ad38d64dec2d9bbde2a5a0702a513036f9f79f508ff78df83c007f2e551f81bfefb270d254ac3820d3f324dfadd35af2229d355070a15b410
+  data.tar.gz: b041c265cea682d7729b0ca7d2149d1c143c7399d23b8a190e500ee259ea76eb9e845b0b920e4c271c539ed56fedaf59f005d9d33a9da1be70f742fba54db812

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.3.0
+
+### Enhancements
+- Tests now hide passing tests by default
+  - To show all tests, use `spout tv`, or verbose tests
+- Exports will now create a folder based on the version specified in the `VERSION` file located in the root of the data dictionary
+  - If a version is specified, `spout export 1.0.1` then the command line version is used
+  - If no version is specified, and no `VERSION` file exists, then the default `1.0.0` is used
+  - The version must be specified on the first line in the `VERSION` file
+- Use of Ruby 2.0.0-p247 is now recommended
+
 ## 0.2.0 (June 26, 2013)
 
 ### Enhancements

data/lib/spout/actions.rb

@@ -9,6 +9,8 @@ module Spout
         puts "Spout #{Spout::VERSION::STRING}"
       when 'test', 't', 'te', 'tes', '--test', '-t', '-te', '-tes'
         system "bundle exec rake"
+      when 'tv'
+        system "bundle exec rake VERBOSE_TESTS=true"
       when 'import', 'i', 'im', 'imp', '--import', '-i', '-im', '-imp'
         import_from_csv(argv)
       when 'import_domain', '--import_domain', 'import_domains', '--import_domains'
@@ -53,7 +55,9 @@ The most common spout commands are:
   [n]ew             Create a new Spout dictionary.
                     "spout new my_dd" creates a new data
                     dictionary called MyDD in "./my_dd"
-  [t]est            Running the test file
+  [t]est            Run tests and show failing tests
+  [tv]              Run the tests and show passing and failing
+                    tests
   [i]mport          Import a CSV file into the JSON repository
   [e]xport [1.0.0]  Export the JSON respository to a CSV
  h[y]brid  [1.0.0]  Export the JSON repository in the Hybrid

data/lib/spout/hidden_reporter.rb

@@ -0,0 +1,175 @@
+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(show_passing = false)
+      @io      = $stdout
+      @trace   = nil
+      @natural = nil
+      @verbose = nil
+      @mark    = 0
+      @show_passing = show_passing
+    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)
+      if @show_passing
+        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

data/lib/spout/tasks/engine.rake

@@ -19,7 +19,7 @@ namespace :dd do
   desc 'Create Data Dictionary from repository'
   task :create do
 
-    folder = "dd/#{ENV['VERSION'] || '1.0.0'}"
+    folder = "dd/#{ENV['VERSION'] || standard_version}"
     FileUtils.mkpath folder
 
     case ENV['TYPE']
@@ -44,6 +44,11 @@ namespace :dd do
   end
 end
 
+def standard_version
+  version = File.open('VERSION', &:readline).strip rescue ''
+  version == '' ? '1.0.0' : version
+end
+
 def standard_export(folder)
   CSV.open("#{folder}/variables.csv", "wb") do |csv|
     keys = %w(id display_name description type units domain labels calculation)

data/lib/spout/tests.rb

@@ -18,3 +18,13 @@ module Spout
     Turn.config.trace = 1
   end
 end
+
+require 'spout/hidden_reporter'
+
+module Turn
+  class Configuration
+    def reporter
+      @reporter ||= Spout::HiddenReporter.new(ENV['VERBOSE_TESTS'] == 'true')
+    end
+  end
+end

data/lib/spout/version.rb

@@ -1,9 +1,9 @@
 module Spout
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY = 0
-    BUILD = nil # nil, "pre", "rc", "rc2"
+    BUILD = "rc" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0.rc
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,6 +92,7 @@ files:
 - bin/spout
 - lib/spout/actions.rb
 - lib/spout/application.rb
+- lib/spout/hidden_reporter.rb
 - lib/spout/tasks/engine.rake
 - lib/spout/tasks.rb
 - lib/spout/templates/Gemfile
@@ -128,9 +129,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3