dsci · February 2, 2016 07:28 · Feb 2, 2016 · Jan 25, 2016 · Jan 25, 2016 · Jan 25, 2016
diff --git a/rake.rb b/rake.rb
@@ -1,3 +1,16 @@
+# Use instance methods of classes as Rake tasks:
+#
+# In a folder tasks, create your classes.
+#
+# class FooTask
+#   extend RakeDecorator
+#
+#   task :numbers, desc: 'A funny task that prints out the first 10 numbers'
+#   def print_numbers_task
+#     puts (1..10).to_a.join(',')
+#   end
+# end
+#
 require 'rake' unless defined?(Rake)
 module RakeTasks
 

diff --git a/rake.rb b/rake.rb
@@ -6,7 +6,7 @@ module RakeTasks
   module_function
 
   def add_task(task)
-    task_class = task[:instance].name
+    task_class = task[:class].name
     if tasks.key?(task_class)
       tasks[task_class][:tasks] << task
     else
@@ -29,19 +29,23 @@ def task(name, *args)
     @_args = args
   end
 
+  def desc(description)
+    @_desc = {}; @_desc[:description] = description
+  end
+
   def method_added(meth_name)
     RakeTasks.add_task(build_task_config(meth_name))
     %i(_task _args _desc).each { |ivar| instance_variable_set("@#{ivar}", nil) }
   end
 
   private def build_task_config(meth_name)
     task = {
-      instance: self,
+      class: self,
       caller: self.instance_method(meth_name),
       task_name: @_task,
       arguments: @_args
       }
-    task[:description] = @_desc[:desc] if @_desc
+    task[:description] = @_desc[:desc] || @desc if @_desc
     task
   end
 end

diff --git a/rake.rb b/rake.rb
@@ -1,15 +1,16 @@
-require 'rake'
+require 'rake' unless defined?(Rake)
 module RakeTasks
 
   @@tasks = {}
 
   module_function
 
   def add_task(task)
-    if tasks.key?(task[:instance].name)
-      tasks[task[:instance].name][:tasks] << task
+    task_class = task[:instance].name
+    if tasks.key?(task_class)
+      tasks[task_class][:tasks] << task
     else
