lino 1.7.0 → 1.8.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43f59cff1f818d9c9c1a1d4c877bb519fa2240376302e6e0aecf14d3ece7a572
-  data.tar.gz: 3be0e037eef7a4ab041b559363e2c1214c9a42bfa1e30945fe6c735f5d7c70f4
+  metadata.gz: e9451d4d5a1cac65706c718503cc44813da8e4d3aa2397c0469c7d6474c96336
+  data.tar.gz: 39aacdb97179f720a9bb440a3e79a9114ef3678428e2b3a7b4611bcf2cd999bf
 SHA512:
-  metadata.gz: 4a0003a27a7eae4b123d06b4a96727281320cd2fbfcf6d46a8dab5c1082708150e034508100b8c30d83b951c8478ba23990bb0da0777c032653fcb7910737d78
-  data.tar.gz: 9fd77c51c4bdaf94ef5bcf48528c45dd9bc3971438b3a4d3a2b153edc30398e46c8a4fb694dcf39f22985158a6324c5de72fc137a3eb4282257dcd87f8128680
+  metadata.gz: a588ae04311413b5d1aeecc166977927f8c1761949b0ede6674b0ffad10b4fc61455c0cbedfe66d35ef126e507594138276da8c14154dde1c8e67c571855059e
+  data.tar.gz: 172aa6befaf57bbecf308a02e0ea01bdf3f43421badbbd34337ca098d7975939d981ecfb6199127297a894107ef120a2556dd4f1c91988cf5957658f100a54f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lino (1.7.0)
+    lino (1.8.0.pre.1)
       hamster (~> 3.0)
       open4 (~> 1.3)
 
@@ -105,4 +105,4 @@ DEPENDENCIES
   simplecov (~> 0.16)
 
 BUNDLED WITH
-   2.2.4
+   2.2.15

data/README.md

@@ -49,37 +49,53 @@ Lino::CommandLineBuilder.for_command('ls')
     .with_flag('-a')
     .build
     .to_s
-    
+
 # => ls -l -a
-  
+
 # commands with options
 Lino::CommandLineBuilder.for_command('gpg')
     .with_option('--recipient', 'tobyclemson@gmail.com')
     .with_option('--sign', './doc.txt')
     .build
-    .to_s 
-    
+    .to_s
+
 # => gpg --recipient tobyclemson@gmail.com --sign ./doc.txt
-  
-# commands with arguments
+
+# commands with an option repeated multiple times (nil and empty option values are ignored)
+Lino::CommandLineBuilder.for_command('example.sh')
+    .with_repeated_option('--opt', ['file1.txt', nil, '', 'file2.txt'])
+    .build
+    .to_s
+
+# => example.sh --opt file1.txt --opt file2.txt
+
+# commands with arguments 
 Lino::CommandLineBuilder.for_command('diff')
     .with_argument('./file1.txt')
     .with_argument('./file2.txt')
     .build
-    .to_s 
-    
+    .to_s
+
 # => diff ./file1.txt ./file2.txt
-  
+
+# commands with an array of arguments (nil and empty arguments are ignored)
+Lino::CommandLineBuilder.for_command('diff')
+    .with_arguments(['./file1.txt', nil, '', './file2.txt'])
+    .build
+    .to_s
+
+# => diff ./file1.txt ./file2.txt
+
 # commands with custom option separator
 Lino::CommandLineBuilder.for_command('java')
     .with_option_separator(':')
     .with_option('-splash', './images/splash.jpg')
     .with_argument('./application.jar')
     .build
-    .to_s 
-    
+    .to_s
+
 # => java -splash:./images/splash.jpg ./application.jar
-  
+
 # commands using a subcommand style
 Lino::CommandLineBuilder.for_command('git')
     .with_flag('--no-pager')
@@ -88,9 +104,9 @@ Lino::CommandLineBuilder.for_command('git')
     end
     .build
     .to_s
