squared 0.0.9 → 0.0.10

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

@@ -4,11 +4,13 @@ module Squared
   module Workspace
     module Project
       class Ruby < Git
+        VAR_SET = %i[version autodetect].freeze
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
+        RUBY_DIR = [*GEMFILE, *::Rake::Application::DEFAULT_RAKEFILES, 'README.rdoc'].freeze
         OPT_INSTALL = %w[no-cache force].freeze
         OPT_UPDATE = %w[redownload local strict conservative group=s].freeze
         OPT_OUTDATED = %w[local strict pre only-explicit group=s].freeze
-        private_constant :GEMFILE, :OPT_INSTALL, :OPT_UPDATE, :OPT_OUTDATED
+        private_constant :VAR_SET, :GEMFILE, :RUBY_DIR, :OPT_INSTALL, :OPT_UPDATE, :OPT_OUTDATED
 
         class << self
           def populate(*); end
@@ -19,7 +21,7 @@ module Squared
 
           def is_a?(val)
             if (val = as_path(val))
-              [*GEMFILE, *::Rake::Application::DEFAULT_RAKEFILES, 'README.rdoc'].any? { |file| val.join(file).exist? }
+              RUBY_DIR.any? { |file| val.join(file).exist? }
             else
               super
             end
@@ -40,8 +42,14 @@ module Squared
 
         def initialize(*, version: nil, autodetect: false, **kwargs)
           super
-          initialize_build(Ruby.ref, **kwargs)
-          @version = env('BUILD', version, suffix: 'VERSION', strict: true)
+          if @pass.include?(Ruby.ref)
+            initialize_ref(Ruby.ref)
+            initialize_logger(**kwargs)
+          else
+            initialize_build(Ruby.ref, **kwargs)
+            initialize_env(**kwargs)
+          end
+          @version = env('BUILD', version, suffix: 'VERSION')
           @autodetect = autodetect
           index = GEMFILE.index { |file| base_path(file).exist? } || 0
           @gemfile = base_path(GEMFILE[index])
@@ -83,7 +91,7 @@ module Squared
 
                   desc format_desc(action, nil, 'command*')
                   task action, [:command] do |_, args|
-                    rake args.to_a
+                    rake(*args.to_a)
                   end
                 end
               else
@@ -186,7 +194,7 @@ module Squared
 
         def copy(from: 'lib', glob: '**/*', gemdir: @gemdir, override: false)
           if @copy && !override
-            return super if @copy.is_a?(::String)
+            return super if runnable?(@copy)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:glob] if @copy.key?(:glob)
@@ -202,99 +210,108 @@ module Squared
             b = dest.join(val)
             c = glob[i] || '**/*'
             log.warn "cp #{a.join(c)} #{b}"
-            copy_d(a, b, glob: c, verbose: verbose?)
+            copy_d(a, b, glob: c, verbose: verbose)
           end
         end
 
         def outdated(rev = nil, opts: [])
           cmd = bundle_session 'outdated', rev && "--#{rev}"
           append_bundle opts, OPT_OUTDATED
-          cmd = cmd.done
+          cmd = close_session(cmd)
           log.info cmd
-          print_item format_banner(cmd) if store_pwd || invoked_sync?("outdated#{rev && ":#{rev}"}")
+          banner = format_banner(cmd)
+          if invoked_sync?('outdated', rev)
+            print_item banner
+            banner = nil
+          end
           start = 0
           found = 0
           major = 0
-          IO.popen("#{cmd} --no-color").each do |line|
-            if start > 0
-              unless pipe?
-                data = line.scan(SEM_VER)
-                cur = data.shift
-                lat = data.shift
-                if cur && lat
-                  semver(cur)
-                  semver(lat)
-                  c = cur.join
-                  l = lat.join
-                  styles = []
-                  data.each do |val|
-                    break unless (req = /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/.match(line))
-
-                    v = semver(val).join
-                    case req[1]
-                    when '>', '>='
-                      if semmajor(cur, lat)
-                        styles = %i[green bold]
-                        major += 1
-                      else
-                        styles[0] = cur[2] == lat[2] ? :yellow : :green
-                      end
-                    when '<', '<='
-                      if c <= v
+          pwd_set do
+            IO.popen("#{cmd} --no-color").each do |line|
+              if start > 0
+                unless stdin?
+                  data = line.scan(SEM_VER)
+                  cur = data.shift
+                  lat = data.shift
+                  if cur && lat
+                    semver(cur)
+                    semver(lat)
+                    c = cur.join
+                    l = lat.join
+                    styles = []
+                    data.each do |val|
+                      break unless (req = /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/.match(line))
+
+                      v = semver(val).join
+                      case req[1]
+                      when '>', '>='
                         if semmajor(cur, lat)
                           styles = %i[green bold]
                           major += 1
                         else
+                          styles[0] = cur[2] == lat[2] ? :yellow : :green
+                        end
+                      when '<', '<='
+                        if c <= v
+                          if semmajor(cur, lat)
+                            styles = %i[green bold]
+                            major += 1
+                          else
+                            styles[0] = :yellow
+                          end
+                        end
+                      when '!='
+                        if c == l
+                          styles.clear
+                        else
+                          styles[1] = :bold
+                        end
+                      when '~>'
+                        if c < v && cur[0] == val[0] && !semmajor(cur, val)
                           styles[0] = :yellow
+                        elsif semmajor(val, lat)
+                          styles[1] = :underline
+                        else
+                          styles[1] = :bold
                         end
                       end
-                    when '!='
-                      if c == l
-                        styles.clear
-                      else
-                        styles[1] = :bold
-                      end
-                    when '~>'
-                      if c < v && cur[0] == val[0] && !semmajor(cur, val)
-                        styles[0] = :yellow
-                      elsif semmajor(lat, val)
-                        styles[1] = :underline
-                      else
-                        styles[1] = :bold
-                      end
                     end
-                  end
-                  unless styles.empty?
-                    case styles[0]
-                    when :green
-                      line = sub_style(line, pat: /^(\S+)(.+)$/, styles: theme[styles[1] == :bold ? :major : :active])
-                      found += 1
-                    when :yellow
-                      found += 1
+                    unless styles.empty?
+                      case styles[0]
+                      when :green
+                        line = sub_style(line, pat: /^(\S+)(.+)$/, styles: theme[styles[1] == :bold ? :major : :active])
+                        found += 1
+                      when :yellow
+                        found += 1
+                      end
+                      styles = styles.compact
+                                     .map { |s| s == :green || s == :yellow ? color(s) : s }
+                                     .flatten
+                      line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.+)$/, styles: styles,
+                                             index: 2)
                     end
-                    line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.+)$/,
-                                           styles: styles.compact, index: 2)
                   end
                 end
+                puts "#{start.to_s.rjust(2)}. #{line}"
+                start += 1
+              elsif line =~ /^Gem /
+                print_item banner if banner
+                unless stdin?
+                  puts print_footer(" #  #{line.chomp}", reverse: true, sub: [
+                    { pat: /^(.+)(Gem)(.+)$/, styles: theme[:header], index: 2 },
+                    { pat: /^(.+)(Latest)(.+)$/, styles: theme[:header], index: 2 }
+                  ])
+                end
+                start += 1
               end
-              puts "#{start.to_s.rjust(2)}. #{line}"
-              start += 1
-            elsif line =~ /^Gem /
-              unless pipe?
-                puts print_footer(" #  #{line.chomp}", reverse: true, sub: [
-                  { pat: /^(.+)(Gem)(.+)$/, styles: theme[:header], index: 2 },
-                  { pat: /^(.+)(Latest)(.+)$/, styles: theme[:header], index: 2 }
-                ])
-              end
-              start += 1
+            end
+            if found > 0
+              puts print_footer(empty_status('Updates are available', 'major', major, always: true))
+            elsif start == 0
+              puts 'No updates were found'
             end
           end
-          if found > 0
-            puts print_footer(empty_status('Updates are available', 'major', major, always: true))
-          elsif start == 0
-            puts 'No updates were found'
-          end
-          store_pwd true
         end
 
         def update(flag, opts: [])
@@ -322,12 +339,8 @@ module Squared
           run_s "bundle #{flag} #{cmd.join(' ')}"
         end
 
-        def rake(cmd)
-          if cmd.empty?
-            run_s 'rake'
-          else
-            cmd.each { |val| run_s "rake #{val}" }
-          end
+        def rake(*cmd)
+          run_s(cmd.empty? ? 'rake' : cmd.map { |val| "rake #{val}" })
         end
 
         def rakefile
@@ -335,8 +348,22 @@ module Squared
           base_path(file) if file
         end
 
+        def variable_set(key, *val, **)
+          case key
+          when :gemfile
+            @gemfile = base_path(val.first)
+          else
+            super
+          end
+        end
+
+        def variable_all
+          ret = super + VAR_SET
+          ret.freeze
+        end
+
         def copy?
-          return true if @copy.is_a?(::String) || @copy&.fetch(:gemdir, nil)
+          return true if super || (@copy.is_a?(::Hash) && copy.fetch(:gemdir, nil))
           return gemdir? if @gemdir
 
           if @version && (val = ENV['GEM_HOME'])
@@ -346,33 +373,27 @@ module Squared
           return false unless @autodetect
 
           unsafe = ->(hint) { raise_error('failed to parse', hint: hint) }
-          begin
-            out = `gem -C #{shell_quote(path)} list --local -d #{project}`
-            data = /#{Regexp.escape(project)} \(([^)]+)\)/.match(out)
-            unsafe.('version') unless data
-            ver = data[1].split(/\s*,\s*/)
-            if @version
-              ver.unshift(@version)
-              ver.uniq!
-            end
-            ver.each do |v|
-              data = /\(#{Regexp.escape(v)}(?:,[^)]+|\b)\):([^\n]+)/.match(out)
-              next unless data
-
-              log.warn "using version #{v} (given #{@version})" if @version && @version != v
-              @version = v
-              break
-            end
-            unsafe.('path') unless data
-            @gemdir = Pathname.new(data[1].strip).join(gempath)
-          rescue StandardError => e
-            log.error e
-            @version = nil
-            @gemdir = nil
-            @autodetect = false
-          else
-            gemdir?
+          out = `gem -C #{shell_quote(path)} list --local -d #{project}`
+          data = /#{Regexp.escape(project)} \(([^)]+)\)/.match(out)
+          unsafe.('version') unless data
+          ver = data[1].split(/\s*,\s*/)
+          ver.unshift(@version).uniq! if @version
+          ver.each do |v|
+            next unless (data = /\(#{Regexp.escape(v)}(?:,[^)]+|\b)\):([^\n]+)/.match(out))
+
+            log.warn "using version #{v} (given #{@version})" if @version && @version != v
+            @version = v
+            break
           end
+          unsafe.('path') unless data
+          @gemdir = Pathname.new(data[1].strip).join(gempath)
+        rescue StandardError => e
+          log.error e
+          @version = nil
+          @gemdir = nil
+          @autodetect = false
+        else
+          gemdir?
         end
 
         def outdated?
@@ -400,14 +421,6 @@ module Squared
           end
         end
 
-        def append_repeat(flag, opts)
-          opts.each { |val| @session << "--#{flag}=#{shell_escape(val, quote: true)}" }
-        end
-
-        def append_value(opts)
-          opts.each { |val| @session << val }
-        end
-
         def gem_session(*cmd)
           ret = session('gem', *cmd)
           if (val = env('GEM_CONFIG_FILE'))

data/lib/squared/workspace/repo.rb

@@ -6,8 +6,23 @@ module Squared
       include Common
       include Format
       include System
+      include Utils
 
-      def repo(url, manifest = 'latest', run: nil, dev: nil, prod: nil, ref: @ref, group: @group)
+      class << self
+        def read_manifest(path)
+          require 'rexml/document'
+          return unless (file = path.join('.repo/manifest.xml')).exist?
+
+          doc = REXML::Document.new(file.read)
+          doc.elements['manifest/include'].attributes['name']&.sub('.xml', '')
+        end
+
+        def empty?(dir)
+          dir.empty? || (dir.children.size == 1 && dir.join(dir.children.first).to_s == __FILE__)
+        end
+      end
+
+      def repo(url, manifest = 'latest', run: nil, script: nil, dev: nil, prod: nil, ref: @ref, group: @group)
         @home = if (val = env('REPO_HOME'))
                   home = Pathname.new(val)
                   if main == home.basename.to_s
@@ -16,71 +31,79 @@ module Squared
                       @root = nil unless home.directory?
                     elsif !@root.exist?
                       @root.mkpath
-                    elsif !install?
-                      @root = nil unless confirm_install
+                    elsif !repo_install?
+                      @root = nil unless repo_confirm
                     end
                   end
                   raise_error('REPO_HOME', val, hint: 'invalid') unless @root
-
                   home.realdirpath
                 elsif (val = env('REPO_ROOT'))
                   @root = Pathname.new(val).realdirpath
                   if !@root.exist?
                     @root.mkpath
-                  elsif !install?
-                    raise_error('REPO_ROOT', val, hint: 'exist') unless confirm_install
+                  elsif !repo_install?(parent: true)
+                    raise_error('REPO_ROOT', val, hint: 'exist') unless repo_confirm
                   end
                   @root.join(main).realdirpath
                 else
-                  install?(pwd = @home) ? pwd.join(main) : pwd
+                  repo_install?(@home) ? @home.join(main) : @home
                 end
         @root = @home.parent
         @manifest_url = url
         @manifest = manifest
-        set_ref = lambda do
-          if group
-            @script[:group][:_] = group.to_s
-          elsif ref
-            @script[:ref][:_] = ref.to_sym
-          end
-        end
+        data = script_obj
         if repo?
-          @script[:build] = case (val = env('REPO_BUILD'))
-                            when 'verbose'
-                              @verbose = true
-                              run.is_a?(String) ? "#{run}:verbose" : run
-                            when 'silent'
-                              @verbose = false
-                              @warning = false
-                              run
-                            else
-                              val || run
-                            end
-          @script[:dev] = bool_match(env('REPO_DEV'), dev)
-          @script[:prod] = bool_match(env('REPO_PROD'), prod)
-          if (val = env('REPO_GROUP'))
-            @script[:group][:_] = val.to_s
-            @script[:env] = true
-          elsif (val = env('REPO_REF'))
-            @script[:ref][:_] = val.to_sym
-            @script[:env] = true
+          if script
+            if (val = env('REPO_BUILD'))
+              data[:script] = case val
+                              when 'verbose'
+                                @verbose = 1
+                                if script.is_a?(::Array)
+                                  script[0] = "#{script[0]}:verbose"
+                                  script
+                                else
+                                  "#{script}:verbose"
+                                end
+                              when 'silent'
+                                @verbose = false
+                                @warning = false
+                                script
+                              else
+                                val
+                              end
+              data[:env] = true
+            else
+              data[:script] = script
+            end
+          elsif (val = env('REPO_BUILD'))
+            data[:run] = val
+            data[:env] = true
           else
-            set_ref
+            data[:run] = run
+          end
+          data[:global] = true
+          data[:dev] = env_match('REPO_DEV', dev, suffix: @envname)
+          data[:prod] = env_match('REPO_PROD', prod, suffix: @envname)
+          if (val = env('REPO_GROUP'))
+            script_set(data, group: val.split(','))
+            found = true
+          end
+          if (val = env('REPO_REF'))
+            script_set(data, ref: val.split(','))
+            found = true
           end
-          @warning = case env('REPO_WARN')
-                     when '0'
-                       false
-                     when '1'
-                       true
-                     else
-                       @warning && !empty?(@root)
-                     end
+          script_set(data, group: group, ref: ref) unless found
+          @warning = env_match('REPO_WARN', @warning && !Repo.empty?(@root), suffix: @envname) != false
           @extensions << :__repo__
-        else
-          @script[:build] = run
-          @script[:dev] = dev
-          @script[:prod] = prod
-          set_ref
+        elsif script || run
+          if script
+            data[:script] = script
+          else
+            data[:run] = run
+          end
+          data[:dev] = dev
+          data[:prod] = prod
+          script_set(data, group: group, ref: ref)
         end
         self
       end
@@ -90,7 +113,7 @@ module Squared
       def __repo__(**kwargs)
         kwargs.delete(:parallel) if env('REPO_SYNC', ignore: '0')
 
-        branch = env('REPO_MANIFEST') || read_manifest
+        branch = env('REPO_MANIFEST') || Repo.read_manifest(root)
         target = branch || @manifest
         stage = nil
         failfast = true
@@ -115,12 +138,9 @@ module Squared
           end
         end
         status = lambda do |val, alt = nil|
-          ver = branch || alt
-          if ver
-            message(@prefix || '', 'repo', val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver)
-          else
-            'inactive'
-          end
+          return 'inactive' unless (ver = branch || alt)
+
+          message(@prefix || '', 'repo', val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver)
         end
 
         namespace task_name('repo') do |repo|
@@ -130,12 +150,12 @@ module Squared
             stage ||= 'all'
             repo['sync'].invoke
             @project.select do |_, proj|
-              next false unless proj.enabled? && proj.ref?(Project::Base.ref)
+              next unless proj.enabled?(Project::Base.ref)
 
               proj.depend if proj.depend?
               proj.build?
             end
-            .each_value { |proj| proj.has?(:dev) ? proj.refresh : proj.build }
+            .each_value { |proj| proj.has?('dev') ? proj.refresh : proj.build }
           end
 
           desc status.("init[manifest?=#{target},{0}]", target)
@@ -166,51 +186,25 @@ module Squared
         end
       end
 
-      def read_manifest
-        require 'rexml/document'
-        return unless (file = root_path('.repo/manifest.xml')).exist?
-
-        doc = REXML::Document.new(file.read)
-        doc.elements['manifest/include'].attributes['name']&.sub('.xml', '')
-      end
-
-      def confirm_install
+      def repo_confirm
         return false unless root.directory?
 
         path = sub_style(root, styles: theme[:inline])
         @override = confirm(
           "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation? [y/N] ",
-          default: 'N',
+          'N',
           timeout: env('REPO_TIMEOUT', 15, ignore: '0')
         )
       end
 
-      def bool_match(val, pat)
-        case val
-        when nil, ''
-          pat
-        when '0'
-          false
-        when '1'
-          true
-        else
-          Regexp.new(val)
-        end
-      end
-
       def repo?
-        !@manifest_url.nil? && (install? || !!@override)
-      end
-
-      def empty?(dir)
-        dir.empty? || (dir.children.size == 1 && dir.join(dir.children.first).to_s == __FILE__)
+        !@manifest_url.nil? && (repo_install? || !!@override)
       end
 
-      def install?(dir = root)
-        return true if empty?(dir) || dir.join('.repo').directory?
-        return false unless dir == root && env('REPO_HOME').nil? && !env('REPO_ROOT').nil?
+      def repo_install?(dir = root, parent: false)
+        return true if Repo.empty?(dir) || dir.join('.repo').directory?
 
-        root.children.none? { |path| path.directory? && path.basename.to_s[0] != '.' && path.to_s != home.to_s }
+        parent && root.children.none? { |ent| ent.directory? && ent.basename.to_s[0] != '.' && ent.to_s != home.to_s }
       end
     end
 

data/lib/squared/workspace/series.rb

@@ -46,7 +46,7 @@ module Squared
       end
 
       def __set__(key)
-        self[key.to_sym] ||= []
+        @data[key.to_sym] ||= []
       end
 
       def __populate__(proj)
@@ -54,11 +54,13 @@ module Squared
 
         group, parent, id = @session.values
         ws = proj.workspace
-        each do |key, items|
+        ref = Project::Base.ref
+        @data.each do |key, items|
           task = "#{proj.name}:#{key}"
-          unless include?(key) ? proj.has?(key) || ws.task_defined?(key) : ws.task_extend?(proj, key)
-            alt = TASK_ALIAS[key]
-            next unless alt && (task = "#{proj.name}:#{alt}") && self[alt].include?(task)
+          unless (base = include?(key)) ? proj.has?(key, ref) : ws.task_extend?(proj, key)
+            next if (base && !proj.ref?(ref)) || (alt = TASK_ALIAS[key]).nil?
+
+            task = "#{proj.name}:#{alt}"
           end
           next unless ws.task_defined?(task)
 
@@ -77,9 +79,9 @@ module Squared
 
       def __build__(parallel: [], **)
         group, parent, id = @session.values
-        merge!(parent) if id.uniq.size > 1
-        merge!(group)
-        each do |key, items|
+        @data.merge!(parent) if id.uniq.size > 1
+        @data.merge!(group)
+        @data.each do |key, items|
           next if items.empty?
 
           key = @workspace.task_name(name = key.to_s)
@@ -103,14 +105,14 @@ module Squared
         end
         TASK_ALIAS.each_key do |key|
           suf = ":#{key}"
-          self[key].clear unless self[key].any? { |val| val.end_with?(suf) }
+          @data[key].clear unless @data[key].any? { |val| val.end_with?(suf) }
         end
         @multiple += sync
         @session = nil
       end
 
       def some?(key)
-        !key.nil? && key?(key = key.to_sym) && !self[key].empty?
+        @data.key?(key) && !@data[key].empty?
       end
 
       def include?(key)
@@ -136,15 +138,15 @@ module Squared
       private
 
       def method_missing(key, *)
-        raise NoMethodError, key unless key?(key)
+        raise NoMethodError, key unless @data.key?(key)
 
-        self[key]
+        @data[key]
       end
 
       def already_invoked?(list, val)
         return list.include?(val) && Common::Task.invoked?(val) if val
 
-        ::Rake::Task.tasks.any? { |item| item.already_invoked && list.include?(item.name) }
+        ::Rake::Task.tasks.any? { |obj| obj.already_invoked && list.include?(obj.name) }
       end
     end
   end