squared 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7630bfea46c3328ad2c6a12c865a913c3efad5609815b4b5dee647abd9e43665
-  data.tar.gz: 7c791bd8356e85949829196c6eddca1ad29227189471a9a89c02b8eb48c101cc
+  metadata.gz: a84fd3fef43628c438131d98c9ac058b2511a7a7f0edab355ae534137a612d1d
+  data.tar.gz: 46e0925a6e7d854d71602aee88d54c2efff7e7ff782d847fd85e95759bad3ffb
 SHA512:
-  metadata.gz: 8fa16263ea3d1d1012d308bc41dda0f72557329c1e0e491fce519b3cb9d9fd67b6ebc635747737053213ffb3dd21e86d4318b49c1de72dbffdce7d93f5cb698a
-  data.tar.gz: 73d2f5163e5d5c87abbb9894933829a88a8d589424eb70bfb39ae8c8721af1050da7f8e1c2e3d2566f914ccd90ea230fc7138dcad7d77fbd559131aa4121c7aa
+  metadata.gz: e90a44a3914f551b4567d2013882ce362dfdc43b44bb157cb24fb2b6171cb64c46dbbb680ba7fcc17fd32f76d0e8d82bfa5ddc411eb00de5524ab5407135d413
+  data.tar.gz: 993f3899bf89ed18f8b89ddda7019c33484b76d2a770a72b8280fa898af6a7caecceafe862de7854236c9e52ddb7c2100cd9e388b8afb4dd3d0f4427647f15ad

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [0.1.7] - 2025-04-27
+
+### Fixed
+
+- Project directory context method option pass was inverted.
+- Shell options with spaces and without quotes were not escaped.
+- Git task status did not display branch information.
+- Ruby copy method argument include was ignored when used directly.
+- Git commit could not push branch without same name as remote.
+
 ## [0.1.6] - 2025-04-17
 
 ### Fixed
@@ -108,6 +118,7 @@
 
 - Changelog was created.
 
+[0.1.7]: https://github.com/anpham6/squared/releases/tag/v0.1.7-ruby
 [0.1.6]: https://github.com/anpham6/squared/releases/tag/v0.1.6-ruby
 [0.1.5]: https://github.com/anpham6/squared/releases/tag/v0.1.5-ruby
 [0.1.4]: https://github.com/anpham6/squared/releases/tag/v0.1.4-ruby

data/lib/squared/common/format.rb

@@ -53,7 +53,7 @@ module Squared
         end
         wrap = ->(s, n) { "\x1B[#{n.join(';')}m#{s}\x1B[0m" }
         code = []
-        args.concat(as_a(styles)).each_with_index do |type, i|
+        args.concat(as_a(styles)).flatten.each_with_index do |type, i|
           next unless type
 
           if index == -1

data/lib/squared/common/prompt.rb

@@ -21,7 +21,7 @@ module Squared
                 return false
               end
               attempts -= 1
-              exit 1 unless attempts >= 0
+              exit 1 unless attempts > 0
             end
           rescue Interrupt
             puts

data/lib/squared/common/shell.rb