-    
+
 # => git --no-pager log --since 2016-01-01
-  
+
 # commands with multiple levels of subcommand
 Lino::CommandLineBuilder.for_command('gcloud')
     .with_subcommand('sql')

data/lib/lino/command_line_builder.rb

@@ -2,10 +2,12 @@ require 'hamster'
 require_relative 'utilities'
 require_relative 'command_line'
 require_relative 'subcommand_builder'
+require_relative 'option_flag_mixin'
 
 module Lino
   class CommandLineBuilder
     include Lino::Utilities
+    include Lino::OptionFlagMixin
 
     class <<self
       def for_command(command)
@@ -14,13 +16,14 @@ module Lino
     end
 
     def initialize(
-        command: nil,
-        subcommands: [],
-        switches: [],
-        arguments: [],
-        environment_variables: [],
-        option_separator: ' ',
-        option_quoting: nil)
+      command: nil,
+      subcommands: [],
+      switches: [],
+      arguments: [],
+      environment_variables: [],
+      option_separator: ' ',
+      option_quoting: nil
+    )
       @command = command
       @subcommands = Hamster::Vector.new(subcommands)
       @switches = Hamster::Vector.new(switches)
@@ -31,16 +34,13 @@ module Lino
     end
 
     def with_subcommand(subcommand, &block)
-      with(subcommands: @subcommands.add((block || lambda { |sub| sub }).call(
-          SubcommandBuilder.for_subcommand(subcommand))))
-    end
-
-    def with_option(switch, value, separator: nil, quoting: nil)
-      with(switches: @switches.add({
-          components: [switch, value],
-          separator: separator,
-          quoting: quoting
-      }))
+      with(
+        subcommands: @subcommands.add(
+          (block || ->(sub) { sub }).call(
+            SubcommandBuilder.for_subcommand(subcommand)
+          )
+        )
+      )
     end
 
     def with_option_separator(option_separator)
@@ -51,12 +51,13 @@ module Lino
       with(option_quoting: character)
     end
 
-    def with_flag(flag)
-      with(switches: @switches.add({components: [flag]}))
+    def with_argument(argument)
+      with(arguments: add_argument(argument))
     end
 
-    def with_argument(argument)
-      with(arguments: @arguments.add({components: [argument]}))
+    def with_arguments(arguments)
+      arguments.each { |argument| add_argument(argument) }
+      with({})
     end
 
     def with_environment_variable(environment_variable, value)
@@ -65,41 +66,47 @@ module Lino
 
     def build
       components = [
-          map_and_join(@environment_variables) { |var|
-            "#{var[0]}=\"#{var[1].to_s.gsub(/"/, "\\\"")}\""
-          },
-          @command,
-          map_and_join(@switches,
-              &(quote_with(@option_quoting) >> join_with(@option_separator))),
-          map_and_join(@subcommands) { |sub|
-            sub.build(@option_separator, @option_quoting)
-          },
-          map_and_join(@arguments, &join_with(' '))
+        map_and_join(@environment_variables) do |var|
+          "#{var[0]}=\"#{var[1].to_s.gsub(/"/, '\\"')}\""
+        end,
+        @command,
+        map_and_join(
+          @switches,
+          &(quote_with(@option_quoting) >> join_with(@option_separator))
+        ),
+        map_and_join(@subcommands) do |sub|
+          sub.build(@option_separator, @option_quoting)
+        end,
+        map_and_join(@arguments, &join_with(' '))
       ]
 
-      command_string = components
-          .reject { |item| item.empty? }
-          .join(' ')
+      command_string = components.reject(&:empty?).join(' ')
 
       CommandLine.new(command_string)
     end
 
     private
 
