enparallel-bin 1.0.7 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8081d1e4fe2054ccd7f26ff9241d43a77361c8bc635f8d28cfb1ab171978ad44
-  data.tar.gz: a4f66a8a980602ae080878f07bf702086a607ceb64bf9a9adc0bd27a91fedb2b
+  metadata.gz: dc0fa02d388e6a1c42c1dfeac34be7deab2644db290e57ed24104015df598e76
+  data.tar.gz: 188617934c9522e84bd46a7d12d968c1df88c9440d5eed4acb40ef112fb9ff0d
 SHA512:
-  metadata.gz: a474109ce87481792143ce537b074e06b1d0056c98daf1253425b2938c57df45d7f370ad2f6786afde0e2c9e4ed0381b6e9dcd077beb2add4458a12be346f2ca
-  data.tar.gz: 66d84b2998e91022f2a385da33798d3f89f683e526e29459d9919054d4caf2d53b6484104422c4ecf61e3cd2582dd85455c402ff2b2dbb8e6256bcc7d9b9e464
+  metadata.gz: 2a70d53f12e64406cfa7e819d26b265bfa5029bb75a6caa30c15ef3dcaca80f15e0dd30ef5041e6110cb74dc1a82789bc7f244e1ee4a1b3784642a91dcf25190
+  data.tar.gz: 4fa9c460d93cae10b379e7f2c5276af73c20902a0425b65fc045b7735348093448d4f9529d4cb70024d97f7146a383c61bd38ac66e1761592374a2d1b44a39d4

data/bin/enparallel

@@ -4,7 +4,7 @@ include Enparallel
 
 class Main
     def self.run
-        cli = CLI.parse(ARGV, STDIN)
+        cli = CLI.parse(ARGV, $stdin)
         tasks = cli.inputs.map { |input| Task.new(cli.command, input) }
         pool = ThreadPool.new(tasks, cli.workers, cli.pick)
         new(pool).run
@@ -35,7 +35,7 @@ class Main
 
     def finish
         puts
-        puts "Tasks complete"
+        puts 'Tasks complete'
         puts
         puts "#{@pool.succeeded_tasks.length.to_s.green.bold} tasks succeeded"
         puts "#{@pool.failed_tasks.length.to_s.red.bold} tasks failed"
@@ -52,7 +52,7 @@ class Main
 
     def render
         print "\r" + @pool.render
-        sleep 0.1
+        sleep(0.1)
     end
 
     def all_paths_available(paths)
@@ -83,14 +83,14 @@ class Main
         log_groups.each do |log_group|
             type = log_group.type
             path = paths[type]
-            puts 'Written %s log: %s (%s)' % [type, *log_group.write(path)]
+            puts 'Written %s log: %s (%s)' % [type, path, log_group.write(path)]
         end
     end
 end
 
 begin
     Main.run
-rescue Docopt::Exit => e
-    puts e.message
-    exit 1
+rescue Docopt::Exit
+    puts CLI.usage
+    exit 2
 end

data/lib/enparallel/cli.rb

@@ -14,7 +14,14 @@ module Enparallel
         end
 
         def self.parse(argv, stdin)
-            new(Docopt::docopt(usage, argv: argv, version: VERSION), stdin)
+            opts = Docopt.docopt(usage, argv: argv)
+
+            if opts['--version']
+                puts VERSION
+                exit
+            end
+
+            new(opts, stdin)
         end
 
         def self.basename
@@ -23,10 +30,11 @@ module Enparallel
 
         def self.usage
             <<~EOF
-                #{'Usage:'.bold}
+                Usage:
                     #{basename} [options] [--] <command>...
+                    #{basename} ( --version | --help )
 
-                #{'Description:'.bold}
+                Description:
                     #{basename} operates by reading lines from standard input, and executing
                     <command> once per entry, in parallel.
 
@@ -41,13 +49,13 @@ module Enparallel
 
                     seq 1 10 | enparallel -- bash -c "sleep {} && echo Slept for {}"
 
-                #{'Options:'.bold}
+                Options:
                     -w, --workers <n>   Batch into a pool of <n> workers [default: #{workers_default}].
                     -p, --pick <type>   Task-picking rule (see "Types") [default: #{pick_default}].
                     -v, --version       Version.
                     -h, --help          Help.
 
-                #{'Types:'.bold}
+                Types:
                     sequential          The order in which the tasks were queued.
                     random              Random order.
             EOF

data/lib/enparallel/log_group.rb

@@ -1,6 +1,7 @@
 module Enparallel
     class LogGroup
-        attr_reader :type, :tasks
+        attr_reader :type
+        attr_reader :tasks
 
         def initialize(type, tasks)
             @type = type
@@ -11,13 +12,13 @@ module Enparallel
             tasks.join("\n\n") + "\n"
         end
 
-        def has_tasks?
+        def tasks?
             tasks.length > 0
         end
 
         def write(path)
             size = File.write(path, to_soml)
-            [path, Util.bytes_to_human(size)]
+            Util.bytes_to_human(size)
         end
 
         def self.of(type, pool)

data/lib/enparallel/logger.rb

@@ -13,7 +13,7 @@ module Enparallel
         end
 
         def get_log_groups
-            get_all_log_groups.select(&:has_tasks?)
+            get_all_log_groups.select(&:tasks?)
         end
     end
 end

data/lib/enparallel/task.rb

@@ -30,7 +30,7 @@ module Enparallel
                 'R'
             elsif @exit_status.nil?
                 'S'
-            elsif has_succeeded?
+            elsif succeeded?
                 'D'.green
             else
                 'F'.red
@@ -41,7 +41,7 @@ module Enparallel
             @running = true
             @ran_at = Time.now
 
-            Open3.popen3(command_line_safe) do |stdin, stdout, stderr, thread|
+            Open3.popen3(command_line_safe) do |_stdin, stdout, stderr, thread|
                 @stdout = stdout.read.chomp
                 @stderr = stderr.read.chomp
                 @exit_status = thread.value.exitstatus
@@ -53,8 +53,9 @@ module Enparallel
             @running = false
         end
 
-        def has_succeeded?
+        def succeeded?
             raise 'Task not resolved' if @ran_at.nil?
+
             @exit_status == 0
         end
 

data/lib/enparallel/thread_pool.rb

@@ -16,7 +16,7 @@ module Enparallel
         def drain
             @workers = @worker_count.times.map do
                 Thread.new do
-                    while task = @picker.next
+                    while (task = @picker.next)
                         task.run
                     end
                 end
@@ -32,17 +32,18 @@ module Enparallel
         end
 
         def succeeded_tasks
-            @tasks.select(&:has_succeeded?)
+            @tasks.select(&:succeeded?)
         end
 
         def failed_tasks
-            @tasks.reject(&:has_succeeded?)
+            @tasks.reject(&:succeeded?)
         end
 
         def tasks_of(type)
-            if type == :success
+            case type
+            when :success
                 succeeded_tasks
-            elsif type == :failure
+            when :failure
                 failed_tasks
             end
         end

data/lib/enparallel/version.rb

@@ -1,3 +1,3 @@
 module Enparallel
-    VERSION = "1.0.7"
+    VERSION = '1.0.11'
 end

data/lib/enparallel.rb

@@ -11,7 +11,7 @@ require 'etc'
 
 module Enparallel
     def self.root_dir
-        File.expand_path('../..', __FILE__)
+        File.expand_path('..', __dir__)
     end
 end
 

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: enparallel-bin
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.11
 platform: ruby
 authors:
 - crdx
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: require_all
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: docopt
+  name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: soml
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 0.21.0
 description:
 email:
 executables:
@@ -129,7 +129,8 @@ files:
 homepage: https://github.com/crdx/enparallel
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -138,14 +139,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.21
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Parallel command runner with a colourful overview