squared 0.4.11 → 0.4.13

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

@@ -100,9 +100,8 @@ module Squared
             initialize_build(Ruby.ref, **kwargs)
             initialize_env(**kwargs)
           end
+          dependfile_set GEMFILE
           @autodetect = autodetect
-          @dependindex = GEMFILE.index { |file| basepath(file).exist? }
-          @dependfile = @path + GEMFILE[@dependindex || 0]
           return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || (file = rakefile).nil?
 
           begin
@@ -203,7 +202,7 @@ module Squared
                           gem!(flag, args, filter: filter)
                         end
                       when :build, :push, :exec
-                        format_desc(action, flag, 'opts*', before: flag == :exec ? 'command+' : nil)
+                        format_desc(action, flag, 'opts*', before: flag == :exec ? 'command,args*' : nil)
                         task flag do |_, args|
                           gem! flag, args.to_a
                         end
@@ -219,15 +218,20 @@ module Squared
                       when :file
                         format_desc action, flag, 'path,opts*,args*'
                         task flag, [:rb] do |_, args|
-                          if (file = args.rb)
-                            args = args.to_a.drop(1)
-                          else
-                            file, opts, extra = choice_index('Select a file', Dir.glob('*.rb', base: path),
-                                                             values: %w[Options Arguments], force: true, series: true)
-                            args = OptionPartition.strip(opts)
-                            ENV['RUBY_ARGS'] = extra if extra
+                          file = args.rb
+                          args = args.to_a.drop(1)
+                          unless file && !file.include?('*')
+                            values = ['Arguments']
+                            values.unshift('Options') unless file
+                            file, opts, extra = choice_index('Select a file', Dir.glob(file || '*.rb', base: path),
+                                                             values: values, force: true, series: !args.include?('v'))
+                            if file
+                              extra = opts
+                            else
+                              args.concat(OptionPartition.strip(opts))
+                            end
                           end
-                          ruby(flag, args, file: file)
+                          ruby(flag, args, file: file, args: extra)
                         end
                       when :script
                         format_desc action, flag, 'opts*,args*'
@@ -374,8 +378,7 @@ module Squared
                       found += 1
                     end
                     if theme[:current]
