scmd 3.0.3 → 3.0.4

data/lib/scmd/command_spy.rb

@@ -1,9 +1,9 @@
-require 'scmd'
+# frozen_string_literal: true
 
-module Scmd
+require "scmd"
 
+module Scmd
   class CommandSpy
-
     attr_reader :cmd_str, :env, :options
     attr_reader :run_calls, :run_bang_calls, :start_calls
     attr_reader :wait_calls, :stop_calls, :kill_calls
@@ -20,12 +20,12 @@ module Scmd
 
       @running = false
 
-      @stdout, @stderr, @pid, @exitstatus = '', '', 1, 0
+      @stdout, @stderr, @pid, @exitstatus = "", "", 1, 0
     end
 
     def run(input = nil)
       @run_calls.push(InputCall.new(input))
-      Scmd.calls.push(Scmd::Call.new(self, input)) if ENV['SCMD_TEST_MODE']
+      Scmd.calls.push(Scmd::Call.new(self, input)) if ENV["SCMD_TEST_MODE"]
       self
     end
 
@@ -35,7 +35,7 @@ module Scmd
 
     def run!(input = nil)
       @run_bang_calls.push(InputCall.new(input))
-      Scmd.calls.push(Scmd::Call.new(self, input)) if ENV['SCMD_TEST_MODE']
+      Scmd.calls.push(Scmd::Call.new(self, input)) if ENV["SCMD_TEST_MODE"]
       self
     end
 
@@ -45,7 +45,7 @@ module Scmd
 
     def start(input = nil)
       @start_calls.push(InputCall.new(input))
-      Scmd.calls.push(Scmd::Call.new(self, input)) if ENV['SCMD_TEST_MODE']
+      Scmd.calls.push(Scmd::Call.new(self, input)) if ENV["SCMD_TEST_MODE"]
       @running = true
     end
 
@@ -92,21 +92,21 @@ module Scmd
       @cmd_str.to_s
     end
 
-    def ==(other_spy)
-      if other_spy.kind_of?(CommandSpy)
-        self.cmd_str         == other_spy.cmd_str        &&
-        self.env             == other_spy.env            &&
-        self.options         == other_spy.options        &&
-        self.run_calls       == other_spy.run_calls      &&
-        self.run_bang_calls  == other_spy.run_bang_calls &&
-        self.start_calls     == other_spy.start_calls    &&
-        self.wait_calls      == other_spy.wait_calls     &&
-        self.stop_calls      == other_spy.stop_calls     &&
-        self.kill_calls      == other_spy.kill_calls     &&
-        self.pid             == other_spy.pid            &&
-        self.exitstatus      == other_spy.exitstatus     &&
-        self.stdout          == other_spy.stdout         &&
-        self.stderr          == other_spy.stderr
+    def ==(other)
+      if other.is_a?(CommandSpy)
+        cmd_str         == other.cmd_str        &&
+        env             == other.env            &&
+        options         == other.options        &&
+        run_calls       == other.run_calls      &&
+        run_bang_calls  == other.run_bang_calls &&
+        start_calls     == other.start_calls    &&
+        wait_calls      == other.wait_calls     &&
+        stop_calls      == other.stop_calls     &&
+        kill_calls      == other.kill_calls     &&
+        pid             == other.pid            &&
+        exitstatus      == other.exitstatus     &&
+        stdout          == other.stdout         &&
+        stderr          == other.stderr
       else
         super
       end
@@ -115,7 +115,5 @@ module Scmd
     InputCall   = Struct.new(:input)
     TimeoutCall = Struct.new(:timeout)
     SignalCall  = Struct.new(:signal)
-
   end
-
 end

data/lib/scmd/stored_commands.rb

@@ -1,9 +1,9 @@
-require 'scmd/command_spy'
+# frozen_string_literal: true
 
-module Scmd
+require "scmd/command_spy"
 
+module Scmd
   class StoredCommands
-
     attr_reader :hash
 
     def initialize
@@ -30,16 +30,15 @@ module Scmd
       @hash.empty?
     end
 
-    def ==(other_stored_commands)
-      if other_stored_commands.kind_of?(StoredCommands)
-        self.hash == other_stored_commands.hash
+    def ==(other)
+      if other.is_a?(StoredCommands)
+        hash == other.hash
       else
         super
       end
     end
 
     class Stub
-
       attr_reader :cmd_str, :hash
 
       def initialize(cmd_str)
@@ -62,17 +61,14 @@ module Scmd
         CommandSpy.new(@cmd_str, opts).tap(&block)
       end
 
-      def ==(other_stub)
-        if other_stub.kind_of?(Stub)
-          self.cmd_str == other_stub.cmd_str &&
-          self.hash    == other_stub.hash
+      def ==(other)
+        if other.is_a?(Stub)
+          cmd_str == other.cmd_str &&
+          hash    == other.hash
         else
           super
         end
       end
-
     end
-
   end
-
 end

data/lib/scmd/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Scmd
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

data/scmd.gemspec

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "scmd/version"
 
@@ -8,18 +10,19 @@ Gem::Specification.new do |gem|
   gem.version     = Scmd::VERSION
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
-  gem.summary     = %q{Build and run system commands.}
-  gem.description = %q{Build and run system commands.}
+  gem.summary     = "Build and run system commands."
+  gem.description = "Build and run system commands."
   gem.homepage    = "http://github.com/redding/scmd"
-  gem.license     = 'MIT'
+  gem.license     = "MIT"
+
+  gem.files = `git ls-files | grep "^[^.]"`.split($INPUT_RECORD_SEPARATOR)
 
-  gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.16.2"])
+  gem.add_development_dependency("much-style-guide", ["~> 0.6.0"])
+  gem.add_development_dependency("assert",           ["~> 2.19.2"])
 
   gem.add_dependency("posix-spawn", ["~> 0.3.11"])
-
 end

data/script/bench.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 # $ bundle exec ruby script/bench.rb
 
-require 'bench/runner'
+require_relative "../bench/runner"
 
 class ScmdBenchLogger
-
   def initialize(file_path)
-    @file = File.open(file_path, 'w')
+    @file = File.open(file_path, "w")
     @ios = [@file, $stdout]
     yield self
     @file.close
@@ -17,10 +18,9 @@ class ScmdBenchLogger
     end
   end
 
-  def respond_to?(*args)
+  def respond_to_missing?(*args)
     @ios.first.respond_to?(args.first.to_s) ? true : super
   end
-
 end
 
 def run_cmd(logger, *args)
@@ -33,7 +33,7 @@ def run_cmd(logger, *args)
   GC.start
 end
 
-ScmdBenchLogger.new('bench/results.txt') do |logger|
+ScmdBenchLogger.new("bench/results.txt") do |logger|
   run_cmd(logger, Scmd.new("echo hi"), 1)
   run_cmd(logger, Scmd.new("echo hi"), 10)
   run_cmd(logger, Scmd.new("echo hi"), 100)
@@ -44,4 +44,3 @@ ScmdBenchLogger.new('bench/results.txt') do |logger|
   run_cmd(logger, Scmd.new("cat test/support/bigger-than-64k.txt"), 100)
   run_cmd(logger, Scmd.new("cat test/support/bigger-than-64k.txt"), 1000)
 end
-

data/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # this file is automatically required when you run `assert`
 # put any test helpers here
 
@@ -6,14 +8,14 @@ ROOT_PATH = File.expand_path("../..", __FILE__)
 $LOAD_PATH.unshift(ROOT_PATH)
 
 # require pry for debugging (`binding.pry`)
-require 'pry'
+require "pry"
 
-require 'test/support/factory'
+require "test/support/factory"
 
 # 1.8.7 backfills
 
 # Array#sample
-if !(a = Array.new).respond_to?(:sample) && a.respond_to?(:choice)
+if !(a = []).respond_to?(:sample) && a.respond_to?(:choice)
   class Array
     alias_method :sample, :choice
   end

