squared 0.0.7 → 0.0.8

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

@@ -8,6 +8,7 @@ module Squared
     module Project
       class Base
         include Common
+        include Format
         include System
         include Shell
         include Task
@@ -44,7 +45,6 @@ module Squared
         @@tasks = {}
 
         attr_reader :name, :project, :workspace, :group, :path, :theme
-        attr_accessor :warning
 
         def initialize(name, path, workspace, *, group: nil, **kwargs)
           @name = name.to_s
@@ -58,8 +58,6 @@ module Squared
           @output = [kwargs[:run], nil]
           @copy = kwargs[:copy]
           @clean = kwargs[:clean]
-          @exclude = as_a(kwargs[:exclude])
-          @warning = workspace.warning
           @theme = if !workspace.verbose
                      {}
                    elsif kwargs.fetch(:common, true)
@@ -67,6 +65,9 @@ module Squared
                    else
                      __get__(:theme)[:project][to_sym] ||= {}
                    end
+          @ref = []
+          @exclude = as_a(kwargs[:exclude], :to_sym).freeze
+          initialize_ref(Base.ref)
           initialize_logger(**kwargs)
         end
 
@@ -91,7 +92,7 @@ module Squared
               raise if @workspace.exception
 
               file = nil
-              warn e if @warning
+              warn e if @workspace.warning
             end
           end
           log[:progname] = @name
@@ -118,23 +119,30 @@ module Squared
         end
 
         def initialize_script(ref, **)
+          initialize_ref(ref)
           return unless (script = workspace.script(group: group, ref: ref))
 
           @depend = script[:depend] if @depend.nil?
           @doc = script[:doc] if @doc.nil?
           @test = script[:test] if @test.nil?
           @clean = script[:clean] if @clean.nil?
+          @exclude = script[:exclude] if @exclude.empty? && script.key?(:exclude)
           @script = script
         end
 
+        def initialize_ref(ref)
+          @ref << ref unless @exclude.include?(ref)
+        end
+
         def populate(*)
-          return if @exclude.include?(Base.ref)
+          valid = ref?(Base.ref)
+          series = workspace.series
 
           namespace name do
-            workspace.series.each_key do |key|
-              next unless Application::WORKSPACE_KEYS.include?(key) ? has?(key) : workspace.task_include?(self, key)
+            series.each_key do |key|
+              next unless series.include?(key) ? has?(key) && valid : workspace.task_extend?(self, key)
 
-              desc message(name, key)
+              desc message(*name.split(':'), key)
               task key do
                 __send__(key)
               end
@@ -170,7 +178,7 @@ module Squared
           build(sync: invoked_sync?('depend'))
           key = "#{name}:copy"
           if workspace.task_defined?(key)
-            invoke key
+            invoke(key, exception: workspace.exception, warning: workspace.warning)
           else
             copy
           end
@@ -251,6 +259,10 @@ module Squared
           respond_to?(m = :"#{method}?") && __send__(m)
         end
 
+        def ref?(val)
+          @ref.include?(val)
+        end
+
         def build?
           !!@output[0]
         end
@@ -283,17 +295,19 @@ module Squared
           !!@dev
         end
 
-        protected
+        private
 
         def run(cmd = @session, exception: workspace.exception, banner: true, sync: true, req: nil, **)
-          return if req && !base_path(req).exist?
-
+          if req && !base_path(req).exist?
+            log.warn "#{req} (not found)"
+            return
+          end
           cmd = close_session(cmd)
           log.info cmd
           begin
             if cmd =~ /^\S+:(\S+:?)+$/ && workspace.task_defined?(cmd)
               print_item if sync
-              invoke(cmd, exception: exception)
+              invoke(cmd, exception: exception, warning: workspace.warning)
             else
               print_item format_banner(cmd, banner: banner) if sync
               shell(cmd, chdir: path, exception: exception)
@@ -309,7 +323,8 @@ module Squared
         end
 
         def env(key, default = nil, equals: nil, ignore: ['0'].freeze, suffix: nil, strict: false)
-          a = "#{key}_#{name.gsub(/[^\w]+/, '_').upcase}"
+          @env ||= name.gsub(/[^\w]+/, '_').upcase
+          a = "#{key}_#{@env}"
           b = ''
           if suffix
             a = [a, suffix].flatten.join('_')
