squared 0.4.3 → 0.4.5

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

@@ -6,8 +6,20 @@ module Squared
       class Ruby < Git
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
+        OPT_RUBY = {
+          rake: %w[A|all B|build-all comments n|dry-run p|execute-print=q m|multitask P|prereqs q|quiet
+                   X|no-deprecation-warnings N|no-search G|no-system nosearch nosystem rules s|silent g|system
+                   v|verbose backtrace=b? D|describe=q? e|execute=q E|execute-continue=q I|libdir=p job-stats=b?
+                   j|jobs=i? R|rakelib=p rakelibdir=p r|require=b suppress-backtrace=q T|tasks=q? t|trace=b?
+                   W|where=q?].freeze,
+          irb: %w[d f U w E=b I=p r=b W=m? autocomplete colorize echo echo-on-assignment extra-doc-dir inf-ruby-mode
+                  inspect multiline no-pager noautocomplete nocolorize noecho noinspect noecho-on-assignment
+                  nomultiline noprompt noscript nosingleline noverbose regexp-completor sample-book-mode script
+                  simple-prompt single-irb singleline tracer truncate-echo-on-assignment type-completor verbose
+                  back-trace-limit=i context-mode=i prompt=b prompt-mode=b].freeze
+        }.freeze
         OPT_BUNDLE = {
-          common: %w[no-color V verbose retry=i].freeze,
+          common: %w[no-color V|verbose retry=i].freeze,
           install: %w[frozen no-cache no-prune system path=p binstubs=p? standalone=q? target-rbconfig=p trust-policy=b
                       with=q without=q].freeze,
           install_base: %w[full-index quiet retry gemfile=p j|jobs=i].freeze,
@@ -15,6 +27,7 @@ module Squared
           outdated: %w[filter-major filter-minor filter-patch groups local parseable pre only-explicit strict
                        update-strict g|group=q source=b].freeze,
           exec: %w[gemfile=p].freeze,
+          cache: %w[all-platforms frozen no-install no-prune quiet cache-path=p gemfile=p path=p].freeze,
           check: %w[dry-run gemfile=p].freeze
         }.freeze
         OPT_GEM = {
@@ -35,7 +48,7 @@ module Squared
           shared_no: %w[env-shebang force format-executable http-proxy lock minimal-deps post-install-message
                         prerelease suggestions user-install wrappers].freeze
         }.freeze
-        private_constant :GEMFILE, :DIR_RUBY, :OPT_BUNDLE, :OPT_GEM
+        private_constant :GEMFILE, :DIR_RUBY, :OPT_RUBY, :OPT_BUNDLE, :OPT_GEM
 
         class << self
           def populate(*); end
@@ -55,16 +68,18 @@ module Squared
           end
         end
 
-        @@tasks[ref] = {
+        subtasks({
           'install' => %i[redownload local prefer-local].freeze,
           'update' => %i[patch minor major all].freeze,
           'outdated' => %i[patch minor major].freeze,
           'gem' => %i[install user-install update pristine outdated push build exec].freeze,
           'exec' => nil,
+          'cache' => nil,
           'config' => nil,
           'check' => nil,
-          'rake' => nil
-        }.freeze
+          'rake' => nil,
+          'irb' => nil
+        })
 
         def initialize(*, autodetect: false, **kwargs)
           super
@@ -109,24 +124,15 @@ module Squared
 
               if flags.nil?
                 case action
-                when 'config', 'exec', 'check'
-                  format_desc(action, nil, case action
-                                           when 'exec', 'check'
-                                             OPT_BUNDLE[action.to_sym]
-                                           end, after: action == 'check' ? nil : 'command+')
-                  task action do |_, args|
-                    bundle action, args.to_a
-                  end
                 when 'rake'
                   next unless rakefile
 
-                  format_desc action, nil, 'command*|^index,args*|#,pattern*'
+                  format_desc action, nil, 'tasks*,opts*|^index|#,pattern*'
                   task action, [:command] do |_, args|
                     if args.command == '#'
                       format_list(read_rakefile, 'rake[^N]', 'tasks', grep: args.extras, from: rakefile.to_s,
                                                                       each: ->(val) { val[0] + val[1].to_s })
-                    elsif (data = indexitem(args.command))
-                      n, opts = data
+                    elsif (n, opts = indexitem(args.command))
                       list = read_rakefile
                       if (item = list[n - 1])
                         cmd = opts ? "#{opts} #{item.first}" : item.first
@@ -138,9 +144,27 @@ module Squared
                       end
                       rake(args.extras.empty? ? cmd : cmd + shell_escape("[#{args.extras.join(',')}]"))
                     else
-                      rake(*args.to_a)
+                      rake(opts: args.to_a)
                     end
                   end
+                when 'irb'
+                  next unless (spec = basepath("#{project}.gemspec") || basepath("#{name}.gemspec"))
+                  next unless basepath('lib').join("#{gemname = File.basename(spec, File.extname(spec))}.rb").exist?
+
+                  format_desc action, nil, 'opts*,args*'
+                  task action do |_, args|
+                    irb gemname, args.to_a
+                  end
+                else
+                  format_desc(action, nil, OPT_BUNDLE[action.to_sym], after: case action
+                                                                             when 'cache', 'check'
+                                                                               nil
+                                                                             else
+                                                                               'command+'
+                                                                             end)
+                  task action do |_, args|
+                    bundle(action, *args.to_a)
+                  end
                 end
               else
                 namespace action do
@@ -342,7 +366,8 @@ module Squared
 
         def update(flag, opts = [])
           bundle_session 'update', "--#{flag}"
-          append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common]
+          append_bundle(opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common],
+                        append: flag == :all ? nil : /^\w+=/)
           run_rb(from: :update)
         end
 
@@ -353,9 +378,9 @@ module Squared
             if (pwd = gempwd)
               cmd << pwd
             end
-            cmd << flag
+            cmd << 'outdated'
           when :push
-            cmd << flag << project
+            cmd << 'push' << project
           when :'user-install'
             cmd << 'install' << '--user-install'
           else
@@ -366,15 +391,21 @@ module Squared
           when :install, :'user-install', :update
             list += OPT_GEM[:shared]
             no = OPT_GEM[:shared_no]
+            first = true
+          when :pristine
+            first = true
           end
-          opts, pat = option_sanitize(opts, list, no: no, first: true)
+          opts, pat = option_sanitize(opts, list, no: no, first: first)
           out = []
+          err = []
           opts.each do |opt|
             if opt =~ pat
               case $1
               when 'g', 'gem'
                 cmd << (flag == :exec ? shell_option($1, $2) : quote_option($1, basepath($2)))
               end
+            elsif opt.match?(/^\w+=/) && !%i[outdated build push exec].include?(flag)
+              err << opt
             else
               out << opt
             end
@@ -383,6 +414,7 @@ module Squared
           case flag
           when :outdated
             log.info cmd.to_s
+            option_clear out
             on :first, from
             print_item format_banner(cmd.to_s)
             pwd_set(pass: !pwd.nil?, from: from) do
@@ -481,39 +513,59 @@ module Squared
                 name = out.first
                 if n == 0
                   cmd << project
-                  version = name[1..-1]
+                  ver = name[1..-1]
                 else
                   cmd << shell_escape(name[0, n])
-                  version = name[n + 1..-1]
+                  ver = name[n + 1..-1]
                 end
-                cmd << shell_option('version', version)
+                cmd << shell_option('version', ver)
                 out.clear
               end
             end
             append_value(out, escape: true)
+            option_clear err
           end
           run_rb(from: from)
         end
 
         def bundle(flag, *args)
-          args = args.flatten
           cmd = bundle_session flag
+          args = case flag
+                 when 'exec', 'cache', 'check'
+                   option_sanitize(args, OPT_BUNDLE[flag.to_sym] + OPT_BUNDLE[:common], args: flag == :exec).first
+                 else
+                   args.flatten
+                 end
           case flag
-          when 'exec', 'check'
-            args = option_sanitize(args, OPT_BUNDLE[flag.to_sym] + OPT_BUNDLE[:common]).first
+          when 'exec', 'config'
+            raise_error('no command given', hint: flag) if args.empty?
+            cmd.merge(args)
+          else
+            option_clear args
           end
-          raise_error('no command given', hint: flag) unless !args.empty? || flag == 'check'
-          cmd.merge(args)
           run(from: :"bundle:#{flag}")
         end
 
-        def rake(*cmd)
-          if cmd.empty?
-            run_s(rake_output(rakeapp), from: :rake, chdir: workspace.pwd)
+        def rake(*args, opts: [])
+          target = [quote_option('f', rakefile)]
+          args += option_sanitize(opts, OPT_RUBY[:rake], target: target).first
+          if args.empty?
+            args << nil
           else
-            cmd = cmd.flatten.map { |val| rake_output(rakeapp, val) }
-            run_s(cmd, from: :rake, chdir: workspace.pwd, banner: false)
+            args.flatten!
           end
+          cmd = rake_output(*target)
+          args.map! { |val| cmd.temp(val) }
+          run_s(args, banner: false, from: :rake)
+        end
+
+        def irb(name, opts = [], path: basepath('lib'))
+          cmd = session 'irb'
+          args = option_sanitize(opts, OPT_RUBY[:irb], first: true).first
+          as_a(name).each { |val| cmd << shell_option('r', val) }
+          as_a(path).each { |val| cmd << quote_option('I', val) }
+          cmd.merge(args)
+          run(banner: false)
         end
 
         def depend?
@@ -586,9 +638,17 @@ module Squared
           run(banner: !@session.include?('--quiet'), **kwargs)
         end
 
-        def append_bundle(opts, list, target: @session)
+        def append_bundle(opts, list, target: @session, append: nil)
           out = option_sanitize(opts, list, target: target).first
-          option_clear(out, target: target)
+          if append
+            if append.is_a?(Regexp)
+              out, err = out.partition { |val| !val.match?(append) }
+              option_clear(err, target: target)
+            end
+            append_value(out, target: target, escape: true)
+          else
+            option_clear(out, target: target)
+          end
         end
 
         def gem_session(*cmd, **kwargs)
@@ -648,10 +708,6 @@ module Squared
           basepath file
         end
 
-        def rakeapp
-          quote_option 'rakefile', Rake.application.rakefile
-        end
-
         def rakepwd
           return unless Rake::VERSION >= '13.0.4'
 

data/lib/squared/workspace/repo.rb

@@ -179,7 +179,7 @@ module Squared
             parse_opts.(args)
             stage = 'init'
             puts if newline
-            system("repo init -u #{manifest_url} -m #{args.manifest || target}.xml", chdir: root)
+            system("repo init -u #{env('REPO_URL') || manifest_url} -m #{args.manifest || target}.xml", chdir: root)
             repo['all'].invoke
           end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []