thematic 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c14cbfc0c94da8836302cdbe2587aff8db3985a0
-  data.tar.gz: 985c223be60f44878d26d4f3d85d7a509c73fcef
+  metadata.gz: 64eaadb8a78f5cfb10df559dfc26e6e376652fdf
+  data.tar.gz: b09dfd02ced1247fc3c806ab3e6f1bb43b2b2a16
 SHA512:
-  metadata.gz: 2f2d55f4d49be4a3bd03519ec6149e2193a652e8c86b4d24bc9959e64a14e647f0fb0c1985509e8e55862f9fd5be9d231d1e117693b412fec066d7aa8762484c
-  data.tar.gz: c5b69e53e25427fa458c3b07691188c9f6baf8147b00dd425a1762e7397e8d85cfd4a9f0be3617a480991f4124cefb5e35973bd6dc79c711a98a62d3884cfb93
+  metadata.gz: d307561fb7ba2bf69919e0b57c9ad08924fa0a08de05c478d2a4b6174806db95d5eeb93412daa7462074fd55bb94c3401784e6ea2e1311db8ad7f9bb927a062b
+  data.tar.gz: c2f331fd623bb1eb35e20d245b82aa3180d9f6ad7c24f4a4add82790f93655077c0c962a5c8f0a26a6f78d0e2cff53d4e6032aaf991c25bb8cdae31e726df602

data/lib/thematic/tasks/thematic.rake

@@ -5,8 +5,7 @@ namespace :thematic do
   task :install, [:filepath] do |task, args|
     # args[:filepath] represent the path of the theme
 
-    puts "Inspecting theme..."
-
+    # CSS #################################
     puts "Installing CSS..."
 
     # We will search the entire theme and all subfolders for all css files
@@ -41,6 +40,7 @@ namespace :thematic do
     f.close
     tempfile.close
 
+    # JS #################################
     puts "Installing JS..."
 
     # We will only search the js folder for js files; plugins can be added via the plugin task below
@@ -73,18 +73,23 @@ namespace :thematic do
     f.close
     tempfile.close
 
+    # IMAGES #################################
+
     puts "Copying images..."
 
     FileUtils.remove_dir "app/assets/images/#{theme_subfolder}" if File.exist?("app/assets/images/#{theme_subfolder}")
     FileUtils.mkdir "app/assets/images/#{theme_subfolder}"
 
     copy_from_path = "#{args[:filepath]}/img"
-    files_to_copy = Dir[ File.join(copy_from_path, '**', '*') ]
 
-    files_to_copy.each do |filepath|
-      copy(filepath, "app/assets/images/#{theme_subfolder}/") unless File.directory?(filepath)
+    # We copy all files AND FOLDERS as they exist in the theme folder structure
+    Dir.open(copy_from_path).each do |filename|
+      next if filename[0] == "."
+      cp_r("#{copy_from_path}/#{filename}", "app/assets/images/#{theme_subfolder}/")
     end
 
+    # FONTS #################################
+
     puts "Copying fonts..."
 
     FileUtils.mkdir "app/assets/fonts" unless File.exist?("app/assets/fonts")
@@ -120,6 +125,7 @@ namespace :thematic do
 
     end
 
+    # REWRITING URLS REFERENCED IN CSS ##########
     if File.exist?("vendor/assets/stylesheets/#{theme_subfolder}/style.css")
       puts "Configuring images referenced in CSS..."
       FileUtils.mv("vendor/assets/stylesheets/#{theme_subfolder}/style.css", "vendor/assets/stylesheets/#{theme_subfolder}/style.css.erb")
@@ -130,7 +136,8 @@ namespace :thematic do
 
       f.each do |line|
         if line =~/background.*url/
-          image_filename = /\(.*\)/.match(line)[0].delete('(').delete(')').split("/").last.delete('"')
+          # image_filename = /\(.*\)/.match(line)[0].delete('(').delete(')').split("/").last.delete('"')
+          image_filename = /".*"/.match(line)[0].split("img/").last.delete('"')
           new_snippet = "(\"<%= asset_path('#{theme_subfolder}/#{image_filename}') %>\")"
           modified_line = line.gsub(/\(.*\)/, new_snippet)
           tempfile << modified_line
@@ -142,6 +149,8 @@ namespace :thematic do
       f.close
       tempfile.close
 
+      puts "Theme installed!"
+
     end
   end 
 

data/lib/thematic/version.rb

@@ -1,3 +1,3 @@
 module Thematic
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thematic
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Jay Wengrow