theme-juice 0.6.18 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 319a340bbbfc7655feb9b0d983bf71e2ebbe8d4d
-  data.tar.gz: c6180a536324a018aa1d0046984cf0fe6a9d3116
+  metadata.gz: a6723de16768298aea17ee0d1f9c07254776eb24
+  data.tar.gz: 1221dc65cd74ae60f045aba59e40f7af3765db98
 SHA512:
-  metadata.gz: d16f8f8d494d69a691aeb83efe89156b7e5ee99c9f306755e37280e5c7d68378e11f781ba88db6fda35a3d5fc86bccaf7ec6f46f339bfdf38e95d71d11a144a1
-  data.tar.gz: 0f4ebf24bdcbc7a6ae3706d56122cfcdbc16ad73c8adb1437a3b1c4c96b7b871f451e1e22abcdb2a180cd1b638cec57d83058042aac12b75f6ba2049b9a05ef4
+  metadata.gz: 94b54c081943afc61514c857e7df586d5cc244154322200e4962f44576eabfe67b900c38595c0806dd29ad82ee5cbe2bee3114ff4962694cda2a84309d6c601d
+  data.tar.gz: 6a926e9644dae59f5e29a5867ddd950299fd4324abaa1e7aeda3d5c681c7d6fdd619eca3f838f8e6e9c7333246e533579d9298f78ef252e358f32faded07fca0

data/README.md

@@ -1,35 +1,34 @@
 # Theme Juice [![Gem Version](http://img.shields.io/gem/v/theme-juice.svg)](https://rubygems.org/gems/theme-juice)
