squared 0.4.12 → 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*'
@@ -427,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)
@@ -436,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
@@ -603,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
@@ -697,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
@@ -733,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

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?('--')
@@ -47,7 +47,7 @@ module Squared
               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)) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - An Pham