Revert changes for putting output in build/ dir as per rake clobber commit.

revert build/ dir change

new

update

up

up

Author: v0dro

lib/rubex/compiler.rb

@@ -27,8 +27,6 @@ class << self
       #    programs.
       # @param files [Array[String]] nil An Array specifying the file names to
       #   compile w.r.t the source_dir directory.
-      # @param invoker [Symbol] nil Determines whether the invoker is a command line
-      #   program or a rake task. Affect build directory for rake task.
       #
       # TODO: The path can be relative to the source_dir if source_dir is specified.
       def compile path,
@@ -39,8 +37,7 @@ def compile path,
                   make: false,
                   debug: false,
                   source_dir: nil,
-                  files: nil,
-                  invoker: nil
+                  files: nil
         CONFIG.flush
         CONFIG.debug = debug
         CONFIG.add_link "m" # link cmath libraries
@@ -57,9 +54,8 @@ def compile path,
         elsif test && multi_file
           return [tree, supervisor, ext]
         end
-        write_files target_name, supervisor, ext, target_dir: target_dir, force: force,
-                    invoker: invoker
-        full_path = build_path(target_dir, target_name, invoker: invoker)
+        write_files target_name, supervisor, ext, target_dir: target_dir, force: force
+        full_path = build_path(target_dir, target_name)
         load_extconf full_path
         run_make full_path if make
       end
@@ -124,12 +120,10 @@ def extract_target_name path
       # @param directory [String] nil Target directory in which files are to be placed.
       # @param force [Boolean] false Recreate the target directory and rewrite the
       #   files whether they are already present or not.
-      # @param invoker [Symbol|NilClass] nil Determines the build directory based on whether
-      #   it being invoked by a rake task or cmd.
-      def write_files target_name, supervisor, ext, target_dir: nil, force: false, invoker: nil
-        path = build_path(target_dir, target_name, invoker: invoker)
+      def write_files target_name, supervisor, ext, target_dir: nil, force: false
+        path = build_path(target_dir, target_name)
         FileUtils.rm_rf(path) if force && Dir.exist?(path)
-        FileUtils.mkdir_p(path) unless Dir.exist?(path)
+        Dir.mkdir(path) unless Dir.exist?(path)
 
         write_to_file "#{path}/#{Rubex::COMMON_UTILS_FILE}.h",
                       supervisor.header(Rubex::COMMON_UTILS_FILE).to_s
@@ -158,14 +152,10 @@ def run_make path
       #
       # @param directory [String] The directory inside which this build path will exist.
       # @param target_name [String] Name of the folder inside the directory.
-      # @param invoker [Symbol|NilClass] nil The calling program. Can be :rake or :cmd.      
-      def build_path directory, target_name, invoker: nil
+      def build_path directory, target_name
         directory = (directory ? directory.to_s : Dir.pwd)
        unless directory.end_with?(target_name)
          directory += "/#{target_name}"
-         if invoker == :rake
-           directory += "/build"
-         end
        end
         directory
       end

lib/rubex/rake_task.rb

@@ -41,25 +41,28 @@ def define_compile_tasks
         desc "Compile a Rubex file into a shared object."
         task :compile do
           file_name = "#{@ext_dir}/#{@name}#{@source_pattern[1..-1]}"
-          Rubex::Compiler.compile file_name, target_dir: "#{@ext_dir}", invoker: :rake
+          Rubex::Compiler.compile file_name, target_dir: "#{@ext_dir}"
         end
 
-        desc "Delete all generated files inside build/ folder."
+        desc "Delete all generated files."
         task :clobber do
-          path = "#{@ext_dir}/#{@name}/build"
+          path = @ext_dir
+          unless path.end_with?(@name)
+            path += "/#{@name}"
+          end
+
           Dir.chdir(path) do
             FileUtils.rm(
               Dir.glob(
               "#{path}/*.{c,h,so,o,bundle,dll}") + ["Makefile", "extconf.rb"], force: true
             )
           end
-          FileUtils.rmdir(path)
         end
       end
       Rake::ExtensionTask.new(@name)
 
       desc "Compile Rubex code into a .so file for use in Ruby scripts."
-      task :compile => "rubex:compile"
+      task "compile" => "rubex:compile"
     end
   end # class RakeTask
 end # module Rubex

spec/rake_task_spec.rb

@@ -46,7 +46,7 @@
       end
       Rake::Task["rubex:compile"].invoke
 
-      build_path = "#{ext_path}/#{name}/build"
+      build_path = "#{ext_path}/#{name}"
       expect(File.exist?("#{build_path}/#{name}.c")).to eq(true)
       expect(File.exist?("#{build_path}/extconf.rb")).to eq(true)
 
@@ -69,12 +69,12 @@
     end
   end
 
-  context "rake:clobber" do
+  context "rake:clobber", focus: :hell do
     before do
       Rake::Task.clear
     end
 
-    it "clobbers generated files inside build/ directory." do
+    it "clobbers generated files." do
       ext_path = "#{Dir.pwd}/spec/fixtures/rake_task/single_file"
       name = "test"
       Rubex::RakeTask.new(name) do
@@ -83,8 +83,8 @@
       Rake::Task["rubex:compile"].invoke
       Rake::Task["rubex:clobber"].invoke
 
-      expect(!File.exist?("#{ext_path}/#{name}/build/#{name}.c")).to eq(true)
-      expect(!File.exist?("#{ext_path}/#{name}/build/extconf.rb")).to eq(true)
+      expect(!File.exist?("#{ext_path}/#{name}/#{name}.c")).to eq(true)
+      expect(!File.exist?("#{ext_path}/#{name}/extconf.rb")).to eq(true)
     end
   end