polytrix 0.1.0.pre → 0.1.0

data/spec/polytrix/configuration_spec.rb

@@ -2,53 +2,14 @@ module Polytrix
   describe Configuration do
     subject(:configuration) { Configuration.new }
 
-    it 'creates a logger' do
-      expect(configuration.logger).to be_kind_of ::Logger
-    end
-
-    describe '.test_manifest' do
+    describe '.manifest' do
       it 'parses the YAML file and registers the manifest' do
-        original_manifest = configuration.test_manifest
-        configuration.test_manifest = 'spec/fixtures/polytrix_tests.yml'
-        new_manifest = configuration.test_manifest
+        original_manifest = configuration.manifest
+        configuration.manifest = 'spec/fixtures/polytrix.yml'
+        new_manifest = configuration.manifest
         expect(original_manifest).to_not eq(new_manifest)
         expect(new_manifest).to(be_an_instance_of(Polytrix::Manifest))
       end
     end
-
-    describe '.implementor' do
-      context 'argument is a Hash' do
-        it 'creates and registers Implementors' do
-          # This'd be a bit nicer w/ rspec 3...
-          expect do
-            configuration.implementor name: 'test', basedir: '.'
-          end.to change {
-            configuration.implementors
-          }.from(be_empty).to be_an_instance_of(Array)
-
-          expect(configuration.implementors.first).to be_an_instance_of Polytrix::Implementor
-          expect(configuration.implementors.first.name).to eq('test')
-        end
-      end
-      context 'argument is a String' do
-        context 'directory exists' do
-          context 'polytrix.yml does not exist' do
-            it 'builds an implementor with default settings' do
-              implementor = configuration.implementor('samples/sdks/ruby')
-              expect(implementor).to be_an_instance_of(Polytrix::Implementor)
-              expect(implementor.name).to eq('ruby') # directory name
-            end
-          end
-
-          context 'polytrix_tests.yml exists' do
-            it 'loads settings from polytrix.yml' do
-              implementor = configuration.implementor('samples/sdks/custom')
-              expect(implementor).to be_an_instance_of(Polytrix::Implementor)
-              expect(implementor.name).to eq('My Custom project')
-            end
-          end
-        end
-      end
-    end
   end
 end

data/spec/polytrix/documentation/helpers/code_helper_spec.rb

@@ -78,7 +78,7 @@ module Polytrix
 
         describe '#code_block' do
           it 'generates markdown code blocks by default' do
-            expected = "```ruby\n" + source + "\n```\n"
+            expected = "\n```ruby\n" + source + "\n```\n\n"
             code_block = challenge.code_block(challenge.source, 'ruby')
             expect(code_block).to eq(expected)
           end

data/spec/polytrix/documentation_generator_spec.rb

@@ -46,9 +46,11 @@ module Polytrix
         expect(generator.code2doc(source_file, 'ruby')).to eq(
           <<-eos.gsub(/^( |\t)+/, '')
           Comments are documentation
+
           ```ruby
           puts 'And this is a code block'
           ```
+
           eos
         )
       end

data/spec/polytrix/implementor_spec.rb

@@ -2,20 +2,62 @@ require 'spec_helper'
 
 module Polytrix
   describe Implementor do
-    subject(:implementor) { described_class.new(name: 'test', language: 'ruby', basedir: 'sdks/test') }
+    subject(:implementor) { described_class.new(name: 'test', language: 'ruby', basedir: expected_sdk_dir) }
+    let(:expected_sdk_dir) { 'samples/sdks/foo' }
     let(:executor) { double('executor') }
+    let(:expected_sdk_path) { Pathname.new(File.absolute_path(expected_sdk_dir)) }
 
     before do
       subject.executor = executor
     end
 
     describe '#bootstrap' do
+      # Need an implementor that's already cloned
+      let(:expected_sdk_dir) { 'samples/sdks/ruby' }
+
       it 'executes script/bootstrap' do
-        expect(executor).to receive(:execute).with('./scripts/bootstrap',  cwd: Pathname.new(File.absolute_path('sdks/test')), prefix: 'test')
+        expect(executor).to receive(:execute).with('./scripts/bootstrap',  cwd: expected_sdk_path, prefix: 'test')
         implementor.bootstrap
       end
     end
 
