psychic-runner 0.0.7 → 0.0.8

data/lib/psychic/runner/version.rb

@@ -1,5 +1,5 @@
 module Psychic
   class Runner
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

data/lib/psychic/shell/mixlib_shellout_executor.rb

@@ -37,7 +37,9 @@ module Psychic
         @logger = opts.delete(:logger) || logger
         @shell = Mixlib::ShellOut.new(command, opts)
         @shell.live_stream = IOToLog.new(@logger)
-        @shell.run_command
+        Bundler.with_clean_env do
+          @shell.run_command
+        end
         execution_result
       rescue SystemCallError, *MIXLIB_SHELLOUT_EXCEPTION_CLASSES, TypeError => e
         # See https://github.com/opscode/mixlib-shellout/issues/62

data/lib/psychic/task.rb

@@ -0,0 +1,14 @@
+module Psychic
+  class Runner
+    class Task < Strict.new(:name, :command)
+      def command
+        fail NotImplementedError, 'Subclasses must implement command'
+      end
+
+      def execute(opts)
+        puts "Executing: #{command}" if opts[:verbose]
+        executor.execute(command, opts)
+      end
+    end
+  end
+end

data/spec/psychic/runner/factories/bundler_detector_spec.rb

@@ -0,0 +1,90 @@
+module Psychic
+  class Runner
+    module Factories
+      RSpec.describe BundlerTaskFactory do
+        let(:shell) { Psychic::Shell.shell = double('shell') }
+        subject { described_class.new(cwd: current_dir) }
+
+        shared_context 'without bundler' do
+          before(:each) do
+            ENV['BUNDLE_GEMFILE'] = nil
+          end
+        end
+
+        shared_context 'with Gemfile' do
+          before(:each) do
+            ENV['BUNDLE_GEMFILE'] = nil
+            write_file 'Gemfile', ''
+          end
+        end
+
+        shared_context 'with .bundle/config' do
+          before(:each) do
+            ENV['BUNDLE_GEMFILE'] = nil
+            write_file '.bundle/config', <<-eos
+---
+BUNDLE_GEMFILE: "../../Gemfile"
+eos
+          end
+        end
+
+        shared_context 'with BUNDLE_GEMFILE environment variable' do
+          around(:each) do | example |
+            ENV['BUNDLE_GEMFILE'] = 'Gemfile'
+            example.run
+            ENV['BUNDLE_GEMFILE'] = nil
+          end
+        end
+
+        shared_examples 'does not use bundler' do
+          describe 'active?' do
+            it 'returns false' do
+              expect(subject.active?).to be false
+            end
+          end
+        end
+
+        shared_examples 'uses bundler' do
+          describe 'known_task?' do
+            it 'is true for bootstrap' do
+              expect(subject.known_task? :bootstrap).to be true
+            end
+            it 'is false for compile' do
+              expect(subject.known_task? :compile).to be false
+            end
+          end
+
+          describe '#bootstrap' do
+            it 'returns bundle install' do
+              expect(subject.build_task(:bootstrap)).to eq('bundle install')
+            end
+          end
+        end
+
+        context 'with Gemfile' do
+          include_context 'with Gemfile' do
+            include_examples 'uses bundler'
+          end
+        end
+
+        context 'with .bundle/config' do
+          include_context 'with .bundle/config' do
+            include_examples 'uses bundler'
+          end
+        end
+
+        context 'with BUNDLE_GEMFILE environment variable' do
+          include_context 'with BUNDLE_GEMFILE environment variable' do
+            include_examples 'uses bundler'
+          end
+        end
+
+        context 'without bundler' do
+          include_context 'without bundler' do
+            include_examples 'does not use bundler'
+          end
+        end
+      end
+    end
+  end
+end

data/spec/psychic/runner/{cold → factories}/shell_script_runner_spec.rb

@@ -1,7 +1,7 @@
 module Psychic
   class Runner
-    module Cold
-      RSpec.describe ShellScriptRunner do
+    module Factories
+      RSpec.describe ShellScriptTaskFactory do
         let(:shell) { Psychic::Shell.shell = double('shell') }
         subject { described_class.new(cwd: current_dir) }
 
@@ -21,15 +21,15 @@ module Psychic
           end
         end
 
-        describe 'respond_to?' do
+        describe 'known_task?' do
           shared_examples 'detects matching scripts' do
             it 'returns true if a matching script exists' do
-              expect(subject.respond_to? :bootstrap).to be true
-              expect(subject.respond_to? :compile).to be true
+              expect(subject.known_task? :bootstrap).to be true
+              expect(subject.known_task? :compile).to be true
             end
             it 'returns false if a matching script does not exists' do
-              expect(subject.respond_to? :foo).to be false
-              expect(subject.respond_to? :bar).to be false
+              expect(subject.known_task? :foo).to be false
+              expect(subject.known_task? :bar).to be false
             end
           end
 
@@ -46,13 +46,13 @@ module Psychic
           end
         end
 
-        describe '#method_missing' do
+        describe '#execute_task' do
           context 'matching a task' do
             context 'with scripts/*.sh files' do
               include_context 'with scripts/*.sh files' do
                 it 'executes the script command' do
                   expect(shell).to receive(:execute).with('./scripts/bootstrap.sh', cwd: current_dir)
-                  subject.bootstrap
+                  subject.execute_task :bootstrap
                 end
               end
             end
@@ -61,7 +61,7 @@ module Psychic
               include_context 'with scripts/* (no extension) files' do
                 it 'executes the script command' do
                   expect(shell).to receive(:execute).with('./scripts/bootstrap', cwd: current_dir)
-                  subject.bootstrap
+                  subject.execute_task :bootstrap
                 end
               end
             end

data/spec/psychic/runner/{hot_runner_spec.rb → hot_read_task_factory_spec.rb}

@@ -1,6 +1,6 @@
 module Psychic
   class Runner