-      tasks[task[:instance].name] = {
+      tasks[task_class] = {
         tasks: [task]
       }
     end

diff --git a/rake.rb b/rake.rb
@@ -29,15 +29,19 @@ def task(name, *args)
   end
 
   def method_added(meth_name)
+    RakeTasks.add_task(build_task_config(meth_name))
+    %i(_task _args _desc).each { |ivar| instance_variable_set("@#{ivar}", nil) }
+  end
+
+  private def build_task_config(meth_name)
     task = {
       instance: self,
       caller: self.instance_method(meth_name),
       task_name: @_task,
       arguments: @_args
       }
     task[:description] = @_desc[:desc] if @_desc
-    RakeTasks.add_task(task)
-    %i(_task _args _desc).each { |ivar| instance_variable_set("@#{ivar}", nil) }
+    task
   end
 end
 
@@ -59,4 +63,4 @@ def LoadTasks(dir_path)
 end
 
 dir_path = File.join(File.dirname(__FILE__), 'tasks', '**')
-LoadTasks(dir_path)
+LoadTasks(dir_path)
diff --git a/rake.rb b/rake.rb
@@ -6,20 +6,20 @@ module RakeTasks
   module_function
 
   def add_task(task)
-    if @@tasks.key?(task[:instance].name)
-      @@tasks[task[:instance].name][:tasks] << task
+    if tasks.key?(task[:instance].name)
+      tasks[task[:instance].name][:tasks] << task
     else
-      @@tasks[task[:instance].name] = {
+      tasks[task[:instance].name] = {
         tasks: [task]
       }
     end
-    #@@tasks << task
   end
 
   def tasks
     @@tasks
   end
 end
+
 module RakeDecorator
 
   def task(name, *args)
@@ -35,39 +35,28 @@ def method_added(meth_name)
       task_name: @_task,
       arguments: @_args
       }
-    if @_desc
-      task[:description] = @_desc[:desc]
-    end
+    task[:description] = @_desc[:desc] if @_desc
     RakeTasks.add_task(task)
     %i(_task _args _desc).each { |ivar| instance_variable_set("@#{ivar}", nil) }
   end
 end
 
-class RakeGen
-  extend RakeDecorator
-
-
-  task "hello", :foo, desc: "Whatever it is."
-  def foo
-    p "Juri"
+def LoadTasks(dir_path)
+  Dir[dir_path].each do |file|
+    require file unless File.directory?(file)
   end
 
-  task "nie"
-  def bar
-    p "what!"
-  end
-end
-
-r = RakeGen.new
-
-RakeTasks.tasks.each_pair do |key,value|
-  tasks = value[:tasks]
-  instance = Module.const_get(key).new
-  tasks.each do |task|
-    Rake.application.last_description = task[:description] if task[:description]
-    caller = task[:caller]
-    Rake::Task.define_task(task[:task_name], task[:arguments]) do |arg|
-      caller.bind(instance).call
+  RakeTasks.tasks.each_pair do |task_class,value|
+    tasks, instance = value[:tasks], Module.const_get(task_class).new
+    tasks.each do |task|
+      Rake.application.last_description = task[:description] if task[:description]
+      caller = task[:caller]
+      Rake::Task.define_task(task[:task_name], task[:arguments]) do |arg|
+        caller.bind(instance).call
+      end
     end
   end
 end
+
+dir_path = File.join(File.dirname(__FILE__), 'tasks', '**')
+LoadTasks(dir_path)
diff --git a/rake.rb b/rake.rb
@@ -31,7 +31,7 @@ def task(name, *args)
   def method_added(meth_name)
     task = {
       instance: self,
-      caller: meth_name,
+      caller: self.instance_method(meth_name),
       task_name: @_task,
       arguments: @_args
       }
@@ -60,15 +60,14 @@ def bar
 
 r = RakeGen.new
 
-#p RakeTasks.tasks
-
 RakeTasks.tasks.each_pair do |key,value|
   tasks = value[:tasks]
   instance = Module.const_get(key).new
   tasks.each do |task|
     Rake.application.last_description = task[:description] if task[:description]
+    caller = task[:caller]
     Rake::Task.define_task(task[:task_name], task[:arguments]) do |arg|
-      instance.public_send(task[:caller])
+      caller.bind(instance).call
     end
   end
-end
+end
diff --git a/rake.rb b/rake.rb
@@ -0,0 +1,74 @@
+require 'rake'
+module RakeTasks
+
+  @@tasks = {}
+
+  module_function
+
+  def add_task(task)
+    if @@tasks.key?(task[:instance].name)
+      @@tasks[task[:instance].name][:tasks] << task
+    else
+      @@tasks[task[:instance].name] = {
+        tasks: [task]
+      }
+    end
+    #@@tasks << task
+  end
+
+  def tasks
+    @@tasks
+  end
+end
+module RakeDecorator
+
+  def task(name, *args)
+    @_task = name
+    @_desc = args.pop if args.last.is_a?(Hash)
+    @_args = args
+  end
+
+  def method_added(meth_name)
+    task = {
+      instance: self,
+      caller: meth_name,
+      task_name: @_task,
+      arguments: @_args
+      }
+    if @_desc
+      task[:description] = @_desc[:desc]
+    end
+    RakeTasks.add_task(task)
+    %i(_task _args _desc).each { |ivar| instance_variable_set("@#{ivar}", nil) }
+  end
+end
+
+class RakeGen
+  extend RakeDecorator
+
+
+  task "hello", :foo, desc: "Whatever it is."
+  def foo
+    p "Juri"
+  end
+
+  task "nie"
+  def bar
+    p "what!"
+  end
+end
+
+r = RakeGen.new
+
+#p RakeTasks.tasks
+
+RakeTasks.tasks.each_pair do |key,value|
+  tasks = value[:tasks]
+  instance = Module.const_get(key).new
+  tasks.each do |task|
+    Rake.application.last_description = task[:description] if task[:description]
+    Rake::Task.define_task(task[:task_name], task[:arguments]) do |arg|
+      instance.public_send(task[:caller])
+    end
+  end
+end