wp-fire 0.0.6 → 0.0.7

data/lib/wp_fire/compiler.rb

@@ -4,7 +4,7 @@ require 'sass'
 module WpFire
   class Compiler
 
-    def self.compile(filename, build_path)
+    def self.compile(filename, build_path, root_path)
       extname = File.extname(filename)
       basename = File.basename(filename, extname)
       if not basename[0].eql?"_" and extname.eql?".scss"
@@ -16,7 +16,7 @@ module WpFire
         parents_filename = []
         find_scss_parents(filename,parents_filename)
         parents_filename.uniq.each do |parent|
-          compile parent, build_path
+          compile parent, build_path, root_path
         end
       elsif extname.eql?".css"
         FileUtils.cp filename, File.join(build_path, File.basename(filename))
@@ -28,16 +28,18 @@ module WpFire
         FileUtils.cp filename, File.join(build_path, File.basename(filename))
       elsif extname.eql?".php"
         FileUtils.cp filename, File.join(build_path, File.basename(filename))
-      elsif [".jpg",".jpeg",".png",".gif",".ico"].include?(extname)
-        Dir.mkdir File.join(build_path, "images") unless File.directory?(File.join(build_path, "images"))
-        FileUtils.cp filename, File.join(build_path, "images", File.basename(filename))
-      elsif [".ttf",".eot",".woff",".svg",".otf"].include?(extname)
-        Dir.mkdir File.join(build_path, "fonts") unless File.directory?(File.join(build_path, "fonts"))
-        FileUtils.cp filename, File.join(build_path, "fonts", File.basename(filename))
+      else
+        dir = File.dirname(filename)
+        dir = dir.sub(File.join(root_path,"source"),'')
+        #unwrap from assets path for backward compatibility
+        dir = dir.sub("assets",'')
+        FileUtils.mkdir_p File.join(build_path, dir) unless File.directory?(File.join(build_path, dir))
+        FileUtils.cp filename, File.join(build_path, dir, File.basename(filename))
       end
+
     end
 
-    def self.compile_all(filenames, build_path)
+    def self.compile_all(filenames, build_path, root_path)
       files = []
       filenames.each do |filename|
         if(File.directory?(filename))
@@ -48,7 +50,7 @@ module WpFire
         end
       end
       files.each do |f|
-        compile f, build_path
+        compile f, build_path, root_path
       end
     end
 
@@ -66,7 +68,7 @@ module WpFire
             find_scss_parents(f,parents_array)
           elsif not File.basename(f)[0].eql?"_"
             parents_array << f
-          end 
+          end
         end
       end
     end

data/lib/wp_fire/main_command.rb

@@ -24,10 +24,11 @@ module WpFire
       @functions_path = File.join(dir,"source","functions")
 
       @build_path = File.join(dir,"build")
+      @root_path = dir
       FileUtils.rm_rf(@build_path) if File.directory?(@build_path)
       Dir.mkdir @build_path
       watch_directories = [@assets_path,@templates_path,@functions_path]
-      WpFire::Compiler.compile_all watch_directories, @build_path
+      WpFire::Compiler.compile_all watch_directories, @build_path, @root_path
     end
 
   end
@@ -47,6 +48,7 @@ module WpFire
       else
         @build_path = dir
       end
+      @root_path = dir
 
       Dir[File.join(dir,"*")].each do |f|
         unless File.directory?(f)
@@ -56,10 +58,10 @@ module WpFire
         end
       end
       watch_directories = [@assets_path,@templates_path,@functions_path]
-      WpFire::Compiler.compile_all watch_directories, @build_path
+      WpFire::Compiler.compile_all watch_directories, @build_path, @root_path
 
       FileWatcher.new(watch_directories,"Watching files:").watch do |filename|
-        WpFire::Compiler.compile filename, @build_path
+        WpFire::Compiler.compile filename, @build_path, @root_path
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wp-fire
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -147,3 +147,4 @@ signing_key:
 specification_version: 3
 summary: Wordpress theme generator with Coffee Script and Sass support
 test_files: []
+has_rdoc: false