+    describe '#clone' do
+      it 'does nothing if there is no clone option' do
+        expect(executor).to_not receive(:execute)
+        implementor.clone
+
+        implementor.clone
+      end
+
+      context 'with git as a simple string' do
+        it 'clones the repo specified by the string' do
+          implementor.git = 'git@github.com/foo/bar'
+          expect(executor).to receive(:execute).with("git clone git@github.com/foo/bar -b master #{expected_sdk_path}", {})
+          implementor.clone
+        end
+      end
+
+      context 'with git as a hash' do
+        it 'clones the repo specified by the repo parameter' do
+          implementor.git = { repo: 'git@github.com/foo/bar' }
+          expect(executor).to receive(:execute).with("git clone git@github.com/foo/bar -b master #{expected_sdk_path}", {})
+          implementor.clone
+        end
+
+        it 'clones the repo on the branch specified by the brach parameter' do
+          implementor.git = { repo: 'git@github.com/foo/bar', branch: 'quuz' }
+          expect(executor).to receive(:execute).with("git clone git@github.com/foo/bar -b quuz #{expected_sdk_path}", {})
+          implementor.clone
+        end
+
+        it 'clones the repo to the location specified by the to parameter' do
+          implementor.git = { repo: 'git@github.com/foo/bar', to: 'sdks/foo' }
+          expect(executor).to receive(:execute).with('git clone git@github.com/foo/bar -b master sdks/foo', {})
+          implementor.clone
+        end
+      end
+    end
+
     describe '#build_challenge' do
       subject(:implementor) { Polytrix::Implementor.new name: 'some_sdk', basedir: File.absolute_path('spec/fixtures') }
       let(:challenge) { Fabricate(:challenge, name: 'factorial', vars: {}) }

data/spec/polytrix/manifest_spec.rb

@@ -1,14 +1,14 @@
 module Polytrix
   describe Manifest do
     describe '#from_yaml' do
-      subject(:manifest) { described_class.from_yaml 'spec/fixtures/polytrix_tests.yml' }
+      subject(:manifest) { described_class.from_yaml 'spec/fixtures/polytrix.yml' }
 
       it 'initializes a manifest' do
         expect(manifest).to be_an_instance_of Polytrix::Manifest
       end
 
       it 'processes ERB' do
-        expect(manifest.global_env['LOCALE']).to eq(ENV['LANG'])
+        expect(manifest.global_env.LOCALE).to eq(ENV['LANG'])
       end
 
       it 'parses global_env' do
@@ -16,12 +16,15 @@ module Polytrix
       end
 
       it 'parses suites' do
-        expect(manifest.suites).to be_an_instance_of Polytrix::Manifest::Suites
+        expect(manifest.suites).to be_an_instance_of Hashie::Hash
+        manifest.suites.each_value do | suite |
+          expect(suite).to be_an_instance_of Polytrix::Manifest::Suite
+        end
       end
 
       describe '#find_suite' do
         before(:each) do
-          Polytrix.configuration.test_manifest = 'samples/polytrix_tests.yml'
+          Polytrix.configuration.manifest = 'samples/polytrix.yml'
         end
         it 'returns nil if no suite matches' do
           suite = subject.find_suite('none')

data/spec/polytrix_spec.rb

@@ -2,23 +2,21 @@ require 'spec_helper'
 
 describe Polytrix do
   describe '.find_implementor' do
+    before do
+      Polytrix.configuration.manifest = 'samples/polytrix.yml'
+    end
+
     it 'returns nil if no implementor is found for the file' do
       tempfile = Tempfile.new(['foo', '.java'])
       expect(described_class.find_implementor tempfile.path).to be_nil
     end
 
-    it 'finds implementors from polytrix.yml in parent directories' do
-      sample_file = 'samples/sdks/custom/challenges/HelloWorld.custom'
-      implementor = described_class.find_implementor sample_file
-      expect(implementor).to be_an_instance_of Polytrix::Implementor
-      expect(implementor.name).to eq('My Custom project')
-    end
-
     it 'finds implementors from by matching basedir to an already loaded implementor' do
-      Polytrix.configuration.implementor(
-        name: 'java',
-        basedir: 'samples/sdks/java'
-      )
+      Polytrix.manifest.implementors['java'] = Fabricate(:implementor, name: 'java', basedir: 'samples/sdks/java')
+      # Polytrix.configuration.implementor(
+      #   name: 'java',
+      #   basedir: 'samples/sdks/java'
+      # )
 
       sample_file = 'samples/sdks/java/challenges/HelloWorld.java'
       implementor = described_class.find_implementor sample_file

