lino 1.2.0.pre.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f400d67549dca909bceb3ca4596ae999a1c9f29cee17ef113e445f4a481163f2
-  data.tar.gz: 10252b5eadc145a150fcffcc121988c98567da08dc1c51f8d261c58d9387e026
+  metadata.gz: b16e7c984524e7ce0257398bc97285ad46d8f5c9b2d03c9cc46401dc0450a7eb
+  data.tar.gz: 95a88627410a2053dc73c3a1f6df576cf239095e0dd7fe8f9b01d9ad4ccd150f
 SHA512:
-  metadata.gz: e6dc5a7ee780de4de6f3576751dca285816bfe21ded3329804e0983466ea4db4d406793672f63d7b45e46f3445e310b396e081283038d2a655275f61bbe65568
-  data.tar.gz: 19c1769b9fce8be5e49be853d6974ac704853b205a6979ffb836a5acd189191640b00428a625e3b5ae62f3dadde8131567405ca5564a1b6da42706a0a14c8d11
+  metadata.gz: e50dbc893fcce9d5d8315047a85c86df23fa3a160ec97790c9530e3503b33cab6d05facf73a2a55f05db4b38ca487c86ade98deaa5741d3874ebbdc27f1dd502
+  data.tar.gz: c72b3205a644395b12a3440d16014fdc480814ed6532ac8920d3a4e0af138ae786cfa99c23b04b8586c503f923441b307e86d1b16be702e79da7e51e496df7f8

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    lino (1.2.0.pre.1)
+    lino (1.5.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     colored2 (3.1.2)
@@ -28,13 +28,13 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multipart-post (2.1.1)
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    public_suffix (4.0.4)
+    public_suffix (4.0.5)
     rake (13.0.1)
     rake_circle_ci (0.7.0)
       colored2 (~> 3.1)
@@ -57,15 +57,15 @@ GEM
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)

data/lib/lino/command_line_builder.rb

@@ -8,7 +8,7 @@ module Lino
     include Lino::Utilities
 
     class <<self
-      def for_command command
+      def for_command(command)
         CommandLineBuilder.new(command: command)
       end
     end
@@ -19,13 +19,15 @@ module Lino
         switches: [],
         arguments: [],
         environment_variables: [],
-        option_separator: ' ')
+        option_separator: ' ',
+        option_quoting: nil)
       @command = command
       @subcommands = Hamster::Vector.new(subcommands)
       @switches = Hamster::Vector.new(switches)
       @arguments = Hamster::Vector.new(arguments)
       @environment_variables = Hamster::Vector.new(environment_variables)
       @option_separator = option_separator
+      @option_quoting = option_quoting
     end
 
     def with_subcommand(subcommand, &block)
@@ -33,14 +35,22 @@ module Lino
           SubcommandBuilder.for_subcommand(subcommand))))
     end
 
-    def with_option(switch, value, separator: nil)
-      with(switches: @switches.add({components: [switch, value], separator: separator}))
+    def with_option(switch, value, separator: nil, quoting: nil)
+      with(switches: @switches.add({
+          components: [switch, value],
+          separator: separator,
+          quoting: quoting
+      }))
     end
 
     def with_option_separator(option_separator)
       with(option_separator: option_separator)
     end
 
+    def with_option_quoting(character)
+      with(option_quoting: character)
+    end
+
     def with_flag(flag)
       with(switches: @switches.add({components: [flag]}))
     end
@@ -55,10 +65,15 @@ module Lino
 
     def build
       components = [
-          map_and_join(@environment_variables) { |var| "#{var[0]}=\"#{var[1]}\"" },
+          map_and_join(@environment_variables) { |var|
+            "#{var[0]}=\"#{var[1].to_s.gsub(/"/, "\\\"")}\""
+          },
           @command,
-          map_and_join(@switches, &join_with(@option_separator)),
-          map_and_join(@subcommands) { |sub| sub.build(@option_separator)},
+          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(' '))
       ]
 
@@ -82,7 +97,8 @@ module Lino
           switches: @switches,
           arguments: @arguments,
           environment_variables: @environment_variables,
-          option_separator: @option_separator
+          option_separator: @option_separator,
+          option_quoting: @option_quoting
       }
     end
   end

data/lib/lino/subcommand_builder.rb

@@ -18,18 +18,23 @@ module Lino
       @switches = Hamster::Vector.new(switches)
     end
 
-    def with_option(switch, value, separator: nil)
-      with(switches: @switches.add({components: [switch, value], separator: separator}))
+    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)
+    def build(option_separator, option_quoting)
       components = [
           @subcommand,
-          map_and_join(@switches, &join_with(option_separator))
+          map_and_join(@switches,
+              &(quote_with(option_quoting) >> join_with(option_separator)))
       ]
 
       components

data/lib/lino/utilities.rb

@@ -1,11 +1,29 @@
+require 'pp'
+
 module Lino
   module Utilities
     def map_and_join(collection, &block)
       collection.map { |item| block.call(item) }.join(' ')
     end
 
-    def join_with(separator)
-      lambda { |item| item[:components].join(item[:separator] || separator) }
+    def join_with(global_separator)
+      lambda do |item|
+        item[:components].join(item[:separator] || global_separator)
+      end
+    end
+
+    def quote_with(global_character)
+      lambda do |item|
+        character = item[:quoting] || global_character
+        components = item[:components]
+        switch = components[0]
+        value = components[1]
+
+        item.merge(
+            components: (components.count > 1) ?
+                [switch, "#{character}#{value}#{character}"] :
+                components)
+      end
     end
   end
 end

data/lib/lino/version.rb

@@ -1,3 +1,3 @@
 module Lino
-  VERSION = '1.2.0.pre.1'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lino
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Toby Clemson
@@ -213,9 +213,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.1
 signing_key: