lino 4.0.0 → 4.1.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2345fde1348f94927b9f8790c0a3d77a28b1bd0829eaa408249ef1b9ad06a9b1
-  data.tar.gz: 2ed278cbe9a30e2df451ccfa78bf592a2ceb6654bb70d1d37f4a3625aae37371
+  metadata.gz: 77313c118a7ec29a28062897a1490fbda3e905cfe910906b930508480fae3793
+  data.tar.gz: fa5815fa27764e9cebf086804873ce6725ff84721037da0768ff5ccde7c2d24f
 SHA512:
-  metadata.gz: 256de30d81d5bd07e9047878c3ed4691d2052997425c95d7a33bdba5cbf402cf3fcd5356945882fb5e8cbd85346e322a36c44c995ff32392c52435163314aac8
-  data.tar.gz: 4fdee42f644db2994a90d0de0465f8d04df02eac2be62f08d755b272dc75278f4894a7772f169935f8a7fc7e9c429466e86980491700e858cc014fe8f5ac9dce
+  metadata.gz: 8887634b824b0949b843cfd25a740d9f41646b61d314015d0b2fc5d5d7d19587913bd46abe9db74985182c40475f8a2d768e0debe3060589dfadf66b6148566f
+  data.tar.gz: faeb8f86d1d6611f87cec507b2016e8f49f11a8fa62d6d4547378bdb2d2387b52894819f66684bc0cbc959a3a71de773655262d146ddde308e9abdb37d428b31

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lino (4.0.0)
+    lino (4.1.0.pre.2)
       childprocess (~> 5.0.0)
       hamster (~> 3.0)
       open4 (~> 1.3)
@@ -107,11 +107,11 @@ GEM
       colored2 (~> 3.1)
       git (~> 1.13, >= 1.13.2)
       rake_factory (= 0.32.0.pre.2)
-    rake_git_crypt (0.1.0.pre.30)
+    rake_git_crypt (0.1.0.pre.32)
       colored2 (~> 3.1)
       rake_factory (= 0.32.0.pre.2)
-      ruby_git_crypt (= 0.1.0.pre.6)
-      ruby_gpg2 (= 0.11.0.pre.5)
+      ruby_git_crypt (= 0.1.0.pre.8)
+      ruby_gpg2 (= 0.11.0.pre.6)
     rake_github (0.13.0)
       colored2 (~> 3.1)
       octokit (>= 4.16, < 9.0)
@@ -162,11 +162,11 @@ GEM
     rubocop-rspec (3.0.3)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    ruby_git_crypt (0.1.0.pre.6)
+    ruby_git_crypt (0.1.0.pre.8)
       immutable-struct (~> 2.4)
-      lino (= 3.2.0.pre.10)
-    ruby_gpg2 (0.11.0.pre.5)
-      lino (= 3.2.0.pre.10)
+      lino (>= 3.1)
+    ruby_gpg2 (0.11.0.pre.6)
+      lino (>= 3.1)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)

data/lib/lino/builders/command_line.rb

@@ -37,8 +37,10 @@ module Lino
         Model::CommandLine.new(
           @command,
           state.merge(
-            options: build_options,
-            subcommands: build_subcommands
+            options: build_options(@option_separator, @option_quoting,
+                                   @option_placement),
+            subcommands: build_subcommands(@option_separator, @option_quoting,
+                                           @option_placement)
           )
         )
       end

data/lib/lino/builders/mixins/options.rb

@@ -91,25 +91,33 @@ module Lino
           super.merge(options: @options)
         end
 
-        def build_options
+        def build_options(option_separator, option_quoting, option_placement)
           @options.map do |data|
-            data[:type] == :option ? build_option(data) : build_flag(data)
+            if data[:type] == :option
+              build_option(
+                data, option_separator, option_quoting, option_placement
+              )
+            else
+              build_flag(data, option_placement)
+            end
           end
         end
 
-        def build_option(option_data)
+        def build_option(
+          option_data, option_separator, option_quoting, option_placement
+        )
           Model::Option.new(
             *option_data[:components],
-            separator: option_data[:separator] || @option_separator,
-            quoting: option_data[:quoting] || @option_quoting,
-            placement: option_data[:placement] || @option_placement
+            separator: option_data[:separator] || option_separator,
+            quoting: option_data[:quoting] || option_quoting,
+            placement: option_data[:placement] || option_placement
           )
         end
 
-        def build_flag(flag_data)
+        def build_flag(flag_data, option_placement)
           Model::Flag.new(
             *flag_data[:components],
-            placement: flag_data[:placement] || @option_placement
+            placement: flag_data[:placement] || option_placement
           )
         end
       end

data/lib/lino/builders/mixins/subcommands.rb

@@ -43,8 +43,12 @@ module Lino
           super.merge(subcommands: @subcommands)
         end
 
-        def build_subcommands
-          @subcommands.map(&:build)
+        def build_subcommands(
+          option_separator, option_quoting, option_placement
+        )
+          @subcommands.map do |s|
+            s.build(option_separator, option_quoting, option_placement)
+          end
         end
       end
     end

data/lib/lino/builders/subcommand.rb

@@ -23,10 +23,14 @@ module Lino
         @options = Hamster::Vector.new(state[:options] || [])
       end
 
-      def build
+      def build(option_separator, option_quoting, option_placement)
         Model::Subcommand.new(
           @subcommand,
-          options: build_options
+          options: build_options(
+            option_separator,
+            option_quoting,
+            option_placement
+          )
         )
       end
 

data/lib/lino/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lino
-  VERSION = '4.0.0'
+  VERSION = '4.1.0.pre.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lino
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0.pre.2
 platform: ruby
 authors:
 - InfraBlocks Maintainers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-14 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -336,9 +336,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key: