polytrix 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57453fe422a3e27d1aaa87f79689d05c8aa9bcc0
-  data.tar.gz: b3fd502c953d29fba9948eb12053b1341d1ce15b
+  metadata.gz: a7ffce1e75b5eb183162405a377b984462fc0bc9
+  data.tar.gz: 747e6c4a45538f02101cb551c2e8e766efd0fbfe
 SHA512:
-  metadata.gz: 3ad963f3478969e5d44cfce5f10e652d94acaa488a9fe5969c377f0ca1133325c022201e211338be5d1b9917664ccdef702b307564cd9258e621d62ca26050c7
-  data.tar.gz: 80e47b9677116fbc2652dc38a54ab0979bc11b10a00cffee865a1026a3bb1609763464a1a67d455714ec3832df1cac33f9676dbae827f309a54d1e4164900d4a
+  metadata.gz: 13df8aff0ebe16f43ad0ea00d7e77e463c2675a316a9d660c3955475ff631fb9e030f619bfe6c11ac0fb0c5844a57e366654b5c77ad32c1abb136fc66088e2a8
+  data.tar.gz: ac2e37d38cd6b2823d05c88199f0fc03ab55887628f9020472ca6d3bfff9bf8a2c034bb56e06f2d58b065b140efdca980fe80baa60c1316fcde1bbdf5fd88dad

data/features/states.feature

@@ -34,7 +34,7 @@ Feature: States
     Then the output should contain:
     """
     Suite  Scenario     Implementor  Status
-    Katas  hello world  ruby         Verified (Level 0)
+    Katas  hello world  ruby         Verified (x1)
     Katas  hello world  java         <Not Found>
     Katas  hello world  python       Executed
     """

data/lib/polytrix/challenge.rb

@@ -89,14 +89,12 @@ module Polytrix
       end
 
       display_file = relativize(absolute_source_file, Dir.pwd)
-      banner "Generating documentation from #{display_file}"
+      banner "Generating documentation for #{slug} from #{display_file}"
       target_dir = Polytrix.configuration.documentation_dir
       format = Polytrix.configuration.documentation_format
-      # language = options[:lang]
-      language = '.rb'
       target_file_name = File.basename(source_file, File.extname(source_file)) + ".#{format}"
       target_file = File.join(target_dir, target_file_name)
-      doc = Polytrix::DocumentationGenerator.new.code2doc(absolute_source_file, language)
+      doc = Polytrix::DocumentationGenerator.new.code2doc(absolute_source_file)
       FileUtils.mkdir_p File.dirname(target_file)
       File.write(target_file, doc)
       info "Documentated saved to #{target_file}"
@@ -106,19 +104,21 @@ module Polytrix
 
     def destroy_action
       perform_action(:destroy, 'Destroying') do
-        # @state_file.destroy
-        # @state_file = nil
+        @state_file.destroy
+        @state_file = nil
+        @validations = nil
+        @state = {}
       end
-      @state_file.destroy
-      @state_file = nil
     end
 
     def verify_action
       perform_action(:verify, 'Verifying') do
         validators = Polytrix::ValidatorRegistry.validators_for self
         validators.each do |validator|
-          validator.validate self
+          validator.validate(self)
+          validations << validator.description
         end
+        @state['validations'] = validations
       end
     end
 
@@ -133,12 +133,12 @@ module Polytrix
     end
 
     def action(what, &block)
-      state = state_file.read
+      @state = state_file.read
       elapsed = Benchmark.measure do
-        # synchronize_or_call(what, state, &block)
-        block.call(state)
+        # synchronize_or_call(what, @state, &block)
+        block.call(@state)
       end
-      state['last_action'] = what.to_s
+      @state['last_action'] = what.to_s
       elapsed
     rescue Polytrix::FeatureNotImplementedError => e
       raise e
@@ -152,7 +152,7 @@ module Polytrix
       fail ActionFailed,
            "Failed to complete ##{what} action: [#{e.message}]", e.backtrace
     ensure
-      state_file.write(state)
+      state_file.write(@state) unless what == :destroy
     end
 
     # Returns the last successfully completed action state of the instance.
@@ -162,6 +162,10 @@ module Polytrix
       state_file.read['last_action']
     end
 
+    def validations
+      @validations ||= (state_file.read['validations'] || [])
+    end
+
     def transition_to(desired)
       transition_result = nil
       begin

data/lib/polytrix/challenge_runner.rb

@@ -11,6 +11,8 @@ module Polytrix
     include Polytrix::Core::FileSystemHelper
     include Polytrix::Runners::Executor
 
+    attr_accessor :env
+
     def self.create_runner
       case RbConfig::CONFIG['host_os']
       when /mswin(\d+)|mingw/i
@@ -30,8 +32,6 @@ module Polytrix
     end
 
     def run_challenge(challenge)
-      # Logging.mdc['implementor'] = "\033[35m#{challenge.implementor.name}\033[0m"
-      # Logging.mdc['scenario'] = "\033[32m#{challenge.name}\033[0m"
       middleware.call(challenge)
       challenge.result
     end

data/lib/polytrix/cli/report.rb

@@ -1,12 +1,12 @@
 module Polytrix
-  module CLI
-    module Reports
-      # autoload :TextReporter, 'polytrix/cli/reports/text_reporter'
-      autoload :MarkdownReporter, 'polytrix/cli/reports/markdown_reporter'
-      # autoload :HTMLReporter, 'polytrix/cli/reports/html_reporter'
-      autoload :JSONReporter, 'polytrix/cli/reports/json_reporter'
-      autoload :YAMLReporter, 'polytrix/cli/reports/yaml_reporter'
-    end
+  module Reports
+    # autoload :TextReporter, 'polytrix/cli/reports/text_reporter'
+    autoload :MarkdownReporter, 'polytrix/cli/reports/markdown_reporter'
+    # autoload :HTMLReporter, 'polytrix/cli/reports/html_reporter'
+    autoload :JSONReporter, 'polytrix/cli/reports/json_reporter'
+    autoload :YAMLReporter, 'polytrix/cli/reports/yaml_reporter'
+  end
+  module Command
     class Report < Polytrix::CLI::Base
       # class_options = super.class_options
       class_option :format, desc: 'Output format for the report', default: 'text', enum: %w(text markdown json yaml)

data/lib/polytrix/cli.rb

@@ -45,7 +45,6 @@ module Polytrix
     def initialize(*args)
       super
       $stdout.sync = true
-      # Polytrix.logger = Polytrix.default_file_logger
     end
 
     desc 'list [INSTANCE|REGEXP|all]', 'Lists one or more scenarios'
@@ -74,6 +73,32 @@ module Polytrix
       perform('list', 'list', args, options)
     end
 
