tryouts 2.0.4 → 2.1.0

data/.gitignore

@@ -1,2 +1 @@
-*.gemspec
 pkg

data/CHANGES.txt

@@ -1,5 +1,13 @@
 TRYOUTS, CHANGES
 
+#### 2.1.0 (2011-02-12) ###############################
+
+* CHANGE: Default output is less verbose (eg. PASS/FAIL/SKIP)
+* CHANGE: -q now prints nothing to STDOUT. Check $?. If 0, all tests pass
+          otherwise it contains the number of tests that failed. 
+* ADDED: -v option for increased output.
+
+
 #### 2.0.4 (2011-01-06) ###############################
 
 * ADDED: -q option for reduced output.

data/README.rdoc

@@ -61,15 +61,41 @@ All code before the first test definition is assumed to be setup code. All code
 
 Try ships with a command-line tool called <tt>try</tt>. When called with no arguments, it will look for files ending with _try.rb in the current directory, or in the subfolder try.
 
-http://delano.github.com/tryouts/screens/tryouts-2.0-success.png
-    
 You can also supply a specific file to test.
 
     $ try path/2/test.rb
+    Ruby 1.9.1 @ 2011-01-06 12:38:29 -0500               
+    
+     # TEST 1: test matches result with expectation             
+    7    a = 1 + 1
+    8    #=> 2
+         ==  2
+    ...
+    
+     ## TEST 12: comments, tests, and expectations can 
+     ## contain multiple lines 
+    13   a = 1
+    14   b = 2
+    15   a + b
+    16   # => 3
+    17   # => 2 + 1
+         ==  3
+         ==  3
+    
+     12 of 12 tests passed (and 5 skipped)
+    
 
 If all tests pass, try exits with a 0. Otherwise it exits with the number of tests that failed. 
 
-http://delano.github.com/tryouts/screens/tryouts-2.0-failure.png
+
+For reduced output, use the `-q` option:
+
+    $ try -q
+    Ruby 1.9.1 @ 2011-01-06 12:38:29 -0500               
+
+     42 of 42 tests passed (and 5 skipped)
+      4 of 4 batches passed
+    
 
 == Installation
 
@@ -92,5 +118,6 @@ With help from:
 
 * Syntenic[http://syntenic.com/] for the hackfest venue. 
 * AlexPeuchert[http://www.rubypulse.com/] for the screencast.
+* Christian Michon for suggesting a better default output format. 
 
 <i>This collision was brought to you by Montreal.rb.</i>

data/Rakefile

@@ -33,7 +33,7 @@ end
 
 
 Rake::RDocTask.new do |rdoc|
-  version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}.#{config[:BUILD]}"
+  version = "#{config[:MAJOR]}.#{config[:MINOR]}.#{config[:PATCH]}}"
   rdoc.rdoc_dir = "doc"
   rdoc.title = "stella #{version}"
   rdoc.rdoc_files.include("README*")

data/VERSION.yml

@@ -1,5 +1,4 @@
 --- 
 :MAJOR: 2
-:MINOR: 0
-:PATCH: 4
-:BUILD: '001'
+:MINOR: 1
+:PATCH: 0

data/bin/try

@@ -7,6 +7,7 @@
 # 
 #      $ try 
 #      $ try -q 
+#      $ try -v
 #      $ try path/2/file.rb
 #      $ try -q path/2/file.rb path/2/another.rb
 #
@@ -23,7 +24,13 @@ require 'tryouts'
   $:.unshift dir
 end
 
+unless ARGV.delete('-V').nil?
+  puts "Tryouts: #{Tryouts::VERSION}"
+  exit
+end
+
 Tryouts.quiet = !ARGV.delete('-q').nil?  # eg try -q [PATH]
+Tryouts.noisy = !ARGV.delete('-v').nil?  # eg try -v [PATH]
 
 if ARGV.empty?
   paths = Dir.glob(File.join(Dir.pwd, '{try,tryouts}', '*_{try,tryouts}.rb'))

data/lib/tryouts.rb

@@ -12,10 +12,7 @@ class Tryouts
       load_config
       [@version[:MAJOR], @version[:MINOR], @version[:PATCH]].join('.')
     end
-    def self.inspect
-      load_config
-      [@version[:MAJOR], @version[:MINOR], @version[:PATCH], @version[:BUILD]].join('.')
-    end
+    alias_method :inspect, :to_s
     def self.load_config
       require 'yaml'
       @version ||= YAML.load_file(File.join(TRYOUTS_LIB_HOME, '..', 'VERSION.yml'))
@@ -27,11 +24,12 @@ end
 class Tryouts
   @debug = false
   @quiet = false
+  @noisy = false
   @container = Class.new
   @cases = []
   @sysinfo = nil
   class << self
-    attr_accessor :debug, :container, :quiet
+    attr_accessor :debug, :container, :quiet, :noisy
     attr_reader :cases
     
     def sysinfo
@@ -56,30 +54,42 @@ class Tryouts
         
         path = batch.path.gsub(/#{Dir.pwd}\/?/, '')
         
-        msg '%-60s %s' % [path, ''] unless Tryouts.quiet # status
+        vmsg '%-60s %s' % [path, '']
         
         before_handler = Proc.new do |t|
-          msg Console.reverse(' %-58s ' % [t.desc.to_s]) unless Tryouts.quiet
-          msg t.test.inspect, t.exps.inspect unless Tryouts.quiet
+          if Tryouts.noisy
+            vmsg Console.reverse(' %-58s ' % [t.desc.to_s]) 
+            vmsg t.test.inspect, t.exps.inspect
+          end
         end
         
         batch.run(before_handler) do |t|
           if t.failed? 
             failed_tests += 1
-            msg Console.color(:red, t.failed.join($/)), $/ unless Tryouts.quiet
+            if Tryouts.noisy 
+              vmsg Console.color(:red, t.failed.join($/)), $/
+            else
+              msg ' %s (%s:%s)' % [Console.color(:red, "FAIL"), path, t.exps.first]
+            end
           elsif t.skipped? || !t.run?
             skipped_tests += 1
-            msg Console.bright(t.skipped.join($/)), $/ unless Tryouts.quiet
+            if Tryouts.noisy
+              vmsg Console.bright(t.skipped.join($/)), $/
+            else
+              msg ' SKIP (%s:%s)' % [path, t.exps.first]
+            end
           else
-            msg Console.color(:green, t.passed.join($/)), $/ unless Tryouts.quiet
+            if Tryouts.noisy
+              vmsg Console.color(:green, t.passed.join($/)), $/
+            else
+              msg ' %s' % [Console.color(:green, 'PASS')]
+            end
           end
-          
           all += 1
-          
         end
       end
       
-      msg unless Tryouts.quiet
+      msg
       if all > 0
         suffix = 'tests passed'
         suffix << " (and #{skipped_tests} skipped)" if skipped_tests > 0
@@ -97,7 +107,7 @@ class Tryouts
     end
     
     def cformat(*args)
-      Console.bright '%3d of %d %s' % args
+      Console.bright '%d of %d %s' % args
     end
     
     def run path
@@ -175,12 +185,17 @@ class Tryouts
     end
     
     def print str
+      return if Tryouts.quiet
       STDOUT.print str
       STDOUT.flush
     end
     
+    def vmsg *msg
+      STDOUT.puts *msg if !Tryouts.quiet && Tryouts.noisy
+    end
+    
     def msg *msg
-      STDOUT.puts *msg
+      STDOUT.puts *msg unless Tryouts.quiet
     end
     
     def err *msg

data/tryouts.gemspec

@@ -0,0 +1,53 @@
+# 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{tryouts}
+  s.version = "2.1.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Delano Mandelbaum"]
+  s.date = %q{2011-02-12}
+  s.default_executable = %q{try}
+  s.description = %q{Don't waste your time writing tests}
+  s.email = %q{delano@solutious.com}
+  s.executables = ["try"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGES.txt",
+     "LICENSE.txt",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "bin/try",
+     "lib/sysinfo.rb",
+     "lib/tryouts.rb",
+     "try/step1_try.rb",
+     "try/step2_try.rb",
+     "try/step3_try.rb",
+     "try/step4_try.rb",
+     "tryouts.gemspec"
+  ]
+  s.homepage = %q{http://github.com/delano/tryouts}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{tryouts}
+  s.rubygems_version = %q{1.5.2}
+  s.summary = %q{Don't waste your time writing tests}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end
+

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: tryouts
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 4
-  version: 2.0.4
+  prerelease: 
+  version: 2.1.0
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 -05:00
+date: 2011-02-12 00:00:00 -05:00
 default_executable: try
 dependencies: []
 
@@ -42,6 +37,7 @@ files:
 - try/step2_try.rb
 - try/step3_try.rb
 - try/step4_try.rb
+- tryouts.gemspec
 has_rdoc: true
 homepage: http://github.com/delano/tryouts
 licenses: []
@@ -56,23 +52,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: tryouts
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Don't waste your time writing tests