-    RSpec.describe HotRunner do
+    RSpec.describe HotReadTaskFactory do
       let(:task_map) do
         {
           'bootstrap' => 'foo',
@@ -12,23 +12,22 @@ module Psychic
       subject { described_class.new(cwd: current_dir, hints: task_map) }
 
       shared_examples 'runs tasks' do
-        describe 'respond_to?' do
+        describe 'known_task?' do
           it 'returns true for task ids' do
             task_map.each_key do |key|
-              expect(subject.respond_to? key).to be true
+              expect(subject.known_task? key).to be true
             end
           end
 
           it 'returns false for anything else' do
-            expect(subject.respond_to? 'max').to be false
+            expect(subject.known_task? 'max').to be false
           end
         end
 
-        describe '#method_missing' do
+        describe '#task_for' do
           context 'matching a task' do
-            it 'executes the task command' do
-              expect(shell).to receive(:execute).with('foo', cwd: current_dir)
-              subject.bootstrap
+            it 'builds the task command' do
+              expect(subject.task_for(:bootstrap)).to eq('foo')
             end
           end
 

data/spec/psychic/runner/sample_finder_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module Psychic
+  class Runner
+    RSpec.describe SampleFinder do
+      context 'without hints' do
+        describe '#known_samples' do
+          it 'returns an empty list' do
+            expect(subject.known_samples).to be_empty
+          end
+        end
+      end
+
+      context 'with hints' do
+        let(:hints) do
+          {
+            'foo' => '/path/to/foo.c',
+            'bar' => '/path/to/bar.rb'
+          }
+        end
+        subject { described_class.new(Dir.pwd, hints) }
+
+        it 'returns the samples from the hints' do
+          samples = subject.known_samples
+          expect(samples.size).to eq(2)
+          expect(samples[0].name).to eq('foo')
+          expect(samples[0].source_file).to eq('/path/to/foo.c')
+          expect(samples[1].name).to eq('bar')
+          expect(samples[1].source_file).to eq('/path/to/bar.rb')
+        end
+      end
+    end
+  end
+end

data/spec/psychic/runner_spec.rb

@@ -20,8 +20,10 @@ module Psychic
       end
 
       describe 'initialize' do
-        it 'should create a HotRunner for the specified directory' do
-          expect(subject.hot_runner).to be_an_instance_of(Psychic::Runner::HotRunner)
+        it 'should create a HotReadTaskFactory for the specified directory' do
+          expect(subject.hot_read_task_factory).to(
+            be_an_instance_of Psychic::Runner::HotReadTaskFactory
+          )
           expect(subject.cwd).to eq(current_dir)
         end
       end
@@ -34,9 +36,9 @@ module Psychic
       end
 
       describe 'initialize' do
-        it 'should create a cold runner for ShellScriptRunner' do
-          expect(subject.cold_runners).to include(
-            an_instance_of(Psychic::Runner::Cold::ShellScriptRunner)
+        it 'should create a ShellScriptTaskFactory' do
+          expect(subject.task_factories).to include(
+            an_instance_of(Psychic::Runner::Factories::ShellScriptTaskFactory)
           )
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psychic-runner
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Max Lincoln
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -189,22 +189,31 @@ files:
 - bin/psychic
 - lib/psychic/cli.rb
 - lib/psychic/logger.rb
+- lib/psychic/output_helper.rb
 - lib/psychic/runner.rb
 - lib/psychic/runner/base_runner.rb
 - lib/psychic/runner/cli.rb
-- lib/psychic/runner/cold/shell_script_runner.rb
-- lib/psychic/runner/cold_runner_registry.rb
-- lib/psychic/runner/hot_runner.rb
+- lib/psychic/runner/code_helper.rb
+- lib/psychic/runner/code_sample.rb
+- lib/psychic/runner/factories/ruby_factories.rb
+- lib/psychic/runner/factories/shell_script_factories.rb
+- lib/psychic/runner/hot_read_task_factory.rb
+- lib/psychic/runner/magic_task_factory.rb
+- lib/psychic/runner/sample_finder.rb
 - lib/psychic/runner/sample_runner.rb
+- lib/psychic/runner/task_factory_registry.rb
 - lib/psychic/runner/version.rb
 - lib/psychic/shell.rb
 - lib/psychic/shell/execution_result.rb
 - lib/psychic/shell/mixlib_shellout_executor.rb
+- lib/psychic/task.rb
 - lib/psychic/tokens.rb
 - lib/psychic/util.rb
 - psychic-runner.gemspec
-- spec/psychic/runner/cold/shell_script_runner_spec.rb
-- spec/psychic/runner/hot_runner_spec.rb
+- spec/psychic/runner/factories/bundler_detector_spec.rb
+- spec/psychic/runner/factories/shell_script_runner_spec.rb
+- spec/psychic/runner/hot_read_task_factory_spec.rb
+- spec/psychic/runner/sample_finder_spec.rb
 - spec/psychic/runner_spec.rb
 - spec/spec_helper.rb
 homepage: 
@@ -232,7 +241,9 @@ signing_key:
 specification_version: 4
 summary: Psychic runs anything.
 test_files:
-- spec/psychic/runner/cold/shell_script_runner_spec.rb
-- spec/psychic/runner/hot_runner_spec.rb
+- spec/psychic/runner/factories/bundler_detector_spec.rb
+- spec/psychic/runner/factories/shell_script_runner_spec.rb
+- spec/psychic/runner/hot_read_task_factory_spec.rb
+- spec/psychic/runner/sample_finder_spec.rb
 - spec/psychic/runner_spec.rb
 - spec/spec_helper.rb

data/lib/psychic/runner/cold_runner_registry.rb

@@ -1,31 +0,0 @@
-module Psychic
-  class Runner
-    class ColdRunnerRegistry
-      include Psychic::Logger
-
-      BUILT_IN_DIR = File.expand_path('../cold', __FILE__)
-
-      class << self
-        def autoload_runners!
-          # Load built-in runners
-          Dir["#{BUILT_IN_DIR}/*.rb"].each do |cold_runner_file|
-            require cold_runner_file
-          end
-        end
-
-        def runner_classes
-          @runner_classes ||= Set.new
-        end
-
-        def register(klass)
-          runner_classes.add klass
-        end
-
-        def active_runners(opts)
-          runners = runner_classes.map { |k| k.new(opts) }
-          runners.select(&:active?)
-        end
-      end
-    end
-  end
-end