-What is it? Theme Juice is a command line interface created to scaffold out a new WordPress development environment (using [VVV](https://github.com/Varying-Vagrant-Vagrants/VVV)) and countless development sites. Everybody loves one command setups, and `tj` can even do one command deployments too.
+What is it? Theme Juice is a command line tool that allows you to scaffold out a new WordPress development environment (using [VVV](https://github.com/Varying-Vagrant-Vagrants/VVV) as the VM) and countless development projects. Everybody loves one command setups, and `tj` will eventually even do one command deployments too.
 
 ## Installation
 * First, install [Vagrant](https://www.vagrantup.com/) and [VirtualBox](https://www.virtualbox.org/) for local development.
-* Then, install [Composer](https://getcomposer.org/) and [WP-CLI](http://wp-cli.org/) (make sure they're executable).
+* Then, install [Composer](https://getcomposer.org/) and [WP-CLI](http://wp-cli.org/), and make sure they're executable.
 * Finally, install with: `gem install theme-juice`
 That`s it!
 
 ## Config
-Because everybody likes to use different tools, you can create a `tj.yml` file (with an optional preceding `.`) that will house all of your theme-specific commands. This allows you to use a streamlined set of commands that will act as aliases to your per-project configuration, as well as starter-theme specific information, such as deployment configuration, etc. For right now, we'll just stick to the `commands` section.
+Because everybody likes to use different tools, you can create a `Juicefile` or `tj.yaml` config (with an optional preceding `.`) that will house all of your theme-specific commands. This allows you to use a streamlined set of commands that will act as aliases to your per-project configuration, as well as starter-theme specific information, such as deployment configuration, etc. For right now, we'll just stick to the `commands` section.
 
-If you're into [Grunt](https://github.com/gruntjs/grunt), then use it. Prefer [Guard](https://github.com/guard/guard)? Go right ahead. This is obviously relative to the starter theme you use, since you can't exactly use Grunt with a starter theme that doesn't support it. Below is the config that comes baked into [our starter theme](https://github.com/ezekg/theme-juice-starter):
+If you're into [Grunt](https://github.com/gruntjs/grunt), then use it. Prefer [Guard](https://github.com/guard/guard)? Go right ahead. This is obviously relative to the starter theme you use, since you can't exactly use Grunt with a project that doesn't support it. Below is the config that comes baked into [our starter theme](https://github.com/ezekg/theme-juice-starter):
 
 ```yml
 commands:
-    watch: bundle exec guard
-    server: bundle exec cap
-    vendor: composer
-    install:
-        - composer install
+  install:
+    - composer install
+  watch:
+    - grunt
+  vendor:
+    - composer
+  wp:
+    - wp ssh --host=vagrant
+  backup:
+    - wp ssh --host=vagrant db export backup/$(date +'%Y-%m-%d-%H-%M-%S').sql
+  dist:
+    - tar -zcvf dist.tar.gz .
 ```
 
-_Note: If you use a starter theme that doesn't have a `tj.yml` file, you'll be prompted through a series of steps in order to create one._
-
-### Command options:
-| Option    | Usage                                                                         |
-|:--------- |:----------------------------------------------------------------------------- |
-| `watch`   | Command to be aliased when you run `tj watch` for bulding assets              |
-| `server`  | Command to be aliased when you run `tj server` for deployments                |
-| `vendor`  | Command to be aliased when you run `tj vendor` for dependencies               |
-| `install` | Each command is executed when you run `tj install` to prepare a starter theme |
+Each command is run within a single execution, with all arguments passed to each command; i.e. `cmd1 [<ARGS>] && cmd2 [<ARGS>] && ...`. So, you should be careful with how this is used. Don't do something like including `sudo rm -rf` in a command, and then passing `/` as an argument. Keep it simple.
 
 ## Usage
 
@@ -42,103 +41,135 @@ tj
 ### Print version:
 This command will print the current version of `tj`.
 ```bash
-tj --version # Aliases: -v, version
+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 |
+| Flag                   | Type   | Description                                |
+|:---------------------- |:------ |:------------------------------------------ |
+| `[--vm-path=PATH]`     | String | Force path to VM                           |
+| `[--vm-ip=IP]`         | String | Force IP address for VM                    |
+| `[--vm-prefix=PREFIX]` | String | Force directory prefix for project in VM   |
+| `[--yolo]`             | Bool   | Say yes to anything and everything         |
+| `[--boring]`           | Bool   | Disable all the coolness                   |
+| `[--no-unicode]`       | Bool   | Disable all unicode characters             |
+| `[--no-colors]`        | Bool   | Disable all colored output                 |
+| `[--no-animations]`    | Bool   | Disable all animations                     |
+| `[--no-landrush]`      | Bool   | Disable landrush for DNS                   |
+| `[--verbose]`          | Bool   | Verbose output                             |
+| `[--dryrun]`           | Bool   | Disable running all commands               |
+
+_Use `ENV` variables to set global flags. For example, by running `export TJ_VM_PATH=~/vagrant-vvv`, the `ENV` variable will be used instead of the default `vm-path` from then on. You can remove global flags with `unset TJ_VM_PATH`_
 
 ### Creating a new development site:
-Use this to create a new development site. It will automagically set up your entire development environment, including a local development site at `http://<sites-dev-url>.dev` with WordPress installed and a fresh WP database. It will sync up your local site installation with the Vagrant VM. This task will also install and configure Vagrant/VVV into your `~/` directory if it has not already been installed. Site name is optional, as it will be asked for if not given.
+Use this to create a new project. It will automagically set up your VM, including a local development site at `http://<url>.dev` with WordPress installed and a fresh WP database. It will sync up your local site installation with the Vagrant VM, so you can organize your projects however you want. This task will also install VVV into your `vm-path` directory if it has not already been installed.
 ```bash
-tj create [<SITE-NAME>] # Aliases: new, add, build, make
+tj create # Aliases: mk new add
 ```
 
 #### Option flags:
-| Flag                        | Type   | Description                                      |
-|:--------------------------- |:------ |:------------------------------------------------ |
-| `-b, [--bare]`              | Bool   | Create a VVV site without a starter theme        |
-| `-n, [--name=NAME]`         | String | Name of the development site                     |
-| `-l, [--location=LOCATION]` | Path   | Location of the local site                       |
-| `-t, [--theme=THEME]`       | URL    | Starter theme to install                         |
-| `-u, [--url=URL]`           | URL    | Development URL of the site (must end in `.dev`) |
-| `-r, [--repository]`        | String | Initialize a new Git remote repository           |
-| `[--skip-repo]`             | Bool   | Skip repository prompts and set to `none`        |
-| `[--skip-db]`               | Bool   | Skip database prompts and use defaults           |
-| `[--use-defaults]`          | Bool   | Skip all prompts and use defaults                |
+| Flag                             | Type   | Description                                      |
+|:-------------------------------- |:------ |:------------------------------------------------ |
+| `[-n, --name]`                   | String | Name of the project                              |
+| `[-l, --location]`               | String | Location of the local project                    |
+| `[-t, --theme]`                  | String | Starter theme to install                         |
+| `[-u, --url]`                    | String | Development URL for the project                  |
+| `[-r, --repository]`             | String | Initialize a new Git remote repository           |
+| `[--import-db, --db_import, -i]` | String | Import an existing database                      |
+| `[--bare]`                       | Bool   | Create a project without a starter theme         |
+| `[--skip_repo]`                  | Bool   | Skip repository prompts and use default settings |
+| `[--skip_db]`                    | Bool   | Skip database prompts and use default settings   |
+| `[--use_defaults]`               | Bool   | Skip all prompts and use default settings        |
+| `[--no_wp]`                      | Bool   | New project is not a WordPress install           |
+| `[--no_db]`                      | Bool   | New project does not need a database             |
 
 ### Setting up an existing site:
-Use this to setup an existing local site installation within the development environment. You will go through the setup process to create the necessary files for the VM, including `vvv-hosts`, `vvv-nginx.conf`, and a fresh database (unless one already exists by the name chosen). Site name is optional, as it will be asked for if not given.
+Use this to setup an existing local site installation within the development environment. You will go through the setup process to create the necessary files for the VM, including `vvv-hosts`, `vvv-nginx.conf`, and a fresh database (unless one already exists by the name chosen). This is essentially an alias for `create`, but with a few options being skipped.
 ```bash
-tj setup [<SITE-NAME>] # Aliases: prep
+tj setup # Aliases: up prep init make
 ```
 
 #### Option flags:
-| Flag                        | Type   | Description                                      |
-|:--------------------------- |:------ |:------------------------------------------------ |
-| `-n, [--name=NAME]`         | String | Name of the development site                     |
-| `-l, [--location=LOCATION]` | Path   | Location of the local site                       |
-| `-u, [--url=URL]`           | URL    | Development URL of the site (must end in `.dev`) |
-| `-r, [--repository]`        | String | Initialize a new Git remote repository           |
-| `[--skip-repo]`             | Bool   | Skip repository prompts and set to `none`        |
-| `[--skip-db]`               | Bool   | Skip database prompts and use defaults           |
-| `[--use-defaults]`          | Bool   | Skip all prompts and use defaults                |
+| Flag                             | Type   | Description                                      |
+|:-------------------------------- |:------ |:------------------------------------------------ |
+| `[-n, --name]`                   | String | Name of the project                              |
+| `[-l, --location]`               | String | Location of the local project                    |
+| `[-u, --url]`                    | String | Development URL for the project                  |
+| `[-r, --repository]`             | String | Initialize a new Git remote repository           |
+| `[-i, --import-db, --db_import]` | String | Import an existing database                      |
+| `[--skip_repo]`                  | Bool   | Skip repository prompts and use default settings |
+| `[--skip_db]`                    | Bool   | Skip database prompts and use default settings   |
+| `[--use_defaults]`               | Bool   | Skip all prompts and use default settings        |
+| `[--no_wp]`                      | Bool   | New project is not a WordPress install           |
+| `[--no_db]`                      | Bool   | New project does not need a database             |
 
 ### Deleting a site from the VM: _(Does not remove your local site)_
-Use this to remove a site from your development environment. This is only remove files that were generated by `tj`. including the database setup, development url, and shared directories. _It will not touch your local files._
+Use this to remove a site from your development environment. This will only remove files that were generated by `tj`. including the database setup, development url, and shared directories. _It will not touch your local folders that were synced to the VM._
 ```bash
-tj delete <SITE-NAME> # Aliases: rm, remove, trash, teardown
+tj delete # Aliases: rm remove trash teardown
 ```
 
 #### Option flags:
-| Flag                    | Type   | Description                                      |
-|:----------------------- |:------ |:------------------------------------------------ |
-| `-n, [--name=NAME]`     | String | Name of the development site                     |
-| `[--restart]`           | Bool   | Restart development environment after deletion   |
-
-### Listing all `tj` sites in the VM:
-Use this to list all sites within your development environment that were generated by `tj`.
+| Flag             | Type   | Description                     |
+|:---------------- |:------ |:------------------------------- |
+| `[-n, --name]`   | String | Name of the development project |
+| `[-u, --url]`    | String | Development URL for the project |
+| `[--db_drop]`    | Bool   | Drop project's database         |
+| `[--vm_restart]` | Bool   | Restart VM after deletion       |
+
+### Managing deployment and migration (coming soon):
+Use this to easily manage your deployment and migration with [Capistrano](https://github.com/capistrano/capistrano) or whatever command is in your config. This is just a wrapper for your chosen command.
 ```bash
-tj list # Aliases: ls, sites, show
+tj deploy # Aliases: deployer server remote
 ```
 
-### Watching and compiling assets:
-Use this to watch and compile assets with your preferred build tool, whether that be [Grunt](https://github.com/gruntjs/grunt), [Gulp](https://github.com/gulpjs/gulp), [Guard](https://github.com/guard/guard), or whatever. This is simply a wrapper for whatever command is in your `tj.yml` file.
+### Listing all `tj` projects in the VM:
+Use this to list all projects within your VM that were generated by `tj`.
 ```bash
-tj watch # Aliases: dev, assets
+tj list # Aliases: ls projects apps sites
 ```
 
 ### Managing development environment:
-Use this to easily manage your [Varying Vagrant Vagrants](https://github.com/Varying-Vagrant-Vagrants/VVV) development environment. This is simply a wrapper for Vagrant commands executed within your VVV path.
+Use this to easily manage your [Varying Vagrant Vagrants](https://github.com/Varying-Vagrant-Vagrants/VVV) VM. This is a wrapper for Vagrant commands executed within your VM path.
+```bash
+tj vm # Aliases: vagrant vvv
+```
+
+### Watching and compiling assets:
+Use this to watch and compile assets with your preferred build tool, whether that be [Grunt](https://github.com/gruntjs/grunt), [Gulp](https://github.com/gulpjs/gulp), [Guard](https://github.com/guard/guard), or whatever. This is simply a wrapper for whatever command is in your config file.
 ```bash
-tj vm # Aliases: vagrant, vvv
+tj watch # Aliases: assets dev build
 ```
 
 ### Managing vendor dependencies:
-Use this to easily manage your dependencies with [Composer](https://github.com/composer/composer), or whatever other command you set in your `tj.yml`. This is a wrapper for whatever command is in your config file.
+Use this to easily manage your dependencies with [Composer](https://github.com/composer/composer), or whatever command you set within your config.
+```bash
+tj vendor # Aliases: dependencies deps
+```
+
+### Executing WP-CLI locally inside your VM:
+Upon setup, an `ssh` block for the VM is automatically added to the `wp-cli.local.yml` file with all of your VM paths. In our starter theme, we use [wp-cli-ssh](https://github.com/xwp/wp-cli-ssh) to run `wp` commands locally.
+In order to do the same, it needs to be a dependency in your `composer.json`.
 ```bash
-tj vendor # Aliases: deps, dependencies
+tj wp # Aliases: wordpress
 ```
 
-### Managing deployment and migration:
-Use this to easily manage your deployment and migration with [Capistrano](https://github.com/capistrano/capistrano) (or again, anything else set within your `tj.yml`). This is just a wrapper for your chosen command.
+### Backing up your database:
+Uses `backup` command within your config.
 ```bash
-tj server # Aliases: deploy, remote
+tj backup # Aliases: bk
 ```
 
-### Executing WP-CLI locally inside your VM with `wp-cli-ssh`
-You can run `wp` commands locally if you specify a `--host`. Upon setup, an `ssh` block for the VM is automatically added to the `wp-cli.local.yml` file with all of your development environment paths.
+### Distributing a package of your project:
+Uses `dist` command within your config.
 ```bash
-wp ssh --host=vagrant [<COMMANDS>]
+tj dist # Aliases: distrubute pack package
+```
 
-# Create an alias
-alias wpv="wp ssh --host=vagrant"
+### Running your test suite:
+Uses `dist` command within your config.
+```bash
+tj test # Aliases: tests spec specs
 ```
 
 ## Contributing

data/bin/tj

@@ -2,14 +2,14 @@
 # encoding: UTF-8
 
 begin
-    require_relative "../lib/theme-juice"
+  require_relative "../lib/theme-juice"
 rescue LoadError => err
-    warn err
-    exit 1
+  warn err
+  exit 1
 end
 
 Signal.trap "INT" do
-    ::ThemeJuice::Interaction.goodbye
+  ThemeJuice::IO.goodbye
 end
 
-::ThemeJuice::CLI.start
+ThemeJuice::CLI.start

data/lib/theme-juice.rb

@@ -2,29 +2,45 @@
 
 require "thor"
 require "faker"
-require "fileutils"
-require "pathname"
-require "tempfile"
+require "os"
 require "yaml"
 
 module ThemeJuice
 end
 
 require_relative "theme-juice/version"
-require_relative "theme-juice/environment"
-require_relative "theme-juice/interaction"
-require_relative "theme-juice/interactions/teejay"
-require_relative "theme-juice/interactions/create"
-require_relative "theme-juice/interactions/delete"
-require_relative "theme-juice/service"
-require_relative "theme-juice/services/config"
-require_relative "theme-juice/services/create"
-require_relative "theme-juice/services/delete"
-require_relative "theme-juice/services/list"
+require_relative "theme-juice/env"
+require_relative "theme-juice/project"
+require_relative "theme-juice/util"
+require_relative "theme-juice/io"
+require_relative "theme-juice/config"
+require_relative "theme-juice/task"
+require_relative "theme-juice/tasks/entry"
+require_relative "theme-juice/tasks/vm"
+require_relative "theme-juice/tasks/create_confirm"
+require_relative "theme-juice/tasks/delete_confirm"
+require_relative "theme-juice/tasks/location"
+require_relative "theme-juice/tasks/theme"
+require_relative "theme-juice/tasks/repo"
+require_relative "theme-juice/tasks/dot_env"
+require_relative "theme-juice/tasks/hosts"
+require_relative "theme-juice/tasks/nginx"
+require_relative "theme-juice/tasks/vm_plugins"
+require_relative "theme-juice/tasks/vm_location"
+require_relative "theme-juice/tasks/vm_customfile"
+require_relative "theme-juice/tasks/database"
+require_relative "theme-juice/tasks/landrush"
+require_relative "theme-juice/tasks/synced_folder"
+require_relative "theme-juice/tasks/dns"
+require_relative "theme-juice/tasks/wp_cli"
+require_relative "theme-juice/tasks/create_success"
+require_relative "theme-juice/tasks/delete_success"
+require_relative "theme-juice/tasks/vm_provision"
+require_relative "theme-juice/tasks/vm_restart"
+require_relative "theme-juice/tasks/import_database"
+require_relative "theme-juice/tasks/list"
 require_relative "theme-juice/command"
-require_relative "theme-juice/commands/install"
 require_relative "theme-juice/commands/create"
 require_relative "theme-juice/commands/delete"
-require_relative "theme-juice/commands/list"
-require_relative "theme-juice/commands/subcommand"
+require_relative "theme-juice/commands/deploy"
 require_relative "theme-juice/cli"

data/lib/theme-juice/cli.rb

@@ -1,318 +1,211 @@
 # encoding: UTF-8
 
 module ThemeJuice
-    class CLI < Thor
-
-        #
-        # Command aliases
-        #
-        map %w[--version -v]                => :version
-        map %w[new, add, build, make]       => :create
-        map %w[prep]                        => :setup
-        map %w[rm, remove, trash, teardown] => :delete
-        map %w[ls, sites, show]             => :list
-        map %w[assets, dev]                 => :watch
-        map %w[dependencies, deps]          => :vendor
-        map %w[deploy, remote]              => :server
-        map %w[vagrant, vvv]                => :vm
-
-        #
-        # Class options
-        #
-        class_option :vvv_path,      :type => :string,  :default => nil, :desc => "Force path to VVV installation"
-        class_option :yolo,          :type => :boolean,                  :desc => "Say yes to anything and everything"
-        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_deployer,   :type => :boolean,                  :desc => "Disable deployer"
-
-        desc "--version, -v", "Print current version"
-        #
-        # Print current version
-        #
-        # @return {String}
-        #
-        def version
-            self.set_environment
-
-            @interaction.speak @version, {
-                :color => :green
-            }
-        end
-
-        desc "create [NAME]", "Create new site and setup VVV environment"
-        method_option :name,         :type => :string,  :aliases => "-n", :default => false, :desc => "Name of the development site"
-        method_option :location,     :type => :string,  :aliases => "-l", :default => false, :desc => "Location of the local site"
-        method_option :theme,        :type => :string,  :aliases => "-t", :default => false, :desc => "Starter theme to install"
-        method_option :url,          :type => :string,  :aliases => "-u", :default => false, :desc => "Development URL of the site"
-        method_option :repository,   :type => :string,  :aliases => "-r",                    :desc => "Initialize a new Git remote repository"
-        method_option :bare,         :type => :boolean,                                      :desc => "Create a VVV site without a starter theme"
-        method_option :skip_repo,    :type => :boolean,                                      :desc => "Skip repository prompts and use defaults"
-        method_option :skip_db,      :type => :boolean,                                      :desc => "Skip database prompts and use defaults"
-        method_option :use_defaults, :type => :boolean,                                      :desc => "Skip all prompts and use default settings"
-        #
-        # Install and setup VVV environment with new site
-        #
-        # @param {String} name (nil)
-        #   Name of the site to create
-        #
-        # @return {Void}
-        #
-        def create(name = nil)
-            self.set_environment
-            @interaction.hello
-
-            opts = {
-                :site_name          => name || options[:name],
-                :site_location      => options[:location],
-                :site_starter_theme => options[:theme],
-                :site_dev_location  => nil,
-                :site_dev_url       => options[:url],
-                :site_repository    => options[:repository],
-                :site_bare          => options[:bare],
-                :skip_repo          => options[:skip_repo],
-                :skip_db            => options[:skip_db],
-                :use_defaults       => options[:use_defaults]
-            }
-
-            @create.new(opts)
-        end
-
-        desc "setup [NAME]", "Setup an existing site within the development environment"
-        method_option :name,         :type => :string,  :aliases => "-n", :default => false, :desc => "Name of the development site"
-        method_option :location,     :type => :string,  :aliases => "-l", :default => false, :desc => "Location of the local site"
-        method_option :url,          :type => :string,  :aliases => "-u", :default => false, :desc => "Development URL of the site"
-        method_option :repository,   :type => :string,  :aliases => "-r",                    :desc => "Initialize a new Git remote repository"
-        method_option :skip_repo,    :type => :boolean,                                      :desc => "Skip repository prompts and use defaults"
-        method_option :skip_db,      :type => :boolean,                                      :desc => "Skip database prompts and use defaults"
-        method_option :use_defaults, :type => :boolean,                                      :desc => "Skip all prompts and use default settings"
-        #
-        # Setup an existing WordPress install in VVV
-        #
-        # @param {String} name (nil)
-        #   Name of the site to setup
-        #
-        # @return {Void}
-        #
-        def setup(name = nil)
-            self.set_environment
-            @interaction.hello
-
-            opts = {
-                :site_name          => name || options[:name],
-                :site_location      => options[:location],
-                :site_starter_theme => false,
-                :site_dev_location  => nil,
-                :site_dev_url       => options[:url],
-                :site_repository    => options[:repository],
-                :site_bare          => true,
-                :skip_repo          => options[:skip_repo],
-                :skip_db            => options[:skip_db],
-                :use_defaults       => options[:use_defaults]
-            }
-
-            @create.new(opts)
-        end
-
-        desc "delete [NAME]", "Remove site from the VVV development environment (does not remove local site)"
-        method_option :name,    :type => :string,  :aliases => "-n", :default => false, :desc => "Name of the development site"
-        method_option :restart, :type => :boolean,                                      :desc => "Restart development environment after deletion"
-        #
-        # Remove all traces of site from Vagrant
-        #
-        # @param {String} name (nil)
-        #   Site to delete. This will not delete your local files, only
-        #   files within the VVV environment.
-        #
-        # @return {Void}
-        #
-        def delete(name = nil)
-            self.set_environment
-
-            opts = {
-                :site_name         => name || options[:name],
-                :site_dev_location => nil,
-                :restart           => options[:restart]
-            }
-
-            @delete.new(opts)
-        end
-
-        desc "list", "List all sites within the VVV development environment"
-        #
-        # List all development sites
-        #
-        # @return {Void}
-        #
-        def list
-            self.set_environment
-
-            @list.new
-        end
-
-        desc "install", "Run installation for the starter theme"
-        #
-        # Install and setup starter theme
-        #
-        # @return {Void}
-        #
-        def install
-            self.set_environment
-
-            @install.new
-        end
-
-        desc "watch [COMMANDS]", "Watch and compile assets"
-        #
-        # Assets
-        #
-        # @param {*} commands
-        #   Commands to run
-        #
-        # @return {Void}
-        #
-        def watch(*commands)
-            self.set_environment
-
-            opts = {
-                :subcommand => "watch",
-                :commands   => commands.join(" ")
-            }
-
-            @subcommand.new(opts)
-        end
-
-        desc "vendor [COMMANDS]", "Manage vendor dependencies"
-        #
-        # Vendor dependencies
-        #
-        # @param {*} commands
-        #   Commands to run
-        #
-        # @return {Void}
-        #
-        def vendor(*commands)
-            self.set_environment
-
-            opts = {
-                :subcommand => "vendor",
-                :commands   => commands.join(" ")
-            }
+  class CLI < Thor
+
+    def initialize(*)
+      super
+
+      @version           = VERSION
+      @env               = Env
+      @io                = IO
+      @config            = Config
+      @project           = Project
+      @util              = Util.new
+      @list              = Tasks::List
+      @create            = Commands::Create
+      @delete            = Commands::Delete
+      @deploy            = Commands::Deploy
+      @env.vm_path       = options.fetch "vm_path",       ENV.fetch("TJ_VM_PATH", File.expand_path("~/vagrant"))
+      @env.vm_ip         = options.fetch "vm_ip",         ENV.fetch("TJ_VM_IP", "192.168.50.4")
+      @env.vm_prefix     = options.fetch "vm_prefix",     ENV.fetch("TJ_VM_PREFIX", "tj-")
+      @env.yolo          = options.fetch "yolo",          ENV.fetch("TJ_YOLO", false)
+      @env.boring        = options.fetch "boring",        ENV.fetch("TJ_BORING", false)
+      @env.no_unicode    = options.fetch "no_unicode",    ENV.fetch("TJ_NO_UNICODE", @env.boring)
+      @env.no_colors     = options.fetch "no_colors",     ENV.fetch("TJ_NO_COLORS", @env.boring)
+      @env.no_animations = options.fetch "no_animations", ENV.fetch("TJ_NO_ANIMATIONS", @env.boring)
+      @env.no_landrush   = options.fetch "no_landrush",   ENV.fetch("TJ_NO_LANDRUSH", false)
+      @env.verbose       = options.fetch "verbose",       ENV.fetch("TJ_VERBOSE", false)
+      @env.dryrun        = options.fetch "dryrun",        ENV.fetch("TJ_DRYRUN", false)
+    end
 
-            @subcommand.new(opts)
-        end
+    map %w[--version -v]             => :version
+    map %w[mk new add]               => :create
+    map %w[up prep init make]        => :setup
+    map %w[rm remove trash teardown] => :delete
+    map %w[ls projects apps sites]   => :list
+    map %w[assets dev build]         => :watch
+    map %w[dependencies deps]        => :vendor
+    map %w[distrubute pack package]  => :dist
+    map %w[wordpress]                => :wp
+    map %w[bk]                       => :backup
+    map %w[tests spec specs]         => :test
+    map %w[deployer server remote]   => :deploy
+    map %w[vagrant vvv]              => :vm
+
+    class_option :vm_path,       :type => :string,  :default => nil, :desc => "Force path to VM"
+    class_option :vm_ip,         :type => :string,  :default => nil, :desc => "Force IP address for VM"
+    class_option :vm_prefix,     :type => :string,  :default => nil, :desc => "Force directory prefix for project in VM"
+    class_option :yolo,          :type => :boolean,                  :desc => "Say yes to anything and everything"
+    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_landrush,   :type => :boolean,                  :desc => "Disable landrush for DNS"
+    class_option :verbose,       :type => :boolean,                  :desc => "Verbose output"
+    class_option :dryrun,        :type => :boolean,                  :desc => "Disable running all commands"
+
+    desc "--version, -v", "Print current version"
+    #
+    # @return {String}
+    #
+    def version
+      @io.speak @version, :color => :green
+    end
 
-        desc "server [COMMANDS]", "Manage deployment and migration"
-        #
-        # Server/Deployment
-        #
-        # @param {*} commands
-        #   Commands to run
-        #
-        # @return {Void}
-        #
-        def server(*commands)
-            self.set_environment
+    desc "create", "Create new project"
+    method_option :name,         :type => :string,  :aliases => "-n", :default => nil, :desc => "Name of the project"
+    method_option :location,     :type => :string,  :aliases => "-l", :default => nil, :desc => "Location of the local project"
+    method_option :theme,        :type => :string,  :aliases => "-t", :default => nil, :desc => "Starter theme to install"
+    method_option :url,          :type => :string,  :aliases => "-u", :default => nil, :desc => "Development URL for the project"
+    method_option :repository,   :type => :string,  :aliases => "-r",                  :desc => "Initialize a new Git remote repository"
+    method_option :db_import,    :type => :string,  :aliases => %w[--import-db -i],    :desc => "Import an existing database"
+    method_option :bare,         :type => :boolean,                                    :desc => "Create a project without a starter theme"
+    method_option :skip_repo,    :type => :boolean,                                    :desc => "Skip repository prompts and use default settings"
+    method_option :skip_db,      :type => :boolean,                                    :desc => "Skip database prompts and use default settings"
+    method_option :use_defaults, :type => :boolean,                                    :desc => "Skip all prompts and use default settings"
+    method_option :no_wp,        :type => :boolean,                                    :desc => "New project is not a WordPress install"
+    method_option :no_db,        :type => :boolean,                                    :desc => "New project does not need a database"
+    #
+    # @return {Void}
+    #
+    def create
+      @io.hello
+      @create.new(options).execute
+    end
 
-            opts = {
-                :subcommand => "server",
-                :commands   => commands.join(" ")
-            }
+    desc "setup", "Setup existing project"
+    method_option :name,         :type => :string,  :aliases => "-n", :default => nil, :desc => "Name of the project"
+    method_option :location,     :type => :string,  :aliases => "-l", :default => nil, :desc => "Location of the local project"
+    method_option :url,          :type => :string,  :aliases => "-u", :default => nil, :desc => "Development URL for the project"
+    method_option :repository,   :type => :string,  :aliases => "-r",                  :desc => "Initialize a new Git remote repository"
+    method_option :import_db,    :type => :string,  :aliases => "-i",                  :desc => "Import an existing database"
+    method_option :skip_repo,    :type => :boolean,                                    :desc => "Skip repository prompts and use default settings"
+    method_option :skip_db,      :type => :boolean,                                    :desc => "Skip database prompts and use default settings"
+    method_option :use_defaults, :type => :boolean,                                    :desc => "Skip all prompts and use default settings"
+    method_option :no_wp,        :type => :boolean,                                    :desc => "New project is not a WordPress install"
+    method_option :no_db,        :type => :boolean,                                    :desc => "New project does not need a database"
+    #
+    # @return {Void}
+    #
+    def setup
+      @io.hello
+      @create.new(options.dup.merge({
+        :theme => false,
+        :bare => true,
+      })).execute
+    end
 
-            @subcommand.new(opts)
-        end
+    desc "delete", "Delete project (does not delete local project)"
+    method_option :name,       :type => :string,  :aliases => "-n", :default => nil, :desc => "Name of the development project"
+    method_option :url,        :type => :string,  :aliases => "-u", :default => nil, :desc => "Development URL for the project"
+    method_option :db_drop,    :type => :boolean, :aliases => "--drop-db",           :desc => "Drop project's database"
+    method_option :vm_restart, :type => :boolean, :aliases => "--restart-vm",        :desc => "Restart VM after deletion"
+    #
+    # @return {Void}
+    #
+    def delete
+      @delete.new(options).unexecute
+    end
 
-        desc "vm [COMMANDS]", "Manage virtual development environment with Vagrant"
-        #
-        # Vagrant
-        #
-        # @param {*} commands
-        #   Commands to run
-        #
-        # @return {Void}
-        #
-        def vm(*commands)
-            self.set_environment
+    desc "deploy", "Manage deployment and migration"
+    #
+    # @return {Void}
+    #
+    def deploy
+      @deploy.new(options).execute
+    end
 
-            system "cd #{@environment.vvv_path} && vagrant #{commands.join(" ")}"
-        end
+    desc "list", "List all projects"
+    #
+    # @return {Void}
+    #
+    def list
+      @list.new(options).list :projects
+    end
 
-        #
-        # Non-Thor commands
-        #
-        no_commands do
+    desc "install", "Run installation for project"
+    #
+    # @return {Void}
+    #
+    def install
+      @config.install
+    end
 
-            #
-            # Set up the environment
-            #
-            # @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
+    desc "update", "Update tj and its dependencies"
+    #
+    # @return {Void}
+    #
+    def update
+      @io.error "Not implemented"
+    end
 
-                self.force_vvv_path?
+    desc "watch [COMMANDS]", "Watch and compile assets"
+    #
+    # @return {Void}
+    #
+    def watch(*commands)
+      @config.watch *commands
+    end
 
-                @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
+    desc "vendor [COMMANDS]", "Manage vendor dependencies"
+    #
+    # @return {Void}
+    #
+    def vendor(*commands)
+      @config.vendor *commands
+    end
 
-                # if self.deployer?
-                #     @deployer = ::ThemeJuiceDeploy::Deployer
-                # else
-                #     @deployer = nil
-                # end
-            end
+    desc "dist [COMMANDS]", "Package project for distribution"
+    #
+    # @return {Void}
+    #
+    def dist(*commands)
+      @config.dist *commands
+    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
+    desc "wp [COMMANDS]", "Manage WordPress installation"
+    #
+    # @return {Void}
+    #
+    def wp(*commands)
+      @config.wp *commands
+    end
 
-            #
-            # Set VVV path
-            #
-            # @return {Void}
-            #
-            def force_vvv_path?
-                if options[:vvv_path].nil?
-                    @environment.vvv_path = File.expand_path("~/vagrant")
-                else
-                    @environment.vvv_path = options[:vvv_path]
-                    @interaction.notice "You're using a custom VVV path : (#{@environment.vvv_path})"
+    desc "backup [COMMANDS]", "Backup project"
+    #
+    # @return {Void}
+    #
+    def backup(*commands)
+      @config.backup *commands
+    end
 
-                    unless @interaction.agree? "Is the path correct?"
-                        @interaction.error "Good call. Let's create things, not break things. Aborting mission."
-                    end
-                end
+    desc "test [COMMANDS]", "Manage and run project tests"
+    #
+    # @return {Void}
+    #
+    def test(*commands)
+      @config.test *commands
+    end
 
-                unless Dir.exist? @environment.vvv_path
-                    @interaction.error "Cannot load VVV path (#{@environment.vvv_path}). Aborting mission before something bad happens."
-                end
-            end
-        end
+    desc "vm [COMMANDS]", "Manage development environment"
+    #
+    # @return {Void}
+    #
+    def vm(*commands)
+      @util.inside @env.vm_path do
+        @util.run "vagrant #{commands.join(" ")}", :verbose => @env.verbose
+      end
     end
+  end
 end