@@ -381,13 +396,14 @@ module Squared
           ret.join("\n")
         end
 
-        def format_desc(action, flag, opts = nil, req: 'opts*')
-          opts = "#{req}=#{opts.join(',')}" if opts.is_a?(::Array)
-          if !flag
+        def format_desc(action, flag, opts = nil, req: '', arg: 'opts*')
+          opts = "#{arg}=#{opts.join(',')}" if opts.is_a?(::Array)
+          unless flag
             flag = action
             action = ''
           end
-          message(name, action, opts ? "#{flag}[#{opts}]" : flag)
+          req = opts ? "#{req}," : "[#{req}]" unless req.to_s.empty?
+          message(*name.split(':'), action, opts ? "#{flag}[#{req}#{opts}]" : flag.to_s + req)
         end
 
         def format_banner(cmd, banner: true, multiple: false)
@@ -457,8 +473,8 @@ module Squared
           workspace.pipe
         end
 
-        def invoked_sync?(action)
-          return true if workspace.series.sync?("#{action}:sync")
+        def invoked_sync?(action, flag = nil)
+          return true if !flag.nil? || workspace.series.sync?("#{action}:sync")
 
           check = lambda do |val|
             if invoked?(val)

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

@@ -4,8 +4,6 @@ module Squared
   module Workspace
     module Project
       class Git < Base
-        include Format
-
         OPT_PULL = %w[all tags prune ff-only autostash dry-run].freeze
         OPT_FETCH = %w[tags prune prune-tags depth=n dry-run].freeze
         private_constant :OPT_PULL, :OPT_FETCH
@@ -13,23 +11,26 @@ module Squared
         class << self
           include ::Rake::DSL
 
-          def populate(workspace, parallel: [], **)
+          def populate(workspace, **)
             return if workspace.series.pull.empty?
 
             desc 'all[git?=rebase|stash]'
             task 'all', [:git] do |_, args|
-              sync = ->(key) { parallel.include?(key) ? :"#{key}:sync" : key }
+              exception = workspace.exception
+              warning = workspace.warning
+              sync = ->(key) { workspace.task_defined?(s = "#{key}:sync") ? s : key }
               pull = case args.git
                      when 'rebase'
-                       sync.(:rebase)
+                       sync.('rebase')
                      when 'stash'
-                       invoke sync.(:stash)
-                       sync.(:pull)
+                       invoke(sync.('stash'), exception: exception, warning: warning)
+                       sync.('pull')
                      else
-                       sync.(:pull)
+                       sync.('pull')
                      end
-              Common::Task.invoke(pull, exception: workspace.exception)
-              Common::Task.invoke(workspace.dev? ? :refresh : :build, exception: workspace.exception)
+              Common::Task.invoke(pull, exception: exception, warning: warning)
+              Common::Task.invoke(workspace.dev? && workspace.series.has?(:refresh) ? :refresh : :build,
+                                  exception: exception, warning: warning)
             end
           end
 
@@ -60,9 +61,14 @@ module Squared
           rev: %i[commit branch]
         }.freeze
 
+        def initialize(*, **)
+          super
+          initialize_ref(Git.ref)
+        end
+
         def populate(*)
           super
-          return unless gitdir.exist? && !@exclude.include?(Git.ref)
+          return unless gitdir.exist? && ref?(Git.ref)
 
           namespace name do
             @@tasks[Git.ref].each do |action, flags|
@@ -121,7 +127,7 @@ module Squared
                       desc format_desc(action, flag, 'index?=0,pathspec*')
                       task flag, [:pathspec] do |_, args|
                         files = args.to_a
-                        index = /^\d+$/.match?(files.first) && !option('index') ? files.shift.to_i : 0
+                        index = /^\d+$/.match?(files.first) && !git_option('index') ? files.shift.to_i : 0
                         diff(flag, files, index: index)
                       end
                     when :cached
@@ -202,12 +208,12 @@ module Squared
           cmd = git_session 'pull'
           if flag == :'no-rebase'
             cmd << '--no-rebase'
-          elsif flag == :rebase || option('rebase')
+          elsif flag == :rebase || git_option('rebase')
             cmd << '--rebase'
           end
           if flag == :'no-commit'
             cmd << '--no-commit'
-          elsif flag == :commit || option('commit')
+          elsif flag == :commit || git_option('commit')
             cmd << '--commit'
           end
           append_pull opts, OPT_PULL, flag
@@ -220,28 +226,28 @@ module Squared
 
         def fetch(flag = nil, opts: [])
           cmd = git_session 'fetch'
-          cmd << '--all' if flag == :all || option('all')
+          cmd << '--all' if flag == :all || git_option('all')
           append_pull opts, OPT_FETCH, flag
           source(sync: invoked_sync?('fetch', flag), stderr: true, exception: !workspace.series.multiple?)
         end
 
-        def stash(flag = :push, files = [], commit: nil)
-          cmd = git_session 'stash', flag.to_s
+        def stash(flag = nil, files = [], commit: nil)
+          cmd = git_session 'stash', (flag || 'push').to_s
           case flag
           when :apply, :pop
-            cmd << '--index' if option('index')
+            cmd << '--index' if git_option('index')
             cmd << commit
           else
             append_option %w[all staged include-untracked]
-            append_message option('message', 'm', zero: false)
+            append_message git_option('message', 'm', zero: false)
             append_pathspec files
           end
           source(sync: invoked_sync?('stash', flag), exception: workspace.exception)
         end
 
         def status
-          cmd = git_session 'status', option('long') ? '--long' : '--short'
-          if (val = option('ignore-submodules'))
+          cmd = git_session 'status', git_option('long') ? '--long' : '--short'
+          if (val = git_option('ignore-submodules'))
             cmd << "--ignore-submodules=#{case val
                                           when '0', 'none'
                                             'none'
@@ -282,7 +288,7 @@ module Squared
               append_submodules flag
             else
               cmd << '--mixed'
-              cmd << '--no-refresh' if option('refresh', equals: '0')
+              cmd << '--no-refresh' if git_option('refresh', equals: '0')
             end
             append_commit ref
           end
@@ -293,10 +299,10 @@ module Squared
           cmd = git_session 'checkout'
           case flag
           when :branch
-            cmd << '--detach' if detach == 'd' || option('detach')
+            cmd << '--detach' if detach == 'd' || git_option('detach')
             if create
               cmd << "-#{create}" << branch
-              if (val = option('start-point'))
+              if (val = git_option('start-point'))
                 cmd << val
               end
             else
@@ -351,22 +357,22 @@ module Squared
               sha = nil
             end
           end
-          if (val = option('unified')).to_i > 0
+          if (val = git_option('unified')).to_i > 0
             cmd << "--unified=#{val}"
           end
           append_nocolor
           case flag
           when :cached
             cmd << '--cached'
-            cmd << '--merge-base' if option('merge-base')
+            cmd << '--merge-base' if git_option('merge-base')
           when :branch
             cmd << branch
           when :files
             cmd << '--no-index'
           else
-            if (val = option('index')) || index > 0
+            if (val = git_option('index')) || index > 0
               cmd << "HEAD~#{val || index}"
-            elsif sha && option('merge-base')
+            elsif sha && git_option('merge-base')
               cmd << '--merge-base'
             end
           end
@@ -376,7 +382,7 @@ module Squared
         end
 
         def commit(flag, files = [], message: nil, pass: false)
-          message ||= option('message', 'm', zero: false)
+          message ||= git_option('message', 'm', zero: false)
           amend = flag.to_s.start_with?('amend')
           if !message && !amend
             return if pass
@@ -391,7 +397,7 @@ module Squared
                        "-- #{files.join(' ')}"
                      end
           if !push?
-            source('git branch -vv --list', io: true, banner: false)[0].each do |val|
+            source('git branch -vv --list', io: true, banner: false).first.each do |val|
               origin = %r{^\* [^\[]+(?<= )\[([\w.-/]+?)/([\w.-]+)\] }.match(val)
               next unless origin
 
@@ -403,7 +409,7 @@ module Squared
           raise_error('commit', 'work tree is not usable') unless push?
 
           cmd = git_session 'commit'
-          cmd << '--dry-run' if option('dry-run')
+          cmd << '--dry-run' if git_option('dry-run')
           if amend
             cmd << '--amend'
           else
@@ -411,7 +417,7 @@ module Squared
           end
           if message
             append_message message
-          elsif flag == :'amend-orig' || option('no-edit')
+          elsif flag == :'amend-orig' || git_option('no-edit')
             cmd << '--no-edit'
           end
           a = ['git add --verbose']
@@ -440,14 +446,14 @@ module Squared
           source(stdout: true)
         end
 
-        protected
+        private
 
         def source(cmd = @session, exception: true, banner: true, io: false, sync: true, stdout: false, stderr: false)
           cmd = close_session(cmd)
           log.info cmd
+          banner = format_banner(cmd.gsub(File.join(path, ''), ''), banner: banner, multiple: true)
+          cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(path)} --git-dir #{shell_quote(gitdir)}")
           begin
