thematic 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2264f912cd0cf3e9618155d5056e5ceca3c8b1d5
-  data.tar.gz: 1d79ee628889032db2a8d77d6fed0e4f3c97ffa4
+  metadata.gz: 357a9903c979c8c7a017e58f58e8f04afecbff7e
+  data.tar.gz: 73ad286317f94fec04f702e6286c6856f4d333c7
 SHA512:
-  metadata.gz: af71e9d4764a902c71814d0020f4b05786b37b175b5ff0434c80a6436117ec321a834db9f4444e4e3d7e59ee6df2be64f8a4ced90f5071ef6199412d25091b27
-  data.tar.gz: a1f79fb558a6c631eee2902144787366dbbb7d0745db1d8b2f4f1f0b3aa8edd8e5e93ef00e1e98a1353a65da90bd425c29893c2be1f3610dfeeb08e5b94cd655
+  metadata.gz: 9aca30a45eb6ca6fffdff26d9f6c6eea4c550e08de7aeb404e6833a99c212dac61d024cf9cc0696072a7125d4fc466e328f51debb06cf83eeae22039436bb654
+  data.tar.gz: 270296ecfa3fbf9a6a506cd45af2757dca853cf14de222606926acc0ed22fba9371619e27adc56f46ad14916ba02025af4a408eb6d330f2296ae7436e54dd553

data/lib/thematic/tasks/thematic.rake

@@ -13,7 +13,7 @@ namespace :thematic do
     copy_from_path = "#{args[:filepath]}/css"
     theme_subfolder = "theme"
 
-    FileUtils.remove_dir "vendor/assets/stylesheets/#{theme_subfolder}"
+    FileUtils.remove_dir "vendor/assets/stylesheets/#{theme_subfolder}" if File.exist?("vendor/assets/stylesheets/#{theme_subfolder}")
     FileUtils.mkdir "vendor/assets/stylesheets/#{theme_subfolder}"
 
     file_to_edit = "app/assets/stylesheets/application.css"
@@ -21,20 +21,17 @@ namespace :thematic do
 
     tempfile = File.open("file.tmp", 'w')
     f.each do |line|
-      break if line =~/^*= require_tree ./
-      tempfile << line
-    end
-
-    Dir.open(copy_from_path).each do |filename|
-      unless File.directory?("#{copy_from_path}/#{filename}") || filename[0] == "."
-        copy("#{copy_from_path}/#{filename}", "vendor/assets/stylesheets/#{theme_subfolder}/") 
-        tempfile << " *= require #{filename.gsub('.css', '')}\n"
+      if line =~/^*= require_tree ./ #we want to insert new require statements above this line
+        Dir.open(copy_from_path).each do |filename|
+          unless File.directory?("#{copy_from_path}/#{filename}") || filename[0] == "."
+            copy("#{copy_from_path}/#{filename}", "vendor/assets/stylesheets/#{theme_subfolder}/") 
+            tempfile << " *= require #{filename.gsub('.css', '')}\n"
+          end
+        end
       end
+      tempfile << line
     end
 
-    tempfile << " *= require_tree .\n"
-    tempfile << " *= require_self\n"
-    tempfile << " */\n"
     FileUtils.mv("file.tmp", file_to_edit)
     f.close
     tempfile.close
@@ -44,7 +41,7 @@ namespace :thematic do
     # it is assumed that the theme comes with a folder called 'js'
     copy_from_path = "#{args[:filepath]}/js"
 
-    FileUtils.remove_dir "vendor/assets/javascripts/#{theme_subfolder}"
+    FileUtils.remove_dir "vendor/assets/javascripts/#{theme_subfolder}" if File.exist?("vendor/assets/javascripts/#{theme_subfolder}")
     FileUtils.mkdir "vendor/assets/javascripts/#{theme_subfolder}"
 
     file_to_edit = "app/assets/javascripts/application.js"
@@ -52,18 +49,17 @@ namespace :thematic do
 
     tempfile = File.open("file.tmp", 'w')
     f.each do |line|
-      break if line =~/^\/\/= require_tree ./
-      tempfile << line
-    end
-
-    Dir.open(copy_from_path).each do |filename|
-      unless File.directory?("#{copy_from_path}/#{filename}") || filename[0] == "."
-        copy("#{copy_from_path}/#{filename}", "vendor/assets/javascripts/#{theme_subfolder}/") unless File.directory?("#{copy_from_path}/#{filename}")
-        tempfile << "//= require #{filename.gsub('.js', '')}\n"
+      if line =~/^\/\/= require_tree ./ #we want to insert new require statements above this line
+        Dir.open(copy_from_path).each do |filename|
+          unless File.directory?("#{copy_from_path}/#{filename}") || filename[0] == "."
+            copy("#{copy_from_path}/#{filename}", "vendor/assets/javascripts/#{theme_subfolder}/") unless File.directory?("#{copy_from_path}/#{filename}")
+            tempfile << "//= require #{filename.gsub('.js', '')}\n"
+          end
+        end
       end
+      tempfile << line
     end
 
-    tempfile << "//= require_tree .\n"
     FileUtils.mv("file.tmp", file_to_edit)
     f.close
     tempfile.close

data/lib/thematic/version.rb

@@ -1,3 +1,3 @@
 module Thematic
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

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