web_rake 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e09eac128735fb1e77c9cb595f2032e6ad1abb9760d09849b78a63bb78f3929
-  data.tar.gz: eb5cd52b01f04054ba61c2f2968a1d1a04bb73bc4346dea81c296e4b2a470f36
+  metadata.gz: 335f7075a11c5508278517e04acd1a77ad37c7baa704475b3082c128b4bde1b5
+  data.tar.gz: 4107f317a0ed93c1eb4c5ae9b6cc9f58c790c5956185e82df04c75dd70625f37
 SHA512:
-  metadata.gz: ef860e8563607df0fc3066f3c6c46a67d91067b9bc9ad83361d8e31bbdd37bbde867136d2f4971d7907740919e5c9666143bb3f4b3629d521899bdd4e464186a
-  data.tar.gz: 0a1e20b4ec60af7c2144bcba16589dbac3892d09b6b68802689af677e67fe08a65692c461cd0735d6f20b80bc93158afa0546a7cec46af44fb5b6fe062dd68ce
+  metadata.gz: 56d5c6ca2d62e2dcff067c8b28512499a085f353ca29d4b0c5d2c23d17855d2767c84fa4cf62f24a767b84287a0aba0c83900be67d83f77b9c5d66d54bb7e612
+  data.tar.gz: ac6f472a51bf31a767e84d17c1575dcc5cc83127b981c2d72b1d1c5b67cee6557902206c0b9fc5b0e3579daecffb5675664766a3ef6f7148376fa0dac0c03b9c

data/app/controllers/web_rake/tasks_controller.rb

@@ -1,3 +1,7 @@
+require 'rake'
+require 'open3'
+require 'ostruct'
+
 module WebRake
   class TasksController < ApplicationController
     before_action :ensure_environment_loaded
@@ -14,9 +18,8 @@ module WebRake
     def execute
       task_name = params[:id].gsub('__', ':')
 
-      # Check if this is one of our allowed tasks (custom tasks + db:seed)
-      allowed_tasks = extract_task_names_from_files + ['db:seed']
-      unless allowed_tasks.include?(task_name)
+      # Use find_task to validate the task is allowed
+      unless find_task
         redirect_to root_path, alert: "Task not found"
         return
       end
@@ -35,7 +38,6 @@ module WebRake
 
         # Run the rake task in a subprocess to avoid state issues
         # This ensures clean execution every time
-        require 'open3'
 
         # Build the rake command
         rake_command = "bundle exec rake #{task_name}"
@@ -77,81 +79,43 @@ module WebRake
     end
 
     def custom_tasks
-      # First, get the names of tasks defined in lib/tasks files
-      custom_task_names = extract_task_names_from_files
-
-      # Always include db:seed task
-      custom_task_names << 'db:seed'
-
       # Ensure all tasks are loaded
       Rails.application.load_tasks
 
-      # Get only the tasks that match our custom task names
-      custom_task_names.filter_map do |name|
-        Rake::Task[name] rescue nil
-      end.select(&:actions)
-    end
-
-    def extract_task_names_from_files
-      task_names = []
-
-      # Parse each rake file to extract task names
-      Dir.glob(Rails.root.join('lib/tasks/**/*.rake')).each do |file|
-        content = File.read(file)
-
-        # Match various task definition patterns
-
-        # Pattern for: task({ :sample_data => :environment })
-        content.scan(/task\s*\(\s*\{\s*:([a-zA-Z_][a-zA-Z0-9_]*)\s*=>/).each do |match|
-          task_names << match[0]
-        end
-
-        # Pattern for: task({ sample_data: :environment }) - Ruby 1.9+ syntax with parens and braces
-        content.scan(/task\s*\(\s*\{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*:/).each do |match|
-          task_names << match[0]
-        end
-
-        # Pattern for: task :sample_data => :environment
-        content.scan(/task\s+:([a-zA-Z_][a-zA-Z0-9_]*)\s*=>/).each do |match|
-          task_names << match[0]
-        end
-
-        # Pattern for: task "sample_data" => :environment
-        content.scan(/task\s+["']([a-zA-Z_][a-zA-Z0-9_]*)["']\s*=>/).each do |match|
-          task_names << match[0]
-        end
+      tasks = []
 
-        # Pattern for: task sample_data: :environment (Ruby 1.9+ syntax)
-        content.scan(/task\s+([a-zA-Z_][a-zA-Z0-9_]*)\s*:/).each do |match|
-          task_names << match[0]
-        end
-
-        # Pattern for: task(:sample_data)
-        content.scan(/task\s*\(\s*:([a-zA-Z_][a-zA-Z0-9_]*)\s*\)/).each do |match|
-          task_names << match[0]
-        end
+      # Find tasks defined in lib/tasks or db:seed
+      Rake.application.tasks.each do |task|
+        next if task.actions.blank?
 
-        # Pattern for: desc "..." \n task :name
-        content.scan(/desc\s+.*?\n\s*task\s+:([a-zA-Z_][a-zA-Z0-9_]*)/).each do |match|
-          task_names << match[0]
+        if task_from_lib_tasks?(task) || task.name == "db:seed"
+          tasks << task
         end
       end
 
-      task_names.uniq
+      tasks
     end
 
     def find_task
       task_name = params[:id].gsub('__', ':')
 
-      # Check if this is one of our allowed tasks (custom tasks + db:seed)
-      allowed_tasks = extract_task_names_from_files + ['db:seed']
-      return nil unless allowed_tasks.include?(task_name)
-
       # Ensure tasks are loaded
       Rails.application.load_tasks
 
       # Find the task
-      Rake::Task[task_name] rescue nil
+      task = Rake::Task[task_name] rescue nil
+
+      # Check if it's db:seed or defined in lib/tasks
+      return task if task_from_lib_tasks?(task) || task_name == "db:seed"
+
+      nil
+    end
+
+    def task_from_lib_tasks?(task)
+      return false if task.actions.blank?
+
+      source_path = task.actions.first.source_location&.first
+      source_path.present? && source_path.include?(Rails.root.join("lib/tasks").to_s)
     end
   end
-end
+end

data/lib/web_rake/version.rb

@@ -1,3 +1,3 @@
 module WebRake
-  VERSION = '0.1.1'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: web_rake
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ben Purinton
 bindir: bin
 cert_chain: []
-date: 2025-09-16 00:00:00.000000000 Z
+date: 2025-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails