squared 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17d98e04832d29621058a1dafa1f9440f0734849aa2b68aecffed2b0c50c0e26
-  data.tar.gz: 31391a2561c19025ddd25a20c980f10cf605de2593a24e793eee87ee3d1ccc67
+  metadata.gz: a9e8d3d41e090465c85e45088c984711f2a26f6ab2f38d56ed8b58658735f678
+  data.tar.gz: 2ff93124747a950b6ac94424052268e4ab6b107e934a2fd16478ca03d74a5409
 SHA512:
-  metadata.gz: 246be3dde753890551351e232e8f804b7cf3e32ea610113983ad465dd863365f800142d18c91e732df7152e3cfdc6c8c727c980d85b1079dc7acc39ecde6a0aa
-  data.tar.gz: 3a9f07b19f697678bacf6d15914df6c33f74e2aa9a0d9b5f10b033b10c29e3460b34e2da3890ae62ed655858d499fb34dae49098096c73b9a2279bb8f9745bd1
+  metadata.gz: 60b75a0d2d6c361ccf9341496b0b4e9e3a0599030ea6099f50a2819246111ff671a8f52cf583e91294593179949542f1e18814059c953007bbee528c1dbaa244
+  data.tar.gz: c52d560aacea0d6279948db05d29c1a5b5c55a5d7fb2218f03d418122417a8ca3377a1b4af54238538d4d911c4827b6a2921b76001b161a6bfdd460e55dd13e5

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 # Changelog
 
-## [0.7.1] - 2025-01-20
+## [0.7.2] - 2026-02-09
+
+### Added
+
+- OptionPartition can parse flags with a custom switch or separator.
+- Gem command uninstall and pristine are interactive.
+- Docker command network action create was implemented.
+- Python command serve using http.server module was implemented.
+- Ruby command serve using webrick was implemented.
+- Node command serve using filename or string was implemented.
+
+### Fixed
+
+- Docker task clean does not run in parallel without ENV override.
+
+## [0.7.1] - 2026-01-20
 
 ### Added
 
@@ -14,7 +29,7 @@
 
 - Git task show was completely non-functional due to excessive formatting.
 
-## [0.7.0] - 2025-01-07
+## [0.7.0] - 2026-01-07
 
 ### Added
 
@@ -87,7 +102,7 @@
 - Project base method command_args did not append prompted value.
 - Bundler command exec did not use correct delegate for delete.
 
-## [0.6.9] - 2025-01-07
+## [0.6.9] - 2026-01-07
 
 ### Added
 
@@ -1680,6 +1695,7 @@
 
 - Changelog was created.
 
