squared 0.3.12 → 0.3.14

data/lib/squared/common/base.rb

@@ -86,7 +86,7 @@ module Squared
       PATH.freeze
       ARG.freeze
       VAR.each_value(&:freeze)
-      VAR[:theme].each_value(&:freeze)
+      VAR[:theme].each_value { |val| val.freeze.each_value(&:freeze) }
       VAR.freeze
     end
 

data/lib/squared/common/format.rb

@@ -127,11 +127,11 @@ module Squared
       def apply_style(data, key, args, empty: true)
         return if data.is_a?(::Symbol) && (data = __get__(:theme)[data]).nil?
 
-        set = ->(k, v) { data[k] = check_style(v, empty: empty) }
+        set = ->(k, v) { data[k.to_sym] = check_style(v, empty: empty) }
         if key.is_a?(::Hash)
           key.each { |k, v| set.(k, v || args) }
         else
-          set.(key.to_sym, args)
+          set.(key, args)
         end
       end
 

data/lib/squared/common/system.rb

@@ -24,7 +24,7 @@ module Squared
         else
           return Kernel.send(name, *args, **kwargs)
         end
-        return ret if ret || !e
+        return ret unless e && !ret && name == :system
 
         raise $?.to_s
       end

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.3.12'
+  VERSION = '0.3.14'
 end

data/lib/squared/workspace/application.rb

@@ -628,9 +628,14 @@ module Squared
       private
 
       def __build__(default: nil, **)
-        return unless default && task_defined?(out = task_name(default))
-
-        task Rake.application.default_task_name => out
+        unless task_defined?('squared:version')
+          task 'squared:version' do
+            puts Squared::VERSION
+          end
+        end
+        if default && task_defined?(out = task_name(default))
+          task Rake.application.default_task_name => out
+        end
       end
 
       def puts(*args)
@@ -664,20 +669,19 @@ module Squared
       end
 
       def data_get(*args, group: nil, ref: nil, target: nil)
-        if group
-          target[:group][group.to_sym]
-        elsif ref.is_a?(Array)
-          ref = ref.each
-        end
-        if ref.instance_of?(Enumerator)
-          ref.each do |key|
-            next unless (ret = target[:ref][key])
+        if group && (ret = target[:group][group.to_sym])
+          ret
+        elsif ref
+          if ref.is_a?(Enumerable)
+            ref.each do |key|
+              next unless (ret = target[:ref][key])
 
-            return ret if args.empty? || args.any? { |val| ret.key?(val) }
+              return ret if args.empty? || args.any? { |val| ret.key?(val) }
+            end
+            nil
+          else
+            target[:ref][ref]
           end
-          nil
-        elsif ref
-          target[:ref][ref]
         end
       end
 

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

@@ -15,7 +15,7 @@ module Squared
         include Rake::DSL
 
         VAR_SET = %i[parent global envname dependfile theme run script env pass].freeze
-        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?\b/.freeze
+        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?[-.]?(\S+)?\b/.freeze
         private_constant :VAR_SET, :SEM_VER
 
         class << self
@@ -255,7 +255,7 @@ module Squared
                 flags.each do |flag|
                   case action
                   when 'graph'
-                    next unless graph?
+                    break unless graph?
 
                     format_desc action, flag, '(-)project*'
                     task flag do |_, args|
@@ -814,7 +814,7 @@ module Squared
           done
         end
 
-        def graph_collect(target, start = [], data: {}, pass: [])
+        def graph_collect(target, start = [], data: {}, pass: [], root: [])
           deps = []
           (start.empty? ? target.instance_variable_get(:@graph) : start)&.each do |val|
             next if pass.include?(val)
@@ -826,18 +826,21 @@ module Squared
             else
               items = workspace.find(group: val, ref: val.to_sym)
             end
-
             items.each do |proj|
-              next if pass.include?(proj.name)
+              next if pass.include?(name = proj.name)
 
-              graph_collect(proj, data: data, pass: pass) if proj.graph? && !data.key?(proj.name)
-              next if (objs = data.fetch(proj.name, [])).include?(target)
+              if proj.graph? && !data.key?(name) && !root.include?(name)
+                graph_collect(proj, data: data, pass: pass, root: root + [name, target.name])
+              end
+              next if (objs = data.fetch(name, [])).include?(target)
 
               deps << proj
-              deps += objs
+              deps.concat(objs)
             end
           end
-          data[target.name] = deps.uniq.reject { |proj| proj == target }
+          deps.uniq!
+          deps.delete(target)
+          data[target.name] = deps
           data
         end
 
@@ -1270,6 +1273,29 @@ module Squared
           fill ? semver(ret) : ret
         end
 
+        def semcmp(val, other)
+          return 0 if val == other
+
+          a, b = [val, other].map! { |ver| ver.scan(SEM_VER) }
+          return -1 if b.empty?
+          return 1 if a.empty?
+
+          a, b = [a.first, b.first].map! do |c|
+            begin
+              d = Integer(c[5]).to_s
+            rescue StandardError
+              d = c[5] ? '-1' : '0'
+            end
+            [c[0], c[2], c[4] || '0', d]
+          end
+          a.each_with_index do |c, index|
+            next if c == (d = b[index])
+
+            return c.to_i < d.to_i ? 1 : -1
+          end
+          0
+        end
+
         def indexitem(val)
           [$1.to_i, $2 && $2[1..-1]] if val =~ /\A#{Regexp.escape(indexchar)}(\d+)(:.+)?\z/
         end

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

@@ -638,15 +638,18 @@ module Squared
             when :major
               if seg[0] != '0' || seg[2].nil?
                 seg[0] = seg[0].succ
+                seg[2] = '0'
               else
                 seg[2] = seg[2].succ
               end
+              seg[4] = '0'
             when :minor
               if seg[0] == '0'
                 seg[4] &&= seg[4].succ
               else
                 seg[2] = seg[2].succ
               end
+              seg[4] = '0'
             when :patch
               seg[4] &&= seg[4].succ
             end
@@ -834,7 +837,7 @@ module Squared
         else
           if key
             @pm[key]
-          elsif (ret = @pm[:_]) && !(version && ret[(ret.index('@') + 1)..-1] < version)
+          elsif (ret = @pm[:_]) && !(version && semcmp(ret[(ret.index('@') + 1)..-1], version) == 1)
             ret
           end
         end

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

@@ -481,7 +481,7 @@ module Squared
           when :exec
             raise_error('gem', flag, hint: 'no command given') if out.empty?
             cmd << basic_option('gem', project) unless session_arg?('g', 'gem')
-            cmd << '--' << out.join(' ')
+            cmd << out.join(' ')
           else
             if out.empty? && cmd.none? { |val| val =~ /^--system(?:=|$)/ }
               raise_error('gem', flag, hint: 'no gemname given')

data/squared.gemspec

@@ -1,16 +1,16 @@
 # 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"]
 
   spec.summary       = %q{Rake task generator for managing multi-language workspaces.}
   spec.description   = %q{Rake task generator for managing multi-language workspaces.}
-  spec.homepage      = "https://github.com/anpham6/squared"
+  spec.homepage      = "https://github.com/anpham6/squared-ruby"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
   spec.licenses      = ["BSD-3-Clause"]
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.metadata["documentation_uri"] = "https://squared.readthedocs.io"
 
   spec.files         = Dir["lib/**/*"] +
-                       %w[CHANGELOG.md LICENSE README.md README.ruby.md squared.gemspec]
+                       %w[CHANGELOG.md LICENSE README.md squared.gemspec]
   spec.bindir        = "exe"
   spec.executables   = []
   spec.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.14
 platform: ruby
 authors:
 - An Pham
@@ -75,7 +75,6 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- README.ruby.md
 - lib/squared.rb
 - lib/squared/app.rb
 - lib/squared/common.rb
@@ -99,12 +98,12 @@ files:
 - lib/squared/workspace/repo.rb
 - lib/squared/workspace/series.rb
 - squared.gemspec
-homepage: https://github.com/anpham6/squared
+homepage: https://github.com/anpham6/squared-ruby
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/anpham6/squared
-  source_code_uri: https://github.com/anpham6/squared
+  homepage_uri: https://github.com/anpham6/squared-ruby
+  source_code_uri: https://github.com/anpham6/squared-ruby
   documentation_uri: https://squared.readthedocs.io
 rdoc_options: []
 require_paths:
@@ -120,7 +119,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: []