squared 0.4.4 → 0.4.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -0
- data/README.ruby.md +1 -0
- data/lib/squared/version.rb +1 -1
- data/lib/squared/workspace/application.rb +3 -1
- data/lib/squared/workspace/project/base.rb +15 -8
- data/lib/squared/workspace/project/python.rb +4 -3
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d23d69be4457a4dfa43c961b405d27f834b915aa7c370b2733d2438dc5792b55
|
4
|
+
data.tar.gz: d070c6ee2417ce81709a5fe6ea881e152d7839b6ef4030f8ab7539b2d7552f8f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5c4f6c187e2b5dd2f230e972919f48ed4badd124c7b73df86f28ec77c87027898480c3bf02044a5e3c986334214c82ec1eaeb15b52d8424eeafc720086652ee3
|
7
|
+
data.tar.gz: 1ec9ca0ff06a048e13743759b82c3e070be6a23efcc2fce8b7d5cad82e49a65597538e78780b8fe88937a07cd055f26f7c54c4a2554926d04183707c0b0e79fe
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,11 @@
|
|
1
1
|
# Changelog
|
2
2
|
|
3
|
+
## [0.4.5] - 2025-04-09
|
4
|
+
|
5
|
+
### Fixed
|
6
|
+
|
7
|
+
- Python virtual environment did not have Powershell permissions.
|
8
|
+
|
3
9
|
## [0.4.4] - 2025-04-08
|
4
10
|
|
5
11
|
### Added
|
@@ -451,6 +457,7 @@
|
|
451
457
|
|
452
458
|
- Changelog was created.
|
453
459
|
|
460
|
+
[0.4.5]: https://github.com/anpham6/squared/releases/tag/v0.4.5-ruby
|
454
461
|
[0.4.4]: https://github.com/anpham6/squared/releases/tag/v0.4.4-ruby
|
455
462
|
[0.4.3]: https://github.com/anpham6/squared/releases/tag/v0.4.3-ruby
|
456
463
|
[0.4.2]: https://github.com/anpham6/squared/releases/tag/v0.4.2-ruby
|
data/README.ruby.md
CHANGED
@@ -238,6 +238,7 @@ Workspace::Application
|
|
238
238
|
.new(main: "squared")
|
239
239
|
.graph(["depend"], ref: :git) # Optional
|
240
240
|
.with(:python) do
|
241
|
+
doc(windows? ? '.\make.bat html' : 'make html')
|
241
242
|
add("android-docs", "android", venv: "/home/user/.venv") # rake android-docs:depend
|
242
243
|
add("chrome-docs", "chrome", graph: "android", venv: ".venv") do # /workspaces/chrome-docs/.venv
|
243
244
|
variable_set :dependindex, 2 # Use Poetry for dependencies (optional)
|
data/lib/squared/version.rb
CHANGED
@@ -591,11 +591,13 @@ module Squared
|
|
591
591
|
end
|
592
592
|
|
593
593
|
def powershell?
|
594
|
+
return false unless windows?
|
595
|
+
|
594
596
|
case ENV['TERM_PROGRAM']
|
595
597
|
when 'powershell.exe', 'vscode'
|
596
598
|
true
|
597
599
|
else
|
598
|
-
|
600
|
+
ENV.fetch('PSModulePath', '').split(';').size > 1
|
599
601
|
end
|
600
602
|
end
|
601
603
|
|
@@ -880,16 +880,15 @@ module Squared
|
|
880
880
|
task_invoke(cmd, exception: exception, warning: warning?)
|
881
881
|
else
|
882
882
|
print_item format_banner(cmd, banner: banner) if sync
|
883
|
-
if var
|
884
|
-
case
|
883
|
+
if var != false && (pre = runenv)
|
884
|
+
case pre
|
885
885
|
when Hash
|
886
|
-
var = pre.merge(var)
|
887
|
-
when
|
888
|
-
cmd =
|
886
|
+
var = var.is_a?(Hash) ? pre.merge(var) : pre
|
887
|
+
when Enumerable
|
888
|
+
cmd = command(*pre.to_a, cmd)
|
889
|
+
else
|
890
|
+
cmd = command(pre, cmd)
|
889
891
|
end
|
890
|
-
elsif var != false && (var = runenv).is_a?(String)
|
891
|
-
cmd = "#{var} && #{cmd}"
|
892
|
-
var = nil
|
893
892
|
end
|
894
893
|
args = var.is_a?(Hash) ? [var, cmd] : [cmd]
|
895
894
|
ret = shell(*args, chdir: chdir, exception: exception)
|
@@ -1531,6 +1530,14 @@ module Squared
|
|
1531
1530
|
nil
|
1532
1531
|
end
|
1533
1532
|
|
1533
|
+
def command(*args)
|
1534
|
+
if workspace.powershell?
|
1535
|
+
"powershell.exe -Command \"& {#{args.join(' ; ')}}\""
|
1536
|
+
else
|
1537
|
+
args.join(' && ')
|
1538
|
+
end
|
1539
|
+
end
|
1540
|
+
|
1534
1541
|
def relativepath(*files, all: false)
|
1535
1542
|
return [] if files.empty?
|
1536
1543
|
|
@@ -544,7 +544,7 @@ module Squared
|
|
544
544
|
return unless venv
|
545
545
|
|
546
546
|
if workspace.windows?
|
547
|
-
venvbin.join(workspace.powershell? ? 'Activate.ps1' : 'activate.bat')
|
547
|
+
shell_quote(venvbin.join(workspace.powershell? ? 'Activate.ps1' : 'activate.bat'), option: false)
|
548
548
|
else
|
549
549
|
{ 'VIRTUAL_ENV' => venv.to_s, 'PATH' => "#{venvbin}:#{ENV['PATH']}" }
|
550
550
|
end
|
@@ -560,7 +560,7 @@ module Squared
|
|
560
560
|
if projectpath?(@venv)
|
561
561
|
if @venv.exist?
|
562
562
|
log.debug "venv found: #{@venv}"
|
563
|
-
|
563
|
+
elsif @path.directory? && !@path.empty?
|
564
564
|
@venv.mkpath
|
565
565
|
log.info "venv mkdir: #{@venv}"
|
566
566
|
end
|
@@ -571,8 +571,9 @@ module Squared
|
|
571
571
|
end
|
572
572
|
|
573
573
|
def venv_init
|
574
|
-
return if !venv || (venvbin.directory? && !venvbin.empty?)
|
574
|
+
return if !venv || (venvbin.directory? && !venvbin.empty?)
|
575
575
|
|
576
|
+
puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'init')
|
576
577
|
cmd = python_session '-m venv', shell_option('prompt', name), '--upgrade-deps', shell_quote(venv)
|
577
578
|
run(cmd, false, exception: true, banner: false)
|
578
579
|
puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'created')
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: squared
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.4.
|
4
|
+
version: 0.4.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- An Pham
|
8
8
|
bindir: exe
|
9
9
|
cert_chain: []
|
10
|
-
date:
|
10
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
11
11
|
dependencies:
|
12
12
|
- !ruby/object:Gem::Dependency
|
13
13
|
name: rake
|
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
121
121
|
- !ruby/object:Gem::Version
|
122
122
|
version: '0'
|
123
123
|
requirements: []
|
124
|
-
rubygems_version: 3.6.
|
124
|
+
rubygems_version: 3.6.7
|
125
125
|
specification_version: 4
|
126
126
|
summary: Rake task generator for managing multi-language workspaces.
|
127
127
|
test_files: []
|