enparallel-bin 1.0.6 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f562c7ba4e17d34abebcd1812747eae69d0effa6d3e96b5b5d3eee036be0021
-  data.tar.gz: e7467eb70cf31214277c759694633b356c825bd34b0f81ad7615f0319f070c5e
+  metadata.gz: 41b497f7ab752ec2100b78f0966c191277afa65f1d645482697d38eb4d13e28d
+  data.tar.gz: ce25b5ec3b39bc60ff067e235eacb192f31666ce8f3d49943be0c8647868ffdc
 SHA512:
-  metadata.gz: 00330b626b14acb8016d7d80d5208c3730c86943d94d1cca7cda885f76cd3e61d2f601b292ee329b1b165e610170161be02e09e0e4fafd2b89e851bdfa60c780
-  data.tar.gz: 81c9795b5a50b6493f850893e6ee0eca75b287d9e1cea07e82762c0d07826bd236c3cc06240139b7dd0b6b0482d20dee85b20cb4b185675405b9fff0988d1717
+  metadata.gz: 760618db0069de59d547f04c08aafd8564ae6a9b20f767d635b888ec798e8685e966dd1122e04cc895bb65863b8179c458b97c18b6850cad29c2c55acbdc3407
+  data.tar.gz: 597fae7122f8bf27884df72b8c57c8464fb05cab168be927b2859e40d48c8092d66a8488e3bf90e6e5dd533bd76ece5a8102e5599bfea18881dba6948c396e94

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.6"
+    VERSION = '1.0.10'
 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.6
+  version: 1.0.10
 platform: ruby
 authors:
 - crdx
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2021-10-12 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: '2.0'
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.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.17.0
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,21 +95,21 @@ 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: '12.3'
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
-description: 
-email: 
+        version: 0.21.0
+description:
+email:
 executables:
 - enparallel
 extensions: []
@@ -130,7 +130,7 @@ homepage: https://github.com/crdx/enparallel
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,15 +138,15 @@ 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.0.6
-signing_key: 
+rubygems_version: 3.2.21
+signing_key:
 specification_version: 4
-summary: Run many commands enparallel with a colourful overview
+summary: Parallel command runner with a colourful overview
 test_files: []