squared 0.0.10 → 0.0.12

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

@@ -12,26 +12,27 @@ module Squared
 
         class << self
           def populate(*); end
+          def batchargs(*); end
 
           def tasks
-            nil
+            %i[outdated].freeze
+          end
+
+          def bannerargs
+            %i[dependfile].freeze
           end
 
           def venv?
             Dir.exist?(ENV.fetch('VIRTUAL_ENV', ''))
           end
 
-          def is_a?(val)
-            if (val = as_path(val))
-              REQUIREMENTS.any? { |file| val.join(file).exist? }
-            else
-              super
-            end
+          def config?(val)
+            return false unless (val = as_path(val))
+
+            REQUIREMENTS.any? { |file| val.join(file).exist? }
           end
         end
 
-        attr_reader :requirements
-
         def initialize(*, **kwargs)
           super
           if @pass.include?(Python.ref)
@@ -41,12 +42,12 @@ module Squared
             initialize_build(Python.ref, **kwargs)
             initialize_env(**kwargs)
           end
-          @reqindex = REQUIREMENTS.index { |file| base_path(file).exist? } || 0
-          @requirements = base_path(REQUIREMENTS[@reqindex])
+          @dependindex = REQUIREMENTS.index { |file| basepath(file).exist? }
+          @dependfile = basepath(REQUIREMENTS[@dependindex || 0])
         end
 
         @@tasks[ref] = {
-          install: %i[user target upgrade force]
+          install: %i[user target upgrade force].freeze
         }.freeze
 
         def ref
@@ -74,11 +75,12 @@ module Squared
                            else
                              OPT_USER
                            end
-                    desc format_desc(action, flag, list + OPT_GENERAL, req: req)
+                    list += OPT_GENERAL
+                    desc format_desc(action, flag, list, req: req)
                     if flag == :target
                       task flag, [:dir, :opts] do |_, args|
-                        guard_params(action, flag, args: args, key: :dir)
-                        depend(flag, dir: args.dir, opts: args.to_a)
+                        dir = guard_params(action, flag, args: args, key: :dir)
+                        depend(flag, dir: dir, opts: args.to_a[1..-1] || [])
                       end
                     else
                       task flag do |_, args|
@@ -92,12 +94,11 @@ module Squared
           end
         end
 
-        def depend(flag = nil, dir: nil, opts: [])
+        def depend(flag = nil, dir: nil, opts: [], sync: invoked_sync?('depend', flag))
           if @depend && !flag
             super
           elsif outdated?
-            sync = invoked_sync?('depend', flag)
-            case (type = install_type)
+            case (type = dependtype)
             when 1, 2
               cmd = pip_session 'install'
               case flag
@@ -105,7 +106,7 @@ module Squared
                 cmd << '--user'
                 append_pip opts, OPT_USER
               when :target
-                cmd << "--target=#{shell_escape(base_path(dir).to_s, quote: true)}"
+                cmd << "--target=#{shell_escape(basepath(dir), quote: true)}"
                 append_pip opts, OPT_USER + ['upgrade']
                 append_eager opts
               when :upgrade
@@ -129,17 +130,13 @@ module Squared
           run
         end
 
-        def install_type(*)
-          requirements.exist? ? @reqindex + 1 : 0
-        end
-
         def variable_set(key, *val, **)
           case key
-          when :requirements
-            req = base_path(val.first)
+          when :dependfile
+            req = basepath(*val)
             if (index = REQUIREMENTS.index(req.basename.to_s))
-              @reqindex = index
-              @requirements = req
+              @dependindex = index
+              @dependfile = req
             else
               log.warn "variable_set: @#{key}=#{req} (not supported)"
             end
@@ -148,8 +145,12 @@ module Squared
           end
         end
 
+        def depend?
+          @depend != false && (!@depend.nil? || outdated?)
+        end
+
         def outdated?
-          install_type > 0
+          dependtype > 0
         end
 
         private
@@ -169,21 +170,23 @@ module Squared
                           (v ? "-#{v[0]}" : "--#{opt}")
                         end
           end
-          @session << '--user' if env('PIP_USER')
-          @session << '--no-input' if env('PIP_NO_INPUT')
-          if (val = env('PIP_PROXY'))
+          @session << '--user' if option('user')
+          @session << '--no-input' if option('no-input')
+          if (val = option('proxy', ignore: false))
             @session << "--proxy=#{shell_escape(val, quote: true)}"
           end
-          if (val = env('PIP_LOG'))
-            @session << "--log=#{shell_escape(base_path(val).to_s, quote: true)}"
+          if (val = option('log', ignore: false))
+            @session << "--log=#{shell_escape(basepath(val), quote: true)}"
           end
-          append_nocolor
+          append_nocolor option('no-color')
         end
 
         def append_eager(opts)
           @session << '--upgrade-strategy=eager' if opts.include?('eager')
         end
       end
+
+      Application.implement Python
     end
   end
 end

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

@@ -14,32 +14,33 @@ module Squared
 
         class << self
           def populate(*); end
+          def batchargs(*); end
 
           def tasks
-            nil
+            %i[outdated].freeze
           end
 
-          def is_a?(val)
-            if (val = as_path(val))
-              RUBY_DIR.any? { |file| val.join(file).exist? }
-            else
-              super
-            end
+          def bannerargs
+            %i[dependfile].freeze
+          end
+
+          def config?(val)
+            return false unless (val = as_path(val))
+
+            RUBY_DIR.any? { |file| val.join(file).exist? }
           end
         end
 
         @@tasks[ref] = {
-          install: %i[redownload local prefer-local gem with without],
-          update: %i[all patch minor major],
-          outdated: %i[patch minor major],
-          pristine: %i[gem all version],
+          install: %i[redownload local prefer-local gem with without].freeze,
+          update: %i[all patch minor major].freeze,
+          outdated: %i[patch minor major].freeze,
+          pristine: %i[gem all version].freeze,
           exec: nil,
           config: nil,
           rake: nil
         }.freeze
 
-        attr_reader :gemfile
-
         def initialize(*, version: nil, autodetect: false, **kwargs)
           super
           if @pass.include?(Ruby.ref)
@@ -51,8 +52,8 @@ module Squared
           end
           @version = env('BUILD', version, suffix: 'VERSION')
           @autodetect = autodetect
-          index = GEMFILE.index { |file| base_path(file).exist? } || 0
-          @gemfile = base_path(GEMFILE[index])
+          @dependindex = GEMFILE.index { |file| basepath(file).exist? }
+          @dependfile = basepath(GEMFILE[@dependindex || 0])
           return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || (file = rakefile).nil?
 
           begin
@@ -89,9 +90,25 @@ module Squared
                 when :rake
                   next unless rakefile
 
-                  desc format_desc(action, nil, 'command*')
+                  desc format_desc(action, nil, 'command*|^index,args*|#,pattern*')
                   task action, [:command] do |_, args|
-                    rake(*args.to_a)
+                    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 = indexdata(args.command))
+                      n, opts = data
+                      list = read_rakefile
+                      if (item = list[n - 1])
+                        cmd = opts ? "#{opts} #{item.first}" : item.first
+                      elsif exception
+                        indexerror n, list
+                      else
+                        next log.warn "rake task #{n} of #{list.size} (out of range)"
+                      end
+                      rake(args.extras.empty? ? cmd : "#{cmd}[#{args.extras.join(',')}]")
+                    else
+                      rake(*args.to_a)
+                    end
                   end
                 end
               else
@@ -103,16 +120,14 @@ module Squared
                       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)
+                          opts = guard_params(action, flag, args: args.to_a)
+                          depend(flag, opts: opts)
                         end
                       when :with, :without
                         desc format_desc(action, flag, 'group+')
                         task flag, [:group] do |_, args|
-                          group = args.to_a
-                          guard_params(action, flag, args: group)
-                          depend(flag, opts: group)
+                          opts = guard_params(action, flag, args: args.to_a)
+                          depend(flag, opts: opts)
                         end
                       else
                         desc format_desc(action, flag, OPT_INSTALL)
