web_rake 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dd05497c2b1cf179f5438f12e3eb383dcf245e9d8c965d9c26d0a900b41239f
-  data.tar.gz: 0bc82a9f2f1d3393e29138355319d96cf824ca69f9c270b027c23c4e85ae1cdf
+  metadata.gz: 335f7075a11c5508278517e04acd1a77ad37c7baa704475b3082c128b4bde1b5
+  data.tar.gz: 4107f317a0ed93c1eb4c5ae9b6cc9f58c790c5956185e82df04c75dd70625f37
 SHA512:
-  metadata.gz: b25f226e01bb2da1632c0e1aa033369f876164f1518528787c3aecb571360742397ae29b1358fa990f48f74a586d603a652ce68db10b8d4e84871750c4806e8f
-  data.tar.gz: 6ee6f9aa70d921bc80668cb9fa2de19739eb76e469b2f58f3a62d1a04728118356979005e0c59a1c32b149e51a7ccbbef0e29db01225d778f67b24ad47fd9dc4
+  metadata.gz: 56d5c6ca2d62e2dcff067c8b28512499a085f353ca29d4b0c5d2c23d17855d2767c84fa4cf62f24a767b84287a0aba0c83900be67d83f77b9c5d66d54bb7e612
+  data.tar.gz: ac6f472a51bf31a767e84d17c1575dcc5cc83127b981c2d72b1d1c5b67cee6557902206c0b9fc5b0e3579daecffb5675664766a3ef6f7148376fa0dac0c03b9c

data/app/controllers/web_rake/tasks_controller.rb

@@ -18,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
@@ -80,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
+      tasks = []
 
-        # 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
+      # Find tasks defined in lib/tasks or db:seed
+      Rake.application.tasks.each do |task|
+        next if task.actions.blank?
 
-        # 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
-
-        # 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
-
-        # 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.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_rake
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ben Purinton