data/spec/thor_spy.rb

@@ -43,6 +43,8 @@ class ThorSpy
       b.unshift("#{b.shift}: #{e.message} (#{e.class})")
       @stderr.puts(b.map { |s| "\tfrom #{s}" }.join("\n"))
       1
+    rescue SystemExit => e
+      e.status
     ensure
       # ...then we put them back.
       $stderr = STDERR

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polytrix
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.0
 platform: ruby
 authors:
 - Max Lincoln
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: buff-shell_out
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -190,17 +218,21 @@ files:
 - docs/samples/code2doc/python/hello_world.md
 - docs/samples/code2doc/python/quine.md
 - docs/samples/code2doc/ruby/hello_world.md
+- features/bootstrapping.feature
+- features/cloning.feature
 - features/execution.feature
 - features/fixtures/configs/empty.yml
 - features/fixtures/configs/hello_world.yml
-- features/fixtures/spec/polytrix_merge.rb
 - features/fixtures/spec/polytrix_spec.rb
-- features/reporting.feature
+- features/solo.feature
+- features/states.feature
 - features/step_definitions/sdk_steps.rb
 - features/support/env.rb
 - lib/polytrix.rb
 - lib/polytrix/challenge.rb
+- lib/polytrix/challenge_result.rb
 - lib/polytrix/challenge_runner.rb
+- lib/polytrix/challenges.rb
 - lib/polytrix/cli.rb
 - lib/polytrix/cli/add.rb
 - lib/polytrix/cli/report.rb
@@ -208,26 +240,41 @@ files:
 - 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/rundoc.rb
+- lib/polytrix/command/test.rb
 - lib/polytrix/configuration.rb
 - lib/polytrix/core/file_system_helper.rb
+- lib/polytrix/core/hashie.rb
 - lib/polytrix/core/implementor.rb
+- lib/polytrix/core/manifest_section.rb
+- lib/polytrix/core/string_helpers.rb
 - lib/polytrix/documentation/code_segmenter.rb
 - lib/polytrix/documentation/comment_styles.rb
 - lib/polytrix/documentation/helpers/code_helper.rb
 - lib/polytrix/documentation/view_helper.rb
 - lib/polytrix/documentation_generator.rb
-- lib/polytrix/executor.rb
+- lib/polytrix/error.rb
 - lib/polytrix/logger.rb
+- lib/polytrix/logging.rb
 - lib/polytrix/manifest.rb
 - lib/polytrix/result.rb
 - lib/polytrix/rspec.rb
 - lib/polytrix/rspec/documentation_formatter.rb
 - lib/polytrix/rspec/yaml_report.rb
+- lib/polytrix/runners/buff_shellout_executor.rb
+- lib/polytrix/runners/executor.rb
 - lib/polytrix/runners/linux_challenge_runner.rb
 - lib/polytrix/runners/middleware/change_directory.rb
 - lib/polytrix/runners/middleware/feature_executor.rb
 - lib/polytrix/runners/middleware/setup_env_vars.rb
+- lib/polytrix/runners/mixlib_shellout_executor.rb
 - lib/polytrix/runners/windows_challenge_runner.rb
+- lib/polytrix/state_file.rb
+- lib/polytrix/util.rb
 - lib/polytrix/validation.rb
 - lib/polytrix/validations.rb
 - lib/polytrix/validator.rb
@@ -235,17 +282,16 @@ files:
 - lib/polytrix/version.rb
 - polytrix.gemspec
 - polytrix.rb
-- polytrix_tests.yml
+- polytrix.yml
 - resources/code_sample.tt
 - samples/.gitignore
 - samples/_markdown.md
 - samples/default_bootstrap.rb
 - samples/polytrix.rb
+- samples/polytrix.yml
 - samples/polytrix_cli.sh
-- samples/polytrix_tests.yml
 - samples/scripts/bootstrap
 - samples/scripts/wrapper
-- samples/sdks/custom/polytrix.yml
 - samples/sdks/java/.gitignore
 - samples/sdks/java/build.gradle
 - samples/sdks/java/challenges/HelloWorld.java
@@ -260,10 +306,11 @@ files:
 - scripts/bootstrap
 - scripts/wrapper
 - spec/fabricators/challenge_fabricator.rb
+- spec/fabricators/implementor_fabricator.rb
 - spec/fabricators/manifest_fabricator.rb
 - spec/fabricators/validator_fabricator.rb
 - spec/fixtures/factorial.py
-- spec/fixtures/polytrix_tests.yml
+- spec/fixtures/polytrix.yml
 - spec/fixtures/src-doc/_scenario.md.erb
 - spec/fixtures/src-doc/quine.md.erb
 - spec/polytrix/challenge_runner_spec.rb
@@ -298,9 +345,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.0
@@ -308,19 +355,22 @@ signing_key:
 specification_version: 4
 summary: A polyglot test runner for sample code
 test_files:
+- features/bootstrapping.feature
+- features/cloning.feature
 - features/execution.feature
 - features/fixtures/configs/empty.yml
 - features/fixtures/configs/hello_world.yml
-- features/fixtures/spec/polytrix_merge.rb
 - features/fixtures/spec/polytrix_spec.rb
-- features/reporting.feature
+- features/solo.feature
+- features/states.feature
 - features/step_definitions/sdk_steps.rb
 - features/support/env.rb
 - spec/fabricators/challenge_fabricator.rb
+- spec/fabricators/implementor_fabricator.rb
 - spec/fabricators/manifest_fabricator.rb
 - spec/fabricators/validator_fabricator.rb
 - spec/fixtures/factorial.py
-- spec/fixtures/polytrix_tests.yml
+- spec/fixtures/polytrix.yml
 - spec/fixtures/src-doc/_scenario.md.erb
 - spec/fixtures/src-doc/quine.md.erb
 - spec/polytrix/challenge_runner_spec.rb

data/features/fixtures/spec/polytrix_merge.rb

@@ -1,5 +0,0 @@
-require 'polytrix'
-
-File.open('reports/polytrix.yaml', 'wb') do |f|
-  f.write Polytrix.merge_results(ARGV)
-end

data/features/reporting.feature

@@ -1,140 +0,0 @@
-Feature: Reporting
-
-  Polytrix creates YAML reports on teach test run. The reports are designed to be "deep mergable", so that you can split a test suite into separate threads running in parallel, each generating a separate report, and then merge them all to create a combined report.
-
-Scenario: A report for a single SDK
-    Given the ruby SDK
-    And the hello_world polytrix config
-    And the standard rspec setup
-    When I successfully run `bundle exec rspec -f Polytrix::RSpec::YAMLReport -o reports/polytrix.yaml`
-    Then the file "reports/polytrix.yaml" should contain exactly:
-    """
-    ---
-    global_env:
-      LOCALE: en_US.UTF-8
-      FAVORITE_NUMBER: '5'
-    suites:
-      Katas:
-        env:
-          NAME: Max
-        samples:
-          hello world:
-            ruby:
-              validations:
-              - validated_by: polytrix
-                result: passed
-              execution_result:
-                exitstatus: 0
-                stdout: |
-                  Hello, world!
-                stderr: ''
-              source_file: challenges/hello_world.rb
-
-    """
-
-Scenario: A report for several SDKS
-    Given the ruby SDK
-    And the java SDK
-    And the python SDK
-    And the hello_world polytrix config
-    And the standard rspec setup
-    When I successfully run `bundle exec rspec -f Polytrix::RSpec::YAMLReport -o reports/polytrix.yaml`
-    Then the file "reports/polytrix.yaml" should contain exactly:
-    """
-    ---
-    global_env:
-      LOCALE: en_US.UTF-8
-      FAVORITE_NUMBER: '5'
-    suites:
-      Katas:
-        env:
-          NAME: Max
-        samples:
-          hello world:
-            java:
-              validations:
-              - validated_by: polytrix
-                result: passed
-              execution_result:
-                exitstatus: 0
-                stdout: |
-                  Hello, world!
-                stderr: ''
-              source_file: challenges/HelloWorld.java
-            python:
-              validations:
-              - validated_by: polytrix
-                result: passed
-              execution_result:
-                exitstatus: 0
-                stdout: |
-                  Hello, world!
-                stderr: ''
-              source_file: challenges/hello_world.py
-            ruby:
-              validations:
-              - validated_by: polytrix
-                result: passed
-              execution_result:
-                exitstatus: 0
-                stdout: |
-                  Hello, world!
-                stderr: ''
-              source_file: challenges/hello_world.rb
-
-    """
-
-Scenario: Merging separate reports
-    Given the ruby SDK
-    And the java SDK
-    And the python SDK
-    And the hello_world polytrix config
-    And the standard rspec setup
-    When I successfully run `bundle exec rspec -f Polytrix::RSpec::YAMLReport -t ruby -o reports/polytrix-ruby.yaml`
-    When I successfully run `bundle exec rspec -f Polytrix::RSpec::YAMLReport -t java -o reports/polytrix-java.yaml`
-    When I successfully run `bundle exec rspec -f Polytrix::RSpec::YAMLReport -t python -o reports/polytrix-python.yaml`
-    And I successfully run `bundle exec ruby spec/polytrix_merge.rb reports/polytrix-java.yaml reports/polytrix-python.yaml reports/polytrix-ruby.yaml`
-    Then the file "reports/polytrix.yaml" should contain exactly:
-    """
-    ---
-    global_env:
-      LOCALE: en_US.UTF-8
-      FAVORITE_NUMBER: '5'
-    suites:
-      Katas:
-        env:
-          NAME: Max
-        samples:
-          hello world:
-            java:
-              validations:
-              - validated_by: polytrix
-                result: passed
-              execution_result:
-                exitstatus: 0
-                stdout: |
-                  Hello, world!
-                stderr: ''
-              source_file: challenges/HelloWorld.java
-            python:
-              validations:
-              - validated_by: polytrix
-                result: passed
-              execution_result:
-                exitstatus: 0
-                stdout: |
-                  Hello, world!
-                stderr: ''
-              source_file: challenges/hello_world.py
-            ruby:
-              validations:
-              - validated_by: polytrix
-                result: passed
-              execution_result:
-                exitstatus: 0
-                stdout: |
-                  Hello, world!
-                stderr: ''
-              source_file: challenges/hello_world.rb
-
-    """

data/lib/polytrix/executor.rb

@@ -1,89 +0,0 @@
-require 'hashie/dash'
-require 'thor'
-
-module Polytrix
-  module Executor
-    class OutputDecorator
-      # Reserve :red, :black, :white
-      COLORS = [:green, :yellow, :blue, :magenta, :cyan]
-
-      def self.next_color
-        @next_color ||= 0
-        @next_color += 1
-        COLORS[@next_color % COLORS.size]
-      end
-
-      def initialize(real_io, prefix = nil)
-        @real_io = real_io
-        # @prefix = set_color(prefix, :cyan)
-        @prefix = "#{prefix}: " if prefix
-        @color = self.class.next_color
-        @thor_shell = Thor::Shell::Color.new
-      end
-
-      def puts(line)
-        line = line.gsub(/^/, @prefix) if @prefix
-        @real_io.puts @thor_shell.set_color(line, @color)
-      end
-
-      def <<(line)
-        line = line.gsub(/^/, @prefix) if @prefix
-        @real_io << @thor_shell.set_color(line, @color)
-      end
-
-      def method_missing(meth, *args, &block)
-        @real_io.send meth, *args, &block
-      end
-    end
-
-    class ExecutionError < StandardError
-      attr_accessor :execution_result
-    end
-
-    class ExecutionResult < Hashie::Dash
-      property :exitstatus, require: true
-      property :stdout, required: true
-      property :stderr, required: true
-    end
-
-    class InteractiveExecutor
-      def execute(command, opts)
-        system command
-        # FIXME: This needs to return execution result, if interactive remains supported
-      end
-    end
-
-    class ShellOutExecutor
-      def execute(command, opts)
-        prefix = opts.delete :prefix
-        shell = Mixlib::ShellOut.new(command, opts)
-        shell.live_stream = OutputDecorator.new($stdout, prefix) unless Polytrix.configuration.suppress_output
-        shell.run_command
-        execution_result = ExecutionResult.new exitstatus: shell.exitstatus, stdout: shell.stdout, stderr: shell.stderr
-        begin
-          shell.error!
-        rescue Mixlib::ShellOut::ShellCommandFailed => e
-          execution_error = ExecutionError.new(e)
-          execution_error.execution_result = execution_result
-          raise execution_error
-        end
-
-        execution_result
-      end
-    end
-
-    attr_writer :executor
-
-    def executor
-      @executor ||= if ENV['INTERACTIVE']
-                      InteractiveExecutor.new
-                    else
-                      ShellOutExecutor.new
-                    end
-    end
-
-    def execute(command, opts = {})
-      executor.execute(command, opts)
-    end
-  end
-end

data/samples/sdks/custom/polytrix.yml

@@ -1,2 +0,0 @@
----
-name: My Custom project