runtime_command 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8e242795477317ba019e209a85a6ab44af589ae
-  data.tar.gz: 3a0fcbcd6a519ee5f15c38860b6b8dc0bc1db1ac
+  metadata.gz: 324ec53b7ebeb61e18c83725f0c66963c63eddac
+  data.tar.gz: dbdb3070c12068ee56e7ca78f6d767d7c39cf346
 SHA512:
-  metadata.gz: b0189a198f5d1f0adef08e7b776427d445a33bb30b2919fdd8d1c99fe9d1f2dba3f3fe8f4e7d2d956883cbb008a7dc6bbd1b925d59bb68b0dcd50d022c200f98
-  data.tar.gz: 7320be85b803f7124d623745b8903555fd1eafe28c00025ecc3ad5e3b938379a25559e2bc3ca3a3322bcf2cc0d12534044ca7a8701a2240997dafe5129c5d03b
+  metadata.gz: 0c0c214d899135f7f0ed29d14842d80eaa8cc4e9326c7fcb8e481dff5bb10e4184606e5a2f93a56d1e4650b2808571a4d0f39cf28444a81f76e6a348ffefc74f
+  data.tar.gz: f7495faa2ce138ddeb4517e73f65aba83a25867b0ecac22a4c688cb86f99841a1388dfdeb4522e1e93db70c10adde34672dc87a41966b916c7d2b51504774935

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+*.log

data/example/sample.rb

@@ -1,12 +1,19 @@
 require 'bundler/setup'
 require 'runtime_command'
 
-command = RuntimeCommand::Builder.new
-# command.colors = :none
+logger = Logger.new('result.log')
+logger.formatter = proc do |severity, datetime, progname, msg|
+  "#{msg}\n"
+end
+
+command = RuntimeCommand::Builder.new(logger: logger)
+command.exec('echo hello')
 command.exec('echo "wait 3" sec; sleep 3; echo "hello world!"')
 
-# command.output = false
 # puts command.exec('ls -la').buffered_stdout
 
-# command.colors[:stdout] = HighLine::Style.rgb(255, 0, 0)
+# colors = {
+#   stdout: HighLine::Style.rgb(255, 0, 0)
+# }
+# command = RuntimeCommand::Builder.new(colors: colors)
 # command.exec('ls -la')

data/lib/runtime_command/builder.rb

@@ -1,29 +1,37 @@
+require 'logger'
 require 'open3'
 require 'runtime_command/logger'
 
 module RuntimeCommand
   class Builder
     attr_reader :buffered_log
-    attr_accessor :stdin_prefix, :colors, :output
 
-    # @param [String] base_dir
+    # @param [Hash] options
+    # @option options [String] base_dir
+    # @option options [Hash] colors
+    # @option options [Logger] logger
+    # @option options [Boolean] output
+    # @option options [String] stdin_prefix
     # @return [RuntimeCommand::Builder]
-    def initialize(base_dir = '.')
-      @base_dir = base_dir
-      @output = true
+    def initialize(options = {})
+      options[:base_dir] ||= '.'
+      options[:colors] ||= {}
+      options[:logger] ||= nil
+      options[:output] ||= true
+      options[:stdin_prefix] ||= '>'
+
+      @options = options
       @buffered_log = ''
-      @stdin_prefix = '>'
-      @colors = {}
     end
 
     # @param [String] command
     # @param [String] chdir
     # @return [RuntimeCommand::Logger]
     def exec(command, chdir = nil)
-      chdir ||= @base_dir
+      chdir ||= @options[:base_dir]
 
-      logger = Logger.new(@output, @colors)
-      logger.stdin(@stdin_prefix + ' ' + command)
+      logger = Logger.new(output: @options[:output], colors: @options[:colors], logger: @options[:logger])
+      logger.stdin(@options[:stdin_prefix] + ' ' + command)
 
       invoke_command(logger) do
         Open3.popen3(command, chdir: chdir) do |stdin, stdout, stderr|
@@ -46,19 +54,13 @@ module RuntimeCommand
     # @param [String] chdir
     # @return [RuntimeCommand::Logger]
     def exec_capture(command, chdir = nil)
-      chdir ||= @base_dir
+      chdir ||= @options[:base_dir]
 
-      logger = Logger.new(@output, @colors)
+      logger = Logger.new(output: @options[:output], colors: @options[:colors], logger: @options[:logger])
       invoke_command(logger) do
         stdout, stderr = Open3.capture3(command, chdir: chdir)
-
-        unless stdout.empty?
-          logger.stdout(stdout)
-        end
-
-        unless stderr.empty?
-          logger.stderr(stderr)
-        end
+        logger.stdout(stdout) unless stdout.empty?
+        logger.stderr(stderr) unless stderr.empty?
       end
 
       logger
@@ -67,7 +69,7 @@ module RuntimeCommand
     # @param [String] message
     # @return [RuntimeCommand::Logger]
     def puts(message)
-      logger = Logger.new(@output, @colors)
+      logger = Logger.new(output: @options[:output], colors: @options[:colors], logger: @options[:logger])
       logger.stdout(message) unless message.nil?
 
       @buffered_log << logger.buffered_log + "\n"
@@ -77,7 +79,7 @@ module RuntimeCommand
     # @param [String] message
     # @return [RuntimeCommand::Logger]
     def puts_error(message)
-      logger = Logger.new(@output, @colors)
+      logger = Logger.new(output: @options[:output], colors: @options[:colors], logger: @options[:logger])
       logger.stderr(message) unless message.nil?
 
       @buffered_log << logger.buffered_log + "\n"

data/lib/runtime_command/logger.rb

@@ -4,17 +4,18 @@ module RuntimeCommand
   class Logger
     attr_reader :buffered_log, :buffered_stdout, :buffered_stderr
 
-    # @param [Boolean] output
-    # @param [Hash] colors
+    # @param [Hash] options
+    # @option options [Hash] colors
+    # @option options [Boolean] output
     # @return RuntimeCommand::Logger
-    def initialize(output = true, colors = {})
-      @output = output
-      @has_color = colors != :none
+    def initialize(options = {})
+      @options = options
+      @has_color = options[:colors] != :none
 
       if @has_color
-        @stdin_color = colors[:stdin] || HighLine::Style.rgb(204, 204, 0)
-        @stdout_color = colors[:stdout] || HighLine::Style.rgb(64, 64, 64)
-        @stderr_color = colors[:stderr] || HighLine::Style.rgb(255, 51, 51)
+        @stdin_color = options.dig(:colors, :stdin) || HighLine::Style.rgb(204, 204, 0)
+        @stdout_color = options.dig(:colors, :stdout) || HighLine::Style.rgb(64, 64, 64)
+        @stderr_color = options.dig(:colors, :stderr) || HighLine::Style.rgb(255, 51, 51)
       end
 
       flash
@@ -22,9 +23,9 @@ module RuntimeCommand
 
     # @param [String] line
     def stdin(line)
-      puts HighLine.color(line, @stdin_color) if @output && @has_color
-      puts line if @output && !@has_color
+      puts @has_color ? HighLine.color(line, @stdin_color) : line if @options[:output]
 
+      @options[:logger].info(line) if @options[:logger]
       @buffered_log << line + "\n"
 
       nil
@@ -37,9 +38,10 @@ module RuntimeCommand
 
     # @param [String] line
     def stdout(line)
-      puts HighLine.color(line.chomp, @stdout_color) if @output && @has_color
-      puts line if @output && !@has_color
+      trim_line = line.chomp
+      puts @has_color ? HighLine.color(trim_line, @stdout_color) : line if @options[:output]
 
+      @options[:logger].info(trim_line) if @options[:logger]
       @buffered_log << line
       @buffered_stdout << line
 
@@ -53,9 +55,10 @@ module RuntimeCommand
 
     # @param [String] line
     def stderr(line)
-      puts HighLine.color(line.chomp, @stderr_color) if @output && @has_color
-      puts line if @output && !@has_color
+      trim_line = line.chomp
+      puts @has_color ? HighLine.color(trim_line, @stderr_color) : line if @options[:output]
 
+      @options[:logger].error(trim_line) if @options[:logger]
       @buffered_log << line
       @buffered_stderr << line
 

data/lib/runtime_command/version.rb

@@ -1,3 +1,3 @@
 module RuntimeCommand
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: runtime_command
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - naomichi-y
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Execute external command from Ruby.