Treat hyphen output targets as stdout

Author: kojix2

spec/parser_spec.cr

@@ -70,4 +70,54 @@ describe YouPlot2::Parser do
       File.delete(pass_path) if File.exists?(pass_path)
     end
   end
+
+  it "treats hyphen output targets as stdout" do
+    argv = ["line", "-o", "-", "-O", "-", "-w", "17"]
+
+    params = YouPlot2::Parameters.new
+    options = YouPlot2::Options.new
+    parser = YouPlot2::Parser.new(argv, params, options)
+
+    parser.parse
+
+    options.output.object_id.should eq(STDOUT.object_id)
+    options.output_path.should be_nil
+    options.pass.try(&.object_id).should eq(STDOUT.object_id)
+    options.pass_path.should be_nil
+    params.width.should eq(17)
+    parser.input_files.should eq([] of String)
+  end
+
+  it "treats long hyphen output targets as stdout" do
+    argv = ["line", "--output", "-", "--pass", "-", "-w", "17"]
+
+    params = YouPlot2::Parameters.new
+    options = YouPlot2::Options.new
+    parser = YouPlot2::Parser.new(argv, params, options)
+
+    parser.parse
+
+    options.output.object_id.should eq(STDOUT.object_id)
+    options.output_path.should be_nil
+    options.pass.try(&.object_id).should eq(STDOUT.object_id)
+    options.pass_path.should be_nil
+    params.width.should eq(17)
+    parser.input_files.should eq([] of String)
+  end
+
+  it "keeps file output targets as paths" do
+    argv = ["line", "-o", "plot.txt", "-O", "data.tsv", "input.csv"]
+
+    params = YouPlot2::Parameters.new
+    options = YouPlot2::Options.new
+    parser = YouPlot2::Parser.new(argv, params, options)
+
+    parser.parse
+
+    options.output.object_id.should eq(STDERR.object_id)
+    options.output_path.should eq("plot.txt")
+    options.pass.should be_nil
+    options.pass_path.should eq("data.tsv")
+    parser.input_files.should eq(["input.csv"])
+  end
 end

src/youplot2/backends/unicode_plot.cr

@@ -227,7 +227,7 @@ module YouPlot2
 
       private def parse_bar_values(raw_values : Array(String?)) : BarValues
         if raw_values.all? { |v| integer_literal?(v) }
-          raw_values.map { |v| v.to_s.to_i64 }
+          raw_values.map(&.to_s.to_i64)
         else
           raw_values.map { |v| to_f64_or_zero(v) }
         end

src/youplot2/parser.cr

@@ -90,26 +90,14 @@ module YouPlot2
     end
 
     private def add_common_options(opt : OptionParser)
-      opt.on("-O", "--pass",
-        "pass input to stdout for pipeline use") do
-        @options.pass = STDOUT
-        @options.pass_path = nil
-      end
-      opt.on("--pass FILE",
-        "pass input to FILE for pipeline use") do |v|
-        @options.pass = nil
-        @options.pass_path = v
+      opt.on("-O [FILE]", "--pass [FILE]",
+        "pass input to stdout or FILE for pipeline use") do |v|
+        set_pass_target(v)
       end
 
-      opt.on("-o", "--output",
-        "write plot to stdout") do
-        @options.output = STDOUT
-        @options.output_path = nil
-      end
-      opt.on("--output FILE",
-        "write plot to FILE (default: stderr)") do |v|
-        @options.output = STDERR
-        @options.output_path = v
+      opt.on("-o [FILE]", "--output [FILE]",
+        "write plot to stdout or FILE (default: stderr)") do |v|
+        set_output_target(v)
       end
 
       opt.on("-d", "--delimiter DELIM",
@@ -173,6 +161,26 @@ module YouPlot2
       end
     end
 
+    private def set_pass_target(value : String) : Nil
+      if value.empty? || value == "-"
+        @options.pass = STDOUT
+        @options.pass_path = nil
+      else
+        @options.pass = nil
+        @options.pass_path = value
+      end
+    end
+
+    private def set_output_target(value : String) : Nil
+      if value.empty? || value == "-"
+        @options.output = STDOUT
+        @options.output_path = nil
+      else
+        @options.output = STDERR
+        @options.output_path = value
+      end
+    end
+
     private def add_subcommands
       add_barplot_commands
       add_count_commands