lib/cloud_powers/helper.rb in cloud_powers-0.1.3 vs lib/cloud_powers/helper.rb in cloud_powers-0.1.4

@@ -60,12 +60,17 @@
           result = yield if block_given?
           sleep 1
         end
       end
 
-      def task_path(file)
-        Pathname(__FILE__).parent.dirname + 'tasks' + to_ruby_file_name(file)
+      def task_path(file = '')
+        # t_p = Pathname(__FILE__).parent.dirname + 'tasks'
+        if file.empty?
+          Pathname(__FILE__).parent.dirname + 'tasks'
+        else
+          Pathname(__FILE__).parent.dirname + "tasks/#{to_snake(file)}"
+        end
       end
 
       def task_require_path(file_name)
         file = File.basename(file_name, File.extname(file_name))
         Pathname(__FILE__).parent.dirname + 'tasks' + file
@@ -90,11 +95,11 @@
       def to_ruby_file_name(name)
         "#{to_snake(name)}.rb"
       end
 
       def to_snake(var)
-        var = var.to_s unless var.kind_of? String
-        var.gsub(/\W/, '_').downcase
+        file_ext = var.to_s[/\.{1}[a-z]+$/] || ''
+        var.to_s.gsub(/\.\w+$/, '').gsub(/\W/, '_').downcase + file_ext
       end
 
       def update_message_body(opts = {})
         # TODO: find better implementation of merging nested hashes
         # this should be fixed with Job #sitrep_message