squared 0.6.2 → 0.6.3

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

@@ -507,7 +507,7 @@ module Squared
             b = dest + val
             c = glob[i] || glob.first
             log.info "cp #{a + c} #{b}"
-            copy_dir(a, b, c, pass: pass, verbose: verbosetype > 0)
+            copy_dir(a, b, c, pass: pass, verbose: !silent?)
           rescue StandardError => e
             on_error e, :copy
           end
@@ -548,13 +548,13 @@ module Squared
                   c = cur.join
                   l = lat.join
                   styles = []
-                  major_set = lambda do
+                  ma = lambda do
                     styles = %i[green bold]
                     major += 1
                   end
-                  minor_set = -> { styles[0] = cur[2] == lat[2] ? :yellow : :green }
+                  mi = -> { styles[0] = cur[2] == lat[2] ? :yellow : :green }
                   if data.empty?
-                    semmajor?(cur, lat) ? major_set.call : minor_set.call
+                    semmajor?(cur, lat) ? ma.call : mi.call
                   else
                     data.each do |val|
                       break unless line =~ /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/
@@ -562,11 +562,11 @@ module Squared
                       v = semver(val).join
                       case $1
                       when '>', '>='
-                        semmajor?(cur, lat) ? major_set.call : minor_set.call
+                        semmajor?(cur, lat) ? ma.call : mi.call
                       when '<', '<='
                         if c <= v
                           if semmajor?(cur, lat)
-                            major_set.call
+                            ma.call
                           else
                             styles[0] = :yellow
                           end
@@ -592,14 +592,14 @@ module Squared
                   unless styles.empty?
                     case styles.first
                     when :green
-                      line = sub_style(line, **opt_style(theme[styles.last == :bold ? :major : :active], /^(\S+)(.+)$/))
+                      sub_style!(line, **opt_style(theme[styles.last == :bold ? :major : :active], /^(\S+)(.+)$/))
                       found += 1
                     when :yellow
                       found += 1
                     end
                     l = Regexp.escape(l)
-                    line = sub_style(line, **opt_style(tc, /^(.+)(#{Regexp.escape(c)})(.+)$/, 2)) if tc
-                    line = sub_style(line, **opt_style(colormap(styles), /^((?:\S+\s+){2})(#{l})(.*)$/, 2))
+                    sub_style!(line, **opt_style(tc, /^(.+)(#{Regexp.escape(c)})(.+)$/, 2)) if tc
+                    sub_style!(line, **opt_style(colormap(styles), /^((?:\S+\s+){2})(#{l})(.*)$/, 2))
                   end
                 end
                 items&.push([line, name])
@@ -799,8 +799,7 @@ module Squared
           when :build, :cert, :generate_index, :mirror, :outdated, :push, :server, :signin, :signout, :sources, :stale
             opts.concat(args)
           end
-          op = OptionPartition.new(opts, gemopts(flag), gem_session(flag, *preopts), project: self,
-                                                                                     no: OPT_GEM[:no][flag])
+          op = OptionPartition.new(opts, gemopts(flag), gem_session(flag), project: self, no: OPT_GEM[:no][flag])
           from = :"gem:#{flag}"
           if flag == :outdated
             op.adjoin(gempwd, start: 0) if gempwd
@@ -848,6 +847,7 @@ module Squared
                 e = 0
                 f = 0
                 j = 0
+                col4 = 0
                 queue = nil
                 rows.each do |row|
                   a, b, c = row.first
@@ -861,14 +861,15 @@ module Squared
                   a, b, c = row.first
                   if i == 0
                     line = '%-*s %-*s    %*s  %*s' % [pad, ' #', d, a, e, b, f, c]
-                    n = line.size
+                    col4 = line.size
+                    s = ARG[:BORDER][1] * col4
                     queue = if stdin?
-                              [line, ARG[:BORDER][1] * n]
+                              [line, s]
                             else
                               2.times do
-                                line = sub_style(line, **opt_style(theme[:header], /^(.+)(?<!\dm)(#{a}|#{c})(.*)$/, 2))
+                                sub_style!(line, **opt_style(theme[:header], /^(.+)(?<!\dm)(#{a}|#{c})(.*)$/, 2))
                               end
-                              [line, sub_style(ARG[:BORDER][1] * n, styles: borderstyle)]
+                              [line, sub_style(s, borderstyle)]
                             end
                   else
                     g = a.ljust(d)
@@ -884,7 +885,7 @@ module Squared
                         next
                       end
                       unless stdin?
-                        g = sub_style(g, styles: theme[:major])
+                        sub_style! g, theme[:major]
                         styles = %i[green bold]
                         pat = (pat.first if pre)
                         latest << :bold
@@ -898,7 +899,7 @@ module Squared
                         next
                       end
                       unless stdin?
-                        g = sub_style(g, styles: theme[:active])
+                        sub_style! g, theme[:active]
                         styles = %i[green]
                         pat = pre ? pat.last : pat.first
                       end
@@ -917,8 +918,8 @@ module Squared
                     b = b.rjust(e)
                     h = c.rjust(f)
                     unless stdin?
-                      b = sub_style(b, **opt_style(colormap(styles), pat, 2))
-                      h = sub_style(h, **opt_style(latest.flatten.compact, pat, 2))
+                      sub_style!(b, **opt_style(colormap(styles), pat, 2))
+                      sub_style!(h, **opt_style(latest.flatten.compact, pat, 2))
                     end
                     j += 1
                     if queue
@@ -931,7 +932,7 @@ module Squared
                     else
                       out.call('%*s %s' % [pad, "#{j}.", s])
                     end
-                    update.delete(a) if ia && !confirm_outdated(a, c, row.last, timeout: 0)
+                    update.delete(a) if ia && !confirm_outdated(a, c, row.last, col4: col4, timeout: 0)
                   end
                 end
               end
@@ -1257,7 +1258,7 @@ module Squared
               dir = basepath sig, file.dirname
               dir.mkpath unless dir.exist?
               base = file.basename.to_s
-              rbs = dir.join(base.stripext + '.rbs')
+              rbs = dir.join("#{base.stripext}.rbs")
               status = if rbs.exist?
                          case y
                          when '0', 'false'
@@ -1394,18 +1395,11 @@ module Squared
         end
 
         def gem_session(*cmd, **kwargs)
-          ret = session('gem', *cmd, **kwargs)
-          return ret if cmd.empty?
-
-          ret.merge(preopts)
+          session('gem', *cmd, *preopts, **kwargs)
         end
 
         def bundle_session(*cmd, **kwargs)
-          ret = session('bundle', *cmd, **kwargs)
-          return ret if cmd.empty?
-
-          append_nocolor
-          ret.merge(preopts)
+          session('bundle', *cmd, *preopts, **kwargs).tap { append_nocolor }
         end
 
         def rake_session(*cmd, **kwargs)
@@ -1458,7 +1452,7 @@ module Squared
         end
 
         def preopts
-          verbose? && !session_arg?('quiet') ? ['--verbose'] : []
+          verbose? ? ['--verbose'] : []
         end
 
         def variables
@@ -1538,8 +1532,7 @@ module Squared
         end
 
         def gemlib
-          @gemlib ||= begin
-            lib = Set.new(['lib'])
+          @gemlib ||= Set.new(['lib']).yield_self do |lib|
             if (spec = gemspec)
               lib.merge(spec.require_paths || [])
             end
@@ -1552,7 +1545,9 @@ module Squared
         end
 
         def gemdir?
-          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
+          return false unless @gemdir
+
+          @gemdir.exist? && !@gemdir.empty?
         end
       end