squared 0.0.6 → 0.0.8

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

@@ -4,11 +4,11 @@ module Squared
   module Workspace
     module Project
       class Ruby < Git
-        REF = :ruby
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
-        OPT_INSTALL = %w[no-cache force quiet verbose].freeze
-        OPT_UPDATE = %w[redownload local strict conservative group=s quiet verbose].freeze
-        private_constant :REF, :GEMFILE, :OPT_INSTALL, :OPT_UPDATE
+        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
 
         class << self
           def populate(*); end
@@ -26,32 +26,34 @@ module Squared
           end
         end
 
-        @@tasks[REF] = {
-          install: %i[redownload local prefer-local with-g without-g],
+        @@tasks[ref] = {
+          install: %i[redownload local prefer-local gem with without],
           update: %i[all patch minor major],
-          pristine: %i[version extensions],
+          outdated: %i[patch minor major],
+          pristine: %i[gem all version],
+          exec: nil,
+          config: nil,
           rake: nil
         }.freeze
 
         attr_reader :gemfile
 
-        def initialize(name, path, workspace, *, version: nil, autodetect: false, **kwargs)
+        def initialize(*, version: nil, autodetect: false, **kwargs)
           super
-          initialize_build(REF, **kwargs)
-          @version = env('BUILD', suffix: 'VERSION', strict: true) || version
+          initialize_build(Ruby.ref, **kwargs)
+          @version = env('BUILD', version, suffix: 'VERSION', strict: true)
           @autodetect = autodetect
           index = GEMFILE.index { |file| base_path(file).exist? } || 0
           @gemfile = base_path(GEMFILE[index])
           return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || (file = rakefile).nil?
 
           begin
-            pat = %r{\brequire\s+(["'])bundler/gem_tasks\1}
             File.foreach(file) do |line|
-              next unless line =~ pat
+              next unless line =~ %r{\brequire\s+(["'])bundler/gem_tasks\1}
 
               @output[0] = 'bundle exec rake build'
               @copy = 'bundle exec rake install'
-              @clean ||= 'bundle exec rake clean'
+              @clean = 'bundle exec rake clean' if @clean.nil?
               break
             end
           rescue StandardError => e
@@ -61,18 +63,23 @@ module Squared
 
         def populate(*)
           super
-          return unless outdated?
+          return unless outdated? && ref?(Ruby.ref)
 
           namespace name do
-            @@tasks[REF].each do |action, flags|
+            @@tasks[Ruby.ref].each do |action, flags|
               if flags.nil?
                 case action
+                when :exec, :config
+                  desc format_desc(action, nil, 'command+')
+                  task action, [:command] do |_, args|
+                    bundle(action, args.to_a)
+                  end
                 when :rake
                   next unless rakefile
 
                   desc format_desc(action, nil, 'command*')
                   task action, [:command] do |_, args|
-                    rake collect_args(args, :command)
+                    rake args.to_a
                   end
                 end
               else
@@ -81,26 +88,51 @@ module Squared
                     case action
                     when :install
                       case flag
-                      when :'with-g', :'without-g'
+                      when :gem
+                        desc format_desc(action, flag, 'name+')
+                        task flag, [:name] do |_, args|
+                          name = args.to_a
+                          guard_params(action, flag, args: name)
+                          depend(flag, opts: name)
+                        end
+                      when :with, :without
                         desc format_desc(action, flag, 'group+')
                         task flag, [:group] do |_, args|
-                          depend(flag, group: collect_args(args, :group), override: true)
+                          group = args.to_a
+                          guard_params(action, flag, args: group)
+                          depend(flag, opts: group)
                         end
                       else
                         desc format_desc(action, flag, OPT_INSTALL)
                         task flag, [:opts] do |_, args|
-                          depend(flag, opts: collect_args(args, :opts), override: true)
+                          depend(flag, opts: args.to_a)
                         end
                       end
-                    when :update
-                      desc format_desc(action, flag, OPT_UPDATE)
+                    when :update, :outdated
+                      desc format_desc(action, flag, action == :update ? OPT_UPDATE : OPT_OUTDATED)
                       task flag, [:opts] do |_, args|
-                        update(flag, opts: collect_args(args, :opts))
+                        __send__(action, flag, opts: args.to_a)
                       end
                     when :pristine
-                      desc format_desc(action, flag, 'version?')
-                      task flag, [:version] do |_, args|
-                        pristine(flag, version: args.version)
+                      case flag
+                      when :gem
+                        desc format_desc(action, flag, 'name+')
+                        task flag, [:name] do |_, args|
+                          name = args.to_a
+                          guard_params(action, flag, args: name)
+                          pristine(flag, opts: name)
+                        end
+                      when :all
+                        desc format_desc(action, flag, 'skip*')
+                        task flag, [:skip] do |_, args|
+                          pristine(flag, opts: args.to_a)
+                        end
+                      when :version
+                        desc format_desc(action, flag, 'version?')
+                        task flag, [:version] do |_, args|
+                          guard_params(action, flag, args: args, key: :version)
+                          pristine(flag, version: args.version)
+                        end
                       end
                     end
                   end
@@ -110,11 +142,17 @@ module Squared
           end
         end
 
-        def depend(flag = nil, opts: [], group: [], override: false)
-          if @depend && !override
+        def depend(flag = nil, opts: [])
+          if @depend && !flag
             super
           elsif outdated?
             case flag
+            when :gem
+              gem_session 'install'
+              append_value opts
+            when :with, :without
+              gem_session 'install'
+              append_repeat flag, opts
             when :redownload, :local, :'prefer-local'
               cmd = bundle_session 'install', "--#{flag}"
               if (val = env('BUNDLE_TRUST_POLICY'))
@@ -134,16 +172,11 @@ module Squared
                                          end}"
               end
               append_bundle opts, OPT_INSTALL
-            when :'with-g', :'without-g'
-              guard_params('install', flag, args: group)
-              cmd = gem_session 'install', '-g'
-              opt = flag.to_s.sub('-g', '')
-              group.each { |s| cmd << "--#{opt}=#{shell_escape(s, quote: true)}" }
             else
-              cmd = bundle_session 'install'
+              bundle_session 'install'
               append_bundle
             end
-            run(banner: banner?, exception: workspace.exception)
+            run_rb(sync: invoked_sync?('depend', flag))
           end
         end
 
@@ -169,28 +202,120 @@ module Squared
           end
         end
 
-        def outdated(*); end
+        def outdated(rev = nil, opts: [])
+          cmd = bundle_session 'outdated', rev && "--#{rev}"
+          append_bundle opts, OPT_OUTDATED
+          cmd = cmd.done
+          log.info cmd
+          print_item format_banner(cmd) if store_pwd || invoked_sync?("outdated#{rev && ":#{rev}"}")
+          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
+                        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(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
+                    end
+                    line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.+)$/,
+                                           styles: styles.compact, index: 2)
+                  end
+                end
+              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
+          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: [])
-          cmd = bundle_session 'update'
-          case flag
-          when :all, :major, :patch, :minor
-            cmd << "--#{flag}"
-          end
+          bundle_session 'update', "--#{flag}"
           append_bundle opts, OPT_UPDATE
-          run(banner: banner?, exception: workspace.exception)
+          run_rb
         end
 
-        def pristine(flag, version: nil)
-          cmd = gem_session 'pristine', project
+        def pristine(flag, version: nil, opts: [])
+          cmd = gem_session 'pristine'
           case flag
-          when :extensions
-            cmd << '--extensions'
+          when :gem
+            append_value opts
+          when :all
+            cmd << '--all'
+            append_repeat 'skip', opts
           when :version
-            guard_params version, 'version'
+            cmd << project << "--version=#{shell_escape(version)}"
           end
-          cmd << "--version=#{version}" if version
-          run(banner: banner?, exception: workspace.exception)
+          run_rb
+        end
+
+        def bundle(flag, cmd)
+          guard_params('bundle', flag, args: cmd)
+          run_s "bundle #{flag} #{cmd.join(' ')}"
         end
 
         def rake(cmd)
@@ -210,9 +335,8 @@ module Squared
           return true if @copy.is_a?(::String) || @copy&.fetch(:gemdir, nil)
           return gemdir? if @gemdir
 
-          gempath = -> { "gems#{::File::SEPARATOR}#{project}-#{@version}" }
           if @version && (val = ENV['GEM_HOME'])
-            @gemdir = Pathname.new(val).join(gempath.())
+            @gemdir = Pathname.new(val).join(gempath)
             return true if gemdir?
           end
           return false unless @autodetect
@@ -236,7 +360,7 @@ module Squared
               break
             end
             unsafe.('path') unless data
-            @gemdir = Pathname.new(data[1].strip).join(gempath.())
+            @gemdir = Pathname.new(data[1].strip).join(gempath)
           rescue StandardError => e
             log.error e
             @version = nil
@@ -247,38 +371,46 @@ module Squared
           end
         end
 
-        def depend?
-          outdated? || !!@depend
-        end
-
         def outdated?
           gemfile.exist?
         end
 
-        def dev?
-          @dev
-        end
-
         private
 
+        def run_rb(sync: true)
+          run(sync: sync, banner: !@session.include?('--quiet'))
+        end
+
         def append_bundle(opts = nil, list = nil)
           if (val = env('BUNDLE_JOBS')).to_i > 0
             @session << "-j#{val}"
           end
-          @session << '--norc' if env('BUNDLE_NORC')
           return unless opts && list
 
           opts.each do |opt|
             if list.include?(opt)
               @session << "--#{opt}"
             elsif opt.match(/^g(?:roup)?=(.+)$/)
-              @session << "--group=#{shell_escape($1, quote: true)}"
+              @session << "--group=#{shell_escape($1)}"
             end
           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)
-          session('gem', *cmd)
+          ret = session('gem', *cmd)
+          if (val = env('GEM_CONFIG_FILE'))
+            ret << "--config-file=#{shell_escape(base_path(val).to_s, quote: true)}"
+          end
+          ret << '--norc' if env('GEM_NORC')
+          ret
         end
 
         def bundle_session(*cmd)
@@ -286,8 +418,8 @@ module Squared
           append_nocolor
         end
 
-        def banner?
-          !@session.include?('--quiet')
+        def gempath
+          File.join('gems', "#{project}-#{@version}")
         end
 
         def gemdir?

data/lib/squared/workspace/project.rb

@@ -5,6 +5,10 @@ module Squared
     module Project
       class << self
         attr_accessor :line_width
+
+        def max_width(lines)
+          [lines.max_by(&:size).size, line_width].max
+        end
       end
 
       @line_width = ENV.fetch('LOG_COLUMNS', 80).to_i

data/lib/squared/workspace/repo.rb

@@ -6,14 +6,11 @@ module Squared
       include Common
       include Format
       include System
-      include Task
 
-      attr_accessor :warning
-
-      def repo(url, manifest = 'latest', run: nil, dev: nil, prod: nil)
+      def repo(url, manifest = 'latest', run: 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
+                  if main == home.basename.to_s
                     @root = home.parent
                     if home.exist?
                       @root = nil unless home.directory?
@@ -33,18 +30,25 @@ module Squared
                   elsif !install?
                     raise_error('REPO_ROOT', val, hint: 'exist') unless confirm_install
                   end
-                  @root.join(@main).realdirpath
+                  @root.join(main).realdirpath
                 else
-                  install?(pwd = Pathname.pwd) ? pwd.join(@main) : pwd
+                  install?(pwd = @home) ? pwd.join(main) : pwd
                 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
         if repo?
           @script[:build] = case (val = env('REPO_BUILD'))
                             when 'verbose'
                               @verbose = true
-                              "#{run}:verbose" if run
+                              run.is_a?(String) ? "#{run}:verbose" : run
                             when 'silent'
                               @verbose = false
                               @warning = false
@@ -54,33 +58,33 @@ module Squared
                             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
+          else
+            set_ref
+          end
           @warning = case env('REPO_WARN')
                      when '0'
                        false
                      when '1'
                        true
                      else
-                       !empty?(@root)
+                       @warning && !empty?(@root)
                      end
           @extensions << :__repo__
         else
           @script[:build] = run
           @script[:dev] = dev
           @script[:prod] = prod
+          set_ref
         end
         self
       end
 
-      protected
-
-      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__)
-      end
-
       private
 
       def __repo__(**kwargs)
@@ -93,7 +97,7 @@ module Squared
         cmd = []
         newline = ARGV.index { |val| val.start_with?('repo:') }.to_i > 0
         parse_opts = lambda do |args|
-          collect_args(args, :opts).each do |val|
+          args.to_a.each do |val|
             case val
             when 'no-fail'
               failfast = false
@@ -122,10 +126,10 @@ module Squared
             stage ||= 'all'
             repo['sync'].invoke
             @project.select do |_, proj|
-              if proj.enabled?
-                proj.depend
-                proj.build?
-              end
+              next false unless proj.enabled? && proj.ref?(Project::Base.ref)
+
+              proj.depend if proj.depend?
+              proj.build?
             end
             .each_value { |proj| proj.has?(:dev) ? proj.refresh : proj.build }
           end
@@ -166,12 +170,13 @@ module Squared
       end
 
       def confirm_install
-        return false unless @root.directory?
+        return false unless root.directory?
 
+        path = sub_style(root, styles: theme[:inline])
         @override = confirm(
-          "#{log_title(:warn)} \"#{sub_style(@root, :bold)}\" is not empty. Continue with installation? [y/N] ",
+          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation? [y/N] ",
           default: 'N',
-          timeout: env('REPO_TIMEOUT', ignore: '0', default: 15)
+          timeout: env('REPO_TIMEOUT', 15, ignore: '0')
         )
       end
 
@@ -188,7 +193,15 @@ module Squared
         end
       end
 
-      def install?(dir = @root)
+      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__)
+      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?