data/test/support/factory.rb

@@ -1,6 +1,7 @@
-require 'assert/factory'
+# frozen_string_literal: true
+
+require "assert/factory"
 
 module Factory
   extend Assert::Factory
-
 end

data/test/system/command_tests.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require "assert"
-require 'scmd/command'
+require "scmd/command"
 
 class Scmd::Command
-
   class SystemTests < Assert::Context
     desc "Scmd::Command"
     setup do
@@ -17,27 +18,28 @@ class Scmd::Command
       assert_equal 0, @success_cmd.exitstatus
       assert @success_cmd.success?
       assert_equal "hi\n", @success_cmd.stdout
-      assert_equal '', @success_cmd.stderr
+      assert_equal "", @success_cmd.stderr
 
       @failure_cmd.run
 
       assert_not_nil @failure_cmd.pid
       assert_not_equal 0, @failure_cmd.exitstatus
       assert_not @failure_cmd.success?
-      assert_equal '', @failure_cmd.stdout
-      assert_not_equal '', @failure_cmd.stderr
+      assert_equal "", @failure_cmd.stdout
+      assert_not_equal "", @failure_cmd.stderr
     end
 
     should "raise an exception with proper backtrace on `run!`" do
-      err = begin;
-        @failure_cmd.run!
-      rescue Exception => err
-        err
-      end
+      err =
+        begin
+          @failure_cmd.run!
+        rescue => ex
+          ex
+        end
 
       assert_kind_of Scmd::RunError, err
-      assert_includes 'No such file or directory', err.message
-      assert_includes 'test/system/command_tests.rb:', err.backtrace.first
+      assert_includes "No such file or directory", err.message
+      assert_includes "test/system/command_tests.rb:", err.backtrace.first
     end
 
     should "return itself on `run`, `run!`" do
@@ -57,7 +59,6 @@ class Scmd::Command
       cmd.wait
       assert_not cmd.running?
     end
-
   end
 
   class InputTests < SystemTests
@@ -65,7 +66,7 @@ class Scmd::Command
     setup do
       @cmd = Scmd::Command.new("sh")
     end
-    subject { @cmd }
+    subject{ @cmd }
 
     should "run the command given a single line of input" do
       subject.run "echo hi"
@@ -81,7 +82,6 @@ class Scmd::Command
       assert_equal "hi\n",  @cmd.stdout
       assert_equal "err\n", @cmd.stderr
     end
-
   end
 
   class LongRunningTests < SystemTests
@@ -124,21 +124,20 @@ class Scmd::Command
 
     should "be killable with a non-default signal" do
       @long_cmd.start
-      @long_cmd.kill('INT')
+      @long_cmd.kill("INT")
 
       assert_not @long_cmd.running?
     end
-
   end
 
   class BufferDeadlockTests < SystemTests
     desc "when capturing data from an output buffer"
     setup do
-      @small_path = File.join(ROOT_PATH, 'test/support/smaller-than-64k.txt')
+      @small_path = File.join(ROOT_PATH, "test/support/smaller-than-64k.txt")
       @small_data = File.read(@small_path)
       @small_cmd  = Scmd::Command.new("cat #{@small_path}")
 
-      @big_path = File.join(ROOT_PATH, 'test/support/bigger-than-64k.txt')
+      @big_path = File.join(ROOT_PATH, "test/support/bigger-than-64k.txt")
       @big_data = File.read(@big_path)
       @big_cmd  = Scmd::Command.new("cat #{@big_path}")
     end
@@ -152,15 +151,14 @@ class Scmd::Command
       assert_nothing_raised{ @big_cmd.wait(1) }
       assert_equal @big_data, @big_cmd.stdout
     end