-            banner = format_banner(cmd.gsub(File.join(path, ''), ''), banner: banner, multiple: true)
-            cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(path)} --git-dir #{shell_quote(gitdir)}")
             if io
               [IO.popen(cmd), banner]
             elsif pipe? ? sync : stdout
@@ -480,7 +486,7 @@ module Squared
             log.error e
             raise if exception
 
-            warn e
+            warn e if workspace.warning
           end
         end
 
@@ -526,14 +532,6 @@ module Squared
           files.map { |val| val == '.' ? '.' : shell_quote(base_path(val.strip)) }
         end
 
-        def source_path?(val)
-          return val.to_s.start_with?(File.join(path, '').to_s) if Pathname.new(val).absolute?
-
-          !val.match?(%r{^\.\.[/\\]})
-        end
-
-        private
-
         def append_pull(opts, list, flag = nil)
           append_submodules flag
           opts.each do |opt|
@@ -551,7 +549,7 @@ module Squared
         end
 
         def append_pathspec(files = [], expect: false, pass: false)
-          if files.empty? && (val = option('pathspec'))
+          if files.empty? && (val = git_option('pathspec'))
             files = split_escape(val)
           end
           files = source_path(files, pass: pass)
@@ -567,30 +565,30 @@ module Squared
         end
 
         def append_head
-          @session << (option('head') || option('tree-ish'))
+          @session << (git_option('head') || git_option('tree-ish'))
         end
 
         def append_ours
-          if option('ours')
+          if git_option('ours')
             @session << '--ours'
-          elsif option('theirs')
+          elsif git_option('theirs')
             @session << '--theirs'
           end
         end
 
         def append_submodules(flag = nil)
-          if option('recurse-submodules', equals: '0')
+          if git_option('recurse-submodules', equals: '0')
             @session << '--no-recurse-submodules'
-          elsif flag == :submodules || option('recurse-submodules')
+          elsif flag == :submodules || git_option('recurse-submodules')
             @session << '--recurse-submodules'
           end
         end
 
         def append_option(list)
-          list.each { |val| @session << "--#{val}" if option(val) }
+          list.each { |val| @session << "--#{val}" if git_option(val) }
         end
 
-        def option(*args, equals: nil, zero: true)
+        def git_option(*args, equals: nil, zero: true)
           for val in args
             break if (ret = ENV["GIT_#{val.gsub(/\W/, '_').upcase}"])
           end
@@ -606,11 +604,13 @@ module Squared
         end
 
         def gitdir
-          @gitdir ||= base_path('.git')
+          base_path('.git')
         end
 
-        def invoked_sync?(action, flag = nil)
-          !flag.nil? || super(action)
+        def source_path?(val)
+          return val.to_s.start_with?(File.join(path, '').to_s) if Pathname.new(val).absolute?
+
+          !val.match?(%r{^\.\.[/\\]})
         end
 
         def push?

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

@@ -32,24 +32,33 @@ module Squared
 
         attr_reader :package
 
-        def initialize(*, **kwargs)
+        def initialize(*, script: nil, **kwargs)
           super
           initialize_script(Node.ref, **kwargs)
-          if (opts = env('BUILD', strict: true))
-            raise_error("BUILD_#{@name.upcase}", opts) if @output[0].is_a?(::Array)
-            @output[1] = opts
-          else
-            @output[1] = (@script && @script[:run]) || @workspace.script
-          end
           @dev = kwargs[:dev]
           @prod = kwargs[:prod]
           @pm = {}
           @package = base_path('package.json')
