theme-juice 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7b265f33f2c10bb5ec0986cfaac97f227267eb2
-  data.tar.gz: 56fd9c78e564671fed27b7b61247134e4560ab47
+  metadata.gz: f0e8e49ed6690203699cd75872e527f2172b537b
+  data.tar.gz: 377ba96a2c4063cbaeabceac6d1dc0b42233989d
 SHA512:
-  metadata.gz: 22db2ac5add5699f3bbf74f601259efe239c77d4821067a5c4dbfdca6cc1c811654e629e057b0456394a81ec483878e68197197715b06950e1cdf75cd75c1baa
-  data.tar.gz: 800a7a0a6f643b8c6fa1518b2a136800e93e9e0675e341bce28d70e93670e361efdd0a9093cf0f7afa5f824ebf321ac91e768dd520532b0256ae55cfaf431e1f
+  metadata.gz: 0ea2fd878b16908385cbb19280471de4451b3cf172fea0b7aed822e7b2782871768a016af70b37955e28bb84426d8dfa8bc5b1165527520067d1d8bd5e425107
+  data.tar.gz: 5ac5d180650ebfa92052a92c797e5100a12ad85f8612cc12217f4ae67850ea2b9a2e3a6cbaba91213105fab351bfbf17be564aaf3350a65a5799b28d6d221930

data/lib/theme-juice/service.rb

@@ -148,8 +148,8 @@ module ThemeJuice
         #
         # @return {Bool}
         #
-        def wordpress_is_setup?
-            !Dir["#{@opts[:site_location]}/*"].select { |f| File.basename(f) =~ %r{wp(-content)?|wordpress|app|content} }.empty?
+        def starter_theme_is_setup?
+            !Dir["#{@opts[:site_location]}/*"].select { |f| File.basename(f) =~ %r{wp(-content)?|wordpress|app|public|web|content} }.empty?
         end
 
         #

data/lib/theme-juice/services/create_site.rb

@@ -21,7 +21,7 @@ module ThemeJuice
             @interaction.notice "Running setup for '#{@opts[:site_name]}'"
 
             setup_project_dir          unless project_dir_is_setup?
-            setup_wordpress            unless wordpress_is_setup?
+            setup_starter_theme        unless starter_theme_is_setup?
             setup_vvv                  unless vvv_is_setup?
             setup_wildcard_subdomains  unless wildcard_subdomains_is_setup?
             setup_hosts                unless hosts_is_setup?
@@ -265,25 +265,23 @@ module ThemeJuice
         end
 
         #
-        # Setup WordPress
-        #
-        # Clones starter theme into site location
+        # Clone starter theme into site location, run install
         #
         # @return {Void}
         #
-        def setup_wordpress
+        def setup_starter_theme
             unless @opts[:site_bare]
-                @interaction.log "Setting up WordPress"
+                @interaction.log "Setting up starter theme"
 
                 run [
                     "cd #{@opts[:site_location]}",
                     "git clone --depth 1 #{@opts[:site_starter_theme]} .",
                 ]
 
-                if wordpress_is_setup?
-                    install_theme_dependencies if config_is_setup?
+                if starter_theme_is_setup?
+                    install_starter_theme_dependencies if config_is_setup?
                 else
-                    @interaction.error "Could not setup WordPress. Make sure you have write capabilities to '#{@opts[:site_location]}'."
+                    @interaction.error "Could not setup starter theme. Make sure you have write capabilities to '#{@opts[:site_location]}'."
                 end
             end
         end
@@ -365,7 +363,7 @@ module ThemeJuice
         #
         # @return {Void}
         #
-        def install_theme_dependencies
+        def install_starter_theme_dependencies
             use_config
 
             @interaction.log "Installing theme dependencies"

data/lib/theme-juice/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    VERSION = "0.6.5"
+    VERSION = "0.6.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Ezekiel Gabrielse