squared 0.4.14 → 0.5.1

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

@@ -557,7 +557,13 @@ module Squared
           ret
         end
 
-        def variable_set(key, *val, **)
+        def variable_set(key, *val, **, &blk)
+          if block_given?
+            case key
+            when :dependfile, :venv, :editable
+              val = block_args val, &blk
+            end
+          end
           case key
           when :dependfile
             req = basepath(*val)
@@ -600,9 +606,7 @@ module Squared
 
         def poetry_session(*cmd)
           ret = session('poetry', *cmd, *preopts)
-          if (val = option('project', ignore: false))
-            ret << quote_option('project', path + val)
-          end
+          option('project', ignore: false) { |val| ret << quote_option('project', path + val) }
           ret
         end
 
@@ -683,7 +687,7 @@ module Squared
         end
 
         def append_global(target: @session)
-          if (val = option('cache-dir', target: target))
+          option('cache-dir', target: target) do |val|
             target << case val
                       when '0', 'false'
                         '--no-cache-dir'
@@ -691,8 +695,8 @@ module Squared
                         quote_option('cache-dir', path + val)
                       end
           end
-          target << shell_option('proxy', val) if (val = option('proxy', target: target))
-          target << quote_option('python', path + val) if (val = option('python', target: target))
+          option('proxy', target: target) { |val| target << shell_option('proxy', val) }
+          option('python', target: target) { |val| target << quote_option('python', path + val) }
           append_nocolor(target: target)
         end
 

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

@@ -231,7 +231,7 @@ module Squared
                           file = args.rb
                           args = args.extras
                           unless file && !file.include?('*')
-                            file, opts, prog = choice_index('Select a file', Dir.glob(file || (path + '*.rb')),
+                            file, opts, prog = choice_index('Select a file', Dir.glob(file || '*.rb', base: path),
                                                             values: (file ? [] : ['Options']) << 'Arguments',
                                                             force: true, series: !args.include?('v'))
                             if file
@@ -304,7 +304,7 @@ module Squared
               copy_dir(a, b, c, pass: pass, verbose: verbose)
             rescue StandardError => e
               log.error e
-              ret = on(:error, :copy, e)
+              ret = on :error, :copy, e
               raise if exception && ret != true
             end
           end
@@ -319,7 +319,7 @@ module Squared
           end
           log.info cmd.to_s
           on :first, :outdated
-          banner = format_banner(cmd.to_s)
+          banner = format_banner cmd.to_s
           print_item banner if sync
           pwd_set(from: :outdated) do
             start = 0
@@ -393,7 +393,7 @@ module Squared
                                                               index: 2)
                   end
                 end
-                out.call("#{start.to_s.rjust(2)}. #{line}")
+                out.call('%2d. %s' % [start, line])
               elsif line.start_with?('Gem')
                 unless stdin?
                   sub = { pat: /^(.+)(?<!\dm)(Gem|Latest)(.+)$/, styles: theme[:header], index: 2 }
@@ -410,7 +410,7 @@ module Squared
             end
             if found > 0
               begin
-                if major == 0 && dependfile.read =~ /\b(?:source\s+(["'])(.+?)\1|remote:\s+(\S+))/
+                if major == 0 && dependfile.read =~ /\b(?:source\s+(["'])((?~\1))\1|remote:\s+(\S+))/
                   status = ($2 || $3).chomp('/')
                   right = true
                 end
@@ -436,7 +436,7 @@ module Squared
         def update(flag, opts = [])
           bundle_session 'update', "--#{flag}"
           append_bundle(opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common],
-                        append: flag == :all ? nil : /\A\w+=/)
+                        append: flag == :all ? nil : /\A[a-z\-]+=/)
           run_rb(from: :update)
         end
 
@@ -445,7 +445,7 @@ module Squared
           when :file, :script
             op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, args: true)
             if file
-              op.extras.unshift(shell_quote(path + file))
+              op.extras.prepend(shell_quote(path + file))
             elsif command
               op << quote_option('e', command, option: false)
             end
@@ -472,8 +472,9 @@ module Squared
                                  when 'rvm'
                                    `rvm current`[/^\S+/, 0]
                                  when 'rbenv'
-                                   name = `rbenv version-name`
-                                   name =~ SEM_VER ? "ruby #{name}" : name
+                                   `rbenv version-name`.yield_self do |name|
+                                     name.match?(SEM_VER) ? "ruby #{name}" : name
+                                   end
                                  when 'chruby.sh'
                                    chruby = session_output 'source', val
                                    `#{chruby.with('ruby --version')}`
@@ -491,7 +492,7 @@ module Squared
                                    when 'chruby.sh'
                                      `#{chruby.with('chruby --version')}`.sub(':', '')
                                    when 'install'
-                                     "asdf #{`asdf version`.sub(/^v/, '')}"
+                                     "asdf #{`asdf version`.delete_prefix('v')}"
                                    else
                                      `#{cmd} --version`
                                    end)
@@ -522,7 +523,7 @@ module Squared
               end
               out.map!(&:split)
               pad = out.map(&:first).map!(&:size).max
-              puts(out.map! { |line| "#{line.first.rjust(pad)} #{line[1..-1].join(' ')}" })
+              puts(out.map! { |line| '%*s %s' % [pad, line.first, line[1..-1].join(' ')] })
             end
             return
           end
@@ -601,7 +602,7 @@ module Squared
 
                   a, b, c = item.first
                   if i == 0
-                    line = "#{' #'.ljust(pad)} #{a.ljust(d)}    #{b.rjust(e)}  #{c.rjust(f)}"
+                    line = '%-*s %-*s    %*s  %*s' % [pad, ' #', d, a, e, b, f, c]
                     n = line.size
                     2.times do
                       line = sub_style(line, pat: /^(.+)(?<!\dm)(#{a}|#{c})(.*)$/, styles: theme[:header], index: 2)
@@ -645,15 +646,14 @@ module Squared
                       styles = %i[yellow]
                       pat = pat.last
                     end
-                    b = b.rjust(e)
-                    b = sub_style(b, *colormap(styles), pat: pat, index: 2)
+                    b = sub_style(b.rjust(e), *colormap(styles), pat: pat, index: 2)
                     h = sub_style(c.rjust(f), styles: latest.flatten.compact, pat: pat, index: 2)
                     j += 1
                     if queue
                       puts queue
                       queue = nil
                     end
-                    puts "#{"#{j}.".rjust(pad)} #{g}    #{b}  #{h}"
+                    puts '%*s %s    %s  %s' % [pad, "#{j}.", g, b, h]
                     update << a if filter == 'interactive' && confirm_outdated(a, c, item.last)
                   end
                 end
@@ -664,15 +664,15 @@ module Squared
             else
               unless update.empty?
                 cmd = gem_output 'update', '-f'
-                if (val = option('document', prefix: 'gem', ignore: false))
+                option('document', prefix: 'gem', ignore: false) do |val|
                   cmd << case val
                          when '0', 'false'
                            '--no-document'
                          else
-                           basic_option('document', val)
+                           basic_option 'document', val
                          end
                 end
-                if (val = option('user-install', prefix: 'gem', ignore: false))
+                option('user-install', prefix: 'gem', ignore: false) do |val|
                   cmd << case val
                          when '0', 'false'
                            '--no-user-install'
@@ -689,7 +689,7 @@ module Squared
             return
           when :build
             if op.empty?
-              spec = [path + "#{project}.gemspec", path + "#{name}.gemspec", *Dir.glob(path + '*.gemspec')]
+              spec = [path + "#{project}.gemspec", path + "#{name}.gemspec", *path.glob('*.gemspec')]
               op << File.basename(spec) if (spec = spec.find { |file| File.exist?(file) })
             else
               op << shell_quote(path + op.shift)
@@ -849,14 +849,15 @@ module Squared
             pwd_set(pass: !pwd.nil?) do
               out = `#{gem_output(pwd, 'list --local -d', project)}`
               if out =~ /#{Regexp.escape(project)} \(([^)]+)\)/
-                ver = $1.split(/\s*,\s*/)
-                ver.unshift(@version).uniq!
-                ver.each do |val|
-                  next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
-
-                  set.call(val, $1)
-                  break
-                end
+                $1.split(/\s*,\s*/)
+                  .prepend(@version)
+                  .uniq
+                  .each do |val|
+                    next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
+
+                    set.call(val, $1)
+                    break
+                  end
               end
             end
           end
@@ -979,10 +980,9 @@ module Squared
         end
 
         def rakefile
-          return @rakefile if @rakefile
-
-          file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
-          @rakefile = file ? path + file : ''
+          @rakefile ||= Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }.yield_self do |file|
+            file ? path + file : ''
+          end
         end
 
         def rakepwd

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

@@ -31,11 +31,11 @@ module Squared
             def clear(target, opts, pass: true, styles: nil, **kwargs)
               return if opts.empty?
 
-              kwargs[:subject] ||= stripext(target.first)
+              kwargs[:subject] ||= stripext target.first
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs)
-              return if pass || confirm("Run? [#{sub_style(target, styles: styles)}] [y/N] ", 'N')
+              return if pass || confirm("Run? [#{sub_style(target, styles: styles)}]", 'N')
 
               raise_error 'user cancelled'
             end
@@ -50,10 +50,11 @@ module Squared
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               unless s.empty?
-                s.map! { |val| Regexp.escape(shell_option(val)) }
+                s.map! { |val| Regexp.escape(val.start_with?('-') ? val : shell_option(val)) }
                 r << /\A(?:#{s.join('|')})#{value ? '[ =].' : '(?: |=|\z)'}/
               end
-              target.any? { |opt| r.any? { |val| opt&.match?(val) } }
+              s = target.to_a.compact
+              r.any? { |pat| s.any?(pat) }
             end
           end
 
@@ -65,7 +66,7 @@ module Squared
                          :pop, :push, :join, :map, :map!, :select, :reject, :size
 
           def initialize(opts, list, target = Set.new, project: nil, path: nil, **kwargs, &blk)
-            @target = target.is_a?(Set) ? target : Set.new(target)
+            @target = target.is_a?(Set) ? target : target.to_set
             @project = project
             @path = path || project&.path
             @errors = []
@@ -245,6 +246,80 @@ module Squared
             OptionPartition.arg?(target, *args, **kwargs)
           end
         end
+
+        class JoinSet < Set
+          def self.to_s
+            super[/[^:]+\z/, 0]
+          end
+
+          attr_reader :delim
+
+          def initialize(data = [], delim: ' ')
+            super(data.compact)
+            @delim = delim
+          end
+
+          def last(val, pat)
+            (@last ||= []).append([val, pat, $1]) if val =~ pat
+            self << val
+          end
+
+          def pass(&blk)
+            ret = to_a.map!(&:to_s).reject(&:empty?)
+            @last&.each do |val, pat, key|
+              i = []
+              j = nil
+              ret.each_with_index do |opt, index|
+                if opt == val
+                  j = index
+                elsif j && opt[pat, 1] == key
+                  i << index
+                end
+              end
+              next unless j && !i.empty?
+
+              val = ret[j]
+              cur = j
+              i.each do |k|
+                ret[cur] = ret[k]
+                cur = k
+              end
+              ret[i.last] = val
+            end
+            block_given? ? ret.reject(&blk) : ret
+          end
+
+          def and(*args)
+            self << '&&'
+            merge args
+          end
+
+          def or(*args)
+            self << '||'
+            merge args
+          end
+
+          def with(*args, &blk)
+            temp('&&', *args, &blk)
+          end
+
+          def temp(*args, &blk)
+            args.compact!
+            ret = pass(&blk)
+            ret = Set.new(ret.concat(args)).to_a unless args.empty?
+            ret.join(@delim)
+          end
+
+          def done
+            ret = to_s
+            clear
+            ret
+          end
+
+          def to_s
+            pass.join(@delim)
+          end
+        end
       end
     end
   end

data/lib/squared/workspace/project.rb

@@ -3,16 +3,6 @@
 module Squared
   module Workspace
     module Project
-      class << self
-        attr_accessor :line_width
-
-        def max_width(lines)
-          n = [lines.max_by(&:size).size, 80].max
-          [n, Rake.application.terminal_width].min
-        end
-      end
-
-      @line_width = ENV.fetch('LOG_COLUMNS', 80).to_i
     end
   end
 end

data/lib/squared/workspace/repo.rb

@@ -57,10 +57,10 @@ module Squared
                               when 'verbose'
                                 @verbose = 1
                                 if script.is_a?(Array)
-                                  script[0] = task_join(script[0], 'verbose')
+                                  script[0] = task_join script[0], 'verbose'
                                   script
                                 else
-                                  task_join(script, 'verbose')
+                                  task_join script, 'verbose'
                                 end
                               when 'silent'
                                 @verbose = false
@@ -81,8 +81,8 @@ module Squared
             data[:run] = run
           end
           data[:global] = true
-          data[:dev] = env_match('REPO_DEV', dev)
-          data[:prod] = env_match('REPO_PROD', prod)
+          data[:dev] = env_match 'REPO_DEV', dev
+          data[:prod] = env_match 'REPO_PROD', prod
           if (val = env('REPO_GROUP'))
             script_set(data, group: val.split(','))
             found = true
@@ -202,7 +202,7 @@ module Squared
             end
           end
 
-          series.sync.push(
+          series.sync.append(
             task_join(name, 'all'),
             task_join(name, 'init'),
             task_join(name, 'sync')
@@ -215,7 +215,7 @@ module Squared
 
         path = sub_style(root, styles: theme[:inline])
         @repo_override = Common::Prompt.confirm(
-          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation? [y/N] ",
+          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation?",
           'N',
           timeout: env('REPO_TIMEOUT', 15, ignore: '0')
         )

data/lib/squared/workspace/series.rb

@@ -68,7 +68,7 @@ module Squared
 
       attr_reader :sync, :multiple, :parallel
 
-      def_delegators :@data, :[], :each, :each_key, :keys, :fetch, :to_a, :to_s, :inspect, :merge!, :key?
+      def_delegators :@data, :[], :each, :each_key, :keys, :key?, :fetch, :update, :merge!, :to_a, :to_s, :inspect
       def_delegators :@workspace, :task_desc, :task_name, :task_namespace, :task_join, :format_desc
 
       def initialize(workspace, exclude: [])
@@ -112,29 +112,29 @@ module Squared
 
       def build(parallel: [], pattern: [], **)
         subcheck = ->(val) { (ns = task_namespace(val)) && parallel.include?(ns) }
-        @data.merge!(@session[:parent]) if @session[:id].uniq.size > 1
-        @data.merge!(@session[:group])
+        @data.update(@session[:parent]) if @session[:id].uniq.size > 1
+        @data.update(@session[:group])
         @data.each do |key, items|
           next if exclude?(key, true) || @workspace.task_exclude?(t = name_get(key))
 
           key = task_name t
-          val = format_desc(key, out: true)
+          title = format_desc(key, out: true)
           if items.size > 1
             @multiple << key
             if parallel.include?(t) || pattern.any? { |pat| t.match?(pat) } || subcheck.call(t)
-              task_desc("#{val} (thread)", name: key)
+              task_desc("#{title} (thread)", name: key) if title
               multitask key => items
               @parallel << key
 
-              s = task_join(key, 'sync')
-              task_desc("#{val} (sync)", name: s)
+              s = task_join key, 'sync'
+              task_desc("#{title} (sync)", name: s) if title
               task s => items
               @sync << s
               next
             end
           end
 
-          task_desc(val, name: key)
+          task_desc(title, name: key) if title
           task key => items
         end
         @multiple.concat(sync)

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

@@ -5,6 +5,7 @@ module Squared
     module Support
       RunData = Struct.new('RunData', :run, :block)
       ChainData = Struct.new('ChainData', :action, :step, :with, :before, :after, :sync)
+      BannerData = Struct.new('BannerData', :command, :order, :styles, :border)
     end
   end
 end

data/lib/squared/workspace.rb

@@ -10,7 +10,7 @@ module Squared
           if id.is_a?(Symbol)
             project id
           else
-            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id) }
+            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id, __dir__) }
           end
         end
         ret.size == 1 ? ret.first : ret

data/squared.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Rake task generator for managing multi-language workspaces.}
   spec.description   = %q{Rake task generator for managing multi-language workspaces.}
   spec.homepage      = "https://github.com/anpham6/squared"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
   spec.licenses      = ["BSD-3-Clause"]
 
   spec.metadata["homepage_uri"] = spec.homepage

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.5.1
 platform: ruby
 authors:
 - An Pham
@@ -80,7 +80,6 @@ files:
 - lib/squared/app.rb
 - lib/squared/common.rb
 - lib/squared/common/base.rb
-- lib/squared/common/class.rb
 - lib/squared/common/format.rb
 - lib/squared/common/prompt.rb
 - lib/squared/common/shell.rb
@@ -118,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/squared/common/class.rb

@@ -1,110 +0,0 @@
-# frozen_string_literal: true
-
-require 'set'
-require 'forwardable'
-
-module Squared
-  module Common
-    class SymSet
-      extend Forwardable
-
-      def self.to_s
-        super[/[^:]+\z/, 0]
-      end
-
-      def_delegators :@data, :+, :each, :each_with_index, :entries, :merge, :include?
-
-      def initialize(data = [])
-        @data = Set.new(data)
-      end
-
-      def add(val)
-        @data.add(val.to_sym)
-      end
-
-      def to_a
-        @data.to_a.freeze
-      end
-
-      def to_s
-        @data.to_s.sub('Set', SymSet.to_s)
-      end
-
-      alias inspect to_s
-    end
-
-    class JoinSet < Set
-      def self.to_s
-        super[/[^:]+\z/, 0]
-      end
-
-      attr_reader :delim
-
-      def initialize(data = [], delim: ' ')
-        super(data.compact)
-        @delim = delim
-      end
-
-      def last(val, pat)
-        (@last ||= []).push([val, pat, $1]) if val =~ pat
-        self << val
-      end
-
-      def pass(&blk)
-        ret = to_a.map!(&:to_s).reject(&:empty?)
-        @last&.each do |val, pat, key|
-          i = []
-          j = nil
-          ret.each_with_index do |opt, index|
-            if opt == val
-              j = index
-            elsif j && opt[pat, 1] == key
-              i << index
-            end
-          end
-          next unless j && !i.empty?
-
-          val = ret[j]
-          cur = j
-          i.each do |k|
-            ret[cur] = ret[k]
-            cur = k
-          end
-          ret[i.last] = val
-        end
-        block_given? ? ret.reject(&blk) : ret
-      end
-
-      def and(*args)
-        self << '&&'
-        merge(args)
-      end
-
-      def or(*args)
-        self << '||'
-        merge(args)
-      end
-
-      def with(*args, &blk)
-        temp('&&', *args, &blk)
-      end
-
-      def temp(*args, &blk)
-        args.compact!
-        ret = pass(&blk)
-        ret = Set.new(ret.concat(args)).to_a unless args.empty?
-        ret.join(@delim)
-      end
-
-      def done
-        ret = to_s
-        clear
-        ret
-      end
-
-      def to_s
-        pass.join(@delim)
-      end
-    end
-  end
-end