theme-juice 0.8.3 → 0.9.0

data/lib/theme-juice/commands/delete.rb

@@ -12,6 +12,11 @@ module ThemeJuice
         runner do |tasks|
           tasks << Tasks::DeleteConfirm.new
           tasks << Tasks::Database.new
+          if @env.nginx
+            tasks << Tasks::Nginx.new
+          else
+            tasks << Tasks::Apache.new
+          end
           tasks << Tasks::VMLocation.new
           tasks << Tasks::SyncedFolder.new
           tasks << Tasks::DNS.new
@@ -23,14 +28,14 @@ module ThemeJuice
       private
 
       def init_project
-        @project.name        = @opts.fetch("name")       { name }
-        @project.url         = @opts.fetch("url")        { url }
-        @project.db_drop     = @opts.fetch("db_drop")    { false }
-        @project.vm_restart  = @opts.fetch("vm_restart") { false }
+        @project.name       = @opts.fetch("name")       { name }
+        @project.url        = @opts.fetch("url")        { url }
+        @project.db_drop    = @opts.fetch("db_drop")    { false }
+        @project.vm_restart = @opts.fetch("vm_restart") { false }
       end
 
       def name
-        name = @io.prompt "What's the project name?"
+        name = @io.ask "What's the project name?"
 
         unless @list.projects.include? name
           @io.error "Project '#{name}' doesn't exist"
@@ -40,7 +45,9 @@ module ThemeJuice
       end
 
       def url
-        url = @io.prompt "What is the project's development url?", :default => "#{@project.name}.dev"
+        return "#{@project.name}.dev" if @env.no_landrush
+        
+        url = @io.ask "What is the project's development url?", :default => "#{@project.name}.dev"
 
         unless @list.urls.include? url
           @io.notice "Project url '#{url}' doesn't exist within DNS records. Skipping..."

data/lib/theme-juice/env.rb

@@ -3,7 +3,7 @@
 module ThemeJuice
   module Env
     include SingletonHelper
-    
+
     attr_accessor :vm_box
     attr_accessor :vm_path
     attr_accessor :vm_ip
@@ -14,11 +14,13 @@ module ThemeJuice
     attr_accessor :no_colors
     attr_accessor :no_animations
     attr_accessor :no_landrush
+    attr_accessor :no_port_forward
     attr_accessor :verbose
     attr_accessor :dryrun
-    
+    attr_accessor :nginx
+
     def vm_box=(val)
-      @vm_box = val ||= ENV.fetch("TJ_VM_BOX") { "https://github.com/Varying-Vagrant-Vagrants/VVV.git" }
+      @vm_box = val ||= ENV.fetch("TJ_VM_BOX") { "git@github.com:ericmann/vvv-apache.git" }
     end
 
     def vm_path=(val)
@@ -57,6 +59,10 @@ module ThemeJuice
       @no_landrush = val ||= ENV.fetch("TJ_NO_LANDRUSH") { false }
     end
 
+    def no_port_forward=(val)
+      @no_port_forward = val ||= ENV.fetch("TJ_NO_PORT_FORWARD") { false }
+    end
+
     def verbose=(val)
       @verbose = val ||= ENV.fetch("TJ_VERBOSE") { false }
     end
@@ -65,6 +71,10 @@ module ThemeJuice
       @dryrun = val ||= ENV.fetch("TJ_DRYRUN") { false }
     end
 
+    def nginx=(val)
+      @nginx = val ||= ENV.fetch("TJ_NGINX") { false }
+    end
+
     extend self
   end
 end

data/lib/theme-juice/io.rb

@@ -4,16 +4,19 @@ module ThemeJuice
   module IO
     include Thor::Shell
 
+    alias_method :_say, :say
+    alias_method :_ask, :ask
+
     ICONS = {
-      :success             => "✓", # "\u2713",
-      :error               => "↑", # "\u2191",
-      :notice              => "→", # "\u2192",
-      :question            => "•", # "\u2022",
-      :general             => "›", # "\u203A",
-      :log                 => "…", # "\u2026",
-      :restart             => "↪", # "\u21AA",
-      :selected            => "•", # "\u2022",
-      :unselected          => "○", # "\u25CB",
+      :success             => "✓",
+      :error               => "↑",
+      :notice              => "→",
+      :question            => "•",
+      :general             => "›",
+      :log                 => "…",
+      :restart             => "↪",
+      :selected            => "•",
+      :unselected          => "○",
       :fallback_success    => "+",
       :fallback_error      => "!",
       :fallback_notice     => "!",
@@ -38,58 +41,48 @@ module ThemeJuice
       " "    => "space",
     }
 
-    @env = Env
-    @sel = 0
+    @env     = Env
+    @project = Project
+    @sel     = 0
 
-    def speak(message, opts = {})
-      format_message message, opts
-      output_message
+    def say(message, opts = {})
+      output_message format_message(message, opts), opts
     end
 
-    def prompt(question, *opts)
-      format_message question, {
-        :color => :blue,
-        :icon  => :question
+    def ask(question, *opts)
+      indentation = if opts[0].respond_to? :fetch
+                      opts[0].fetch :indent, 0
+                    else
+                      0
+                    end
+
+      q = format_message question, {
+        :color  => :blue,
+        :icon   => :question,
+        :indent => indentation
       }
 
-      opts.each do |opt|
-
-        # if opt[:default]
-        #   opt[:default] = set_color(opt[:default], :black, :bold) unless @env.no_colors
-        # end
-
-        if opt[:indent]
-          with(question) { |str| (" " * opt[:indent]) << str }
-        end
-
-        break
-      end
-
-      ask("#{question} :", *opts).gsub /\e\[\d+m/, ""
+      _ask("#{q} :", *opts).gsub /\e\[\d+m/, ""
     end
 
     def agree?(question, opts = {})
-      format_message question, {
+      q = format_message question, {
         :color => opts.fetch("color", :blue),
         :icon  => :question
       }
 
-      if opts[:simple]
-        yes? " :", opts.fetch("color", {})
-      else
-        yes? "#{question} (y/N) :"
-      end
+      yes? "#{q} (y/N) :"
     end
 
     def log(message)
-      speak message, {
+      say message, {
         :color => :yellow,
         :icon  => :log
       }
     end
 
     def success(message)
-      speak message, {
+      say message, {
         :color => [:black, :on_green, :bold],
         :icon  => :success,
         :row   => true
@@ -97,7 +90,7 @@ module ThemeJuice
     end
 
     def notice(message)
-      speak message, {
+      say message, {
         :color => [:black, :on_yellow],
         :icon  => :notice,
         :row   => true
@@ -105,7 +98,7 @@ module ThemeJuice
     end
 
     def error(message, code = SystemExit)
-      speak message, {
+      say message, {
         :color => [:white, :on_red],
         :icon  => :error,
         :row   => true
@@ -117,7 +110,7 @@ module ThemeJuice
     end
 
     def hello(opts = {})
-      speak "Welcome to Theme Juice!", {
+      say "Welcome to Theme Juice!", {
         :color => [:black, :on_green, :bold],
         :row   => true
       }.merge(opts)
@@ -132,17 +125,16 @@ module ThemeJuice
         "Later, homes",
         "I'll be back",
         "Victory is ours!",
-        "May the force be with you",
+        "May the juice be with you",
         "Take a break, man...",
         "It's not me, it's you",
         "Go home, developer, you're drunk",
         "Okay, this is getting a little out of hand...",
         "I don't like it when you press my buttons",
         "Ouch!",
-        ":(",
       ]
 
-      speak goodbyes.sample, {
+      say goodbyes.sample, {
         :color   => :yellow,
         :newline => true
       }.merge(opts)
@@ -151,14 +143,14 @@ module ThemeJuice
     end
 
     def list(header, color, list)
-      speak header, {
+      say header, {
         :color => [:black, :"on_#{color}"],
         :icon  => :notice,
         :row   => true
       }
 
       list.each do |item|
-        speak item, {
+        say item, {
           :color => :"#{color}",
           :icon  => :general
         }
@@ -166,7 +158,7 @@ module ThemeJuice
     end
 
     def choose(header, color, list)
-      speak "#{header} (#{choose_instructions})", {
+      say "#{header} (#{choose_instructions})", {
         :color => :"#{color}",
         :icon  => :question
       }
@@ -186,13 +178,14 @@ module ThemeJuice
         when "esc", "ctrl+c"
           goodbye :newline => false
         # else
-        #   speak key.inspect, { :color => :yellow }
+        #   say key.inspect, { :color => :yellow }
         end
       end
     end
 
     private
 
+    # @TODO Windows has issues registering the arrow and enter keys
     def choose_instructions
       if OS.windows?
         "use WASD keys and press space"
@@ -210,7 +203,7 @@ module ThemeJuice
 
       list.each_with_index do |item, i|
         icon = i == @sel ? "selected" : "unselected"
-        speak "#{item}", {
+        say "#{item}", {
           :color  => :"#{color}",
           :icon   => :"#{icon}",
           :indent => 2
@@ -236,58 +229,62 @@ module ThemeJuice
     end
 
     def format_message(message, opts = {})
-      @message, @opts = message, opts
 
-      format_message_icon
-      format_message_newline
-      format_message_row
-      format_message_width
-      format_message_color
-      format_message_indent
+      %W[icon newline row width color indent].each do |f|
+        message = self.send "format_#{f}", message, opts
+      end
 
-      @message
+      message
     end
 
-    def with(string)
-      str = yield(string); string.clear; string << str
-    end
+    def format_icon(message, opts)
+      return " #{message}" if opts[:icon].nil?
 
-    def format_message_icon
-      icon = @env.no_unicode ? "fallback_#{@opts[:icon]}" : "#{@opts[:icon]}"
+      icon = if @env.no_unicode
+               "fallback_#{opts[:icon]}"
+             else
+               "#{opts[:icon]}"
+             end
 
-      if @opts[:icon]
-        with(@message) { |msg| "#{ICONS[:"#{icon}"]}" << (@opts[:empty] ? nil : " #{msg}") }
-      else
-        with(@message) { |msg| "" << msg }
-      end
+      " #{ICONS[:"#{icon}"]} " << message
     end
 
-    def format_message_newline
-      with(@message) { |msg| "\n" << msg } if @opts[:newline]
+    def format_newline(message, opts)
+      return message if opts[:newline].nil?
+
+      "\n#{message}"
     end
 
-    def format_message_color
-      unless @env.no_colors
-        with(@message) { |msg| set_color(msg, *@opts[:color]) } if @opts[:color]
-      end
+    def format_color(message, opts)
+      return message if @env.no_colors || opts[:color].nil?
+
+      set_color(message, *opts[:color])
     end
 
-    def format_message_row
-      unless OS.windows?
-        with(@message) { |msg| msg.ljust(terminal_width) } if @opts[:row]
-      end
+    def format_row(message, opts)
+      return message if OS.windows? || opts[:row].nil?
+
+      message.ljust terminal_width
     end
 
-    def format_message_width
-      with(@message) { |msg| msg.ljust(@opts[:width]) } if @opts[:width]
+    def format_width(message, opts)
+      return message if opts[:width].nil?
+
+      message.ljust opts[:width]
     end
 
-    def format_message_indent
-      with(@message) { |str| (" " * @opts[:indent]) << str } if @opts[:indent]
+    def format_indent(message, opts)
+      return message if opts[:indent].nil?
+
+      (" " * opts[:indent]) << message
     end
 
-    def output_message
-      @opts[:quiet] ? @message : say(@message)
+    def output_message(message, opts)
+      if opts[:quiet]
+        message
+      else
+        _say message
+      end
     end
 
     extend self

data/lib/theme-juice/man/tj

@@ -10,190 +10,242 @@
 \fBtj\fR [\fIcommand\fR] [\-\-flag=\fIarg\fR] [\-\-flag]
 .
 .SH "DESCRIPTION"
-\fBTheme Juice\fR is a WordPress development command line utility that allows you to scaffold out entire Vagrant development environments in seconds (using VVV \fIhttps://github\.com/Varying\-Vagrant\-Vagrants/VVV\fR as the VM), manage dependencies and build tools, and even handle deployments\.
+\fBTheme Juice\fR is a WordPress development command line utility that allows you to scaffold out an entire Vagrant development environment in seconds (using an Apache fork of VVV \fIhttps://github\.com/Varying\-Vagrant\-Vagrants/VVV\fR called VVV\-Apache \fIhttps://github\.com/ericmann/vvv\-apache\.git\fR as the VM)\. It also helps you manage dependencies and build tools, and can even handle your deployments\.
 .
 .SH "GLOBAL OPTIONS"
 .
 .TP
-\fB\-\-vm\-box\fR=\fIrepository\fR:
-.
-.br
-Force Vagrant box to use for VM
-
+\fB\-\-vm\-box\fR=\fIrepository\fR
+Force Vagrant box for use as VM
 .
 .TP
-\fB\-\-vm\-path\fR=\fIpath\fR:
-.
-.br
+\fB\-\-vm\-path\fR=\fIpath\fR
 Force path to VM
-
 .
 .TP
-\fB\-\-vm\-ip\fR=\fIip\fR:
-.
-.br
+\fB\-\-vm\-ip\fR=\fIip\fR
 Force IP address of VM
-
 .
 .TP
-\fB\-\-vm\-prefix\fR=\fIstring\fR:
-.
-.br
+\fB\-\-vm\-prefix\fR=\fIstring\fR
 Force directory prefix for project in VM
-
 .
 .TP
-\fB\-\-yolo\fR:
-.
-.br
+\fB\-\-yolo\fR
 Say yes to anything and everything
-
 .
 .TP
-\fB\-\-boring\fR:
-.
-.br
+\fB\-\-boring\fR
 Prints all output without any fancy formatting
-
 .
 .TP
-\fB\-\-no\-unicode\fR:
-.
-.br
+\fB\-\-no\-unicode\fR
 Prints all output without unicode characters
-
 .
 .TP
-\fB\-\-no\-colors\fR, \fB\-\-no\-color\fR:
-.
-.br
+\fB\-\-no\-colors\fR, \fB\-\-no\-color\fR
 Prints all output without color
-
 .
 .TP
-\fB\-\-no\-animations\fR:
-.
-.br
-Prints all output without animations (coming soon)
-
+\fB\-\-no\-animations\fR
+Prints all output without animations
 .
 .TP
-\fB\-\-no\-landrush\fR:
-.
-.br
+\fB\-\-no\-landrush\fR
 Disable the \fBlandrush\fR gem for managing DNS
-
 .
 .TP
-\fB\-\-verbose\fR:
+\fB\-\-no\-port\-forward\fR, \fB\-\-no\-port\-forwarding\fR
+Disable automatic port forwarding
 .
-.br
+.TP
+\fB\-\-verbose\fR
 Prints out additional logging information
-
 .
 .TP
-\fB\-\-dryrun\fR, \fB\-\-dry\-run\fR:
-.
-.br
+\fB\-\-dryrun\fR, \fB\-\-dry\-run\fR
 Run a command without actually doing anything
-
+.
+.TP
+\fB\-\-nginx\fR, \fB\-\-no\-apache\fR
+Create conf files for nginx instead of apache
 .
 .SH "PRIMARY COMMANDS"
 Run \fBtj help\fR [\fIcommand\fR] to view an individual command\'s man page\.
 .
 .TP
-\fBcreate\fR, \fBnew\fR, \fBmk\fR:
-.
-.br
+\fBcreate\fR, \fBnew\fR, \fBmk\fR
 Create a new project
-
 .
 .TP
-\fBsetup\fR, \fBup\fR, \fBinit\fR:
-.
-.br
+\fBsetup\fR, \fBup\fR, \fBinit\fR
 Setup an existing project
-
 .
 .TP
-\fBdelete\fR, \fBrm\fR, \fBremove\fR, \fBtrash\fR:
-.
-.br
+\fBdelete\fR, \fBrm\fR, \fBremove\fR, \fBtrash\fR
 Delete a project
-
+.
+.TP
+\fBdeploy\fR, \fBserver\fR, \fBremote\fR
+Deploy a project
 .
 .SH "SECONDARY COMMANDS"
 .
 .TP
-\fBversion\fR, \fB\-\-version\fR, \fB\-v\fR:
-.
-.br
+\fBversion\fR, \fB\-\-version\fR, \fB\-v\fR
 Print the current version
-
 .
 .TP
-\fBlist\fR, \fBls\fR, \fBprojects\fR, \fBapps\fR, \fBsites\fR:
-.
-.br
+\fBlist\fR, \fBls\fR, \fBprojects\fR, \fBapps\fR, \fBsites\fR
 List all projects
-
 .
 .TP
-\fBvm\fR, \fBvagrant\fR, \fBvvv\fR=[\fIcommand\fR[,\fIcommand\fR]\.\.\.]:
-.
-.br
-Manage development environment\. Commands are proxied to your Vagrant installation so that they can be run from any directory\.
-
+\fBvm\fR, \fBvagrant\fR, \fBvvv\fR=[\fIcommand\fR[,\fIcommand\fR]\.\.\.]
+Manage development environment via \fBvagrant\fR\. Commands are proxied to your Vagrant installation so that they can be run from any directory\.
 .
 .SH "CONFIG COMMANDS"
-These run the corresponding command from your project\'s config file\. They accept any number of commands, since the behavior and handling of input is defined within the config file itself\.
+These run the corresponding command from your project\'s config file\. They accept any number of arguments, since the behavior and handling of input is defined within the config file itself\.
 .
 .TP
-\fBinstall\fR, \fBbuild\fR=[\fIcommand\fR[,\fIcommand\fR]\.\.\.]:
-.
-.br
+\fBinstall\fR, \fBbuild\fR=[\fIarg\fR[,\fIarg\fR]\.\.\.]
 Run installation for project
-
 .
 .TP
-\fBwatch\fR, \fBdev\fR=[\fIcommand\fR[,\fIcommand\fR]\.\.\.]:
-.
-.br
+\fBwatch\fR, \fBdev\fR=[\fIarg\fR[,\fIarg\fR]\.\.\.]
 Manage and run development build tools
-
 .
 .TP
-\fBvendor\fR, \fBdeps\fR=[\fIcommand\fR[,\fIcommand\fR]\.\.\.]:
-.
-.br
+\fBvendor\fR, \fBdeps\fR=[\fIarg\fR[,\fIarg\fR]\.\.\.]
 Manage PHP vendor dependencies
-
 .
 .TP
-\fBdist\fR, \fBpkg\fR, \fBpackage\fR, \fBzip\fR=[\fIcommand\fR[,\fIcommand\fR]\.\.\.]:
-.
-.br
+\fBdist\fR, \fBpkg\fR, \fBpackage\fR, \fBzip\fR=[\fIarg\fR[,\fIarg\fR]\.\.\.]
 Package project for distribution
-
 .
 .TP
-\fBwp\fR, \fBwordpress\fR=[\fIcommand\fR[,\fIcommand\fR]\.\.\.]:
+\fBwp\fR, \fBwordpress\fR=[\fIarg\fR[,\fIarg\fR]\.\.\.]
+Manage WordPress installation
+.
+.TP
+\fBbackup\fR, \fBbk\fR=[\fIarg\fR[,\fIarg\fR]\.\.\.]
+Backup project
+.
+.TP
+\fBtest\fR, \fBtests\fR, \fBspec\fR, \fBspecs\fR=[\fIarg\fR[,\fIarg\fR]\.\.\.]
+Manage and run project tests
+.
+.SH "CONFIG FILE"
+A YAML configuration file (\fBJuicefile\fR) can be used to store commonly\-used build scripts\. Each command block sequence can be mapped to an individual project\'s build tool, allowing a streamlined set of commands to be used across multiple projects that utilize different tools\.
+.
+.TP
+\fBcommands\fR
+Collection of various command block sequences
+.
+.TP
+\fBcommands\.install\fR
+Run theme installation
 .
-.br
+.TP
+\fBcommands\.watch\fR
+Manage development build tools
+.
+.TP
+\fBcommands\.vendor\fR
+Manage vendor dependencies
+.
+.TP
+\fBcommands\.wp\fR
 Manage WordPress installation
-
 .
 .TP
-\fBbackup\fR, \fBbk\fR=[\fIcommand\fR[,\fIcommand\fR]\.\.\.]:
+\fBcommands\.dist\fR
+Package project for distribution
 .
-.br
+.TP
+\fBcommands\.backup\fR
 Backup project
-
 .
 .TP
-\fBtest\fR, \fBtests\fR, \fBspec\fR, \fBspecs\fR=[\fIcommand\fR[,\fIcommand\fR]\.\.\.]:
-.
-.br
+\fBcommands\.test\fR
 Manage and run project tests
-
+.
+.TP
+\fBdeployment\fR
+Coming soon
+.
+.P
+Placeholder arguments can be used within any command block sequence to allow splat or indexed arguments to be passed to the corresponding command when executed\.
+.
+.TP
+\fB%args%\fR, \fB%arguments%\fR
+Splat argument placeholder e\.g\. \fBcmd %args%\fR
+.
+.TP
+\fB%argN%\fR, \fB%argumentN%\fR
+Where \fBn\fR is the argument index e\.g\. \fBcmd %arg1% | cmd %arg2%\fR
+.
+.P
+When naming your configuration file, use the recommended \fBJuicefile\fR, or \fB\.tj\.yaml\fR naming convention\. The raw filename regex matcher is below if you want to be a little different\.
+.
+.P
+\fB/^(((\e\.)?(tj)|((J|j)uicefile))(\.y(a)?ml)?$)/\fR
+.
+.SH "ENVIRONMENT"
+All of the global options have a corresponding \fBENV\fR variable that can be set to permanently use the specified value each time \fBtj\fR is run\. This is useful if you\'re using an alternate Vagrant box, or if you need to disable certain features due to limited support e\.g\. on Windows\.
+.
+.TP
+\fBTJ_VM_BOX\fR=\fIrepository\fR
+Force Vagrant box for use as VM
+.
+.TP
+\fBTJ_PATH\fR=\fIpath\fR
+Force path to VM
+.
+.TP
+\fBTJ_IP\fR=\fIip\fR
+Force IP address of VM
+.
+.TP
+\fBTJ_PREFIX\fR=\fIstring\fR
+Force directory prefix for project in VM
+.
+.TP
+\fBTJ_YOLO\fR=\fIbool\fR
+Say yes to anything and everything
+.
+.TP
+\fBTJ_BORING\fR=\fIbool\fR
+Prints all output without any fancy formatting
+.
+.TP
+\fBTJ_NO_UNICODE\fR=\fIbool\fR
+Prints all output without unicode characters
+.
+.TP
+\fBTJ_NO_COLORS\fR=\fIbool\fR
+Prints all output without color
+.
+.TP
+\fBTJ_NO_ANIMATIONS\fR=\fIbool\fR
+Prints all output without animations (coming soon)
+.
+.TP
+\fBTJ_NO_LANDRUSH\fR=\fIbool\fR
+Disable the \fBlandrush\fR gem for managing DNS
+.
+.TP
+\fBTJ_NO_PORT_FORWARD\fR=\fIbool\fR
+Disable automatic port forwarding
+.
+.TP
+\fBTJ_VERBOSE\fR=\fIbool\fR
+Prints out additional logging information
+.
+.TP
+\fBTJ_DRYRUN\fR=\fIbool\fR
+Run a command without actually doing anything
+.
+.TP
+\fBTJ_NGINX\fR=\fIbool\fR
+Create conf files for nginx instead of apache