@@ -130,9 +145,8 @@ module Squared
                       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)
+                          opts = guard_params(action, flag, args: args.to_a)
+                          pristine(flag, opts: opts)
                         end
                       when :all
                         desc format_desc(action, flag, 'skip*')
@@ -142,8 +156,8 @@ module Squared
                       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)
+                          version = guard_params(action, flag, args: args, key: :version)
+                          pristine(flag, version: version)
                         end
                       end
                     end
@@ -154,7 +168,7 @@ module Squared
           end
         end
 
-        def depend(flag = nil, opts: [])
+        def depend(flag = nil, opts: [], sync: invoked_sync?('depend', flag))
           if @depend && !flag
             super
           elsif outdated?
@@ -167,7 +181,7 @@ module Squared
               append_repeat flag, opts
             when :redownload, :local, :'prefer-local'
               cmd = bundle_session 'install', "--#{flag}"
-              if (val = env('BUNDLE_TRUST_POLICY'))
+              if (val = option('trust-policy', ignore: false))
                 cmd << "--trust-policy=#{case val
                                          when '0'
                                            'NoSecurity'
@@ -188,28 +202,28 @@ module Squared
               bundle_session 'install'
               append_bundle
             end
-            run_rb(sync: invoked_sync?('depend', flag))
+            run_rb(sync: sync)
           end
         end
 
-        def copy(from: 'lib', glob: '**/*', gemdir: @gemdir, override: false)
+        def copy(from: 'lib', glob: nil, into: @gemdir, override: false)
           if @copy && !override
             return super if runnable?(@copy)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:glob] if @copy.key?(:glob)
-            gemdir = @copy[:gemdir] if @copy.key?(:gemdir)
+            into = @copy[:into] if @copy.key?(:into)
           end
-          return unless gemdir
+          return unless into
 
-          dest = Pathname.new(gemdir).realpath
+          dest = Pathname.new(into).realpath
           print_item unless @output[0]
-          glob = as_a(glob)
+          glob = as_a(glob || '**/*')
           as_a(from).each_with_index do |val, i|
-            a = base_path(val)
+            a = basepath(val)
             b = dest.join(val)
-            c = glob[i] || '**/*'
-            log.warn "cp #{a.join(c)} #{b}"
+            c = glob[i] || glob[0]
+            log.info "cp #{a.join(c)} #{b}"
             copy_d(a, b, glob: c, verbose: verbose)
           end
         end
@@ -217,7 +231,7 @@ module Squared
         def outdated(rev = nil, opts: [])
           cmd = bundle_session 'outdated', rev && "--#{rev}"
           append_bundle opts, OPT_OUTDATED
-          cmd = close_session(cmd)
+          cmd = session_done(cmd)
           log.info cmd
           banner = format_banner(cmd)
           if invoked_sync?('outdated', rev)
@@ -232,31 +246,32 @@ module Squared
               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 = []
+                  next unless (cur = data.shift) && (lat = data.shift)
+
+                  semver(cur)
+                  semver(lat)
+                  c = cur.join
+                  l = lat.join
+                  styles = []
+                  major_set = lambda do
+                    styles = %i[green bold]
+                    major += 1
+                  end
+                  minor_set = -> { styles[0] = cur[2] == lat[2] ? :yellow : :green }
+                  if data.empty?
+                    semmajor?(cur, lat) ? major_set.() : minor_set.()
+                  else
                     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
+                        semmajor?(cur, lat) ? major_set.() : minor_set.()
                       when '<', '<='
                         if c <= v
-                          if semmajor(cur, lat)
-                            styles = %i[green bold]
-                            major += 1
+                          if semmajor?(cur, lat)
+                            major_set.()
                           else
                             styles[0] = :yellow
                           end
@@ -268,29 +283,29 @@ module Squared
                           styles[1] = :bold
                         end
                       when '~>'
-                        if c < v && cur[0] == val[0] && !semmajor(cur, val)
+                        if c < v && cur[0] == val[0] && !semmajor?(cur, val)
                           styles[0] = :yellow
-                        elsif semmajor(val, lat)
+                        elsif semmajor?(val, lat)
                           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
-                      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
+                  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
                 end
                 puts "#{start.to_s.rjust(2)}. #{line}"
@@ -298,16 +313,24 @@ module Squared
               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 }
-                  ])
+                  sub = { pat: /^(.+)(?<!\dm)(Gem|Latest)(.+)$/, styles: theme[:header], index: 2 }
+                  puts print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub])
                 end
                 start += 1
               end
             end
             if found > 0
-              puts print_footer(empty_status('Updates are available', 'major', major, always: true))
+              begin
+                if major == 0 && (data = /\b(?:source\s+(["'])(.+?)\1|remote:\s+(\S+))/.match(dependfile.read))
+                  status = (data[2] || data[3]).chomp('/')
+                  right = true
+                end
+              rescue StandardError => e
+                log.debug e
+              ensure
+                status ||= 'Updates are available'
+              end
+              puts print_footer(empty_status(status, 'major', major, always: !right), right: right)
             elsif start == 0
               puts 'No updates were found'
             end
@@ -340,30 +363,19 @@ module Squared
         end
 
         def rake(*cmd)
-          run_s(cmd.empty? ? 'rake' : cmd.map { |val| "rake #{val}" })
-        end
-
-        def rakefile
-          file = ::Rake::Application::DEFAULT_RAKEFILES.find { |val| base_path(val).exist? }
-          base_path(file) if file
-        end
-
-        def variable_set(key, *val, **)
-          case key
-          when :gemfile
-            @gemfile = base_path(val.first)
+          if cmd.empty?
+            run_s 'rake'
           else
-            super
+            run_s(*cmd.map { |val| "rake #{val}" }, banner: false)
           end
         end
 
-        def variable_all
-          ret = super + VAR_SET
-          ret.freeze
+        def depend?
+          @depend != false && (!@depend.nil? || outdated?)
         end
 
         def copy?
-          return true if super || (@copy.is_a?(::Hash) && copy.fetch(:gemdir, nil))
+          return true if super || (@copy.is_a?(::Hash) && copy.fetch(:into, nil))
           return gemdir? if @gemdir
 
           if @version && (val = ENV['GEM_HOME'])
@@ -397,17 +409,22 @@ module Squared
         end
 
         def outdated?
-          gemfile.exist?
+          dependtype > 0
         end
 
         private
 
+        def variables
+          ret = super + VAR_SET
+          ret.freeze
+        end
+
         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
+          if (val = option('jobs')).to_i > 0
             @session << "-j#{val}"
           end
           return unless opts && list
@@ -423,16 +440,34 @@ module Squared
 
         def gem_session(*cmd)
           ret = session('gem', *cmd)
-          if (val = env('GEM_CONFIG_FILE'))
-            ret << "--config-file=#{shell_escape(base_path(val).to_s, quote: true)}"
+          if (val = option('config-file', ignore: false))
+            ret << "--config-file=#{shell_escape(basepath(val), quote: true)}"
           end
-          ret << '--norc' if env('GEM_NORC')
+          ret << '--norc' if option('norc')
           ret
         end
 
         def bundle_session(*cmd)
           session('bundle', *cmd)
-          append_nocolor
+          append_nocolor option('no-color')
+          @session
+        end
+
+        def read_rakefile
+          return @rakelist if @rakelist
+
+          ret = []
+          IO.popen("rake -C #{shell_quote(path)} -AT").each do |line|
+            next unless (data = /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/.match(line))
+
+            ret << [data[1], data[2]]
+          end
+          @rakelist = ret
+        end
+
+        def rakefile
+          file = ::Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
+          basepath(file) if file
         end
 
         def gempath
@@ -443,6 +478,8 @@ module Squared
           @gemdir.exist? && !@gemdir.empty?
         end
       end
+
+      Application.implement Ruby
     end
   end
 end

data/lib/squared/workspace/project.rb

@@ -18,6 +18,3 @@ end
 
 require_relative 'project/base'
 require_relative 'project/git'
-require_relative 'project/node'
-require_relative 'project/python'
-require_relative 'project/ruby'