-                      line = sub_style(line, styles: theme[:current], pat: /^(.+)(#{Regexp.escape(c)})(.+)$/,
-                                             index: 2)
+                      line = sub_style(line, styles: theme[:current], pat: /^(.+)(#{Regexp.escape(c)})(.+)$/, index: 2)
                     end
                     line = sub_style(line, *colormap(styles), pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.*)$/,
                                                               index: 2)
@@ -428,7 +431,7 @@ module Squared
           run_rb(from: :update)
         end
 
-        def ruby(flag, opts = [], file: nil, command: nil)
+        def ruby(flag, opts = [], file: nil, command: nil, args: nil)
           case flag
           when :file, :script
             op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, args: true)
@@ -437,9 +440,7 @@ module Squared
             elsif command
               op << quote_option('e', command, option: false)
             end
-            if (args = ENV['RUBY_ARGS'])
-              op.extras << args
-            end
+            op.extras << args if (args = ENV.fetch('RUBY_ARGS', args))
             op.append(delim: true, escape: false, quote: false) unless op.empty?
           when :version
             pwd_set do
@@ -604,7 +605,7 @@ module Squared
                     g = a.ljust(d)
                     pat = [/^([^.]+\.)([^.]+\..+)$/, /^([^.]+\.[^.]+\.)(.+)$/]
                     pre = b.start_with?('0.')
-                    latest = [theme[:current]]
+                    latest = [theme[:latest]]
                     case item.last
                     when 1
                       case filter
@@ -698,7 +699,11 @@ module Squared
             end
           when :exec
             raise_error('missing command', hint: flag) if op.empty?
-            op << project << op.join(' ')
+            op << basic_option('gem', project) unless op.arg?('g', 'gem')
+            if (args = command_args(op.extras))
+              op.push(args)
+            end
+            op.append(delim: true, quote: false)
           else
             raise_error('missing gemname', hint: flag) if op.empty? && !op.arg?('system')
             if flag == :pristine
@@ -734,8 +739,12 @@ module Squared
                  end
           case flag
           when 'exec', 'config'
-            raise_error('no command args', hint: flag) if args.empty?
-            cmd.merge(args)
+            if args.empty?
+              cmd << readline('Enter arguments', force: true)
+            else
+              args << command_args(args)
+              cmd.merge(args)
+            end
           else
             option_clear args
           end
@@ -757,7 +766,9 @@ module Squared
 
         def irb(name, opts = [], path: @path + 'lib', load: nil)
           op = OptionPartition.new(opts, OPT_RUBY[:irb], session('irb'), project: self, first: [/\.rb$/])
-          as_a(name).each { |val| op << shell_option('r', val, merge: true) }
+          r = as_a name
+          r.unshift('bundler/setup') unless load
+          r.each { |val| op << shell_option('r', val, merge: true) }
           as_a(path).each { |val| op << quote_option('I', val, merge: true) }
           if load
             op << '--' << load

data/lib/squared/workspace/project/support/class.rb

@@ -15,7 +15,7 @@ module Squared
             include Shell
             include Prompt
 
-            def append(target, *args, delim: false, escape: false, quote: true)
+            def append(target, *args, delim: false, escape: false, quote: true, **)
               return if (ret = args.flatten).empty?
 
               target << '--' if delim && !target.include?('--')
@@ -44,10 +44,10 @@ module Squared
               return [] unless val
 
               val = shell_split(val) if val.is_a?(String)
-              val.map { |s| s.sub(/\A-([a-z\d])(.+)\z/mi, '\1=\2').sub(/\A--?/, '') }.reject(&:empty?)
+              val.map { |s| s.sub(/\A-([a-z\d])(.+)\z/i, '\1=\2').sub(/\A--?/, '') }.reject(&:empty?)
             end
 
-            def arg?(target, *args, value: false)
+            def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               unless s.empty?
                 s.map! { |val| Regexp.escape(shell_option(val)) }
@@ -60,9 +60,9 @@ module Squared
           attr_reader :target, :extras, :found, :errors, :values, :project, :path
 
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
-                         :merge, :delete, :delete?, :grep, :inspect, :to_a, :to_s
-          def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :first, :last, :shift, :pop, :push,
-                         :join, :map, :map!, :dup, :size
+                         :merge, :delete, :delete?, :delete_if, :grep, :inspect, :to_a, :to_s
+          def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :last, :shift, :unshift,
+                         :pop, :push, :join, :map, :map!, :select, :reject, :size
 
           def initialize(opts, list, target = Set.new, project: nil, path: nil, **kwargs, &blk)
             @target = target.is_a?(Set) ? target : Set.new(target)

data/lib/squared/workspace/project.rb

@@ -7,13 +7,8 @@ module Squared
         attr_accessor :line_width
 
         def max_width(lines)
-          win = 0
-          if $stdout.tty?
-            require 'io/console'
-            win = $stdout.winsize[1] rescue nil
-          end
-          n = [lines.max_by(&:size).size, line_width].max
-          [n, win > 0 ? win : ::Float::INFINITY].min
+          n = [lines.max_by(&:size).size, 80].max
+          [n, Rake.application.terminal_width].min
         end
       end
 

data/lib/squared/workspace/series.rb

@@ -76,6 +76,7 @@ module Squared
         @sync = []
         @multiple = []
         @parallel = []
+        @chain = {}
         @exclude = exclude.freeze
         @session = {
           group: {},
@@ -139,6 +140,26 @@ module Squared
         @multiple.concat(sync)
       end
 
+      def chain(key, level, sync: [])
+        return if level.empty?
+
+        index = 0
+        prereqs = level.map do |tasks|
+          task_join(key, index += 1).tap do |subkey|
+            if sync.include?(tasks) || (tasks.size == 1 && (sync << tasks))
+              task subkey => tasks
+            else
+              multitask subkey => tasks
+            end
+          end
+        end
+        @chain[key] = level.freeze
+        parallel << key
+
+        format_desc key, level.map(&:size).join('-')
+        task key => prereqs
+      end
+
       def name_get(key)
         (TASK_NAME[key] || key).to_s
       end
@@ -187,6 +208,19 @@ module Squared
         data.keys.any? { |ref| obj.ref?(ref) }
       end
 
+      def chain?(val)
+        @chain.each_value do |tasks|
+          tasks.flatten(1).each do |task|
+            next unless Rake::Task[task].already_invoked
+
+            if val == task || Rake::Task[task].prerequisites.any? { |pr| pr == val && Rake::Task[val].already_invoked }
+              return true
+            end
+          end
+        end
+        false
+      end
+
       def multiple?(val = nil)
         already_invoked?(multiple, val)
       end

data/lib/squared/workspace/support/data.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Squared
+  module Workspace
+    module Support
+      RunData = Struct.new(:run, :block)
+      ChainData = Struct.new(:action, :step, :with, :before, :after, :sync)
+    end
+  end
+end

data/lib/squared/workspace/support.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'support/data'

data/lib/squared/workspace.rb

@@ -36,6 +36,7 @@ module Squared
   end
 end
 
+require_relative 'workspace/support'
 require_relative 'workspace/application'
 require_relative 'workspace/series'
 require_relative 'workspace/project'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.13
 platform: ruby
 authors:
 - An Pham
@@ -101,6 +101,8 @@ files:
 - lib/squared/workspace/project/support/class.rb
 - lib/squared/workspace/repo.rb
 - lib/squared/workspace/series.rb
+- lib/squared/workspace/support.rb
+- lib/squared/workspace/support/data.rb
 - squared.gemspec
 homepage: https://github.com/anpham6/squared
 licenses: