squared 0.6.2 → 0.6.4

data/lib/squared/workspace/repo.rb

@@ -3,9 +3,12 @@
 module Squared
   module Workspace
     module Repo
+      REPO_URL = 'https://storage.googleapis.com/git-repo-downloads/repo'
+      private_constant :REPO_URL
+
       attr_reader :manifest_url, :manifest
 
-      def repo(url, manifest = 'latest', run: nil, script: nil, args: nil, dev: nil, prod: nil,
+      def repo(url, manifest = 'latest', install: nil, run: nil, script: nil, args: nil, dev: nil, prod: nil,
                ref: @ref, group: @group)
         @home = if (val = env('REPO_HOME'))
                   path = Pathname.new(val)
@@ -101,6 +104,7 @@ module Squared
           data[:prod] = prod
           script_set(data, group: group, ref: ref)
         end
+        @repo_bin = install.is_a?(String) ? @root + install : @root if install
         self
       end
 
@@ -128,20 +132,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)
@@ -154,7 +158,7 @@ module Squared
           desc.call("init[manifest?=#{target},groups?,{0}]", target)
           task 'init' do |_, args|
             args = args.to_a
-            u = env('REPO_URL') || manifest_url
+            u = env('REPO_GIT') || manifest_url
             m = args.first && !opts.include?(args.first) ? args.shift : target
             g = (args.shift if args.first && !opts.include?(args.first))
             g = case (val = env('REPO_GROUPS'))
@@ -221,7 +225,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,21 +235,42 @@ 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)
-        puts log_message(Logger::INFO, cmd, subject: main, hint: root) if verbose
+        puts log_message(cmd, subject: main, hint: root) if verbose
         Common::System.shell(cmd, chdir: root, exception: exception)
       end
 
       def repo_bin
-        Common::Shell.shell_bin('repo')
+        return Common::Shell.shell_bin('repo') unless @repo_bin
+
+        @repo_bin.join('repo').tap do |bin|
+          next if bin.file?
+
+          require 'open-uri'
+          puts log_message('Installing repo...', subject: main, hint: @repo_bin) if verbose
+          URI.open(REPO_URL) do |url|
+            @repo_bin.mkpath
+            File.open(bin, 'wb') do |f|
+              f.write(url.read)
+              f.chmod(0o755)
+            end
+          end
+        end
       end
 
       def repo_opts(*args)
@@ -255,7 +280,9 @@ module Squared
       end
 
       def repo?
-        !manifest_url.nil? && (repo_install? || @repo_override == true)
+        return false unless manifest_url && !windows?
+
+        repo_install? || @repo_override == true
       end
 
       def repo_submodules?(val = false)

data/lib/squared/workspace/series.rb

@@ -11,10 +11,11 @@ module Squared
       TASK_BASE = []
       TASK_BATCH = {}
       TASK_EXTEND = Support.hashlist
+      TASK_METHODS = {}
       TASK_KEYS = []
       TASK_ALIAS = Support.hashobj
       TASK_NAME = {}
-      private_constant :TASK_BASE, :TASK_BATCH, :TASK_EXTEND, :TASK_KEYS, :TASK_ALIAS, :TASK_NAME
+      private_constant :TASK_BASE, :TASK_BATCH, :TASK_EXTEND, :TASK_METHODS, :TASK_KEYS, :TASK_ALIAS, :TASK_NAME
 
       class << self
         def add(task, obj)
@@ -52,6 +53,11 @@ module Squared
           TASK_BASE.concat(obj.tasks.reject { |val| TASK_KEYS.include?(val) })
         end
 
+        def extend_set(obj)
+          obj.tasks&.each { |task| add(task, obj) }
+          TASK_METHODS[obj] = obj.instance_methods(false)
+        end
+
         private
 
         def key_set(val)
@@ -64,7 +70,8 @@ module Squared
 
       attr_reader :sync, :multiple, :parallel
 
-      def_delegators :@data, :[], :each, :each_key, :keys, :key?, :fetch, :update, :merge!, :to_a, :to_s, :inspect
+      def_delegators :@data, :[], :each, :each_key, :keys, :key?, :include?, :fetch, :update, :merge!, :any?, :none?,
+                     :delete, :delete_if, :find, :find_all, :to_a, :to_s, :inspect
       def_delegators :@workspace, :task_desc, :task_name, :task_namespace, :task_join, :format_desc
 
       def initialize(workspace, exclude: [])
@@ -79,14 +86,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 +113,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 +161,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 +178,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) } }
@@ -182,12 +191,14 @@ module Squared
       end
 
       def extend?(obj, key)
-        return false unless (items = TASK_EXTEND[key]) && !(items = items.select { |kind| obj.is_a?(kind) }).empty?
+        return false unless (items = TASK_EXTEND[key])
 
-        meth = :"#{key}?"
         ret = false
         items.each do |kind|
-          if kind.instance_methods.include?(meth)
+          next unless obj.is_a?(kind)
+
+          meth = :"#{key}?"
+          if TASK_METHODS[kind].include?(meth)
             out = obj.__send__(meth)
             return true if out == 1
             return out if obj.ref?(kind.ref)
@@ -199,7 +210,9 @@ module Squared
       end
 
       def batch?(obj, key)
-        (data = batch_get(key)) ? data.keys.any? { |ref| obj.ref?(ref) } : false
+        return false unless (data = batch_get(key))
+
+        data.keys.any? { |ref| obj.ref?(ref) }
       end
 
       def chain?(val)
@@ -226,7 +239,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/lib/squared/workspace.rb

@@ -5,12 +5,14 @@ module Squared
     class << self
       include Common
 
-      def resolve(*args)
-        ret = args.map! do |id|
+      def resolve(*args, base: '..')
+        values = __get__(:project).values
+        ret = args.map do |id|
           if id.is_a?(Symbol)
             project id
           else
-            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id, __dir__) }
+            values.find { |proj| proj.name == id } || values.find { |proj| proj.project == id } ||
+              values.find { |proj| proj.path.to_s == File.expand_path(id, base) }
           end
         end
         ret.size == 1 ? ret.first : ret

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.4
 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

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

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