-
   end
 
   class WithEnvVarTests < SystemTests
     desc "with environment variables"
     setup do
       @cmd = Scmd::Command.new("echo $SCMD_TEST_VAR", {
-        :env => { 'SCMD_TEST_VAR' => 'test' }
-      })
+        env: { "SCMD_TEST_VAR" => "test" },
+      },)
     end
 
     should "use them when running the command" do
@@ -168,7 +166,6 @@ class Scmd::Command
       assert @cmd.success?
       assert_equal "test\n", @cmd.stdout
     end
-
   end
 
   class WithOptionsTests < SystemTests
@@ -177,8 +174,8 @@ class Scmd::Command
       @path = "/"
       # `chdir` is the only one that reliably worked
       @cmd = Scmd::Command.new("pwd", {
-        :options => { :chdir => @path }
-      })
+        options: { chdir: @path },
+      },)
     end
 
     should "use them when running the command" do
@@ -188,7 +185,5 @@ class Scmd::Command
       assert_not_equal "#{Dir.pwd}\n", @cmd.stdout
       assert_equal "#{@path}\n", @cmd.stdout
     end
-
   end
-
 end

data/test/unit/command_spy_tests.rb

@@ -1,20 +1,20 @@
+# frozen_string_literal: true
+
 require "assert"
-require 'scmd/command_spy'
+require "scmd/command_spy"
 
 class Scmd::CommandSpy
-
   class UnitTests < Assert::Context
     desc "Scmd::CommandSpy"
     setup do
       @spy_class = Scmd::CommandSpy
     end
-
   end
 
   class InitTests < UnitTests
     setup do
-      @orig_scmd_test_mode = ENV['SCMD_TEST_MODE']
-      ENV['SCMD_TEST_MODE'] = '1'
+      @orig_scmd_test_mode = ENV["SCMD_TEST_MODE"]
+      ENV["SCMD_TEST_MODE"] = "1"
       Scmd.reset
 
       @cmd_str = Factory.string
@@ -22,7 +22,7 @@ class Scmd::CommandSpy
     end
     teardown do
       Scmd.reset
-      ENV['SCMD_TEST_MODE'] = @orig_scmd_test_mode
+      ENV["SCMD_TEST_MODE"] = @orig_scmd_test_mode
     end
     subject{ @spy }
 
@@ -54,17 +54,17 @@ class Scmd::CommandSpy
 
       assert_equal 1,  subject.pid
       assert_equal 0,  subject.exitstatus
-      assert_equal '', subject.stdout
-      assert_equal '', subject.stderr
+      assert_equal "", subject.stdout
+      assert_equal "", subject.stderr
     end
 
     should "allow specifying env and options" do
       opts = { Factory.string => Factory.string }
       cmd = Scmd::Command.new(Factory.string, {
-        :env     => { :SCMD_TEST_VAR => 1 },
-        :options => opts
-      })
-      exp = { 'SCMD_TEST_VAR' => '1' }
+        env: { SCMD_TEST_VAR: 1 },
+        options: opts,
+      },)
+      exp = { "SCMD_TEST_VAR" => "1" }
       assert_equal exp,  cmd.env
       assert_equal opts, cmd.options
     end
@@ -162,7 +162,7 @@ class Scmd::CommandSpy
     end
 
     should "not track global run, run! or start calls if not in test mode" do
-      ENV.delete('SCMD_TEST_MODE')
+      ENV.delete("SCMD_TEST_MODE")
 
       input = Factory.string
       # if `Scmd.calls` is called when not in test mode it will raise an error,
@@ -174,7 +174,7 @@ class Scmd::CommandSpy
         subject.start(input)
       end
 
-      ENV['SCMD_TEST_MODE'] = '1'
+      ENV["SCMD_TEST_MODE"] = "1"
     end
 
     should "track its wait calls" do
@@ -232,13 +232,11 @@ class Scmd::CommandSpy
         :pid,
         :exitstatus,
         :stdout,
-        :stderr
+        :stderr,
       ].sample
       Assert.stub(spy2, a){ Factory.string }
 
       assert_not_equal spy1, spy2
     end
-
   end
-
 end