makit 0.0.135 → 0.0.138
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/lib/makit/auto.rb +1 -0
- data/lib/makit/cli/main.rb +2 -0
- data/lib/makit/cli/strategy_commands.rb +51 -1
- data/lib/makit/commands/runner.rb +16 -11
- data/lib/makit/commands/strategies/factory.rb +25 -24
- data/lib/makit/rake/trace_controller.rb +174 -0
- data/lib/makit/rake.rb +73 -17
- data/lib/makit/tasks/hook_manager.rb +53 -1
- data/lib/makit/version.rb +5 -1
- data/lib/makit.rb +2 -0
- metadata +16 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bd8b097019d57c32609cdb2320d15ccc7b31759e8cf44616a9ebb0747075cbbd
|
4
|
+
data.tar.gz: f89b84d3bbe7a6a46225f72bfc5092bdc8663cb163238b1f5fa7e93337a727bd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a3f566a10289394cf014ebee6cc813ed11bb21f63bccf0787305d71f08b4817bd67a9a6807027df371fc4b3db5f41f2ca8cda5befd4daa545fe383b84ad5c103
|
7
|
+
data.tar.gz: 506a7d1bddd28c29ce3328fa1f7e023c835d3a95c47553ad76af0baabc79ffe22ba6f6db0da8298d07da305a11edf137a35ef81e8f56a323478046ead5b84d46
|
data/lib/makit/auto.rb
CHANGED
@@ -16,6 +16,7 @@ begin
|
|
16
16
|
require_relative "cli/project_commands"
|
17
17
|
require_relative "cli/build_commands"
|
18
18
|
require_relative "cli/utility_commands"
|
19
|
+
require_relative "cli/strategy_commands"
|
19
20
|
rescue LoadError => e
|
20
21
|
puts "Warning: Could not load CLI modules: #{e.message}"
|
21
22
|
end
|
data/lib/makit/cli/main.rb
CHANGED
@@ -22,6 +22,7 @@ module Makit
|
|
22
22
|
build - Build operations and cleanup (make, clean)
|
23
23
|
utility - System utilities and maintenance (nuget-cache, system-info)
|
24
24
|
strategy - Manage execution strategies (show, test)
|
25
|
+
trace - Manage trace functionality (show, enable, disable, test)
|
25
26
|
rake - Manage rake tasks
|
26
27
|
|
27
28
|
Common usage examples:
|
@@ -59,6 +60,7 @@ module Makit
|
|
59
60
|
subcommand "build", "Build operations and cleanup", BuildCommand
|
60
61
|
subcommand "utility", "System utilities and maintenance", UtilityCommand
|
61
62
|
subcommand "strategy", "Manage execution strategies", StrategyCommands
|
63
|
+
subcommand "trace", "Manage trace functionality", TraceCommands
|
62
64
|
subcommand "rake", "Manage rake tasks", Makit::Rake::CliCommand
|
63
65
|
end
|
64
66
|
end
|
@@ -94,9 +94,59 @@ module Makit
|
|
94
94
|
puts " Duration: #{duration.round(3)}s"
|
95
95
|
puts " Error: #{e.message}"
|
96
96
|
|
97
|
-
|
97
|
+
{ duration: duration.round(3), status: "ERROR", success: false }
|
98
|
+
end
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
# Add trace commands to the main CLI
|
104
|
+
module Makit
|
105
|
+
module Cli
|
106
|
+
# Commands for managing trace functionality
|
107
|
+
class TraceCommands < Base
|
108
|
+
desc "trace", "Show current trace status and configuration"
|
109
|
+
option ["--verbose", "-v"], :flag, "Show detailed trace information"
|
110
|
+
def trace
|
111
|
+
puts "Makit Trace Status:"
|
112
|
+
puts "=" * 30
|
113
|
+
|
114
|
+
status = Makit::Rake.status
|
115
|
+
|
116
|
+
puts "Enhanced Tracing: #{Makit::Rake.tracing_enabled? ? 'Enabled' : 'Disabled'}"
|
117
|
+
puts "Rake Trace: #{status[:trace_controller][:rake_trace] || 'Not set'}"
|
118
|
+
puts "Trace Flag: #{status[:trace_controller][:trace_flag] ? 'Present' : 'Not present'}"
|
119
|
+
puts "Makit Trace: #{status[:trace_controller][:makit_trace] || 'Not set'}"
|
120
|
+
puts "Verbose Mode: #{status[:verbose] ? 'Enabled' : 'Disabled'}"
|
121
|
+
|
122
|
+
if options[:verbose]
|
123
|
+
puts "\nDetailed Information:"
|
124
|
+
puts " Strategy: #{status[:strategy][:type] || 'Unknown'}"
|
125
|
+
puts " Class: #{status[:strategy][:class] || 'Unknown'}"
|
126
|
+
puts " Factory Info: #{status[:strategy][:factory_info] || 'Not available'}"
|
98
127
|
end
|
99
128
|
end
|
129
|
+
|
130
|
+
desc "trace enable", "Enable enhanced tracing"
|
131
|
+
def enable
|
132
|
+
ENV['MAKIT_TRACE'] = 'true'
|
133
|
+
puts "Enhanced tracing enabled"
|
134
|
+
puts "Run 'rake --trace' to see enhanced output"
|
135
|
+
end
|
136
|
+
|
137
|
+
desc "trace disable", "Disable enhanced tracing"
|
138
|
+
def disable
|
139
|
+
ENV.delete('MAKIT_TRACE')
|
140
|
+
puts "Enhanced tracing disabled"
|
141
|
+
end
|
142
|
+
|
143
|
+
desc "trace test", "Test trace functionality with a simple rake task"
|
144
|
+
def test
|
145
|
+
puts "Testing trace functionality..."
|
146
|
+
puts "Run: rake --trace"
|
147
|
+
puts "You should see [MAKIT] prefixed trace output for makit-related tasks"
|
148
|
+
end
|
100
149
|
end
|
101
150
|
end
|
102
151
|
end
|
152
|
+
end
|
@@ -41,19 +41,24 @@ module Makit
|
|
41
41
|
# @return [Runner] default runner with standard middleware
|
42
42
|
def self.default
|
43
43
|
# Recreate the runner if the log level has changed
|
44
|
-
current_log_level = Makit::Logging.current_log_level
|
44
|
+
current_log_level = defined?(Makit::Logging) ? Makit::Logging.current_log_level : :info
|
45
45
|
if @default.nil? || @last_log_level != current_log_level
|
46
46
|
@last_log_level = current_log_level
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
47
|
+
begin
|
48
|
+
@default = new(
|
49
|
+
middleware: [
|
50
|
+
Middleware::CommandLogger.new(
|
51
|
+
log_stdout: true,
|
52
|
+
log_stderr: true,
|
53
|
+
log_performance: true,
|
54
|
+
max_output_lines: 50,
|
55
|
+
),
|
56
|
+
],
|
57
|
+
)
|
58
|
+
rescue => e
|
59
|
+
# Fallback to basic runner if there are issues
|
60
|
+
@default = new
|
61
|
+
end
|
57
62
|
end
|
58
63
|
@default
|
59
64
|
end
|
@@ -36,16 +36,22 @@ module Makit
|
|
36
36
|
def self.create(options = {})
|
37
37
|
strategy_type = determine_strategy_type
|
38
38
|
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
39
|
+
begin
|
40
|
+
case strategy_type
|
41
|
+
when 'childprocess'
|
42
|
+
create_childprocess_strategy(options)
|
43
|
+
when 'open3'
|
44
|
+
create_open3_strategy(options)
|
45
|
+
when 'auto'
|
46
|
+
create_auto_detect_strategy(options)
|
47
|
+
else
|
48
|
+
Makit::Logging.warn("Unknown strategy '#{strategy_type}', falling back to Open3") if defined?(Makit::Logging)
|
49
|
+
create_open3_strategy(options)
|
50
|
+
end
|
51
|
+
rescue => e
|
52
|
+
# Ultimate fallback - create basic synchronous strategy
|
53
|
+
Makit::Logging.warn("Failed to create strategy: #{e.message}") if defined?(Makit::Logging)
|
54
|
+
Synchronous.new
|
49
55
|
end
|
50
56
|
end
|
51
57
|
|
@@ -90,20 +96,15 @@ module Makit
|
|
90
96
|
# @param options [Hash] strategy options
|
91
97
|
# @return [Strategies::Base] strategy instance
|
92
98
|
def self.create_auto_detect_strategy(options)
|
93
|
-
#
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
# rescue LoadError, StandardError => e
|
103
|
-
# Makit::Logging.debug("ChildProcess not available: #{e.message}")
|
104
|
-
# Makit::Logging.debug("Using Open3 strategy")
|
105
|
-
# Synchronous.new(**options)
|
106
|
-
# end
|
99
|
+
# Always use Open3 for now to avoid circular dependency issues
|
100
|
+
begin
|
101
|
+
Makit::Logging.debug("Using Open3 strategy") if defined?(Makit::Logging)
|
102
|
+
Synchronous.new(**options)
|
103
|
+
rescue => e
|
104
|
+
# Fallback to basic strategy if there are any issues
|
105
|
+
Makit::Logging.warn("Failed to create Open3 strategy: #{e.message}") if defined?(Makit::Logging)
|
106
|
+
Synchronous.new
|
107
|
+
end
|
107
108
|
end
|
108
109
|
|
109
110
|
# Get information about available strategies
|
@@ -0,0 +1,174 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Makit
|
4
|
+
module Rake
|
5
|
+
# Enhanced trace controller for Rake with Makit-specific debugging information
|
6
|
+
#
|
7
|
+
# This class provides enhanced tracing capabilities when --trace is passed to rake,
|
8
|
+
# adding makit-specific debugging information to help with troubleshooting and
|
9
|
+
# understanding command execution flow.
|
10
|
+
#
|
11
|
+
# @example Basic usage
|
12
|
+
# # In Rakefile
|
13
|
+
# require "makit"
|
14
|
+
# Makit::Rake::TraceController.setup
|
15
|
+
#
|
16
|
+
# @example With environment variable
|
17
|
+
# MAKIT_TRACE=true rake --trace
|
18
|
+
class TraceController
|
19
|
+
# Set up enhanced tracing for Rake tasks
|
20
|
+
#
|
21
|
+
# This method should be called early in the Rakefile to enable enhanced
|
22
|
+
# tracing when --trace is passed to rake.
|
23
|
+
#
|
24
|
+
# @return [void]
|
25
|
+
def self.setup
|
26
|
+
return unless should_enhance_trace?
|
27
|
+
|
28
|
+
# Set up enhanced tracing
|
29
|
+
setup_enhanced_tracing
|
30
|
+
Makit::Logging.debug("Enhanced trace controller activated") if defined?(Makit::Logging)
|
31
|
+
end
|
32
|
+
|
33
|
+
# Check if trace enhancement should be enabled
|
34
|
+
#
|
35
|
+
# @return [Boolean] true if trace enhancement should be enabled
|
36
|
+
def self.should_enhance_trace?
|
37
|
+
ENV['RAKE_TRACE'] ||
|
38
|
+
ARGV.include?('--trace') ||
|
39
|
+
ENV['MAKIT_TRACE'] == 'true'
|
40
|
+
end
|
41
|
+
|
42
|
+
# Get current trace status
|
43
|
+
#
|
44
|
+
# @return [Hash] trace status information
|
45
|
+
def self.trace_status
|
46
|
+
{
|
47
|
+
rake_trace: ENV['RAKE_TRACE'],
|
48
|
+
trace_flag: ARGV.include?('--trace'),
|
49
|
+
makit_trace: ENV['MAKIT_TRACE'],
|
50
|
+
enhanced: should_enhance_trace?
|
51
|
+
}
|
52
|
+
end
|
53
|
+
|
54
|
+
private
|
55
|
+
|
56
|
+
# Set up enhanced tracing by monkey patching Rake's trace methods
|
57
|
+
#
|
58
|
+
# @return [void]
|
59
|
+
def self.setup_enhanced_tracing
|
60
|
+
# Store the original trace method if not already stored
|
61
|
+
unless ::Rake::Task.method_defined?(:makit_original_trace)
|
62
|
+
::Rake::Task.class_eval do
|
63
|
+
alias_method :makit_original_trace, :trace
|
64
|
+
|
65
|
+
def trace(mode, message)
|
66
|
+
# Call original trace
|
67
|
+
makit_original_trace(mode, message)
|
68
|
+
|
69
|
+
# Add makit-specific trace info
|
70
|
+
add_makit_trace_info(mode, message)
|
71
|
+
end
|
72
|
+
|
73
|
+
private
|
74
|
+
|
75
|
+
# Add makit-specific trace information
|
76
|
+
#
|
77
|
+
# @param mode [Symbol] trace mode (:execute, :invoke, :prereq, etc.)
|
78
|
+
# @param message [String] trace message
|
79
|
+
# @return [void]
|
80
|
+
def add_makit_trace_info(mode, message)
|
81
|
+
case mode
|
82
|
+
when :execute
|
83
|
+
trace_makit_execution(message)
|
84
|
+
when :invoke
|
85
|
+
trace_makit_invocation(message)
|
86
|
+
when :prereq
|
87
|
+
trace_makit_prerequisite(message)
|
88
|
+
when :syntax
|
89
|
+
trace_makit_syntax(message)
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
# Trace makit execution with detailed information
|
94
|
+
#
|
95
|
+
# @param message [String] execution message
|
96
|
+
# @return [void]
|
97
|
+
def trace_makit_execution(message)
|
98
|
+
if makit_related?(message)
|
99
|
+
puts " [MAKIT] Executing: #{message}"
|
100
|
+
puts " [MAKIT] Strategy: #{get_makit_strategy_info}"
|
101
|
+
puts " [MAKIT] Environment: #{ENV['MAKIT_STRATEGY'] || 'auto'}"
|
102
|
+
puts " [MAKIT] Working Directory: #{Dir.pwd}"
|
103
|
+
puts " [MAKIT] Timestamp: #{Time.now.iso8601}"
|
104
|
+
puts " [MAKIT] Task: #{name}"
|
105
|
+
end
|
106
|
+
end
|
107
|
+
|
108
|
+
# Trace makit invocation
|
109
|
+
#
|
110
|
+
# @param message [String] invocation message
|
111
|
+
# @return [void]
|
112
|
+
def trace_makit_invocation(message)
|
113
|
+
if makit_related?(message)
|
114
|
+
puts " [MAKIT] Invoking: #{message}"
|
115
|
+
puts " [MAKIT] Task: #{name}"
|
116
|
+
end
|
117
|
+
end
|
118
|
+
|
119
|
+
# Trace makit prerequisite
|
120
|
+
#
|
121
|
+
# @param message [String] prerequisite message
|
122
|
+
# @return [void]
|
123
|
+
def trace_makit_prerequisite(message)
|
124
|
+
if makit_related?(message)
|
125
|
+
puts " [MAKIT] Prerequisite: #{message}"
|
126
|
+
puts " [MAKIT] Task: #{name}"
|
127
|
+
end
|
128
|
+
end
|
129
|
+
|
130
|
+
# Trace makit syntax
|
131
|
+
#
|
132
|
+
# @param message [String] syntax message
|
133
|
+
# @return [void]
|
134
|
+
def trace_makit_syntax(message)
|
135
|
+
if makit_related?(message)
|
136
|
+
puts " [MAKIT] Syntax: #{message}"
|
137
|
+
end
|
138
|
+
end
|
139
|
+
|
140
|
+
# Check if message is makit-related
|
141
|
+
#
|
142
|
+
# @param message [String] message to check
|
143
|
+
# @return [Boolean] true if message is makit-related
|
144
|
+
def makit_related?(message)
|
145
|
+
message.downcase.include?('makit') ||
|
146
|
+
message.include?('bundle') ||
|
147
|
+
message.include?('gem') ||
|
148
|
+
message.include?('dotnet') ||
|
149
|
+
message.include?('protoc') ||
|
150
|
+
message.include?('git')
|
151
|
+
end
|
152
|
+
|
153
|
+
# Get makit strategy information safely
|
154
|
+
#
|
155
|
+
# @return [String] strategy information
|
156
|
+
def get_makit_strategy_info
|
157
|
+
begin
|
158
|
+
if defined?(Makit::Commands::Runner)
|
159
|
+
runner = Makit::Commands::Runner.default
|
160
|
+
info = runner.strategy_info
|
161
|
+
"#{info[:type]} (#{info[:class]})"
|
162
|
+
else
|
163
|
+
"not available"
|
164
|
+
end
|
165
|
+
rescue => e
|
166
|
+
"error: #{e.message}"
|
167
|
+
end
|
168
|
+
end
|
169
|
+
end
|
170
|
+
end
|
171
|
+
end
|
172
|
+
end
|
173
|
+
end
|
174
|
+
end
|
data/lib/makit/rake.rb
CHANGED
@@ -1,25 +1,81 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
|
3
|
+
require_relative "rake/trace_controller"
|
4
|
+
|
4
5
|
module Makit
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
6
|
+
module Rake
|
7
|
+
# Enhanced Rake integration for Makit
|
8
|
+
#
|
9
|
+
# This module provides enhanced Rake integration capabilities including
|
10
|
+
# trace enhancement, task monitoring, and debugging utilities.
|
11
|
+
#
|
12
|
+
# @example Basic usage
|
13
|
+
# require "makit"
|
14
|
+
# Makit::Rake.setup
|
15
|
+
#
|
16
|
+
# @example With custom options
|
17
|
+
# Makit::Rake.setup(trace: true, verbose: true)
|
18
|
+
class << self
|
19
|
+
# Set up enhanced Rake integration
|
20
|
+
#
|
21
|
+
# @param trace [Boolean] enable trace enhancement (default: auto-detect)
|
22
|
+
# @param verbose [Boolean] enable verbose output (default: false)
|
23
|
+
# @return [void]
|
24
|
+
def setup(trace: nil, verbose: false)
|
25
|
+
# Set up trace enhancement
|
26
|
+
if trace.nil?
|
27
|
+
TraceController.setup
|
28
|
+
elsif trace
|
29
|
+
ENV['MAKIT_TRACE'] = 'true'
|
30
|
+
TraceController.setup
|
31
|
+
end
|
32
|
+
|
33
|
+
# Set up verbose output if requested
|
34
|
+
if verbose
|
35
|
+
ENV['MAKIT_VERBOSE'] = 'true'
|
14
36
|
end
|
15
|
-
|
16
|
-
|
17
|
-
|
37
|
+
|
38
|
+
# Log setup completion
|
39
|
+
if defined?(Makit::Logging)
|
40
|
+
Makit::Logging.debug("Makit Rake integration setup completed")
|
41
|
+
Makit::Logging.debug("Trace status: #{TraceController.trace_status}")
|
42
|
+
end
|
43
|
+
end
|
44
|
+
|
45
|
+
# Get current Rake integration status
|
46
|
+
#
|
47
|
+
# @return [Hash] integration status
|
48
|
+
def status
|
49
|
+
{
|
50
|
+
trace_controller: TraceController.trace_status,
|
51
|
+
verbose: ENV['MAKIT_VERBOSE'] == 'true',
|
52
|
+
strategy: get_strategy_info
|
53
|
+
}
|
54
|
+
end
|
55
|
+
|
56
|
+
# Check if enhanced tracing is active
|
57
|
+
#
|
58
|
+
# @return [Boolean] true if enhanced tracing is active
|
59
|
+
def tracing_enabled?
|
60
|
+
TraceController.should_enhance_trace?
|
18
61
|
end
|
19
|
-
|
20
|
-
|
21
|
-
|
62
|
+
|
63
|
+
private
|
64
|
+
|
65
|
+
# Get strategy information safely
|
66
|
+
#
|
67
|
+
# @return [Hash] strategy information
|
68
|
+
def get_strategy_info
|
69
|
+
begin
|
70
|
+
if defined?(Makit::Commands::Runner)
|
71
|
+
Makit::Commands::Runner.default.strategy_info
|
72
|
+
else
|
73
|
+
{ error: "Commands::Runner not available" }
|
74
|
+
end
|
75
|
+
rescue => e
|
76
|
+
{ error: e.message }
|
77
|
+
end
|
22
78
|
end
|
23
79
|
end
|
24
80
|
end
|
25
|
-
end
|
81
|
+
end
|
@@ -270,13 +270,65 @@ module Makit
|
|
270
270
|
def setup!
|
271
271
|
return if @hooks_installed
|
272
272
|
|
273
|
-
Rake::Task.class_eval do
|
273
|
+
::Rake::Task.class_eval do
|
274
274
|
alias_method :makit_original_execute, :execute
|
275
275
|
|
276
|
+
# Check if this task should have enhanced makit tracing
|
277
|
+
#
|
278
|
+
# @return [Boolean] true if task should be traced
|
279
|
+
def should_trace_makit_task?
|
280
|
+
# Check if trace is enabled
|
281
|
+
return false unless ENV['RAKE_TRACE'] || ARGV.include?('--trace') || ENV['MAKIT_TRACE'] == 'true'
|
282
|
+
|
283
|
+
# Check if task is makit-related
|
284
|
+
makit_related_task?
|
285
|
+
end
|
286
|
+
|
287
|
+
# Check if task is makit-related
|
288
|
+
#
|
289
|
+
# @return [Boolean] true if task is makit-related
|
290
|
+
def makit_related_task?
|
291
|
+
name.downcase.include?('makit') ||
|
292
|
+
name.include?('bundle') ||
|
293
|
+
name.include?('gem') ||
|
294
|
+
name.include?('dotnet') ||
|
295
|
+
name.include?('protoc') ||
|
296
|
+
name.include?('git') ||
|
297
|
+
name.include?('setup') ||
|
298
|
+
name.include?('build') ||
|
299
|
+
name.include?('test')
|
300
|
+
end
|
301
|
+
|
302
|
+
# Get makit strategy information safely
|
303
|
+
#
|
304
|
+
# @return [String] strategy information
|
305
|
+
def get_makit_strategy_info
|
306
|
+
begin
|
307
|
+
if defined?(Makit::Commands::Runner)
|
308
|
+
runner = Makit::Commands::Runner.default
|
309
|
+
info = runner.strategy_info
|
310
|
+
"#{info[:type]} (#{info[:class]})"
|
311
|
+
else
|
312
|
+
"not available"
|
313
|
+
end
|
314
|
+
rescue => e
|
315
|
+
"error: #{e.message}"
|
316
|
+
end
|
317
|
+
end
|
318
|
+
|
276
319
|
def execute(args = nil)
|
277
320
|
start_time = Time.now
|
278
321
|
error = nil
|
279
322
|
result = nil
|
323
|
+
|
324
|
+
# Add enhanced trace output for makit-related tasks
|
325
|
+
if should_trace_makit_task?
|
326
|
+
puts " [MAKIT] Executing task: #{name}"
|
327
|
+
puts " [MAKIT] Strategy: #{get_makit_strategy_info}"
|
328
|
+
puts " [MAKIT] Environment: #{ENV['MAKIT_STRATEGY'] || 'auto'}"
|
329
|
+
puts " [MAKIT] Working Directory: #{Dir.pwd}"
|
330
|
+
puts " [MAKIT] Timestamp: #{Time.now.iso8601}"
|
331
|
+
end
|
280
332
|
|
281
333
|
begin
|
282
334
|
# Execute pre-hooks
|
data/lib/makit/version.rb
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
module Makit
|
4
4
|
# Static version for now to avoid circular dependency issues
|
5
|
-
VERSION = "0.0.
|
5
|
+
VERSION = "0.0.138"
|
6
6
|
|
7
7
|
# Version management utilities for various file formats
|
8
8
|
#
|
@@ -39,6 +39,8 @@ module Makit
|
|
39
39
|
Makit::Version.detect_from_file(path, / Version="([\d.]+)"/)
|
40
40
|
when ".yml"
|
41
41
|
Makit::Version.detect_from_file(path, /VERSION:\s*["']?([\d.]+)["']?/)
|
42
|
+
when ".rb"
|
43
|
+
Makit::Version.detect_from_file(path, /VERSION = "([\d.]+)"/)
|
42
44
|
else
|
43
45
|
raise "unrecognized file type"
|
44
46
|
end
|
@@ -72,12 +74,14 @@ module Makit
|
|
72
74
|
# @return [nil]
|
73
75
|
def self.set_version_in_file(filename, version)
|
74
76
|
text = File.read(filename)
|
77
|
+
# VERSION = "0.0.138" (.rb file)
|
75
78
|
new_text = text
|
76
79
|
new_text = text.gsub(/VERSION:\s?['|"]([.\d]+)['|"]/, "VERSION: \"#{version}\"") if filename.include?(".yml")
|
77
80
|
new_text = text.gsub(/version\s?=\s?['|"]([.\d]+)['|"]/, "version='#{version}'") if filename.include?(".gemspec")
|
78
81
|
new_text = text.gsub(/<Version>([-\w\d.]+)</, "<Version>#{version}<") if filename.include?(".csproj")
|
79
82
|
new_text = text.gsub(/<version>([-\w\d.]+)</, "<version>#{version}<") if filename.include?(".nuspec")
|
80
83
|
new_text = text.gsub(/ Version="([\d.]+)"/, " Version=\"#{version}\"") if filename.include?(".wxs")
|
84
|
+
new_text = text.gsub(/VERSION = "([\d.]+)"/, "VERSION = \"#{version}\"") if filename.include?(".rb")
|
81
85
|
new_text = text.gsub(/version\s+=\s+['"]([\w.]+)['"]/, "version=\"#{version}\"") if filename.include?(".toml")
|
82
86
|
File.write(filename, new_text) if new_text != text
|
83
87
|
end
|
data/lib/makit.rb
CHANGED
@@ -7,6 +7,7 @@ ENV["LOG_LEVEL"] ||= "info"
|
|
7
7
|
|
8
8
|
require_relative "makit/version"
|
9
9
|
require_relative "makit/dotnet"
|
10
|
+
require_relative "makit/rake"
|
10
11
|
|
11
12
|
# Load essential modules for Rakefile
|
12
13
|
require_relative "makit/version_util"
|
@@ -24,6 +25,7 @@ require_relative "makit/process"
|
|
24
25
|
require_relative "makit/mp/string_mp"
|
25
26
|
require_relative "makit/git"
|
26
27
|
require_relative "makit/protoc"
|
28
|
+
require_relative "makit/zip"
|
27
29
|
|
28
30
|
module Makit
|
29
31
|
class Error < StandardError; end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: makit
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.138
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Your Name
|
@@ -65,6 +65,20 @@ dependencies:
|
|
65
65
|
- - "~>"
|
66
66
|
- !ruby/object:Gem::Version
|
67
67
|
version: '1.0'
|
68
|
+
- !ruby/object:Gem::Dependency
|
69
|
+
name: zip
|
70
|
+
requirement: !ruby/object:Gem::Requirement
|
71
|
+
requirements:
|
72
|
+
- - "~>"
|
73
|
+
- !ruby/object:Gem::Version
|
74
|
+
version: '2.0'
|
75
|
+
type: :runtime
|
76
|
+
prerelease: false
|
77
|
+
version_requirements: !ruby/object:Gem::Requirement
|
78
|
+
requirements:
|
79
|
+
- - "~>"
|
80
|
+
- !ruby/object:Gem::Version
|
81
|
+
version: '2.0'
|
68
82
|
- !ruby/object:Gem::Dependency
|
69
83
|
name: bundler
|
70
84
|
requirement: !ruby/object:Gem::Requirement
|
@@ -278,6 +292,7 @@ files:
|
|
278
292
|
- lib/makit/protoc.rb
|
279
293
|
- lib/makit/rake.rb
|
280
294
|
- lib/makit/rake/cli.rb
|
295
|
+
- lib/makit/rake/trace_controller.rb
|
281
296
|
- lib/makit/ruby.rb
|
282
297
|
- lib/makit/ruby/cli.rb
|
283
298
|
- lib/makit/secrets.rb
|