Remove all Javascript CrazyFun code

Alter CF ruby / rake files to correctly named ruby_mappings and rake_mappings
Move global method ruby to be duplicated in the requisite classes (We can dry this up later)

Author: luke-hill

Rakefile

@@ -21,10 +21,9 @@ require 'rake_tasks/selenium_rake/crazy_fun'
 
 # The CrazyFun builders - Most of these are either partially or fully obsolete
 require 'rake_tasks/crazy_fun/mappings/file_copy_hack'
-require 'rake_tasks/crazy_fun/mappings/javascript'
+require 'rake_tasks/crazy_fun/mappings/rake_mappings'
+require 'rake_tasks/crazy_fun/mappings/ruby_mappings'
 require 'rake_tasks/crazy_fun/mappings/tasks'
-require 'rake_tasks/crazy_fun/mappings/rake'
-require 'rake_tasks/crazy_fun/mappings/ruby'
 
 # Location of all new methods
 require 'rake_tasks/selenium_rake/checks'

rake_tasks/crazy_fun/mappings/javascript.rb

@@ -25,21 +25,3 @@ def add_all(fun)
     fun.add_mapping "rubygem", RubyGem.new
   end
 end
-
-def ruby(opts)
-  cmd = %w(bundle exec ruby -w)
-  cmd << "-d"   if opts[:debug]
-
-  if opts.has_key? :include
-    cmd << "-I"
-    cmd << Array(opts[:include]).join(File::PATH_SEPARATOR)
-  end
-
-  cmd << "-S" << opts[:command] if opts.has_key?(:command)
-  cmd += Array(opts[:args]) if opts.has_key?(:args)
-  cmd += Array(opts[:files]) if opts.has_key?(:files)
-
-  puts cmd.join(' ')
-
-  sh(*cmd)
-end

rake_tasks/crazy_fun/mappings/rake.rb renamed to rake_tasks/crazy_fun/mappings/rake_mappings.rb

@@ -20,5 +20,23 @@ def handle(_fun, dir, args)
              :files   => files
       end
     end
+
+    def ruby(opts)
+      cmd = %w(bundle exec ruby -w)
+      cmd << "-d"   if opts[:debug]
+
+      if opts.has_key? :include
+        cmd << "-I"
+        cmd << Array(opts[:include]).join(File::PATH_SEPARATOR)
+      end
+
+      cmd << "-S" << opts[:command] if opts.has_key?(:command)
+      cmd += Array(opts[:args]) if opts.has_key?(:args)
+      cmd += Array(opts[:files]) if opts.has_key?(:files)
+
+      puts cmd.join(' ')
+
+      sh(*cmd)
+    end
   end
 end

rake_tasks/crazy_fun/mappings/ruby.rb

@@ -7,5 +7,23 @@ def handle(_fun, dir, args)
              :files   => args[:srcs]
       end
     end
+
+    def ruby(opts)
+      cmd = %w(bundle exec ruby -w)
+      cmd << "-d"   if opts[:debug]
+
+      if opts.has_key? :include
+        cmd << "-I"
+        cmd << Array(opts[:include]).join(File::PATH_SEPARATOR)
+      end
+
+      cmd << "-S" << opts[:command] if opts.has_key?(:command)
+      cmd += Array(opts[:args]) if opts.has_key?(:args)
+      cmd += Array(opts[:files]) if opts.has_key?(:files)
+
+      puts cmd.join(' ')
+
+      sh(*cmd)
+    end
   end
 end

rake_tasks/crazy_fun/mappings/ruby_mappings.rb

@@ -22,5 +22,24 @@ def handle(_fun, dir, args)
              :files   => args[:srcs]
       end
     end
+
+    def ruby(opts)
+      cmd = %w(bundle exec ruby -w)
+      cmd << "-d"   if opts[:debug]
+
+      if opts.has_key? :include
+        cmd << "-I"
+        cmd << Array(opts[:include]).join(File::PATH_SEPARATOR)
+      end
+
+      cmd << "-S" << opts[:command] if opts.has_key?(:command)
+      cmd += Array(opts[:args]) if opts.has_key?(:args)
+      cmd += Array(opts[:files]) if opts.has_key?(:files)
+
+      puts cmd.join(' ')
+
+      sh(*cmd)
+    end
+
   end
 end