Merge pull request #40 from customink/no_pty_windows

Don't use PTY when running on Windows

Author: Seth Vargo

lib/strainer/cli.rb

@@ -15,6 +15,7 @@
 # limitations under the License.
 #
 
+require 'buff/platform'
 require 'strainer'
 require_relative 'strainerfile'
 
@@ -65,7 +66,7 @@ def initialize(*args)
     class_option :strainer_file,  :type => :string,  :aliases => '-s',  :desc => 'The path to the Strainer file to run against', :banner => 'FILE', :default => Strainer::Strainerfile::DEFAULT_FILENAME
     class_option :sandbox,        :type => :string,  :aliases => '-s',  :desc => 'The sandbox path (defaults to a temporary directory)', :default => Dir.mktmpdir
     class_option :debug,          :type => :boolean, :aliases => '-d',  :desc => 'Show debugging log output', :default => false
-    class_option :color,          :type => :boolean, :aliases => '-co', :desc => 'Enable color in Strainer output', :default => true
+    class_option :color,          :type => :boolean, :aliases => '-co', :desc => 'Enable color in Strainer output', :default => !Buff::Platform.windows?
 
     # strainer test *COOKBOOKS
     method_option :except,        :type => :array,   :aliases => '-e', :desc => 'Strainerfile labels to ignore'

lib/strainer/command.rb

@@ -15,7 +15,11 @@
 # limitations under the License.
 #
 
-require 'pty'
+begin
+  # PTY is not a thing on Windows :(
+  require 'pty'
+rescue LoadError
+end
 
 module Strainer
   # The Command class is responsible for a command (test) against a cookbook.
@@ -58,18 +62,8 @@ def run!
 
       inside do
         Strainer.ui.debug "Running '#{command}'"
-        speak command
-        PTY.spawn(command) do |r, _, pid|
-          begin
-            r.sync
-            r.each_line { |line| speak line }
-          rescue Errno::EIO => e
-            # Ignore this. Otherwise errors will be thrown whenever
-            # the process is closed
-          ensure
-            ::Process.wait pid
-          end
-        end
+        speak(command)
+        defined?(PTY) ? run_as_pty(command) : run_as_system(command)
 
         unless $?.success?
           Strainer.ui.error label_with_padding + Strainer.ui.set_color('Terminated with a non-zero exit status. Strainer assumes this is a failure.', :red)
@@ -177,5 +171,33 @@ def inside_cookbook(&block)
       Strainer.ui.debug "Restoring working directory to '#{original_pwd}'"
       success
     end
+
+    # Run a command using PTY
+    #
+    # @param [String] command
+    #   the command to run
+    def run_as_pty(command)
+      Strainer.ui.debug 'Using PTY'
+      PTY.spawn(command) do |r, _, pid|
+        begin
+          r.sync
+          r.each_line { |line| speak line }
+        rescue Errno::EIO => e
+          # Ignore this. Otherwise errors will be thrown whenever
+          # the process is closed
+        ensure
+          ::Process.wait pid
+        end
+      end
+    end
+
+    # Run a command using Ruby's shell out (backticks/%x).
+    #
+    # @param [String] command
+    #   the command to run
+    def run_as_system(command)
+      Strainer.ui.debug 'Using %x'
+      %x{#{command}}
+    end
   end
 end

strainer.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |gem|
   gem.name          = 'strainer'
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'berkshelf', '~> 2.0'
+  gem.add_runtime_dependency 'berkshelf',     '~> 2.0'
+  gem.add_runtime_dependency 'buff-platform', '~> 0.1'
 
   gem.add_development_dependency 'redcarpet'
   gem.add_development_dependency 'yard'