squared 0.4.14 → 0.4.16

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

@@ -4,7 +4,7 @@ module Squared
   module Workspace
     module Project
       class Ruby < Git
-        GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
+        GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb gems.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_RUBY = {
           ruby: %w[0=im? a c e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit v|verbose y|yydebug
@@ -91,7 +91,7 @@ module Squared
           'irb' => nil
         })
 
-        def initialize(*, autodetect: false, **kwargs)
+        def initialize(*, autodetect: false, gemspec: nil, **kwargs)
           super
           if @pass.include?(Ruby.ref)
             initialize_ref Ruby.ref
@@ -102,7 +102,8 @@ module Squared
           end
           dependfile_set GEMFILE
           @autodetect = autodetect
-          return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || rakefile.empty?
+          @gemfile = path + gemspec if gemspec
+          return if !@output[0].nil? || !@copy.nil? || version || @autodetect || !rakefile
 
           begin
             File.foreach(rakefile) do |line|
@@ -129,12 +130,12 @@ module Squared
 
           namespace name do
             Ruby.subtasks do |action, flags|
-              next if @pass.include?(action)
+              next if task_pass?(action)
 
               if flags.nil?
                 case action
                 when 'rake'
-                  next if rakefile.empty?
+                  next unless rakefile
 
                   format_desc action, nil, "task+,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
@@ -167,13 +168,11 @@ module Squared
                     end
                   end
                 when 'irb'
-                  next unless (spec = basepath("#{project}.gemspec") || basepath("#{name}.gemspec"))
-                  next unless basepath('lib').join("#{gemname = stripext(spec)}.rb").exist?
-
                   format_desc action, nil, 'opts*,args*|:'
                   task action do |_, args|
                     args = args.to_a
-                    irb(gemname, args, args: (readline('Enter file [arguments]', force: false) if args.delete(':')))
+                    name = basepath('lib').join("#{gemname}.rb").exist? ? gemname : nil
+                    irb(name, args, args: (readline('Enter file [arguments]', force: false) if args.delete(':')))
                   end
                 else
                   format_desc(action, nil, 'opts*', before: case action
@@ -303,9 +302,7 @@ module Squared
             begin
               copy_dir(a, b, c, pass: pass, verbose: verbose)
             rescue StandardError => e
-              log.error e
-              ret = on(:error, :copy, e)
-              raise if exception && ret != true
+              on_error e, :copy
             end
           end
           on :last, :copy
@@ -445,11 +442,11 @@ module Squared
           when :file, :script
             op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, args: true)
             if file
-              op.extras.unshift(shell_quote(path + file))
+              op.unshift(shell_quote(path + file))
             elsif command
               op << quote_option('e', command, option: false)
             end
-            op.extras << args if (args = ENV.fetch('RUBY_ARGS', args))
+            op.push(args) if (args = ENV.fetch('RUBY_ARGS', args))
             op.append(delim: true, escape: false, quote: false) unless op.empty?
           when :version
             pwd_set do
@@ -688,37 +685,44 @@ module Squared
             on :last, from
             return
           when :build
-            if op.empty?
-              spec = [path + "#{project}.gemspec", path + "#{name}.gemspec", *Dir.glob(path + '*.gemspec')]
-              op << File.basename(spec) if (spec = spec.find { |file| File.exist?(file) })
-            else
+            if !op.empty?
               op << shell_quote(path + op.shift)
               op.clear(pass: false)
+            elsif (file = gemfile)
+              op << shell_quote(file)
             end
           when :push
             if op.empty?
-              op << shell_quote(path + choice_index('Select a file', Dir.glob('*.gem', base: path), force: true))
+              file = path + (if (spec = gemspec)
+                               "#{spec.name}-#{spec.version}.gem"
+                             else
+                               choice_index('Select a file', Dir.glob('*.gem', base: path), force: true)
+                             end)
             else
               file = path + op.shift
+              raise_error('gem not found', hint: file) unless file.exist?
               raise_error("unknown args: #{op.join(', ')}", hint: flag) unless op.empty?
-              if file.exist?
-                op << shell_quote(file)
-              else
-                raise_error('gem not found', hint: file)
-              end
             end
-            run_rb(from: from, interactive: "Push #{sub_style(project, styles: theme[:active])}")
+            op << shell_quote(file)
+            run_rb(from: from, interactive: "Push #{sub_style(gemname, styles: theme[:active])}")
             return
           when :exec
-            raise_error('missing command', hint: flag) if op.empty?
-            op << basic_option('gem', project) unless op.arg?('g', 'gem')
-            if (args = command_args(op.extras))
+            min = if op.arg?('g', 'gem')
+                    1
+                  elsif op.empty?
+                    op << basic_option('gem', gemname)
+                    1
+                  else
+                    op << op.shift
+                    0
+                  end
+            if (args = command_args(op.extras, min: min, force: min == 1 && op.empty?))
               op.push(args)
             end
-            op.append(delim: true, quote: false)
+            op.append(quote: false)
           when :update
             unless op.arg?('system')
-              op.push(project) if op.empty?
+              op.push(gemname) if op.empty?
               op.adjoin
             end
             op.clear(errors: true)
@@ -738,7 +742,7 @@ module Squared
                 items = op.extras.to_a
                 name = items.delete_at(n)
                 if (n = name.index('@')) == 0
-                  pre = project
+                  pre = gemname
                   ver = name[1..-1]
                 else
                   pre = name[0, n]
@@ -793,10 +797,11 @@ module Squared
           run_s(args, banner: false, from: :rake)
         end
 
-        def irb(name, opts = [], path: @path + 'lib', args: nil)
+        def irb(name = nil, opts = [], path: basepath('lib'), args: nil)
           op = OptionPartition.new(opts, OPT_RUBY[:irb], session('irb'), project: self, first: [/\.rb$/])
           r = args ? [] : ['bundler/setup']
-          (r << name).each { |val| op << shell_option('r', val, merge: true) }
+          r << name if name
+          r.each { |val| op << shell_option('r', val, merge: true) }
           Array(path).each { |val| op << quote_option('I', val, merge: true) }
           if args
             op << '--' << args
@@ -807,6 +812,24 @@ module Squared
           run(banner: false)
         end
 
+        def gemspec
+          return @gemspec unless @gemspec.nil?
+
+          begin
+            if (file = gemfile)
+              require 'rubygems'
+              @gemspec = Gem::Specification.load(file.to_s)
+            end
+          rescue StandardError => e
+            log.debug e
+          end
+          @gemspec ||= false
+        end
+
+        def gemname
+          @gemname ||= ((spec = gemspec) ? spec.name : project)
+        end
+
         def depend?
           @depend != false && (!@depend.nil? || outdated?)
         end
@@ -815,7 +838,7 @@ module Squared
           return true if super || (@copy.is_a?(Hash) && copy.fetch(:into, nil))
           return gemdir? if @gemdir
 
-          if @version
+          if version
             begin
               case @autodetect
               when 'rvm'
@@ -840,42 +863,47 @@ module Squared
           return false unless @autodetect
 
           set = lambda do |val, path|
-            log.warn "using version #{val} (given #{@version})" if @version && @version != val
-            @version = val
+            if (ver = version) && ver != val
+              log.warn "using version #{val} (given #{ver})"
+            end
+            self.version = val
             @gemdir = Pathname.new(path.strip) + gempath
           end
-          if @version
-            pwd = gempwd
-            pwd_set(pass: !pwd.nil?) do
-              out = `#{gem_output(pwd, 'list --local -d', project)}`
-              if out =~ /#{Regexp.escape(project)} \(([^)]+)\)/
-                ver = $1.split(/\s*,\s*/)
-                ver.unshift(@version).uniq!
-                ver.each do |val|
-                  next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
-
-                  set.call(val, $1)
-                  break
-                end
+          if version
+            opt = gempwd
+            pwd_set(pass: !opt.nil?) do
+              out = `#{gem_output(opt, 'list --local -d', gemname)}`
+              if out =~ /#{Regexp.escape(gemname)} \(([^)]+)\)/
+                $1.split(/\s*,\s*/)
+                  .unshift(@version)
+                  .uniq
+                  .each do |val|
+                    next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
+
+                    set.call(val, $1)
+                    return gemdir? if @gemdir
+                  end
               end
             end
-          end
-          unless @gemdir
+            require 'rubygems'
+            @gemdir = Pathname.new(Gem.dir) + gempath
+          else
             parse = lambda do |path|
               next unless path
 
-              lib = Regexp.new(['', 'gems', "#{project}-([^#{File::SEPARATOR}]+)", ''].join(File::SEPARATOR))
+              lib = Regexp.new(['', 'gems', "#{gemname}-([^#{File::SEPARATOR}]+)", ''].join(File::SEPARATOR))
               if (ver = path[lib, 1]) && (val = path[/\A(.+)#{gempath(ver[1])}/, 1])
                 set.call(ver, val)
               end
             end
             if RUBY_VERSION >= '2.6'
               target = RUBY_VERSION.start_with?('2.6') ? RubyVM : $LOAD_PATH
-              parse.call(target.resolve_feature_path(project)&.last)
+              parse.call(target.resolve_feature_path(gemname)&.last)
+            end
+            if !@gemdir && !pwd_set { parse.call(`#{bundle_output('show', gemname)}`) }
+              raise_error 'gems directory not found'
             end
-            pwd_set { parse.call(`#{bundle_output('show', project)}`) } unless @gemdir
           end
-          raise_error('parse failed', hint: @version || 'path') unless @gemdir
         rescue StandardError => e
           log.error e
           @version = nil
@@ -979,10 +1007,10 @@ module Squared
         end
 
         def rakefile
-          return @rakefile if @rakefile
+          return @rakefile unless @rakefile.nil?
 
           file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
-          @rakefile = file ? path + file : ''
+          @rakefile = file ? path + file : false
         end
 
         def rakepwd
@@ -997,8 +1025,16 @@ module Squared
           quote_option 'C', path
         end
 
-        def gempath(val = @version)
-          File.join('gems', "#{project}-#{val}")
+        def gemfile
+          return @gemfile unless @gemfile.nil?
+
+          @gemfile = [project, name].map! { |val| path + "#{val}.gemspec" }
+                                    .concat(path.glob('*.gemspec'))
+                                    .find { |file| File.exist?(file) } || false
+        end
+
+        def gempath(val = version)
+          File.join('gems', "#{gemname}-#{val}")
         end
       end
 

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

@@ -35,9 +35,7 @@ module Squared
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs)
-              return if pass || confirm("Run? [#{sub_style(target, styles: styles)}] [y/N] ", 'N')
-
-              raise_error 'user cancelled'
+              exit 1 unless pass || confirm("Run? [#{sub_style(target, styles: styles)}] [y/N] ", 'N')
             end
 
             def strip(val)
@@ -62,7 +60,7 @@ module Squared
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
                          :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
+                         :pop, :push, :index, :delete_at, :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/series.rb

@@ -10,16 +10,16 @@ module Squared
 
       TASK_BASE = []
       TASK_BATCH = {}
-      TASK_EXTEND = {}
+      TASK_EXTEND = Support.hashlist
       TASK_KEYS = []
-      TASK_ALIAS = {}
+      TASK_ALIAS = Support.hashobj
       TASK_NAME = {}
       private_constant :TASK_BASE, :TASK_BATCH, :TASK_EXTEND, :TASK_KEYS, :TASK_ALIAS, :TASK_NAME
 
       class << self
         def add(task, obj)
           key_set task
-          (TASK_EXTEND[task] ||= []) << obj
+          TASK_EXTEND[task] << obj
         end
 
         def batch(*args, obj)
@@ -37,7 +37,7 @@ module Squared
 
         def alias(ref, obj)
           if obj.is_a?(Hash)
-            obj.each { |key, val| (TASK_ALIAS[key] ||= {})[ref] = val }
+            obj.each { |key, val| TASK_ALIAS[key][ref] = val }
           else
             TASK_ALIAS[obj]&.delete(ref)
           end
@@ -79,8 +79,8 @@ module Squared
         @chain = {}
         @exclude = exclude.freeze
         @session = {
-          group: {},
-          parent: {},
+          group: Support.hashlist,
+          parent: Support.hashlist,
           id: []
         }
         @data = {}
@@ -95,7 +95,7 @@ module Squared
 
           if (g = proj.group)
             id << g
-            (group[:"#{key}:#{g}"] ||= []).concat(tasks)
+            group[:"#{key}:#{g}"].concat(tasks)
           else
             items.concat(tasks)
           end
@@ -106,7 +106,7 @@ module Squared
           next unless (b = ws.find_base(proj)) && (n = b.ref.to_s) != g
 
           id << n
-          (parent[:"#{key}:#{n}"] ||= []).concat(tasks)
+          parent[:"#{key}:#{n}"].concat(tasks)
         end
       end
 

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Squared
+  module Workspace
+    module Support
+      class << self
+        def hashobj
+          Hash.new { |data, key| data[key] = {} }
+        end
+
+        def hashlist
+          Hash.new { |data, key| data[key] = [] }
+        end
+      end
+    end
+  end
+end

data/lib/squared/workspace/support.rb

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

data/squared.gemspec

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "lib/squared/version"
+version = File.read(File.join(__dir__, "lib/squared/version.rb"))[/\bVERSION = '(.+)'$/, 1]
 
 Gem::Specification.new do |spec|
   spec.name          = "squared"
-  spec.version       = Squared::VERSION
+  spec.version       = version
   spec.authors       = ["An Pham"]
   spec.email         = ["anpham6@gmail.com"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.4.16
 platform: ruby
 authors:
 - An Pham
@@ -102,6 +102,7 @@ files:
 - lib/squared/workspace/repo.rb
 - lib/squared/workspace/series.rb
 - lib/squared/workspace/support.rb
+- lib/squared/workspace/support/base.rb
 - lib/squared/workspace/support/data.rb
 - squared.gemspec
 homepage: https://github.com/anpham6/squared
@@ -125,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []