multish 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 047ccfeb880c5b9ebabc0b394e72cfb0b7015ef8
-  data.tar.gz: d516b3e8dd2ad8f5020a682ec8668ce82007a4ae
+SHA256:
+  metadata.gz: d76d493821db956c0ff89f1b06f65b9017130620400fbb58468c9c90f3417019
+  data.tar.gz: 89234f44a40082755499b5a7b0279cff4e147ed43bde517f457a651653d2b56b
 SHA512:
-  metadata.gz: e3e57b936eba70f97d6430e63b96143994decc55c4d8fe7394b59caa032a11d37c18310584348571bd4eacc66656dc18f1d334e2ee7370c24162ef2fb21eff34
-  data.tar.gz: b721e8b5399007a3201c2ddc674e421844affcf7f43908420a10ca579bb9885c088ef560489a6df88e2452ed1256df39cae931397d39560db2af83786c9a8913
+  metadata.gz: 215dc7043862bc9c4185730f74855cb74448b4d5627f674595ff2978c944c56f4bfc5f284f058123aec0a5f14325672479b42df494d10079dca3fcf3ebebc37a
+  data.tar.gz: '04969adf2a71b600d3cdf0d61d0d260c851fd6a49a12111d261cb2da2bb2b99dc793efea3966a2c2eecd23dbffb91ce53041bf82633d655d665171c96e1951d6'

data/.gitignore

@@ -11,3 +11,4 @@
 
 # rspec failure tracking
 .rspec_status
+.ruby-version

data/.rubocop.yml

@@ -1,10 +1,7 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   DisplayCopNames: true
 
-Rails:
-  Enabled: false
-
 Style/SymbolArray:
   Enabled: true
 
@@ -21,23 +18,22 @@ Style/ClassAndModuleChildren:
   Enabled: false
   EnforcedStyle: compact
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
-Style/IndentHash:
-  Enabled: false
-  EnforcedStyle: align_braces
-
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
   Enabled: true
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 
 Style/NumericLiterals:
@@ -49,7 +45,7 @@ Lint/Void:
 Style/Documentation:
   Enabled: false
 
-AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
 Metrics/MethodLength:
@@ -70,10 +66,10 @@ Style/PerlBackrefs:
 Style/RegexpLiteral:
   Enabled: false
 
-Lint/EndAlignment:
+Layout/EndAlignment:
   AutoCorrect: true
 
-Lint/DefEndAlignment:
+Layout/DefEndAlignment:
   AutoCorrect: true
 
 Style/RaiseArgs:
@@ -91,9 +87,6 @@ Style/Lambda:
 Metrics/ModuleLength:
   Enabled: false
 
-Rails/HasAndBelongsToMany:
-  Enabled: false
-
 Style/EachWithObject:
   Enabled: false
 
@@ -106,7 +99,7 @@ Style/ClassVars:
 Style/MultilineBlockChain:
   Enabled: false
 
-Style/PredicateName:
+Naming/PredicateName:
   Enabled: false
 
 Style/DoubleNegation:
@@ -124,7 +117,7 @@ Style/NumericPredicate:
 Style/TernaryParentheses:
   Enabled: false
 
-Style/FileName:
+Naming/FileName:
   Enabled: false
 
 Style/IfUnlessModifier:
@@ -136,7 +129,7 @@ Style/RedundantSelf:
 Lint/AssignmentInCondition:
   Enabled: false
 
-Lint/LiteralInCondition:
+Lint/LiteralAsCondition:
   Enabled: false
 
 Style/For:
@@ -150,3 +143,62 @@ Style/RescueModifier:
 
 Style/GlobalVars:
   Enabled: false
+
+Gemspec/DateAssignment: # (new in 1.10)
+  Enabled: true
+Layout/SpaceBeforeBrackets: # (new in 1.7)
+  Enabled: true
+Lint/AmbiguousAssignment: # (new in 1.7)
+  Enabled: true
+Lint/DeprecatedConstants: # (new in 1.8)
+  Enabled: true
+Lint/DuplicateBranch: # (new in 1.3)
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
+  Enabled: true
+Lint/EmptyBlock: # (new in 1.1)
+  Enabled: true
+Lint/EmptyClass: # (new in 1.3)
+  Enabled: true
+Lint/LambdaWithoutLiteralBlock: # (new in 1.8)
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
+  Enabled: true
+Lint/NumberedParameterAssignment: # (new in 1.9)
+  Enabled: true
+Lint/OrAssignmentToConstant: # (new in 1.9)
+  Enabled: true
+Lint/RedundantDirGlobSort: # (new in 1.8)
+  Enabled: true
+Lint/SymbolConversion: # (new in 1.9)
+  Enabled: true
+Lint/ToEnumArguments: # (new in 1.1)
+  Enabled: true
+Lint/TripleQuotes: # (new in 1.9)
+  Enabled: true
+Lint/UnexpectedBlockArity: # (new in 1.5)
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
+  Enabled: true
+Style/ArgumentsForwarding: # (new in 1.1)
+  Enabled: true
+Style/CollectionCompact: # (new in 1.2)
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # (new in 1.1)
+  Enabled: true
+Style/EndlessMethod: # (new in 1.8)
+  Enabled: true
+Style/HashConversion: # (new in 1.10)
+  Enabled: true
+Style/HashExcept: # (new in 1.7)
+  Enabled: true
+Style/IfWithBooleanLiteralBranches: # (new in 1.9)
+  Enabled: true
+Style/NegatedIfElseCondition: # (new in 1.2)
+  Enabled: true
+Style/NilLambda: # (new in 1.3)
+  Enabled: true
+Style/RedundantArgument: # (new in 1.4)
+  Enabled: true
+Style/SwapValues: # (new in 1.1)
+  Enabled: true

data/lib/multish.rb

@@ -2,6 +2,7 @@ require 'multish/version'
 
 require 'curses'
 require 'open3'
+require 'colorize'
 
 class MultishItem
   attr_reader :command
@@ -10,6 +11,7 @@ class MultishItem
     @command = command
     @index = index
     @count = count
+    @output = ''
   end
 
   def width
@@ -40,23 +42,26 @@ class MultishItem
       4
     elsif finished?
       errored? ? 3 : 2
-    else
+    else # rubocop:disable Lint/DuplicateBranch
       4
     end
   end
 
   def errored?
-    @exit_code && !(@exit_code == 0)
+    @exit_code && @exit_code != 0
   end
 
   def update_title!
     @nav_window.setpos(0, 0)
     @nav_window.attron(Curses.color_pair(color_code) | Curses::A_REVERSE | Curses::A_BOLD)
-    text = !finished? ? "$ #{command}" : "[ #{command} ] -> #{@exit_code}"
-    @nav_window.addstr(text.ljust(width - 1))
+    @nav_window.addstr(window_title.ljust(width - 1))
     @nav_window.refresh
   end
 
+  def window_title
+    finished? ? "[ #{command} ] -> #{@exit_code}" : "$ #{command}"
+  end
+
   def open_process!
     @stdin, @stdout, @stderr, @wait_thr = Open3.popen3(@command)
     @stdin.close
@@ -66,25 +71,33 @@ class MultishItem
     [@stdout, @stderr]
   end
 
-  def try_update(fd)
-    return unless fd == @stdout || fd == @stderr
+  def try_update(fd) # rubocop:disable Naming/MethodParameterName
+    return unless [@stdout, @stderr].include?(fd)
+
     line = fd.gets
     print(line) if line
   end
 
   def print(text)
+    @output << text
     @window.addstr(text)
     @window.refresh
   end
 
   def finished?
     return false unless @wait_thr
+
     ret = !@wait_thr.alive?
     if ret && !@exit_code
       @exit_code = @wait_thr.value
     end
     ret
   end
+
+  def print_output!
+    warn window_title.red
+    warn @output
+  end
 end
 
 class Multish
@@ -92,6 +105,10 @@ class Multish
     self.new.run!(args)
   end
 
+  def errored?
+    @commands.any?(&:errored?)
+  end
+
   def run!(args)
     @commands = args.each_with_index.map { |arg, index| MultishItem.new(arg, index, args.count) }
     Curses.init_screen
@@ -109,6 +126,7 @@ class Multish
       while true
         fdlist.reject!(&:closed?)
         break if fdlist.empty?
+
         ready = IO.select(fdlist)[0]
         ready.each do |fd|
           @commands.each { |command| command.try_update(fd) }
@@ -119,7 +137,15 @@ class Multish
     ensure
       Curses.curs_set(1)
       Curses.close_screen
-      exit(@commands.any?(&:errored?) ? 1 : 0)
+      if errored?
+        warn 'At least one of the commands exited with error.'
+        @commands.select(&:errored?).each do |command|
+          command.print_output!
+        end
+        exit 1
+      else
+        exit 0
+      end
     end
   end
 end

data/lib/multish/version.rb

@@ -1,3 +1,3 @@
 class Multish
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/multish.gemspec

@@ -1,5 +1,4 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'multish/version'
 
@@ -21,10 +20,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler', '~> 2.2'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.47.1'
+  spec.add_development_dependency 'rubocop', '~> 1.0'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
 
+  spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'curses'
+
+  spec.required_ruby_version = '>= 2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multish
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomasz Dąbrowski
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: curses
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +148,7 @@ homepage: http://github.com/dabroz/multish
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,16 +156,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Run multiple commands in one terminal, side by side
 test_files: []