+    desc 'report [INSTANCE|REGEXP|all]', 'Summary report for one or more scenarios'
+    method_option :bare,
+                  aliases: '-b',
+                  type: :boolean,
+                  desc: 'List the name of each scenario only, one per line'
+    method_option :log_level,
+                  aliases: '-l',
+                  desc: 'Set the log level (debug, info, warn, error, fatal)'
+    method_option :manifest,
+                  aliases: '-m',
+                  desc: 'The Polytrix test manifest file location',
+                  default: 'polytrix.yml'
+    method_option :test_dir,
+                  aliases: '-t',
+                  desc: 'The Polytrix test directory',
+                  default: 'tests/polytrix'
+    method_option :solo,
+                  desc: 'Enable solo mode - Polytrix will auto-configure a single implementor and its scenarios'
+                  # , default: 'polytrix.yml'
+    method_option :solo_glob,
+                  desc: 'The globbing pattern to find code samples in solo mode'
+    def report(*args)
+      update_config!
+      perform('report', 'report', args, options)
+    end
+
     {
       clone: "Change scenario state to cloned. " \
                     "Clone the code sample from git",
@@ -202,7 +227,7 @@ module Polytrix
     end
     map %w[-v --version] => :version
 
-    # register Polytrix::Generator::Init, "init",
+    # register Polytrix::CLI::Report, "init",
     #   "init", "Adds some configuration to your cookbook so Polytrix can rock"
     # long_desc <<-D, :for => "init"
     #   Init will add Test Polytrix support to an existing project for
@@ -210,7 +235,7 @@ module Polytrix
     #   intended to be customized) is created in the project's root directory
     #   and one or more gems will be added to the project's Gemfile.
     # D
-    # tasks["init"].options = Polytrix::Generator::Init.class_options
+    # tasks["init"].options = Polytrix::CLI::Report.class_options
 
     private
 

data/lib/polytrix/command/list.rb

@@ -43,7 +43,7 @@ module Polytrix
         when 'clone' then colorize('Cloned', :cyan)
         when 'bootstrap' then colorize('Bootstrapped', :magenta)
         when 'exec' then colorize('Executed', :blue)
-        when 'verify' then colorize("Verified (Level #{challenge.verification_level})", :yellow)
+        when 'verify' then colorize("Verified (x#{challenge.validations.count})", :yellow)
         when nil then colorize('<Not Found>', :red)
         else colorize("<Unknown (#{challenge.last_action})>", :white)
         end

data/lib/polytrix/command/report.rb

@@ -0,0 +1,94 @@
+module Polytrix
+  module Reports
+    # autoload :TextReporter, 'polytrix/cli/reports/text_reporter'
+    autoload :MarkdownReporter, 'polytrix/cli/reports/markdown_reporter'
+    # autoload :HTMLReporter, 'polytrix/cli/reports/html_reporter'
+    autoload :JSONReporter, 'polytrix/cli/reports/json_reporter'
+    autoload :YAMLReporter, 'polytrix/cli/reports/yaml_reporter'
+  end
+  module Command
+    class Report < Polytrix::Command::Base
+      def call
+        fail StandardError, 'Report command not yet implemented - work in progress'
+        # setup
+        # @tests = parse_subcommand(args.first)
+        # tests_by_implementor = @tests.group_by(&:implementor)
+
+        # table = [
+        #   [
+        #     colorize('SDK', :green), colorize('Passed', :green),
+        #     colorize('Failed', :red), colorize('Pending', :yellow),
+        #     colorize('Skipped', :cyan)
+        #   ]
+        # ]
+        # load_results.each do |sdk, sdk_summary|
+        #   table << [sdk, sdk_summary[:passed], sdk_summary[:failed], sdk_summary[:pending], sdk_summary[:skipped]]
+        # end
+        # shell.print_table table
+      end
+
+      private
+
+      def count(results, state)
+        results.count do |r|
+          result.last_action.to_s == state.to_s
+        end
+      end
+
+      def load_results
+        result_stats = Hash.new do |hash, sdk|
+          hash[sdk] = { passed: 0, failed: 0, pending: 0, skipped: 0 }
+        end
+        Polytrix.manifest.suites.reduce(result_stats) do |hash, (suite_name, suite)|
+          suite.samples.each do |sample, suite_results|
+            Polytrix.implementors.map(&:name).each do |sdk|
+              result = Result.new(suite_results[sdk])
+              result.validations << Validation.new(validated_by: 'polytrix', result: 'skipped')
+              hash[sdk][result.status.to_sym] += 1
+            end
+          end
+          hash
+        end
+        result_stats
+      end
+
+      def reporter
+        @reporter ||= case options[:format]
+                      when 'text'
+                        self
+                      when 'markdown'
+                        Polytrix::CLI::Reports::MarkdownReporter.new
+                      when 'json'
+                        Polytrix::CLI::Reports::JSONReporter.new
+                      when 'yaml'
+                        Polytrix::CLI::Reports::YAMLReporter.new
+                      else
+                        fail "Unknown report format #{options[:format]}"
+                      end
+      end
+
+      def print_table(*args)
+        shell.print_table(*args)
+      end
+
+      def colorize(string, *args)
+        shell.set_color(string, *args)
+      end
+
+      def color_pad(string)
+        string + colorize('', :white)
+      end
+
+      def format_last_action(challenge)
+        case challenge.last_action
+        when 'clone' then colorize('Cloned', :cyan)
+        when 'bootstrap' then colorize('Bootstrapped', :magenta)
+        when 'exec' then colorize('Executed', :blue)
+        when 'verify' then colorize("Verified (Level #{challenge.verification_level})", :yellow)
+        when nil then colorize('<Not Found>', :red)
+        else colorize("<Unknown (#{challenge.last_action})>", :white)
+        end
+      end
+    end
+  end
+end

data/lib/polytrix/command.rb

@@ -87,10 +87,11 @@ module Polytrix
       def solo_setup
         suites = {}
         solo_basedir = @options.solo
-        solo_glob = @options.fetch(:solo_glob, "**/*.{#{SUPPORTED_EXTENSIONS.join(',')}}")
+        solo_glob = @options.fetch('solo_glob', "**/*.{#{SUPPORTED_EXTENSIONS.join(',')}}")
         Dir[File.join(solo_basedir, solo_glob)].each do | code_sample |
           code_sample = Pathname.new(code_sample)
           suite_name = relativize(code_sample.dirname, solo_basedir).to_s
+          suite_name = solo_basedir if suite_name == '.'
           scenario_name = code_sample.basename(code_sample.extname).to_s
           suite = suites[suite_name] ||= Polytrix::Manifest::Suite.new(samples: [])
           suite.samples << scenario_name

data/lib/polytrix/configuration.rb

@@ -61,7 +61,7 @@ module Polytrix
     end
 
     def default_validator
-      @default_validator ||= Validator.new(suite: //, scenario: //, &default_validator_callback)
+      @default_validator ||= Validator.new('default validator', suite: //, scenario: //, &default_validator_callback)
     end
 
     attr_writer :default_validator_callback

data/lib/polytrix/core/file_system_helper.rb

@@ -12,11 +12,14 @@ module Polytrix
         potential_files.concat Dir.glob(glob_string.gsub('_', '-'), File::FNM_CASEFOLD)
         potential_files.concat Dir.glob(glob_string.gsub('_', ''), File::FNM_CASEFOLD)
 
-        # Find the first file, not including generated files
-        file = potential_files.find do |f|
+        # Filter out ignored filesFind the first file, not including generated files
+        files = potential_files.select do |f|
           !ignored? ignored_patterns, search_path, f
         end
 
+        # Select the shortest path, likely the best match
+        file = files.min_by(&:length)
+
         fail FileNotFound, "No file was found for #{scenario_name} within #{search_path}" if file.nil?
         Pathname.new file
       end

data/lib/polytrix/documentation_generator.rb

@@ -40,7 +40,7 @@ module Polytrix
       end
     end
 
-    def code2doc(source_file, language)
+    def code2doc(source_file, language = nil)
       source_code = File.read(source_file)
       if language.nil?
         language, comment_style = Documentation::CommentStyles.infer File.extname(source_file)

data/lib/polytrix/manifest.rb

@@ -45,6 +45,8 @@ module Polytrix
     end
 
     class Environment < Hashie::Mash
+      include Hashie::Extensions::Coercion
+      coerce_value Integer, String
     end
 
     class CodeSample < Polytrix::ManifestSection

data/lib/polytrix/reports/hash_reporter.rb

@@ -0,0 +1,28 @@
+require 'csv'
+
+module Polytrix
+  module Reports
+    class HashReporter
+      def initialize(io = $stdout)
+        @buffer = io
+      end
+
+      def print_table(table)
+        headers = table[0]
+        data = []
+        table[1..-1].map do |row|
+          row_data = {}
+          row.each_with_index do |value, index|
+            row_data[headers[index]] = value
+          end
+          data << row_data
+        end
+        @buffer.puts convert(data)
+      end
+
+      def convert(data)
+        fail 'Subclass HashReporter and convert the data to the target format'
+      end
+    end
+  end
+end

data/lib/polytrix/reports/json_reporter.rb

@@ -0,0 +1,12 @@
+require 'json'
+require 'polytrix/cli/reports/hash_reporter'
+
+module Polytrix
+  module Reports
+    class JSONReporter < HashReporter
+      def convert(data)
+        JSON.pretty_generate data
+      end
+    end
+  end
+end

data/lib/polytrix/reports/markdown_reporter.rb

@@ -0,0 +1,21 @@
+module Polytrix
+  module Reports
+    class MarkdownReporter
+      def initialize(io = $stdout)
+        @buffer = io
+      end
+
+      def print_table(table)
+        @buffer.puts # Markdown tables don't always render properly without a break
+        header_data = table[0]
+        header_line = header_data.join ' | '
+        @buffer.puts header_line
+        @buffer.puts header_line.gsub(/[^|]/, '-')
+
+        table[1..-1].each do |data_line|
+          @buffer.puts data_line.join ' | '
+        end
+      end
+    end
+  end
+end

data/lib/polytrix/reports/yaml_reporter.rb

@@ -0,0 +1,12 @@
+require 'yaml'
+require 'polytrix/cli/reports/hash_reporter'
+
+module Polytrix
+  module Reports
+    class YAMLReporter < HashReporter
+      def convert(data)
+        YAML.dump data
+      end
+    end
+  end
+end

data/lib/polytrix/rspec.rb

@@ -19,7 +19,7 @@ module Polytrix
               samples.each do |scenario|
                 describe scenario.name do
                   Polytrix.implementors.each do |sdk|
-                    it sdk.name, sdk.name.to_sym => true do
+                    it sdk.name, sdk.name.to_sym => true do | example |
                       begin
                         skip "#{sdk.name} is not setup" unless File.directory? sdk.basedir
                         slug = Polytrix::Challenge.slugify(suite_name, scenario.name, sdk.name)

data/lib/polytrix/runners/executor.rb

@@ -15,6 +15,7 @@ module Polytrix
 
     module Executor
       attr_writer :executor
+      attr_accessor :env
 
       def executor
         @executor ||= if RUBY_PLATFORM == 'java'
@@ -25,6 +26,7 @@ module Polytrix
       end
 
       def execute(command, opts = {})
+        opts[:env] = env unless env.nil?
         executor.execute(command, opts)
       end
     end

data/lib/polytrix/runners/linux_challenge_runner.rb

@@ -8,9 +8,10 @@ module Polytrix
       def challenge_command(env_file, challenge_script)
         challenge_script = "./#{challenge_script}" unless challenge_script.to_s.start_with? '/'
         if File.exist? 'scripts/wrapper'
-          ". #{env_file} && scripts/wrapper #{challenge_script}"
+          # ". #{env_file} && scripts/wrapper #{challenge_script}"
+          "scripts/wrapper #{challenge_script}"
         else
-          ". #{env_file} && #{challenge_script}"
+          "#{challenge_script}"
         end
       end
 

data/lib/polytrix/runners/middleware/setup_env_vars.rb

@@ -18,21 +18,23 @@ module Polytrix
           end
           vars = vars.merge env[:vars].dup
 
-          env[:env_file] = setup_env_vars(env[:name], vars, env[:challenge_runner])
+          setup_env_vars(env[:name], vars, env[:challenge_runner])
+          # env[:env_file] = setup_env_vars(env[:name], vars, env[:challenge_runner])
           @app.call env
         end
 
         private
 
         def setup_env_vars(challenge_name, vars, challenge_runner)
-          FileUtils.mkdir_p 'tmp'
-          extension = challenge_runner.script_extension
-          file = File.open(slugify("tmp/#{challenge_name}_vars.#{extension}"), 'w')
-          vars.each do |key, value|
-            file.puts challenge_runner.save_environment_variable(key, value)
-          end
-          file.close
-          file.path
+          challenge_runner.env = vars.to_hash
+          # FileUtils.mkdir_p 'tmp'
+          # extension = challenge_runner.script_extension
+          # file = File.open(slugify("tmp/#{challenge_name}_vars.#{extension}"), 'w')
+          # vars.each do |key, value|
+          #   file.puts challenge_runner.save_environment_variable(key, value)
+          # end
+          # file.close
+          # file.path
         end
       end
     end

data/lib/polytrix/state_file.rb

@@ -11,7 +11,7 @@ module Polytrix
 
     def read
       if File.exist?(file_name)
-        Hashie::Mash.load(file_name).dup
+        Hashie::Mash.load(file_name).dup || {}
       else
         Hashie::Mash.new
       end

data/lib/polytrix/validator.rb

@@ -5,9 +5,10 @@ module Polytrix
     include RSpec::Matchers
 
     UNIVERSAL_MATCHER = //
-    attr_reader :suite, :sample, :level, :callback
+    attr_reader :description, :suite, :sample, :level, :callback
 
-    def initialize(scope = {}, &validator)
+    def initialize(description, scope = {}, &validator)
+      @description = description
       @suite = scope[:suite] ||= UNIVERSAL_MATCHER
       @sample = scope[:sample] ||= UNIVERSAL_MATCHER
       @callback = validator
@@ -20,5 +21,9 @@ module Polytrix
     def validate(challenge)
       instance_exec challenge, &@callback if should_validate?(challenge)
     end
+
+    def to_s
+      @description
+    end
   end
 end

data/lib/polytrix/validator_registry.rb

@@ -13,11 +13,8 @@ module Polytrix
         instance.validators
       end
 
-      def register(validator, &callback)
-        if block_given?
-          match_rules = validator
-          validator = Validator.new(match_rules, &callback)
-        end
+      def register(validator, scope = {}, &callback)
+        validator = Validator.new(validator, scope, &callback) if block_given?
         validators << validator
       end
 

data/lib/polytrix/version.rb

@@ -1,3 +1,3 @@
 module Polytrix
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/polytrix.rb

@@ -101,12 +101,9 @@ module Polytrix
 
     # Registers a {Polytrix::Validator} that will be used during test
     # execution on matching {Polytrix::Challenge}s.
-    def validate(scope = { suite: //, sample: // }, validator = nil, &block)
-      if block_given?
-        validator = Polytrix::Validator.new(scope, &block)
-      elsif validator.nil?
-        fail ArgumentError 'You must a block or a Validator as the second argument'
-      end
+    def validate(desc, scope = { suite: //, sample: // }, &block)
+      fail ArgumentError 'You must pass block' unless block_given?
+      validator = Polytrix::Validator.new(desc, scope, &block)
 
       Polytrix::ValidatorRegistry.register validator
       validator

data/polytrix.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "mixlib-shellout", "~> 1.3" # Used for MRI
   spec.add_dependency "buff-shell_out", "~> 0.1"  # Used for JRuby
   spec.add_dependency "middleware", "~> 0.1"
-  spec.add_dependency "rspec", "~> 2.99"
+  spec.add_dependency "rspec", "~> 3.0"
   spec.add_dependency "hashie", "~> 3.0"
   spec.add_dependency "padrino-helpers", "~> 0.12"
   spec.add_development_dependency "bundler", "~> 1.5"

data/samples/polytrix.rb

@@ -1,18 +1,14 @@
 require 'polytrix'
 
-RSpec.configure do |c|
-  c.expose_current_running_example_as :example
-end
-
-Polytrix.validate suite: 'Katas', sample: 'hello world' do |challenge|
+Polytrix.validate 'Hello world validator', suite: 'Katas', sample: 'hello world' do |challenge|
   expect(challenge.result.stdout).to eq "Hello, world!\n"
 end
 
-Polytrix.validate suite: 'Katas', sample: 'quine' do |challenge|
+Polytrix.validate 'Quine output matches source code', suite: 'Katas', sample: 'quine' do |challenge|
   expect(challenge.result.stdout).to eq(challenge.source)
 end
 
-Polytrix.validate do |challenge|
+Polytrix.validate 'default validator' do |challenge|
   expect(challenge.result.exitstatus).to eq(0)
   expect(challenge.result.stderr).to be_empty
   expect(challenge.result.stdout).to end_with "\n"

data/samples/tests/polytrix/validators.rb

@@ -0,0 +1,15 @@
+require 'polytrix'
+
+Polytrix.validate 'Hello world validator', suite: 'Katas', sample: 'hello world' do |challenge|
+  expect(challenge.result.stdout).to eq "Hello, world!\n"
+end
+
+Polytrix.validate 'Quine output matches source code', suite: 'Katas', sample: 'quine' do |challenge|
+  expect(challenge.result.stdout).to eq(challenge.source)
+end
+
+Polytrix.validate 'default validator' do |challenge|
+  expect(challenge.result.exitstatus).to eq(0)
+  expect(challenge.result.stderr).to be_empty
+  expect(challenge.result.stdout).to end_with "\n"
+end

data/spec/fabricators/validator_fabricator.rb

@@ -3,9 +3,11 @@ require 'hashie/mash'
 Fabricator(:validator, from: Polytrix::Validator) do
   initialize_with do
     callback = @_transient_attributes.delete :callback
+    desc = @_transient_attributes.delete :description
     scope = @_transient_attributes
-    @_klass.new(scope, &callback)
+    @_klass.new(desc, scope, &callback)
   end # Hash based initialization
+  transient description: 'Sample validator'
   transient suite: LANGUAGES.sample
   transient sample: SAMPLE_NAMES.sample
   transient callback: Proc.new { Proc.new { |challenge| } } # rubocop:disable Proc

data/spec/polytrix/validator_registry_spec.rb

@@ -5,11 +5,12 @@ module Polytrix
     describe '#register' do
       it 'registers a validator' do
         callback = proc do |challenge|
+          expect(challenge[:result]).to_not be_nil
           expect(challenge[:result].execution_result.exitstatus).to eq(0)
         end
 
         expect(registry.validators).to be_empty
-        registry.register suite: 'java', sample: 'hello world', &callback
+        registry.register(Validator.new('dummy', suite: 'java', sample: 'hello world', &callback))
         validator = registry.validators.first
         expect(validator.suite).to eql('java')
         expect(validator.sample).to eql('hello world')

data/spec/polytrix/validator_spec.rb

@@ -6,14 +6,14 @@ module Polytrix
       let(:global_matcher) { Validator::UNIVERSAL_MATCHER }
 
       it 'accepts scope options and callback' do
-        validator = Validator.new suite: 'java', sample: 'hello world' do |challenge|
+        validator = Validator.new 'dummy', suite: 'java', sample: 'hello world' do |challenge|
           # Validate the challenge
         end
         expect(validator.suite).to eq('java')
       end
 
       it 'defaults suite and sample to the universal matcher' do
-        validator = Validator.new do |challenge|
+        validator = Validator.new 'dummy' do |challenge|
           # Validate
         end
         expect(validator.suite).to eq(Validator::UNIVERSAL_MATCHER)
@@ -44,7 +44,7 @@ module Polytrix
 
       xit 'calls the validation callback' do
         called = false
-        validator = Validator.new do |challenge|
+        validator = Validator.new 'dummy' do |challenge|
           called = true
         end
         expect { validator.validate challenge }.to change { called }.from(false).to(true)
@@ -55,7 +55,7 @@ module Polytrix
       scope = {}
       scope[:suite] = args[0]
       scope[:sample] = args[1] if args[1]
-      Validator.new scope do |challenge|
+      Validator.new 'dummy', scope do |challenge|
         # Dummy validator
       end
     end

data/spec/polytrix_spec.rb

@@ -28,7 +28,7 @@ describe Polytrix do
   describe '.validate' do
     context 'block given' do
       it 'creates and registers a validator' do
-        Polytrix.validate suite: 'test', sample: 'test' do |challenge|
+        Polytrix.validate 'custom validator', suite: 'test', sample: 'test' do |challenge|
           # Validate the challenge results
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polytrix
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Max Lincoln
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -234,16 +234,12 @@ files:
 - lib/polytrix/challenge_runner.rb
 - lib/polytrix/challenges.rb
 - lib/polytrix/cli.rb
-- lib/polytrix/cli/add.rb
 - lib/polytrix/cli/report.rb
-- lib/polytrix/cli/reports/hash_reporter.rb
-- lib/polytrix/cli/reports/json_reporter.rb
-- lib/polytrix/cli/reports/markdown_reporter.rb
-- lib/polytrix/cli/reports/yaml_reporter.rb
 - lib/polytrix/color.rb
 - lib/polytrix/command.rb
 - lib/polytrix/command/action.rb
 - lib/polytrix/command/list.rb
+- lib/polytrix/command/report.rb
 - lib/polytrix/command/rundoc.rb
 - lib/polytrix/command/test.rb
 - lib/polytrix/configuration.rb
@@ -261,6 +257,10 @@ files:
 - lib/polytrix/logger.rb
 - lib/polytrix/logging.rb
 - lib/polytrix/manifest.rb
+- lib/polytrix/reports/hash_reporter.rb
+- lib/polytrix/reports/json_reporter.rb
+- lib/polytrix/reports/markdown_reporter.rb
+- lib/polytrix/reports/yaml_reporter.rb
 - lib/polytrix/result.rb
 - lib/polytrix/rspec.rb
 - lib/polytrix/rspec/documentation_formatter.rb
@@ -303,6 +303,7 @@ files:
 - samples/sdks/python/challenges/quine.py
 - samples/sdks/python/scripts/wrapper
 - samples/sdks/ruby/challenges/hello_world.rb
+- samples/tests/polytrix/validators.rb
 - scripts/bootstrap
 - scripts/wrapper
 - spec/fabricators/challenge_fabricator.rb

data/lib/polytrix/cli/add.rb

@@ -1,67 +0,0 @@
-module Polytrix
-  module CLI
-    class Add < Polytrix::CLI::Base
-      include Thor::Actions
-      desc 'sample IMPLEMENTOR SCENARIO', 'Add a code sample for an implementor'
-      # sdk_options
-      method_option :language, type: 'string', desc: 'Programming language to use (if not already configured by the implementor)', default: 'rb'
-      def sample(implementor, scenario)
-        # implementor = pick_implementor(options[:sdk])
-        implementor = pick_implementor implementor
-        language = implementor.language || options[:language]
-        generate_source implementor, scenario, language
-      end
-
-      protected
-
-      source_root Polytrix.configuration.template_dir
-      # source_root implementor.basedir
-
-      def generate_source(implementor, scenario, language)
-        source_paths.prepend File.expand_path(implementor.basedir)
-        @implementor = implementor
-        @scenario = implementor.build_challenge(
-          name: scenario
-        )
-        @language = language
-
-        output_file = File.join(implementor.basedir, "#{scenario.gsub(' ', '_')}.#{language}")
-        template('code_sample.tt', output_file)
-      end
-
-      def commented(comment)
-        return if comment.nil?
-
-        buffer = StringIO.new
-        _lang, comment_style = Polytrix::Documentation::CommentStyles.infer @language
-        if use_multiline? comment, comment_style
-          buffer.puts comment_style[:multi][:start]
-          comment.lines.each do |line|
-            buffer.puts comment_line(line, comment_style[:multi][:middle])
-          end
-          buffer.puts comment_style[:multi][:end]
-        else
-          comment.lines.each do |line|
-            buffer.puts comment_line(line, comment_style[:single])
-          end
-        end
-        buffer.string
-      end
-
-      def comment_line(line, comment_string)
-        comment_string ||= ''
-        if line.strip.empty?
-          whitespace, line = line.gsub("\n", ''), ''
-        else
-          whitespace, line = line.rstrip.match(/([\s]*)(.*)/).captures
-        end
-
-        "#{whitespace}#{comment_string} #{line}"
-      end
-
-      def use_multiline?(comment, comment_style)
-        comment.lines.size > 1 && !comment_style[:multi].nil? && (comment_style[:multi][:idiomatic] != false)
-      end
-    end
-  end
-end

data/lib/polytrix/cli/reports/hash_reporter.rb

@@ -1,30 +0,0 @@
-require 'csv'
-
-module Polytrix
-  module CLI
-    module Reports
-      class HashReporter
-        def initialize(io = $stdout)
-          @buffer = io
-        end
-
-        def print_table(table)
-          headers = table[0]
-          data = []
-          table[1..-1].map do |row|
-            row_data = {}
-            row.each_with_index do |value, index|
-              row_data[headers[index]] = value
-            end
-            data << row_data
-          end
-          @buffer.puts convert(data)
-        end
-
-        def convert(data)
-          fail 'Subclass HashReporter and convert the data to the target format'
-        end
-      end
-    end
-  end
-end

data/lib/polytrix/cli/reports/json_reporter.rb

@@ -1,14 +0,0 @@
-require 'json'
-require 'polytrix/cli/reports/hash_reporter'
-
-module Polytrix
-  module CLI
-    module Reports
-      class JSONReporter < HashReporter
-        def convert(data)
-          JSON.pretty_generate data
-        end
-      end
-    end
-  end
-end

data/lib/polytrix/cli/reports/markdown_reporter.rb

@@ -1,23 +0,0 @@
-module Polytrix
-  module CLI
-    module Reports
-      class MarkdownReporter
-        def initialize(io = $stdout)
-          @buffer = io
-        end
-
-        def print_table(table)
-          @buffer.puts # Markdown tables don't always render properly without a break
-          header_data = table[0]
-          header_line = header_data.join ' | '
-          @buffer.puts header_line
-          @buffer.puts header_line.gsub(/[^|]/, '-')
-
-          table[1..-1].each do |data_line|
-            @buffer.puts data_line.join ' | '
-          end
-        end
-      end
-    end
-  end
-end

data/lib/polytrix/cli/reports/yaml_reporter.rb

@@ -1,14 +0,0 @@
-require 'yaml'
-require 'polytrix/cli/reports/hash_reporter'
-
-module Polytrix
-  module CLI
-    module Reports
-      class YAMLReporter < HashReporter
-        def convert(data)
-          YAML.dump data
-        end
-      end
-    end
-  end
-end