assert 1.0.0 → 1.1.0

data/README.md

@@ -193,6 +193,8 @@ $ rake test halt_on_fail=true             # force halt on failure using an env v
 
 ## Rake Tasks
 
+**Note**: rake task handling is deprecated and will be removed in v2.0
+
 Assert provides some rake task helpers that will scan your test folder and recursively generate rake tasks for each one of your test folders or files.  Test files must end in either `'_test.rb'` or `'_tests.rb'`.  Use this as an alternative to running ruby on each one of your test files individually.
 
 As an example, say your test folder has a file structure like so:

data/bin/assert

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+#
+# Copyright (c) 2011-Present Kelly Redding and Collin Redding
+#
+
+require 'assert/cli'
+Assert::CLI.run ARGV

data/lib/assert/cli.rb

@@ -0,0 +1,137 @@
+require 'set'
+require 'assert/version'
+
+module Assert
+
+  class CLI
+
+    def self.run(*args)
+      self.new.run(*args)
+    end
+
+    def initialize
+      @cli = CLIRB.new
+    end
+
+    def run(*args)
+      begin
+        @cli.parse!(*args)
+        tests = @cli.args
+        tests = ['test'] if tests.empty?
+        Assert::CLIRunner.new(*tests).run
+      rescue CLIRB::HelpExit
+        puts help
+      rescue CLIRB::VersionExit
+        puts Assert::VERSION
+      rescue CLIRB::Error => exception
+        puts "#{exception.message}\n"
+        puts help
+        exit(1)
+      rescue Exception => exception
+        puts "#{exception.class}: #{exception.message}"
+        puts exception.backtrace.join("\n") if ENV['DEBUG']
+        exit(1)
+      end
+
+      # Don't call `exit(0)`.  The test suite runs as the by an `at_exit`
+      # callback.  Calling `exit(0)` bypasses that callback.
+    end
+
+    def help
+      "Usage: assert [TESTS] [options]\n\n"\
+      "Options:"\
+      "#{@cli}"
+    end
+
+  end
+
+  class CLIRunner
+    TEST_FILE_SUFFIXES = ['_tests.rb', '_test.rb']
+
+    attr_reader :test_files
+
+    def initialize(*args)
+      options, test_paths = [
+        args.last.kind_of?(::Hash) ? args.pop : {},
+        args
+      ]
+
+      @test_files = file_paths(test_paths).select{ |f| test_file?(f) }
+    end
+
+    def run
+      @test_files.each{ |file| require file }
+      require 'assert' if @test_files.empty?  # show empty test output
+    end
+
+    private
+
+    def file_paths(test_paths)
+      test_paths.inject(Set.new) do |paths, path|
+        paths += Dir.glob("#{path}*") + Dir.glob("#{path}*/**/*")
+      end
+    end
+
+    def test_file?(path)
+      TEST_FILE_SUFFIXES.inject(false) do |result, suffix|
+        result || path =~ /#{suffix}$/
+      end
+    end
+  end
+
+  class CLIRB  # Version 1.0.0, https://github.com/redding/cli.rb
+    Error    = Class.new(RuntimeError);
+    HelpExit = Class.new(RuntimeError); VersionExit = Class.new(RuntimeError)
+    attr_reader :argv, :args, :opts, :data
+
+    def initialize(&block)
+      @options = []; instance_eval(&block) if block
+      require 'optparse'
+      @data, @args, @opts = [], [], {}; @parser = OptionParser.new do |p|
+        p.banner = ''; @options.each do |o|
+          @opts[o.name] = o.value; p.on(*o.parser_args){ |v| @opts[o.name] = v }
+        end
+        p.on_tail('--version', ''){ |v| raise VersionExit, v.to_s }
+        p.on_tail('--help',    ''){ |v| raise HelpExit,    v.to_s }
+      end
+    end
+
+    def option(*args); @options << Option.new(*args); end
+    def parse!(argv)
+      @args = (argv || []).dup.tap do |args_list|
+        begin; @parser.parse!(args_list)
+        rescue OptionParser::ParseError => err; raise Error, err.message; end
+      end; @data = @args + [@opts]
+    end
+    def to_s; @parser.to_s; end
+    def inspect
+      "#<#{self.class}:#{'0x0%x' % (object_id << 1)} @data=#{@data.inspect}>"
+    end
+
+    class Option
+      attr_reader :name, :opt_name, :desc, :abbrev, :value, :klass, :parser_args
+
+      def initialize(name, *args)
+        settings, @desc = args.last.kind_of?(::Hash) ? args.pop : {}, args.pop || ''
+        @name, @opt_name, @abbrev = parse_name_values(name, settings[:abbrev])
+        @value, @klass = gvalinfo(settings[:value])
+        @parser_args = if [TrueClass, FalseClass, NilClass].include?(@klass)
+          ["-#{@abbrev}", "--[no-]#{@opt_name}", @desc]
+        else
+          ["-#{@abbrev}", "--#{@opt_name} #{@opt_name.upcase}", @klass, @desc]
+        end
+      end
+
+      private
+
+      def parse_name_values(name, custom_abbrev)
+        [ (processed_name = name.to_s.strip.downcase), processed_name.gsub('_', '-'),
+          custom_abbrev || processed_name.gsub(/[^a-z]/, '').chars.first || 'a'
+        ]
+      end
+      def gvalinfo(v); v.kind_of?(Class) ? [nil,gklass(v)] : [v,gklass(v.class)]; end
+      def gklass(k); k == Fixnum ? Integer : k; end
+    end
+  end
+
+end

data/lib/assert/rake_tasks.rb

@@ -17,6 +17,8 @@ module Assert::RakeTasks
   end
 
   def self.install
+    warn "[DEPRECATED] `Assert::RakeTasts` has been deprecated.  Support for running tests with Rake will be removed in v2.0.  Use the assert CLI instead."
+
     assert_test_root = ENV['ASSERT_TEST_ROOT'] || './test'
 
     if File.exists?(assert_test_root)

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: assert
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-21 00:00:00 Z
+date: 2013-02-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ansi
@@ -37,8 +37,8 @@ description: Test::Unit style testing framework, just better than Test::Unit.
 email: 
 - kelly@kellyredding.com
 - collin.redding@me.com
-executables: []
-
+executables: 
+- assert
 extensions: []
 
 extra_rdoc_files: []
@@ -51,9 +51,11 @@ files:
 - README.md
 - Rakefile
 - assert.gemspec
+- bin/assert
 - lib/assert.rb
 - lib/assert/assertions.rb
 - lib/assert/autorun.rb
+- lib/assert/cli.rb
 - lib/assert/context.rb
 - lib/assert/macro.rb
 - lib/assert/macros/methods.rb