theme-juice 0.6.17 → 0.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 861d3d2efbeb83173900e744154c99d6988d4865
-  data.tar.gz: e659c97a76c127e5d262bbf7fa32c5c82620259f
+  metadata.gz: 319a340bbbfc7655feb9b0d983bf71e2ebbe8d4d
+  data.tar.gz: c6180a536324a018aa1d0046984cf0fe6a9d3116
 SHA512:
-  metadata.gz: ba71b391b7b2e18e5e9bbe7be90e4313aa8562cca7863e7dd9f182a049db24a55b278a01f9a84c1a2e90a564ceec8d1377f9b3b317535d18cb7d03748252f6b7
-  data.tar.gz: 74d547daf3de5ac28859d4c04ad0393687d91181c776e53931a7404f223107c9dbc5bbfb2c6fd1a4ee2667e44d094224983dd8ee836e947ae6cc090a244b48da
+  metadata.gz: d16f8f8d494d69a691aeb83efe89156b7e5ee99c9f306755e37280e5c7d68378e11f781ba88db6fda35a3d5fc86bccaf7ec6f46f339bfdf38e95d71d11a144a1
+  data.tar.gz: 0f4ebf24bdcbc7a6ae3706d56122cfcdbc16ad73c8adb1437a3b1c4c96b7b871f451e1e22abcdb2a180cd1b638cec57d83058042aac12b75f6ba2049b9a05ef4

data/README.md

@@ -47,9 +47,11 @@ tj --version # Aliases: -v, version
 
 ### Global flags:
 | Flag                | Type   | Description                                |
-|:--------------------|:------ |:------------------------------------------ |
+|:------------------- |:------ |:------------------------------------------ |
 | `[--no-unicode]`    | Bool   | Disable all unicode characters             |
 | `[--no-colors]`     | Bool   | Disable colored output                     |
+<!-- | `[--no-animations]` | Bool   | Disable animations                         | -->
+<!-- | `[--no-deployer]`   | Bool   | Disable deployer                           | -->
 | `[--vvv-path=PATH]` | String | Force custom path to your VVV installation |
 
 ### Creating a new development site:

data/lib/theme-juice/cli.rb

@@ -24,7 +24,8 @@ module ThemeJuice
         class_option :boring,        :type => :boolean,                  :desc => "Disable all the coolness"
         class_option :no_unicode,    :type => :boolean,                  :desc => "Disable all unicode characters"
         class_option :no_colors,     :type => :boolean,                  :desc => "Disable all colored output"
-        class_option :no_animations, :type => :boolean,                  :desc => "Disable all animations"
+        # class_option :no_animations, :type => :boolean,                  :desc => "Disable all animations"
+        # class_option :no_deployer,   :type => :boolean,                  :desc => "Disable deployer"
 
         desc "--version, -v", "Print current version"
         #
@@ -248,40 +249,48 @@ module ThemeJuice
             # @return {Void}
             #
             def set_environment
-                @version     = ::ThemeJuice::VERSION
-                @environment = ::ThemeJuice::Environment
-                @interaction = ::ThemeJuice::Interaction
-                @create      = ::ThemeJuice::Command::Create
-                @delete      = ::ThemeJuice::Command::Delete
-                @list        = ::ThemeJuice::Command::List
-                @install     = ::ThemeJuice::Command::Install
-                @subcommand  = ::ThemeJuice::Command::Subcommand
-
-                @environment.no_colors     = if self.boring? then true else options[:no_colors]     end
-                @environment.no_unicode    = if self.boring? then true else options[:no_unicode]    end
-                @environment.no_animations = if self.boring? then true else options[:no_animations] end
+                @version      = ::ThemeJuice::VERSION
+                @environment  = ::ThemeJuice::Environment
+                @interaction  = ::ThemeJuice::Interaction
+                @create       = ::ThemeJuice::Command::Create
+                @delete       = ::ThemeJuice::Command::Delete
+                @list         = ::ThemeJuice::Command::List
+                @install      = ::ThemeJuice::Command::Install
+                @subcommand   = ::ThemeJuice::Command::Subcommand
 
                 self.force_vvv_path?
-                self.yolo?
-            end
 
-            #
-            # Enable boring-mode
-            #
-            # @return {Bool}
-            #
-            def boring?
-                @environment.boring = options[:boring]
+                @environment.yolo          = options[:yolo]
+                @environment.boring        = options[:boring]
+                # @environment.no_deployer   = options[:no_deployer]
+                @environment.no_colors     = if @environment.boring then true else options[:no_colors]     end
+                @environment.no_unicode    = if @environment.boring then true else options[:no_unicode]    end
+                # @environment.no_animations = if @environment.boring then true else options[:no_animations] end
+
+                # if self.deployer?
+                #     @deployer = ::ThemeJuiceDeploy::Deployer
+                # else
+                #     @deployer = nil
+                # end
             end
 
-            #
-            # Enable yolo-mode
-            #
-            # @return {Bool}
-            #
-            def yolo?
-                @environment.yolo = options[:yolo]
-            end
+            # #
+            # # Load deployer if installed
+            # #
+            # # @return {Bool}
+            # #
+            # def deployer?
+            #     if @environment.no_deployer
+            #         false
+            #     else
+            #         begin
+            #             require "theme-juice-deploy"
+            #             true
+            #         rescue LoadError
+            #             false
+            #         end
+            #     end
+            # end
 
             #
             # Set VVV path

data/lib/theme-juice/environment.rb

@@ -6,7 +6,8 @@ module ThemeJuice
             attr_accessor :vvv_path
             attr_accessor :no_unicode
             attr_accessor :no_colors