-    def with **replacements
+    def with(**replacements)
       CommandLineBuilder.new(**state.merge(replacements))
     end
 
     def state
       {
-          command: @command,
-          subcommands: @subcommands,
-          switches: @switches,
-          arguments: @arguments,
-          environment_variables: @environment_variables,
-          option_separator: @option_separator,
-          option_quoting: @option_quoting
+        command: @command,
+        subcommands: @subcommands,
+        switches: @switches,
+        arguments: @arguments,
+        environment_variables: @environment_variables,
+        option_separator: @option_separator,
+        option_quoting: @option_quoting
       }
     end
+
+    def add_argument(argument)
+      return @arguments if missing?(argument)
+
+      @arguments = @arguments.add({ components: [argument] })
+    end
   end
-end
+end

data/lib/lino/option_flag_mixin.rb

@@ -0,0 +1,36 @@
+module Lino
+  module OptionFlagMixin
+    def with_option(switch, value, separator: nil, quoting: nil)
+      with(switches: add_option(switch, value, separator, quoting))
+    end
+
+    def with_repeated_option(switch, values, separator: nil, quoting: nil)
+      values.each do |value|
+        add_option(switch, value, separator, quoting)
+      end
+      with({})
+    end
+
+    def with_flag(flag)
+      with(switches: @switches.add({ components: [flag] }))
+    end
+
+    private
+
+    def add_option(switch, value, separator, quoting)
+      return @switches if missing?(value)
+
+      @switches = @switches.add(
+        {
+          components: [switch, value],
+          separator: separator,
+          quoting: quoting
+        }
+      )
+    end
+
+    def missing?(value)
+      value.nil? || (value.respond_to?(:empty?) && value.empty?)
+    end
+  end
+end

data/lib/lino/subcommand_builder.rb

@@ -1,58 +1,45 @@
 require 'hamster'
 require_relative 'utilities'
+require_relative 'option_flag_mixin'
 
 module Lino
   class SubcommandBuilder
     include Lino::Utilities
+    include Lino::OptionFlagMixin
 
     class <<self
-      def for_subcommand subcommand
+      def for_subcommand(subcommand)
         SubcommandBuilder.new(subcommand: subcommand)
       end
     end
 
-    def initialize(
-        subcommand: nil,
-        switches: [])
+    def initialize(subcommand: nil, switches: [])
       @subcommand = subcommand
       @switches = Hamster::Vector.new(switches)
     end
 
-    def with_option(switch, value, separator: nil, quoting: nil)
-      with(switches: @switches.add({
-          components: [switch, value],
-          separator: separator,
-          quoting: quoting
-      }))
-    end
-
-    def with_flag(flag)
-      with(switches: @switches.add({components: [flag]}))
-    end
-
     def build(option_separator, option_quoting)
       components = [
-          @subcommand,
-          map_and_join(@switches,
-              &(quote_with(option_quoting) >> join_with(option_separator)))
+        @subcommand,
+        map_and_join(
+          @switches,
+          &(quote_with(option_quoting) >> join_with(option_separator))
+        )
       ]
-
-      components
-          .reject { |item| item.empty? }
-          .join(' ')
+      components.reject(&:empty?).join(' ')
     end
 
     private
 
-    def with **replacements
+    def with(**replacements)
       SubcommandBuilder.new(**state.merge(replacements))
     end
 
     def state
       {
-          subcommand: @subcommand,
-          switches: @switches
+        subcommand: @subcommand,
+        switches: @switches
       }
     end
   end
-end
+end

data/lib/lino/version.rb

@@ -1,3 +1,3 @@
 module Lino
-  VERSION = '1.7.0'
+  VERSION = '1.8.0.pre.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lino
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0.pre.1
 platform: ruby
 authors:
 - Toby Clemson
@@ -182,6 +182,7 @@ files:
 - lib/lino.rb
 - lib/lino/command_line.rb
 - lib/lino/command_line_builder.rb
+- lib/lino/option_flag_mixin.rb
 - lib/lino/subcommand_builder.rb
 - lib/lino/utilities.rb
 - lib/lino/version.rb
@@ -200,9 +201,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: