squared 0.6.2 → 0.6.3

data/lib/squared/workspace/repo.rb

@@ -128,20 +128,20 @@ module Squared
           task 'all' do |_, args|
             stage ||= 'all'
             ns['sync'].invoke(*args.to_a)
-            next if (stage = env('REPO_STAGE')) == '1'
+            next if (n = env('REPO_STAGE')) == '1'
 
-            @project.select do |_, proj|
+            select do |proj|
               next unless proj.enabled?(proj.workspace.baseref) && proj.global
 
               proj.depend(sync: true) if proj.depend?
-              next if stage == '2'
+              next if n == '2'
 
               proj.build?
             end
-            .each_value do |proj|
+            .each do |proj|
               proj.build(sync: true)
-              next if stage == '3'
-              next unless proj.copy? && (proj.dev? || stage == '4')
+              next if n == '3'
+              next unless proj.copy? && (proj.dev? || n == '4')
 
               if (ws = proj.workspace).task_defined?(target = task_join(proj.name, 'copy'))
                 task_invoke(target, **ws.invokeargs)
@@ -221,7 +221,7 @@ module Squared
       end
 
       def repo_manifest(path = root)
-        return unless (file = path + '.repo/manifest.xml').exist?
+        return unless (file = Pathname.new(path).join('.repo/manifest.xml')).exist?
 
         require 'rexml/document'
         doc = REXML::Document.new(file.read)
@@ -231,12 +231,19 @@ module Squared
       def repo_confirm
         return false unless root.directory?
 
-        path = sub_style(root, styles: theme[:inline])
-        @repo_override = env('REPO_Y', equals: '1') || Common::Prompt.confirm(
-          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation?",
-          'N',
-          timeout: env('REPO_TIMEOUT', 15, ignore: '0')
-        )
+        path = sub_style root, theme[:inline]
+        @repo_override = case env('REPO_Y')
+                         when '0', 'false'
+                           false
+                         when '1', 'true'
+                           true
+                         else
+                           Common::Prompt.confirm(
+                             "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation?",
+                             'N',
+                             force: true, timeout: env('REPO_TIMEOUT', 15, ignore: '0')
+                           )
+                         end
       end
 
       def repo_run(cmd, exception: false)
@@ -255,7 +262,9 @@ module Squared
       end
 
       def repo?
-        !manifest_url.nil? && (repo_install? || @repo_override == true)
+        return false unless manifest_url
+
+        repo_install? || @repo_override == true
       end
 
       def repo_submodules?(val = false)

data/lib/squared/workspace/series.rb

@@ -79,14 +79,12 @@ module Squared
           parent: Support.hashlist,
           id: []
         }
-        @data = {}
-        (TASK_BASE + TASK_KEYS).each { |key| @data[key] = [] }
       end
 
       def populate(proj, **)
         group, parent, id = @session.values
         ws = proj.workspace
-        @data.each do |key, items|
+        each do |key, items|
           next if exclude?(key) || (tasks = ws.task_resolve(proj, key)).empty?
 
           if (g = proj.group)
@@ -108,9 +106,9 @@ module Squared
 
       def build(parallel: [], pattern: [], **)
         subcheck = ->(val) { (ns = task_namespace(val)) && parallel.include?(ns) }
-        @data.update(@session[:parent]) if @session[:id].uniq.size > 1
-        @data.update(@session[:group])
-        @data.each do |key, items|
+        update @session[:parent] if @session[:id].uniq.size > 1
+        update @session[:group]
+        each do |key, items|
           next if exclude?(key, true) || @workspace.task_exclude?(t = name_get(key))
 
           key = task_name t
@@ -156,6 +154,10 @@ module Squared
         task key => prereqs
       end
 
+      def reset
+        @data = {}.tap { |data| (TASK_BASE + TASK_KEYS).each { |key| data[key] = [] } }
+      end
+
       def name_get(key)
         (TASK_NAME[key] || key).to_s
       end
@@ -169,7 +171,7 @@ module Squared
       end
 
       def some?(key)
-        return @data.key?(key) && !@data[key].empty? unless (batch = batch_get(key))
+        return key?(key) && !self[key].empty? unless (batch = batch_get(key))
 
         batch.each_value do |items|
           return true if items.all? { |val| some?(val) || alias_get(val)&.any? { |_, alt| some?(alt) } }
@@ -226,7 +228,7 @@ module Squared
       end
 
       def exclude?(key, empty = false)
-        @exclude.include?(key) || (empty && @data[key].empty?)
+        @exclude.include?(key) || (empty && self[key].empty?)
       end
 
       private

data/squared.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   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.summary       = "Rake task generator for managing multi-language workspaces."
+  spec.description   = "Rake task generator for managing multi-language workspaces."
   spec.homepage      = "https://github.com/anpham6/squared-ruby"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
   spec.licenses      = ["BSD-3-Clause"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - An Pham
@@ -95,8 +95,8 @@ files:
 - lib/squared/workspace/project/node.rb
 - lib/squared/workspace/project/python.rb
 - lib/squared/workspace/project/ruby.rb
-- lib/squared/workspace/project/support.rb
 - lib/squared/workspace/project/support/class.rb
+- lib/squared/workspace/project/support/optionpartition.rb
 - lib/squared/workspace/repo.rb
 - lib/squared/workspace/series.rb
 - lib/squared/workspace/support.rb
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []

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

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