-            attr_accessor :no_animations
+            # attr_accessor :no_animations
+            # attr_accessor :no_deployer
             attr_accessor :boring
             attr_accessor :yolo
         end

data/lib/theme-juice/service.rb

@@ -38,11 +38,11 @@ module ThemeJuice
         end
 
         #
-        # Verify config is properly setup, set global var
+        # Verify config is properly setup and load it
         #
         # @return {Void}
         #
-        def use_config
+        def load_config
 
             if config_is_setup?
                 @config = YAML.load_file(Dir["#{@config_path}/*"].select { |f| @config_regex =~ File.basename(f) }.last)
@@ -75,6 +75,8 @@ module ThemeJuice
             ], false
         end
 
+        #
+        # Test if site creation was successful
         #
         # @return {Bool}
         #
@@ -82,6 +84,9 @@ module ThemeJuice
             vvv_is_setup? and dev_site_is_setup? and hosts_is_setup? and database_is_setup? and nginx_is_setup?
         end
 
+        #
+        # Test if site removal was successful. This just reverses the check
+        #  for a successful setup.
         #
         # @return {Bool}
         #
@@ -89,6 +94,8 @@ module ThemeJuice
             !setup_was_successful?
         end
 
+        #
+        # Test if project directory tree has been created
         #
         # @return {Bool}
         #
@@ -96,13 +103,17 @@ module ThemeJuice
             Dir.exist? "#{@opts[:site_location]}"
         end
 
+        #
+        # Test if config file is in current working directory
         #
         # @return {Bool}
         #
         def config_is_setup?
-            !Dir["#{@config_path}/*"].select { |f| File.basename(f) =~ @config_regex }.empty?
+            !Dir["#{@config_path}/*"].select { |f| @config_regex =~ File.basename(f) }.empty?
         end
 
+        #
+        # Test if VVV has been cloned
         #
         # @return {Bool}
         #
@@ -110,6 +121,8 @@ module ThemeJuice
             File.exist? File.expand_path(@environment.vvv_path)
         end
 
+        #
+        # Test if landrush block has been placed
         #
         # @return {Bool}
         #
@@ -117,6 +130,8 @@ module ThemeJuice
             File.readlines(File.expand_path("#{@environment.vvv_path}/Vagrantfile")).grep(/(config.landrush.enabled = true)/m).any?
         end
 
+        #
+        # Test if VVV development location has been created
         #
         # @return {Bool}
         #
@@ -124,6 +139,8 @@ module ThemeJuice
             File.exist? "#{@opts[:site_dev_location]}"
         end
 
+        #
+        # Test if hosts file has been created
         #
         # @return {Bool}
         #
@@ -131,6 +148,8 @@ module ThemeJuice
             File.exist? "#{@opts[:site_location]}/vvv-hosts"
         end
 
+        #
+        # Test if database block has been placed
         #
         # @return {Bool}
         #
@@ -138,6 +157,8 @@ module ThemeJuice
             File.readlines(File.expand_path("#{@environment.vvv_path}/database/init-custom.sql")).grep(/(### Begin '#{@opts[:site_name]}')/m).any?
         end
 
+        #
+        # Test if nginx config has been created
         #
         # @return {Bool}
         #
@@ -145,13 +166,18 @@ module ThemeJuice
             File.exist? "#{@opts[:site_location]}/vvv-nginx.conf"
         end
 
+        #
+        # Test if starter theme has been set up by checking for common
+        #  WordPress directories
         #
         # @return {Bool}
         #
         def starter_theme_is_setup?
-            !Dir["#{@opts[:site_location]}/*"].select { |f| File.basename(f) =~ %r{wp(-content)?|wordpress|app|public|web|content} }.empty?
+            !Dir["#{@opts[:site_location]}/*"].select { |f| %r{wp(-content)?|wordpress|app|public|web|content} =~ File.basename(f) }.empty?
         end
 
+        #
+        # Test if synced folder block has been placed
         #
         # @return {Bool}
         #
@@ -159,6 +185,8 @@ module ThemeJuice
             File.readlines(File.expand_path("#{@environment.vvv_path}/Vagrantfile")).grep(/(### Begin '#{@opts[:site_name]}')/m).any?
         end
 
+        #
+        # Test if repository has been set up
         #
         # @return {Bool}
         #
@@ -166,6 +194,8 @@ module ThemeJuice
             File.exist? File.expand_path("#{@opts[:site_location]}/.git")
         end
 
+        #
+        # Test if .env file has been created
         #
         # @return {Bool}
         #
@@ -173,6 +203,8 @@ module ThemeJuice
             File.exist? File.expand_path("#{@opts[:site_location]}/.env.development")
         end
 
+        #
+        # Test if local wp-cli file has been created
         #
         # @return {Bool}
         #
@@ -180,6 +212,8 @@ module ThemeJuice
             File.exist? File.expand_path("#{@opts[:site_location]}/wp-cli.local.yml")
         end
 
+        #
+        # Test if we're initializing a new repository
         #
         # @return {Bool}
         #

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

@@ -16,7 +16,7 @@ module ThemeJuice
         # @return {Void}
         #
         def install
-            use_config
+            load_config
 
             @config["commands"]["install"].each do |command|
                 run ["cd #{@config_path}", command], false
@@ -32,7 +32,7 @@ module ThemeJuice
         # @return {Void}
         #
         def subcommand(subcommand, command)
-            use_config
+            load_config
 
             if @config["commands"][subcommand]
                 run ["#{@config["commands"][subcommand]} #{command}"], false

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

@@ -364,7 +364,7 @@ module ThemeJuice
         # @return {Void}
         #
         def install_starter_theme_dependencies
-            use_config
+            load_config
 
             @interaction.log "Installing theme dependencies"
 

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.6.17
+  version: 0.6.18
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faker