pups 1.1.0 → 1.2.0

data/test/exec_command_test.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'test_helper'
-require 'tempfile'
+require "test_helper"
+require "tempfile"
 
 module Pups
-  class ExecCommandTest < MiniTest::Test
+  class ExecCommandTest < ::Minitest::Test
     def from_str(str, params = {})
       ExecCommand.from_str(str, params).commands
     end
@@ -14,52 +14,49 @@ module Pups
     end
 
     def test_simple_str_command
-      assert_equal(['do_something'],
-                   from_str('do_something'))
+      assert_equal(["do_something"], from_str("do_something"))
     end
 
     def test_simple_str_command_with_param
-      assert_equal(['hello world'],
-                   from_str('hello $bob', { 'bob' => 'world' }))
+      assert_equal(
+        ["hello world"],
+        from_str("hello $bob", { "bob" => "world" })
+      )
     end
 
     def test_nested_command
-      assert_equal(['first'],
-                   from_hash('cmd' => 'first'))
+      assert_equal(["first"], from_hash("cmd" => "first"))
     end
 
     def test_multi_commands
-      assert_equal(%w[first second],
-                   from_hash('cmd' => %w[first second]))
+      assert_equal(%w[first second], from_hash("cmd" => %w[first second]))
     end
 
     def test_multi_commands_with_home
-      assert_equal(['cd /home/sam && first',
-                    'cd /home/sam && second'],
-                   from_hash('cmd' => %w[first second],
-                             'cd' => '/home/sam'))
+      assert_equal(
+        ["cd /home/sam && first", "cd /home/sam && second"],
+        from_hash("cmd" => %w[first second], "cd" => "/home/sam")
+      )
     end
 
     def test_exec_works
-      ExecCommand.from_str('ls', {}).run
+      ExecCommand.from_str("ls", {}).run
     end
 
     def test_fails_for_bad_command
-      assert_raises(Errno::ENOENT) do
-        ExecCommand.from_str('boom', {}).run
-      end
+      assert_raises(Errno::ENOENT) { ExecCommand.from_str("boom", {}).run }
     end
 
     def test_backgroud_task_do_not_fail
       cmd = ExecCommand.new({})
       cmd.background = true
-      cmd.add('sleep 10 && exit 1')
+      cmd.add("sleep 10 && exit 1")
       cmd.run
     end
 
     def test_raise_on_fail
       cmd = ExecCommand.new({})
-      cmd.add('chgrp -a')
+      cmd.add("chgrp -a")
       cmd.raise_on_fail = false
       cmd.run
     end
@@ -67,29 +64,27 @@ module Pups
     def test_stdin
       `touch test_file`
       cmd = ExecCommand.new({})
-      cmd.add('read test ; echo $test > test_file')
-      cmd.stdin = 'hello'
+      cmd.add("read test ; echo $test > test_file")
+      cmd.stdin = "hello"
       cmd.run
 
-      assert_equal("hello\n", File.read('test_file'))
+      assert_equal("hello\n", File.read("test_file"))
     ensure
-      File.delete('test_file')
+      File.delete("test_file")
     end
 
     def test_fails_for_non_zero_exit
       assert_raises(Pups::ExecError) do
-        ExecCommand.from_str('chgrp -a', {}).run
+        ExecCommand.from_str("chgrp -a", {}).run
       end
     end
 
     def test_can_terminate_async
       cmd = ExecCommand.new({})
       cmd.background = true
-      pid = cmd.spawn('sleep 10 && exit 1')
+      pid = cmd.spawn("sleep 10 && exit 1")
       ExecCommand.terminate_async
-      assert_raises(Errno::ECHILD) do
-        Process.waitpid(pid, Process::WNOHANG)
-      end
+      assert_raises(Errno::ECHILD) { Process.waitpid(pid, Process::WNOHANG) }
     end
 
     def test_can_terminate_rogues
@@ -101,9 +96,7 @@ module Pups
 
       ExecCommand.terminate_async(wait: 0.1)
 
-      assert_raises(Errno::ECHILD) do
-        Process.waitpid(pid, Process::WNOHANG)
-      end
+      assert_raises(Errno::ECHILD) { Process.waitpid(pid, Process::WNOHANG) }
     end
   end
 end

data/test/file_command_test.rb

@@ -1,23 +1,22 @@
 # frozen_string_literal: true
 
-require 'test_helper'
-require 'tempfile'
+require "test_helper"
+require "tempfile"
 
 module Pups
-  class FileCommandTest < MiniTest::Test
+  class FileCommandTest < ::Minitest::Test
     def test_simple_file_creation
-      tmp = Tempfile.new('test')
-      tmp.write('x')
+      tmp = Tempfile.new("test")
+      tmp.write("x")
       tmp.close
 
       cmd = FileCommand.new
       cmd.path = tmp.path
-      cmd.contents = 'hello $world'
-      cmd.params = { 'world' => 'world' }
+      cmd.contents = "hello $world"
+      cmd.params = { "world" => "world" }
       cmd.run
 
-      assert_equal('hello world',
-                   File.read(tmp.path))
+      assert_equal("hello world", File.read(tmp.path))
     ensure
       tmp.close
       tmp.unlink

data/test/merge_command_test.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require 'test_helper'
-require 'tempfile'
+require "test_helper"
+require "tempfile"
 
 module Pups
-  class MergeCommandTest < MiniTest::Test
+  class MergeCommandTest < ::Minitest::Test
     def test_deep_merge_arrays
-      a = { a: { a: ['hi', 1] } }
-      b = { a: { a: ['hi', 2] } }
+      a = { a: { a: ["hi", 1] } }
+      b = { a: { a: ["hi", 2] } }
       c = { a: {} }
 
       d = Pups::MergeCommand.deep_merge(a, b, :merge_arrays)
       d = Pups::MergeCommand.deep_merge(d, c, :merge_arrays)
 
-      assert_equal(['hi', 1, 'hi', 2], d[:a][:a])
+      assert_equal(["hi", 1, "hi", 2], d[:a][:a])
     end
 
     def test_merges
@@ -23,7 +23,7 @@ module Pups
           password: "xyz"
       YAML
 
-      f = Tempfile.new('test')
+      f = Tempfile.new("test")
       f.write source
       f.close
 
@@ -32,24 +32,27 @@ module Pups
           name: "bob2"
       YAML
 
-      MergeCommand.from_str("#{f.path} $yaml", { 'yaml' => YAML.safe_load(merge) }).run
+      MergeCommand.from_str(
+        "#{f.path} $yaml",
+        { "yaml" => YAML.safe_load(merge) }
+      ).run
 
       changed = YAML.load_file(f.path)
 
-      assert_equal({ 'user' => {
-                     'name' => 'bob2',
-                     'password' => 'xyz'
-                   } }, changed)
+      assert_equal(
+        { "user" => { "name" => "bob2", "password" => "xyz" } },
+        changed
+      )
 
       def test_deep_merge_nil
-        a = { param: { venison: 'yes please' } }
+        a = { param: { venison: "yes please" } }
         b = { param: nil }
 
         r1 = Pups::MergeCommand.deep_merge(a, b)
         r2 = Pups::MergeCommand.deep_merge(b, a)
 
-        assert_equal({ venison: 'yes please' }, r1[:param])
-        assert_equal({ venison: 'yes please' }, r2[:param])
+        assert_equal({ venison: "yes please" }, r1[:param])
+        assert_equal({ venison: "yes please" }, r2[:param])
       end
     ensure
       f.unlink

data/test/replace_command_test.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'test_helper'
-require 'tempfile'
+require "test_helper"
+require "tempfile"
 
 module Pups
-  class ReplaceCommandTest < MiniTest::Test
+  class ReplaceCommandTest < ::Minitest::Test
     def test_simple
       command = ReplaceCommand.new({})
-      command.text = 'hello world'
+      command.text = "hello world"
       command.from = /he[^o]+o/
-      command.to = 'world'
+      command.to = "world"
 
-      assert_equal('world world', command.replaced_text)
+      assert_equal("world world", command.replaced_text)
     end
 
     def test_reverse
@@ -21,20 +21,23 @@ module Pups
         1 one thousand 1
       SCR
 
-      f = Tempfile.new('test')
+      f = Tempfile.new("test")
       f.write source
       f.close
 
       hash = {
-        'filename' => f.path,
-        'from' => '/one t.*d/',
-        'to' => 'hello world',
-        'direction' => 'reverse'
+        "filename" => f.path,
+        "from" => "/one t.*d/",
+        "to" => "hello world",
+        "direction" => "reverse"
       }
 
       command = ReplaceCommand.from_hash(hash, {})
 
-      assert_equal("1 one thousand 1\n1 one thousand 1\n1 hello world 1\n", command.replaced_text)
+      assert_equal(
+        "1 one thousand 1\n1 one thousand 1\n1 hello world 1\n",
+        command.replaced_text
+      )
     ensure
       f.unlink
     end
@@ -46,15 +49,15 @@ module Pups
         one
       SCR
 
-      f = Tempfile.new('test')
+      f = Tempfile.new("test")
       f.write source
       f.close
 
       hash = {
-        'filename' => f.path,
-        'from' => '/one/',
-        'to' => 'two',
-        'global' => 'true'
+        "filename" => f.path,
+        "from" => "/one/",
+        "to" => "two",
+        "global" => "true"
       }
 
       command = ReplaceCommand.from_hash(hash, {})
@@ -65,20 +68,16 @@ module Pups
     end
 
     def test_replace_with_env
-      source = '123'
+      source = "123"
 
-      f = Tempfile.new('test')
+      f = Tempfile.new("test")
       f.write source
       f.close
 
-      hash = {
-        'filename' => f.path,
-        'from' => '123',
-        'to' => 'hello $hellos'
-      }
+      hash = { "filename" => f.path, "from" => "123", "to" => "hello $hellos" }
 
-      command = ReplaceCommand.from_hash(hash, { 'hello' => 'world' })
-      assert_equal('hello worlds', command.replaced_text)
+      command = ReplaceCommand.from_hash(hash, { "hello" => "world" })
+      assert_equal("hello worlds", command.replaced_text)
     ensure
       f.unlink
     end
@@ -90,19 +89,19 @@ module Pups
         }
       SCR
 
-      f = Tempfile.new('test')
+      f = Tempfile.new("test")
       f.write source
       f.close
 
       hash = {
-        'filename' => f.path,
-        'from' => "/this[^\}]+\}/m",
-        'to' => 'hello world'
+        "filename" => f.path,
+        "from" => "/this[^\}]+\}/m",
+        "to" => "hello world"
       }
 
       command = ReplaceCommand.from_hash(hash, {})
 
-      assert_equal('hello world', command.replaced_text.strip)
+      assert_equal("hello world", command.replaced_text.strip)
     ensure
       f.unlink
     end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'pups'
-require 'pups/cli'
-require 'minitest/autorun'
-require 'minitest/pride'
+require "pups"
+require "pups/cli"
+require "minitest/autorun"
+require "minitest/pride"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pups
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Sam Saffron
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,7 +145,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
-- ".github/workflows/lint.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG
@@ -179,7 +178,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -194,8 +193,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Toolkit for orchestrating a composed docker image
 test_files:

data/.github/workflows/lint.yml

@@ -1,27 +0,0 @@
-name: Lint
-
-on:
-  push:
-    branches:
-      - master
-  pull_request: {}
-
-jobs:
-  lint:
-    name: "pups lint"
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 5
-
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [ubuntu-latest]
-        ruby: ["2.7"]
-
-    steps:
-      - uses: actions/checkout@v2
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      - run: bundle exec rubocop