+[0.7.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.2
 [0.7.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.1
 [0.7.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.0
 [0.6.9]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.9

data/README.md

@@ -11,7 +11,7 @@
 | 2025-01-07 |   0.2.0 |        |  3.4.0 |     |
 | 2025-02-07 |   0.3.0 |        |  3.4.1 |     |
 | 2025-03-06 |   0.4.0 |        |  3.4.2 |  *  |
-| 2025-06-16 |   0.5.0 |  2.5.0 |  3.4.3 |  *  |
+| 2025-06-16 |   0.5.0 |  2.5.0 |  3.4.4 |  *  |
 | ---------- |   ----- |  ----- |  ----- | --- |
 | 2025-08-23 |   0.5.5 |        |  3.4.5 |     |
 | 2025-10-31 |   0.6.0 |        |  3.4.7 |  *  |
@@ -300,10 +300,10 @@ Workspace::Application
   end
   .with(:python) do
     doc("make html")
-    add("android-docs") do
+    add("android-docs", serve: "./build/html") do                          # Uses built-in http.server module (ruby: webrick)
       chain "all", "doc", with: "squared", after: "squared"                # step: 4
     end
-    add("chrome-docs") do
+    add("chrome-docs", serve: { root: "./build/html", port: 8000 }) do     # root | bind | port | opts[]
       chain "all", "doc", with: "squared", before: "squared:revbuild"      # Same
     end
   end

data/lib/squared/common/shell.rb

@@ -73,7 +73,7 @@ module Squared
       end
 
       def shell_option(flag, val = nil, sep: '=', escape: true, quote: true, force: true, double: false, merge: false,
-                       override: false)
+                       switch: nil, override: false)
         flag = flag.to_s
         if flag =~ QUOTE_VALUE
           double = $1 == '"'
@@ -88,6 +88,9 @@ module Squared
                   else
                     merge ? '' : ' '
                   end
+                elsif switch
+                  pre = switch unless flag.start_with?(switch)
+                  merge ? '' : sep
                 elsif flag.size == 1
                   pre = '-'
                   merge ? '' : ' '

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/lib/squared/workspace/project/base.rb

@@ -23,7 +23,7 @@ module Squared
 
         OPTIONS = Workspace::Support.hashobj
         VAR_SET = %i[parent global script index envname desc dependfile dependname dependindex theme archive env graph
-                     dev prod timeout pass only exclude asdf].freeze
+                     dev prod timeout pass only exclude serve asdf].freeze
         BLK_SET = %i[run depend doc lint test copy clean].freeze
         SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?[-.]?(\S+)?\b/.freeze
         URI_SCHEME = %r{\A([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.freeze
@@ -117,7 +117,8 @@ module Squared
         subtasks({
           'graph' => %i[run print].freeze,
           'unpack' => %i[zip gz tar ext],
-          'asdf' => %i[set exec env current update latest where reshim]
+          'asdf' => %i[set exec env current update latest where reshim],
+          'serve' => nil
         })
 
         attr_reader :name, :workspace, :path, :theme, :group, :parent, :children, :dependfile,
@@ -276,80 +277,114 @@ module Squared
             Base.subtasks do |action, flags|
               next if task_pass?(action)
 
-              namespace action do
-                flags.each do |flag|
-                  case action
-                  when 'graph'
-                    break unless graph?
-
-                    format_desc action, flag, '(-)project*'
-                    task flag do |_, args|
-                      args = args.to_a.reject { |val| val == name }
-                      if flag == :run
-                        graph args
-                      else
-                        out = graph(args, out: [], order: {})
-                        emphasize(out, title: path, right: true, border: borderstyle, sub: [
-                          opt_style(theme[:header], /\A(#{Regexp.escape(path.to_s)})(.*)\z/),
-                          opt_style(theme[:active], /\A(#{Regexp.escape(name)})(.*)\z/),
-                          opt_style(theme[:inline], /\A((?~ \() \()(\d+)(\).*)\z/, 2)
-                        ])
+              if flags.nil?
+                case action
+                when 'serve'
+                  next unless serve?
+
+                  format_desc action, nil, 'root,port?,bind?,opts*'
+                  task action, [:root] do |_, args|
+                    if !args.root && @serve
+                      kwargs = @serve.dup
+                      root = kwargs.delete(:root)
+                      opts = kwargs.delete(:opts) || []
+                    else
+                      root = param_guard(action, 'path', args: args, key: :root)
+                      opts = args.extras
+                      unless opts.empty?
+                        port = opts.shift
+                        if port.match?(/^\d+$/)
+                          bind = opts.shift
+                        else
+                          bind = port
+                          port = nil
+                        end
+                        if bind&.start_with?('-')
+                          opts << bind
+                          bind = nil
+                        end
                       end
+                      kwargs = { port: port, bind: bind }.compact
                     end
-                  when 'unpack'
-                    format_desc(action, flag, 'tag/url,dir,digest?,f/orce?', before: ('ext' if flag == :ext))
-                    params = %i[tag dir digest force]
-                    params.unshift(:ext) if flag == :ext
-                    task flag, params do |_, args|
-                      ext = flag == :ext ? param_guard(action, flag, args: args, key: :ext) : flag.to_s
-                      tag = param_guard(action, flag, args: args, key: :tag)
-                      dir = param_guard(action, flag, args: args, key: :dir)
-                      unless tag.match?(URI_SCHEME)
-                        tag = unpack_get tag, ext
-                        tag ||= if @release
-                                  "%s.#{ext}" % [@release.include?('??') ? @release.sub('??', tag) : @release + tag]
+                    serve(basepath(root).to_s, opts, **kwargs)
+                  end
+                end
+              else
+                namespace action do
+                  flags.each do |flag|
+                    case action
+                    when 'graph'
+                      break unless graph?
+
+                      format_desc action, flag, '(-)project*'
+                      task flag do |_, args|
+                        args = args.to_a.reject { |val| val == name }
+                        if flag == :run
+                          graph args
+                        else
+                          out = graph(args, out: [], order: {})
+                          emphasize(out, title: path, right: true, border: borderstyle, sub: [
+                            opt_style(theme[:header], /\A(#{Regexp.escape(path.to_s)})(.*)\z/),
+                            opt_style(theme[:active], /\A(#{Regexp.escape(name)})(.*)\z/),
+                            opt_style(theme[:inline], /\A((?~ \() \()(\d+)(\).*)\z/, 2)
+                          ])
+                        end
+                      end
+                    when 'unpack'
+                      format_desc(action, flag, 'tag/url,dir,digest?,f/orce?', before: ('ext' if flag == :ext))
+                      params = %i[tag dir digest force]
+                      params.unshift(:ext) if flag == :ext
+                      task flag, params do |_, args|
+                        ext = flag == :ext ? param_guard(action, flag, args: args, key: :ext) : flag.to_s
+                        tag = param_guard(action, flag, args: args, key: :tag)
+                        dir = param_guard(action, flag, args: args, key: :dir)
+                        unless tag.match?(URI_SCHEME)
+                          tag = unpack_get tag, ext
+                          tag ||= if @release
+                                    "%s.#{ext}" % [@release.include?('??') ? @release.sub('??', tag) : @release + tag]
+                                  else
+                                    raise_error ArgumentError, "no base uri: #{tag}", hint: ext
+                                  end
+                        end
+                        force = case (digest = args.digest)
+                                when 'f', 'force'
+                                  digest = nil
+                                  true
                                 else
-                                  raise_error ArgumentError, "no base uri: #{tag}", hint: ext
+                                  args.fetch(:force, false)
                                 end
+                        unpack(basepath(dir), uri: tag, digest: digest, ext: ext, force: force)
                       end
-                      force = case (digest = args.digest)
-                              when 'f', 'force'
-                                digest = nil
-                                true
-                              else
-                                args.fetch(:force, false)
-                              end
-                      unpack(basepath(dir), uri: tag, digest: digest, ext: ext, force: force)
-                    end
-                  when 'asdf'
-                    break unless @asdf
-
-                    case flag
-                    when :set
-                      format_desc action, flag, 'version,dir?=u/home|p/arent'
-                      task flag, [:version] do |_, args|
-                        args = if (version = args.version)
-                                 args.extras
-                               else
-                                 version, opts = choice_index('Select a version',
-                                                              @asdf[1].children
-                                                                      .map(&:basename)
-                                                                      .sort { |a, b| b <=> a }
-                                                                      .push('latest', 'system'),
-                                                              accept: [accept_y('Confirm?')],
-                                                              values: 'Options')
-                                 OptionPartition.strip(opts)
-                               end
-                        asdf(flag, args, version: version)
-                      end
-                    else
-                      format_desc(action, flag, case flag when :exec, :env then 'command' end)
-                      task flag do |_, args|
-                        args = args.to_a
-                        if args.empty? && (flag == :exec || flag == :env)
-                          args << readline('Enter command', force: flag == :exec)
+                    when 'asdf'
+                      break unless @asdf
+
+                      case flag
+                      when :set
+                        format_desc action, flag, 'version,dir?=u/home|p/arent'
+                        task flag, [:version] do |_, args|
+                          args = if (version = args.version)
+                                   args.extras
+                                 else
+                                   version, opts = choice_index('Select a version',
+                                                                @asdf[1].children
+                                                                        .map(&:basename)
+                                                                        .sort { |a, b| b <=> a }
+                                                                        .push('latest', 'system'),
+                                                                accept: [accept_y('Confirm?')],
+                                                                values: 'Options')
+                                   OptionPartition.strip(opts)
+                                 end
+                          asdf(flag, args, version: version)
+                        end
+                      else
+                        format_desc(action, flag, case flag when :exec, :env then 'command' end)
+                        task flag do |_, args|
+                          args = args.to_a
+                          if args.empty? && (flag == :exec || flag == :env)
+                            args << readline('Enter command', force: flag == :exec)
+                          end
+                          asdf flag, args
                         end
-                        asdf flag, args
                       end
                     end
                   end
@@ -959,6 +994,8 @@ module Squared
               parent_set val
             when :archive
               archive_set val
+            when :serve
+              serve_set val
             when :asdf
               asdf_set val
             when :run
@@ -2499,6 +2536,17 @@ module Squared
                      end
         end
 
+        def serve_set(val)
+          @serve = case val
+                   when false
+                     false
+                   when String
+                     { root: val }
+                   when Hash
+                     val if val.key?(:root)
+                   end
+        end
+
         def asdf_set(val)
           @asdf = if @@asdf && val
                     dir = @@asdf.path.join('installs', val)
@@ -2660,6 +2708,10 @@ module Squared
           level.empty? ? ex != false && ex != Logger::INFO : ex.is_a?(Numeric) && level.include?(ex)
         end
 
+        def serve?
+          false
+        end
+
         def variables
           VAR_SET
         end

data/lib/squared/workspace/project/docker.rb

@@ -72,6 +72,8 @@ module Squared
           }.freeze,
           network: {
             connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=q link=b link-local-ip=q].freeze,
+            create: %w[attachable config-only gateway ingress internal ipv4 ipv6 aux-address=q config-from=b d|driver=b
+                       ip-range=q ipam-driver=b ipam-opt=q label=q o|opt=q scope=b subnet=q].freeze,
             disconnect: %w[f|force].freeze
           }.freeze
         }.freeze
@@ -114,7 +116,7 @@ module Squared
           'image' => %i[ls rm pull push tag save].freeze,
           'container' => %i[run create exec update commit inspect diff start stop restart pause unpause top stats kill
                             rm].freeze,
-          'network' => %i[connect disconnect].freeze,
+          'network' => %i[connect disconnect create].freeze,
           'ls' => nil
         })
 
@@ -312,8 +314,9 @@ module Squared
                     when 'network'
                       format_desc action, flag, 'target,opts*'
                       task flag, [:target] do |_, args|
-                        if args.target
-                          network(flag, args.extras, target: args.target)
+                        target = flag == :create ? param_guard(action, flag, args: args, key: :target) : args.target
+                        if target
+                          network(flag, args.extras, target: target)
                         else
                           choice_command flag
                         end
@@ -329,8 +332,8 @@ module Squared
         def clean(*, sync: invoked_sync?('clean'), **)
           if runnable?(@clean)
             super
-          else
-            image(:rm, sync: sync)
+          elsif sync || option('y', prefix: 'docker')
+            image :rm
           end
         end
 
@@ -635,10 +638,17 @@ module Squared
 
         def network(flag, opts = [], target: nil)
           cmd, opts = docker_session('network', flag, opts: opts)
-          OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, project: self)
-                         .clear
+          op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, project: self)
+                              .clear
           from = symjoin 'network', flag
-          list_image(flag, docker_output('ps -a'), from: from) { |id| success?(run(cmd.temp(target, id), from: from)) }
+          if flag == :create
+            op.add_quote(target)
+            run(from: from)
+          else
+            list_image(flag, docker_output('ps -a'), from: from) do |id|
+              success?(run(cmd.temp(target, id), from: from))
+            end
+          end
         end
 
         def build?

data/lib/squared/workspace/project/git.rb

@@ -1108,15 +1108,16 @@ module Squared
           pull(:autostash, sync: sync)
         end
 
-        def fetch(flag = nil, opts = [], sync: invoked_sync?('fetch', flag), remote: nil)
+        def fetch(flag = nil, opts = [], sync: invoked_sync?('fetch', flag), remote: nil,
+                  banner: !sync || verbose? || task_invoked?('fetch'))
           opts = git_session('fetch', opts: opts).last
           opts << 'all' if flag == :all || option('all')
           append_pull(opts, collect_hash(OPT_GIT[:fetch]), flag: flag, from: :fetch, remote: remote,
                                                            no: collect_hash(OPT_GIT[:no][:fetch]))
           if sync
-            source
+            source(banner: banner)
           else
-            source(sync: false, **threadargs)
+            source(sync: false, banner: banner, **threadargs)
           end
         end
 

data/lib/squared/workspace/project/node.rb

@@ -106,7 +106,21 @@ module Squared
           tsc: %w[excludeDirectories excludeFiles customConditions lib moduleSuffixes plugins rootDirs typeRoots
                   types].freeze
         }.freeze
-        private_constant :OPT_NPM, :OPT_PNPM, :OPT_YARN, :OPT_BERRY, :OPT_TSC, :PASS_NODE
+        APP_SERVE = 'const t=require("http"),e=require("fs"),a=require("path"),i="$ROOT",o={avif:"image/avif",css:"te' \
+                    'xt/css",gif:"image/gif",htm:"text/html",html:"text/html",ico:"image/x-icon",jpeg:"image/jpeg",jp' \
+                    'g:"image/jpeg",js:"text/javascript",mjs:"application/javascript",json:"application/json",md:"tex' \
+                    't/markdown",m4a:"audio/x-m4a",mp3:"audio/mpeg",mp4:"video/mp4",otf:"font/otf",pdf:"application/p' \
+                    'df",png:"image/png",rss:"application/rss+xml",svg:"image/svg+xml",ttc:"font/collection",ttf:"fon' \
+                    't/ttf",txt:"text/plain",wasm:"application/wasm",webp:"image/webp",woff:"font/woff",woff2:"font/w' \
+                    'off2",xml:"application/xml",webmanifest:"application/manifest+json",yaml:"text/yaml",yml:"text/y' \
+                    'aml"};function n(t){return o[a.extname(t).slice(1)]||"application/octet-stream"}t.createServer((' \
+                    't,o)=>{let l=a.join(i,t.url.split("?")[0]);try{e.statSync(l).isDirectory()&&(l=a.join(l,"index.h' \
+                    'tml"))}catch{}e.readFile(l,(t,e)=>{console.error(`[${(new Date).toLocaleTimeString().padStart(11' \
+                    ', 0)}] ${t?"\x1B[31m404\x1B[39m":"\x1B[1m200\x1B[22m"} ${l.slice(i.length)}`);if(t)return o.writ' \
+                    'eHead(404,{"Content-Type":"text/plain"}),void o.end("404 Not Found");o.writeHead(200,{"Content-T' \
+                    'ype":n(l)}),o.end(e)})}).listen({host:"$HOST",port:+"$PORT"},()=>{console.log("HTTP server liste' \
+                    'ning on http://$HOST:$PORT")});'
+        private_constant :OPT_NPM, :OPT_PNPM, :OPT_YARN, :OPT_BERRY, :OPT_TSC, :PASS_NODE, :APP_SERVE
 
         class << self
           def tasks
@@ -160,6 +174,7 @@ module Squared
           end
           @dependname = 'package.json'
           dependfile_set [@dependname]
+          serve_set kwargs[:serve]
           @tsfile = basepath! ts
           @pm = { __: kwargs[:init] }
         end
@@ -1148,6 +1163,30 @@ module Squared
           end
         end
 
+        def serve(root, opts = [], bind: nil, port: 3000, **)
+          var = {}
+          if File.extname(root) =~ /[cm]?js/
+            var['HOST'] = bind if bind
+            var['PORT'] = port.to_s if port
+            target = root
+            root = File.dirname(target)
+          else
+            require 'tempfile'
+            app = APP_SERVE.dup
+            app.gsub!('$ROOT', root)
+            app.gsub!('$HOST', bind || 'localhost')
+            app.gsub!('$PORT', port.to_s)
+            file = Tempfile.new([name, '.cjs'])
+            file.write(app)
+            file.close
+            trap 'INT' do
+              file.unlink
+            end
+            target = file.path
+          end
+          shell(var, session('node', shell_quote(target), *opts.map { |s| fill_option(s) }).done, chdir: root)
+        end
+
         def depend?
           @depend != false && (!@depend.nil? || outdated?)
         end
@@ -1438,6 +1477,10 @@ module Squared
           ret
         end
 
+        def serve?
+          @serve != false
+        end
+
         def nolockfile?(prefix = dependbin)
           option('package-lock', 'lockfile', prefix: prefix, equals: '0') || !option('no-lockfile', prefix: prefix).nil?
         end

data/lib/squared/workspace/project/python.rb

@@ -129,6 +129,7 @@ module Squared
             initialize_env(**kwargs)
           end
           dependfile_set DEP_PYTHON
+          serve_set kwargs[:serve]
           editable_set editable
           venv_set kwargs[:venv]
         end
@@ -272,7 +273,7 @@ module Squared
                             if args.empty?
                               args = readline('Enter command', force: true).split(' ', 2)
                             elsif args.size == 1 && option('interactive', notequals: '0', prefix: ref)
-                              args << readline('Enter arguments', force: false)
+                              args << readline('Enter arguments', force: false) unless args.first.include?(' ')
                             end
                             venv_init
                             run args.join(' ')
@@ -804,6 +805,10 @@ module Squared
             .yield_self { |val| ret || val }
         end
 
+        def serve(root, opts = [], bind: 'localhost', port: nil, **)
+          shell(python_session('-m http.server', port, basic_option('b', bind), opts: opts).first.done, chdir: root)
+        end
+
         def project
           return @project unless @project.frozen?
 
@@ -855,6 +860,10 @@ module Squared
           !venv.nil?
         end
 
+        def serve?
+          @serve != false
+        end
+
         private
 
         def pip_session(*cmd)

data/lib/squared/workspace/project/ruby.rb

@@ -213,6 +213,7 @@ module Squared
             initialize_env(**kwargs)
           end
           dependfile_set GEMFILE
+          serve_set kwargs[:serve]
           gemfile_set kwargs[:gemspec]
           @autodetect = autodetect
           @steepfile = basepath! steep if steep
@@ -458,9 +459,10 @@ module Squared
                           bundle(flag, opts: args.to_a, banner: flag == :exec ? verbose? : true)
                         end
                       when :reinstall
-                        format_desc action, flag, 'f/orce?,opts*'
+                        format_desc action, flag, 'f/orce?,l/ocal?,opts*'
                         task flag do |_, args|
                           opts = args.to_a
+                          opts << 'local' if has_value!(opts, 'l')
                           opts << 'redownload' if has_value!(opts, 'f', 'force')
                           if (lock = basepath!('Gemfile.lock'))
                             config = basepath '.bundle', 'config'
@@ -1167,6 +1169,7 @@ module Squared
           when :dependency, :environment, :list, :search, :specification, :which
             op.concat(args)
           end
+          ia = op.remove(':')
           op.each do |opt|
             if gems && !opt.start_with?('-') && !opt.match?(GEMNAME)
               op.errors << opt
@@ -1228,7 +1231,7 @@ module Squared
             end
           when :install, :uninstall, :pristine
             if flag == :install
-              post = if op.remove(':')
+              post = if ia
                        op.concat(args)
                        readline('Enter command [args]', force: true)
                      elsif op.empty?
@@ -1237,6 +1240,25 @@ module Squared
                      elsif !args.empty?
                        args.join(' ')
                      end
+            elsif ia
+              name = op.shift || args.shift || (s = readline('Enter gem name', force: true))
+              list = []
+              pwd_set do
+                pat = /^#{name}\s+\((.+)\)$/
+                IO.popen(gem_output("list -a #{shell_quote(name)}").to_s).each do |val|
+                  next unless val =~ pat
+
+                  split_escape($1).each { |val| list << val unless val.start_with?('default:') }
+                  break
+                end
+              end
+              ver = choice_index('Select version', list, force: s.nil?) unless list.empty?
+              if ver
+                op << '--force'
+                op.unshift("#{name}@#{ver}")
+              else
+                op.unshift(name)
+              end
             end
             raise_error ArgumentError, 'missing gem name', hint: flag if op.empty?
             if op.arg?('all')
@@ -1246,7 +1268,7 @@ module Squared
               else
                 op.clear
               end
-            elsif (n = op.index { |val| val.match?(/(\A|[a-z])@\d/) })
+            elsif (n = op.index { |val| val.match?(/(\A|[\w.-])@\d/) })
               name = op.remove_at(n)
               n = name.index('@')
               pre, ver = if n == 0
@@ -1254,7 +1276,7 @@ module Squared
                          else
                            [name[0, n], name[n.succ..-1]]
                          end
-              op.adjoin(pre, basic_option('version', ver))
+              op.adjoin(pre, quote_option('version', ver))
                 .clear
             end
             if flag == :install
@@ -1540,6 +1562,18 @@ module Squared
           run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: :rubocop)
         end
 
+        def serve(root, *, bind: nil, port: nil, **kwargs)
+          require 'webrick'
+          config = kwargs.merge({ DocumentRoot: root })
+          config[:BindAddress] = bind if bind
+          config[:Port] = port if port
+          server = WEBrick::HTTPServer.new(config)
+          trap 'INT' do
+            server.shutdown
+          end
+          server.start
+        end
+
         def gemspec
           @gemspec = !gemfile.nil? && Gem::Specification.load(gemfile.to_s) rescue false if @gemspec.nil?
           @gemspec || nil
@@ -1873,6 +1907,13 @@ module Squared
             semgte?(ver.to_s, min.to_s) && (max == Float::INFINITY || !semgte?(ver.to_s, max.to_s))
           end
         end
+
+        def serve?
+          !Gem::Specification.find_by_name('webrick').nil?
+        rescue Gem::MissingSpecError => e
+          log.warn e if @serve
+          false
+        end
       end
 
       Application.implement Ruby

data/lib/squared/workspace/project/support/optionpartition.rb

@@ -221,6 +221,8 @@ module Squared
             si = []
             bl = []
             ml = []
+            sw = {}
+            se = {}
             list.flat_map do |val|
               x, y = val.split('|', 2)
               if y
@@ -233,6 +235,11 @@ module Squared
               end
             end
             .each do |val|
+              if val.size > 1 && val =~ /^\{([^},]*)(?:,([^}]+))?\}(.+)$/
+                op1 = $1 unless $1.empty?
+                op2 = $2
+                val = $3
+              end
               if (n = val.index('='))
                 flag = val[0, n]
                 case val[n.succ]
@@ -265,9 +272,12 @@ module Squared
                 end
                 m << flag if val[n + 2] == 'm'
                 bare << flag if val.end_with?('?')
+                val = flag
               else
                 bare << val
               end
+              sw[val] = op1 if op1
+              se[val] = op2 if op2
             end
             no = (no || []).map { |val| (n = val.index('=')) ? val[0, n] : val }
             bare.concat(no)
@@ -316,30 +326,34 @@ module Squared
               if single&.match?(opt)
                 add "-#{opt}"
               elsif bare.include?(opt)
-                add(opt.size == 1 ? "-#{opt}" : "--#{opt}")
-              elsif opt.start_with?(/no[-_]/) && no.include?(name = opt[3..-1])
-                add "--no-#{name}"
+                if sw[opt]
+                  add "#{sw[opt]}#{opt}"
+                else
+                  add(opt.size == 1 ? "-#{opt}" : "--#{opt}")
+                end
+              elsif opt.start_with?(/no[-_]/) && no.include?(s = opt[3..-1])
+                add "--no-#{s}"
               else
                 if opt =~ OPT_VALUE
                   key = $1
                   val = $2
                   merge = m.include?(key)
-                  if e.include?(key)
-                    add shell_option(key, val, merge: merge, sep: sep)
+                  switch = sw[key]
+                  kwargs = { sep: se[key] || sep, merge: merge, switch: switch }
+                  if e.include?(key) || (bl.include?(key) && %w[true false].include?(val))
+                    add shell_option(key, val, **kwargs)
                   elsif q.include?(key)
-                    add quote_option(key, val, double: qq.include?(key), merge: merge, sep: sep)
+                    add quote_option(key, val, double: qq.include?(key), **kwargs)
                   elsif p.include?(key)
                     if val.match?(/\A(["']).+\1\z/)
-                      add shell_option(key, val, escape: false, merge: merge, sep: sep)
+                      add shell_option(key, val, escape: false, **kwargs)
                     elsif path
-                      add quote_option(key, path + val, merge: merge, sep: sep)
+                      add quote_option(key, path + val, **kwargs)
                     else
                       push opt
                     end
-                  elsif b.include?(key) || (bl.include?(key) && %w[true false].include?(val)) || numcheck.call(key, val)
-                    add basic_option(key, val, merge: merge, sep: sep)
-                  elsif merge
-                    add basic_option(key, val, merge: true, sep: sep)
+                  elsif b.include?(key) || numcheck.call(key, val) || se[key] || merge || switch
+                    add basic_option(key, val, **kwargs)
                   else
                     push opt
                   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - An Pham