squared 0.0.9 → 0.0.11

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

@@ -12,22 +12,21 @@ module Squared
 
         class << self
           def populate(*); end
+          def batchargs(*); end
+          def aliasargs(*); end
 
           def tasks
-            nil
+            %i[outdated].freeze
           end
 
           def venv?
-            val = ENV['VIRTUAL_ENV']
-            !val.nil? && Dir.exist?(val)
+            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
 
@@ -35,13 +34,19 @@ module Squared
 
         def initialize(*, **kwargs)
           super
+          if @pass.include?(Python.ref)
+            initialize_ref(Python.ref)
+            initialize_logger(**kwargs)
+          else
+            initialize_build(Python.ref, **kwargs)
+            initialize_env(**kwargs)
+          end
           @reqindex = REQUIREMENTS.index { |file| base_path(file).exist? } || 0
           @requirements = base_path(REQUIREMENTS[@reqindex])
-          initialize_build(Python.ref, **kwargs)
         end
 
         @@tasks[ref] = {
-          install: %i[user target upgrade force]
+          install: %i[user target upgrade force].freeze
         }.freeze
 
         def ref
@@ -69,7 +74,8 @@ 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)
@@ -87,11 +93,10 @@ 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)
             when 1, 2
               cmd = pip_session 'install'
@@ -128,6 +133,25 @@ module Squared
           requirements.exist? ? @reqindex + 1 : 0
         end
 
+        def variable_set(key, *val, **)
+          case key
+          when :requirements
+            req = base_path(val.first)
+            if (index = REQUIREMENTS.index(req.basename.to_s))
+              @reqindex = index
+              @requirements = req
+            else
+              log.warn "variable_set: @#{key}=#{req} (not supported)"
+            end
+          else
+            super
+          end
+        end
+
+        def depend?
+          @depend != false && (!@depend.nil? || outdated?)
+        end
+
         def outdated?
           install_type > 0
         end
@@ -149,21 +173,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'))
+          if (val = option('log', ignore: false))
             @session << "--log=#{shell_escape(base_path(val).to_s, 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

@@ -4,33 +4,35 @@ 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
+          def batchargs(*); end
+          def aliasargs(*); end
 
           def tasks
-            nil
+            %i[outdated].freeze
           end
 
-          def is_a?(val)
-            if (val = as_path(val))
-              [*GEMFILE, *::Rake::Application::DEFAULT_RAKEFILES, 'README.rdoc'].any? { |file| val.join(file).exist? }
-            else
-              super
-            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
@@ -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
@@ -146,7 +154,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?
@@ -159,7 +167,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'
@@ -180,88 +188,95 @@ 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: '**/*', into: @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)
-            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)
           as_a(from).each_with_index do |val, i|
             a = base_path(val)
             b = dest.join(val)
             c = glob[i] || '**/*'
-            log.warn "cp #{a.join(c)} #{b}"
-            copy_d(a, b, glob: c, verbose: verbose?)
+            log.info "cp #{a.join(c)} #{b}"
+            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 = session_done(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
+          pwd_set do
+            IO.popen("#{cmd} --no-color").each do |line|
+              if start > 0
+                unless stdin?
+                  data = line.scan(SEM_VER)
+                  next unless (cur = data.shift) && (lat = data.shift)
+
                   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
+                  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 '>', '>='
+                        semmajor(cur, lat) ? major_set.() : minor_set.()
+                      when '<', '<='
+                        if c <= v
+                          if semmajor(cur, lat)
+                            major_set.()
+                          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?
@@ -272,29 +287,40 @@ module Squared
                     when :yellow
                       found += 1
                     end
-                    line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.+)$/,
-                                           styles: styles.compact, index: 2)
+                    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}"
+                start += 1
+              elsif line =~ /^Gem /
+                print_item banner if banner
+                unless stdin?
+                  sub = { pat: /^(.+)(?<!\dm)(Gem|Latest)(.+)$/, styles: theme[:header], index: 2 }
+                  puts print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub])
+                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
+            if found > 0
+              begin
+                if major == 0 && (data = /\b(?:source\s+(["'])(.+?)\1|remote:\s+(\S+))/.match(@gemfile.read))
+                  status = (data[2] || data[3]).chomp('/')
+                  right = true
+                end
+              rescue StandardError => e
+                log.debug e
+              ensure
+                status ||= 'Updates are available'
               end
-              start += 1
+              puts print_footer(empty_status(status, 'major', major, always: !right), right: right)
+            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 +348,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 +357,26 @@ 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 variables
+          ret = super + VAR_SET
+          ret.freeze
+        end
+
+        def depend?
+          @depend != false && (!@depend.nil? || outdated?)
+        end
+
         def copy?
-          return true if @copy.is_a?(::String) || @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'])
@@ -346,33 +386,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?
@@ -386,7 +420,7 @@ module Squared
         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
@@ -400,26 +434,19 @@ 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'))
+          if (val = option('config-file', ignore: false))
             ret << "--config-file=#{shell_escape(base_path(val).to_s, 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 gempath
@@ -430,6 +457,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'