+          return if @output[0] == false
+
+          if @output[0].nil?
+            val, ext = @workspace.script(Node.ref, @group)
+            apply_script val
+            unless ext
+              if script
+                apply_script script
+              elsif (val = @script && @script[:run])
+                @output[0] = val
+                @output[1] = nil
+              end
+            end
+          end
+          @output[@output[0] || val.include?(' ') ? 0 : 1] = val if (val = env('BUILD', strict: true))
         end
 
         def populate(*)
           super
-          return unless outdated? && !@exclude.include?(Node.ref)
+          return unless outdated? && ref?(Node.ref)
 
           namespace name do
             @@tasks[Node.ref].each do |action, flags|
@@ -70,10 +79,10 @@ module Squared
                     when :install
                       desc format_desc(action, flag)
                       task flag do
-                        depend(flag, override: true)
+                        depend(flag)
                       end
                     when :outdated
-                      desc format_desc(action, flag, %w[prune interactive dry-run], req: 'opts?')
+                      desc format_desc(action, flag, %w[prune interactive dry-run], arg: 'opts?')
                       task flag, [:opts] do |_, args|
                         outdated(flag, opts: args.to_a)
                       end
@@ -95,7 +104,7 @@ module Squared
             into = @copy[:into] if @copy.key?(:into)
             also = @copy[:also] if @copy.key?(:also)
           end
-          items = [project == workspace.main ? nil : workspace.home].concat(as_a(also))
+          items = [name == workspace.main ? nil : workspace.home].concat(as_a(also))
           items.each_with_index do |dir, i|
             if i == 0
               next unless dev? & !doc?
@@ -133,8 +142,8 @@ module Squared
           end
         end
 
-        def depend(flag = nil, override: false)
-          if @depend && !override
+        def depend(flag = nil)
+          if @depend && !flag
             super
           elsif outdated?
             frozen = flag == :frozen
@@ -191,7 +200,7 @@ module Squared
               append_nocolor
             end
             append_loglevel
-            run(sync: invoked_sync?('depend'))
+            run(sync: invoked_sync?('depend', flag))
           end
         end
 
@@ -200,7 +209,7 @@ module Squared
           equ = rev || (prod? ? :patch : :minor)
           cmd = pnpm? ? 'pnpm outdated' : 'npm outdated'
           log.info cmd
-          if store_pwd || invoked_sync?("outdated#{rev ? ":#{rev}" : ''}")
+          if store_pwd || invoked_sync?("outdated#{rev && ":#{rev}"}")
             print_item format_banner("#{cmd}#{opts.include?('dry-run') ? ' --dry-run' : ''}", multiple: true)
           end
           data = `#{cmd} --json --loglevel=error`
@@ -300,10 +309,10 @@ module Squared
                   elsif modified == cur
                     'FAIL'
                   elsif d == 1
-                    a = sub_style(a, styles: theme[:active])
+                    a = sub_style(a, styles: theme[:major])
                     sub_style(c, :green, :bold)
                   else
-                    sub_style(c, :green, :bold, pat: SEM_VER, index: d)
+                    sub_style(c, :green, pat: SEM_VER, index: d)
                   end
               puts "#{pad_ord.(i, found)}. #{a}#{b.ljust(col2)}#{c}"
             end
@@ -433,7 +442,7 @@ module Squared
           Node.prod? || workspace.prod?(script: @output[1], pat: @prod, **runargs)
         end
 
-        protected
+        private
 
         def append_loglevel(cmd = @session)
           return unless (level = env('NODE_LOGLEVEL'))
@@ -466,16 +475,22 @@ module Squared
           end
         end
 
-        private
-
         def confirm_outdated(rev, pkg, ver)
           m = ver == :major
           confirm("Upgrade to #{rev}? #{sub_style("#{pkg} #{ver}", styles: theme[:inline])} [#{m ? 'y/N' : 'Y/n'}] ",
                   default: m ? 'N' : 'Y', timeout: 60)
         end
 
+        def apply_script(val)
+          @output[1] = if val.is_a?(::Array)
+                         val[Node.prod? ? 1 : 0]
+                       else
+                         val
+                       end
+        end
+
         def runargs
-          { ref: Node.ref, group: group, global: !@script || @script[:run].nil? }
+          { ref: Node.ref, group: group, global: @output[0].nil? && !(@script && @script[:run]) }
         end
       end
     end