@@ -10,7 +10,7 @@ module Squared
 
       def shell_escape(val, quote: false, force: false)
         if (data = /\A(--?[^= ]+)((=|\s+)(["'])?(.+?)(["'])?)?\z/m.match(val = val.to_s))
-          return val if !data[2] || (!data[4] && data[5] =~ /\s/)
+          return val if !data[2] || (!data[4] && !data[5].match?(/\s/))
 
           join = ->(opt) { data[1] + data[3] + shell_quote(opt) }
           if data[4] == data[6]
@@ -21,7 +21,7 @@ module Squared
         elsif Rake::Win32.windows?
           quote ? shell_quote(val, force: force) : val
         else
-          Shellwords.escape(val)
+          val.empty? ? '' : Shellwords.escape(val)
         end
       end
 

data/lib/squared/version.rb

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

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

@@ -922,7 +922,7 @@ module Squared
         def pwd_set(done = nil, pass: false, &blk)
           pwd = Pathname.pwd
           if block_given?
-            if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join >= RUBY_VERSION)
+            if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
               ret = instance_eval(&blk)
             else
               Dir.chdir(path)

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

@@ -295,6 +295,7 @@ module Squared
 
         def status
           cmd = git_session 'status', option('long') ? '--long' : '--short'
+          cmd << '--branch' if option('branch')
           if (val = option('ignore-submodules', ignore: false))
             cmd << shell_option('ignore-submodules', case val
                                                      when '0', 'none'
@@ -465,41 +466,29 @@ module Squared
                        raise_error('commit', 'pathspec', hint: 'missing') if (files = projectmap(files)).empty?
                        "-- #{files.join(' ')}"
                      end
-          origin = nil
+          format = '%(if)%(HEAD)%(then)%(refname:short)...%(upstream:short)...%(upstream:track)%(end)'
           branch = nil
-          upstream = false
-          source('git fetch --no-tags --quiet', io: true, banner: false)
-          source('git branch -vv --list', io: true, banner: false).first.each do |val|
-            next unless (data = /\A\*\s(\S+)\s+(\h+)(?:\s\[(.+?)(?=\]\s)\])?\s/.match(val))
-
-            branch = data[1]
-            sha = data[2]
-            if !data[3]
-              unless (origin = option('repository', prefix: 'git', ignore: false))
-                out = source('git log -n1 --format=%h%d', io: true, stdout: true, banner: false).first
-                if (data = /\A#{sha} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)\z/.match(out))
-                  split_escape(data[1]).each do |s|
-                    next unless s.end_with?("/#{branch}")
-
-                    origin = s[0..s.size - branch.size - 2]
-                    break
-                  end
-                end
-              end
-              upstream = !origin.nil?
-            elsif (data = Regexp.new("\\A(.+)/#{Regexp.escape(branch)}\\z").match(data[3]))
-              origin = data[1]
+          origin = nil
+          source('git fetch --no-tags --quiet', io: true, banner: false, stdout: true)
+          source("git for-each-ref --format=\"#{format}\" refs/heads", io: true, banner: false).first.each do |line|
+            next if (line = line.chomp).empty?
+
+            branch, origin, hint = line.split('...')
+            if hint && !hint.match?(/^\[(\D+0,\D+0)\]$/)
+              raise_error('work tree is not usable', hint: hint[1..-2])
+            elsif origin.empty?
+              return nil if pass
+
+              raise_error('no remote upstream', hint: branch)
             end
             break
           end
-          raise_error('commit', 'work tree is not usable') unless origin && branch
+          i = origin.index('/')
+          branch = "#{branch}:#{origin[i + 1..-1]}" unless origin.end_with?("/#{branch}")
+          origin = origin[0..i - 1]
           cmd = git_session 'commit'
           cmd << '--dry-run' if option('dry-run')
-          if amend
-            cmd << '--amend'
-          else
-            cmd.delete('--amend')
-          end
+          cmd << '--amend' if amend
           if message
             append_message message
           elsif flag == :'amend-orig' || option('no-edit')
@@ -507,13 +496,9 @@ module Squared
           end
           a = ['git add --verbose']
           b = ['git push']
-          b << '--set-upstream' if upstream
-          if dry_run?
-            a << '--dry-run'
-            b << '--dry-run'
-          end
+          b << '--dry-run' if dry_run?
           a << pathspec
-          b << '--force' if amend
+          b << '--force-with-lease' if amend
           b << origin << branch
           puts if pass
           source a.join(' ')

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

@@ -207,13 +207,15 @@ module Squared
           end
         end
 
-        def copy(from: 'lib', include: nil, exclude: nil, into: @gemdir, override: false)
+        def copy(from: 'lib', into: @gemdir, override: false, **kwargs)
+          glob = kwargs[:include]
+          pass = kwargs[:exclude]
           if @copy && !override
             return super if runnable?(@copy)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:include] if @copy.key?(:include)
-            exclude = @copy[:exclude] if @copy.key?(:exclude)
+            pass = @copy[:exclude] if @copy.key?(:exclude)
             into = @copy[:into] if @copy.key?(:into)
           end
           return unless into
@@ -224,9 +226,9 @@ module Squared
           as_a(from).each_with_index do |val, i|
             a = basepath(val)
             b = dest.join(val)
-            c = glob[i] || glob[0]
+            c = glob[i] || glob.first
             log.info "cp #{a.join(c)} #{b}"
-            copy_d(a, b, glob: c, pass: exclude, verbose: verbose)
+            copy_d(a, b, glob: c, pass: pass, verbose: verbose)
           end
         end
 

data/lib/squared/workspace/repo.rb

@@ -3,8 +3,6 @@
 module Squared
   module Workspace
     module Repo
-      include Common::Format
-
       class << self
         def read_manifest(path)
           require 'rexml/document'

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - An Pham
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,6 +107,7 @@ metadata:
   homepage_uri: https://github.com/anpham6/squared
   source_code_uri: https://github.com/anpham6/squared
   documentation_uri: https://squared.readthedocs.io
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,7 +122,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []