verbose-shell 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff19a00a675872b8e881837f8044a415af141f2bc52c8aab4e93d9fc3c946b22
-  data.tar.gz: ad1a145ff01cedc6b96fe8fe5a2e17196b5b8db036d4a21534847f669b8a41ea
+  metadata.gz: eab068b31159003750b1d5c4fe63ec4ee4175405a8e68a380b16a91c1f8f7461
+  data.tar.gz: 8a2f37566449ae10c823d478e01e3209fe7b1fca5368b5c9ba33433d0f6890f9
 SHA512:
-  metadata.gz: c9e6af5b9116ad179a38536827d66751d079a85c38dba74214b539d21565e0d0ee06cd9fa502551b4aae6b8ac3d3269750c35a5db507f2344706ab39bd090034
-  data.tar.gz: 67238b499ce73835447ceaf696ac53b53f6a4feeca4ceaae5f474abbff3a6977de8fb36e6daf9924a07f34d82e676a497eaaa6f9f014d8add142180fca621f74
+  metadata.gz: 836dde2994738abc1d1e8a4b0dfa2e2269404485bcc860adfc90955a8065f04957c34c5a728a56afca96fd051a853c54b058a6ac7a77f8a8660586d1190888a6
+  data.tar.gz: f8c6bf683eb9a5938e6c9832aefd96ccfc5399870bc21836aa36e2e6ead05fbf48f889f9ad10cf7905c15a27bbf164e39e6ce139c8eba5e0dd740507ac9d3773

data/Rakefile

@@ -1,2 +1,10 @@
 require "bundler/gem_tasks"
-task :default => :spec
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/*_test.rb"]
+end
+
+task :default => :test

data/lib/verbose-shell/version.rb

@@ -1,3 +1,3 @@
-module VerboseShell
-    VERSION = "0.2.0"
+class VerboseShell
+    VERSION = "0.3.0"
 end

data/lib/verbose-shell.rb

@@ -4,6 +4,21 @@ require 'pastel'
 
 class VerboseShell
   @verbose = 0
+
+  class ShellError < RuntimeError
+    attr_accessor :output, :cmd, :exit_code
+    def initialize(output, cmd, exit_code)
+      @output = output
+      @cmd = cmd
+      @exit_code = exit_code
+    end
+
+    def message
+      "\n\n"+(['']*20+@output.split("\n"))[-20..-1].join("\n").lstrip + "\n"+Pastel.new.bright_white.on_red("💩  Command \"#{@cmd[0]}\" returned #{@exit_code}")
+    end
+    def to_s; message; end
+  end
+
   class << self
     attr_accessor :verbose
     def verbose=(val); @verbose = val == true ? 1 : (val || 0); end
@@ -13,20 +28,6 @@ class VerboseShell
       puts "+ "+args.map{|a| a =~ /\s/ ? '"'+a+'"' : a}.join(' ') # TODO: Fix quoting so it's more shell-like
     end
 
-    class ShellError < RuntimeError
-      attr_accessor :output, :cmd, :exit_code
-      def initialize(output, cmd, exit_code)
-        @output = output
-        @cmd = cmd
-        @exit_code = exit_code
-      end
-
-      def message
-        "\n\n"+(['']*20+@output.split("\n"))[-20..-1].join("\n").lstrip + "\n"+Pastel.new.bright_white.on_red("💩  Command \"#{@cmd[0]}\" returned #{@exit_code}")
-      end
-      def to_s; message; end
-    end
-
     def system(*args)
       system_trace *args
       args, opts = args.last.is_a?(Hash) ? [args[0..-2], args.last.dup] : [args, {}]
@@ -38,14 +39,38 @@ class VerboseShell
       end
     end
 
-    def system_or_true(*args)
+    def try_system(*args)
       system *args
-    rescue
+    rescue ShellError => e
+      e.exit_code
+    end
+
+    def system_or_true(*args)
+      warn "system_or_true is deprecated, use system_noraise", category: :deprecated, uplevel: 1
+      system_noraise(*args)
     end
 
     def capture(*args) # ``
       system_trace *args
-      IO.popen(args + (@verbose == 0 ? [{:err => "/dev/null"}] : []), "r") {|io| io.read}.strip
+      ret = IO.popen(args + (@verbose == 0 ? [{:err => "/dev/null"}] : []), "r") {|io| io.read}.strip
+      raise ShellError.new(ret, args, $?.exitstatus) unless $? == 0
+      ret
+    end
+
+    def try_capture(*args) # ``
+      system_trace *args
+      ret = IO.popen(args + (@verbose == 0 ? [{:err => "/dev/null"}] : []), "r") {|io| io.read}.strip
+    end
+
+    def popen(*args, &block)
+      env = args.first.is_a?(Hash) && args.unshift
+      opts = args.last.is_a?(Hash) && args.pop
+      mode = args.length == 2 ? args.pop : 'r'
+      cmd = args[0]
+      system_trace *cmd
+      ret = IO.popen(*([env, cmd, mode, opts].select {|v| v}.to_a), &block)
+      raise ShellError.new('', cmd, $?.exitstatus) if block_given? and $? != 0
+      ret
     end
 
     def which?(exe)
@@ -77,10 +102,13 @@ class VerboseShell
     def chown_R_formatter(method, user, group, file)
       chown_formatter(method, user, group, file)
     end
+    def mkdir_p_formatter(method, file)
+      method_to_a(method) + (file.is_a?(Array) ? file : [file])
+    end
 
     def method_missing(method, *args, &block)
-      system_trace self.respond_to?("#{method}_formatter") ? self.send("#{method}_formatter", method, *args)
-                   : method_to_a(method) + args
+      system_trace *(self.respond_to?("#{method}_formatter") ? self.send("#{method}_formatter", method, *args)
+                   : method_to_a(method) + args)
       FileUtils.send(method, *args, &block)
     end
   end

data/verbose-shell.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'pastel', '~> 0.7.2'
 
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2"
+  spec.add_development_dependency "rake", ">= 12.3"
+  spec.add_development_dependency "minitest", "~> 5.25"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: verbose-shell
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - David Caldwell
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -28,30 +27,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '5.25'
 description: sh -x like logging of FileUtils functions.
 email:
 - david@porkrind.org
@@ -73,7 +86,6 @@ homepage: https://github.com/caldwell/verbose-shell
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -88,9 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.7.2
 specification_version: 4
 summary: sh -x like logging of FileUtils functions.
 test_files: []