theme-juice 0.26.3 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 993a7061f134c09e5214a50afd234d7c72f3e56a
-  data.tar.gz: cac7fcedefb39e8d768727237ed03014522f4dfe
+  metadata.gz: 290cdb9fdc0a7207ea88f2fb585739bb55292df5
+  data.tar.gz: 25f14c0e4f8f24f2eedeaeec05fa676448cfcfce
 SHA512:
-  metadata.gz: 060a2da004e18ec839ab6e25d7bdd0fb95c9f1a50ac1e75e783056590e4ad25d804836987e4fb4406a3ef5b19c7bded3cc1126cc46ed022b9613a3bef4ab6295
-  data.tar.gz: 4e738554ac822d7e020f200b60570d8cf39b2cb022b0544d3e34cceb2d71c0cc947dd812012a07a26920e56fc142f424016f42963aa5075c425733b4e6ae4d07
+  metadata.gz: 775f94c36331cb9b3aa8efce9c4fb5c38efa8a6a4c3f98ab374aacfd8f8a309ab4ec2035d04318e8cab4c8ac2a75f8de777d7e55d4858a66c4ffa1dac11ba9ff
+  data.tar.gz: b530f9705253ec34e80512d58d5e3b80319e08554f09b3dd2368393b3eaef67ce997f470befd2c0084dbced47d576be14e6241a8f6310e78cf9c59bdc88a5b2b

data/README.md

@@ -8,7 +8,7 @@
 ![Theme Juice CLI](demo.gif)
 
 ## What is it?
-The [Theme Juice CLI](http://themejuice.it), also known as `tj`, helps you create new local WordPress development sites, manage existing sites, and deploy them, all from the command line. It utilizes our [Graft VM](https://github.com/ezekg/theme-juice-vm) for the virtual machine to spin up new development sites in seconds.
+The [Theme Juice CLI](http://themejuice.it), also known as `tj`, helps you create new local WordPress development sites, manage existing sites, and deploy them, all from the command line. It utilizes our [Graft VM](https://github.com/ezekg/graft) for the virtual machine to spin up new development sites in seconds.
 
 Check out [our getting started guide over at SitePoint](http://www.sitepoint.com/introducing-theme-juice-for-local-wordpress-development/), or [view the documentation site](http://themejuice.it).
 
@@ -64,15 +64,15 @@ tj create
 #### What happens on your first `create`?
 1. `tj` will execute `tj init` if the VM is uninitialized
 1. `tj` will clone the selected starter template
-1. `tj` will run the starter template's Juicefile `install` command
+1. `tj` will run the starter template's `Juicefile` install command
 1. `tj` will create all of the necessary project files, such as:
-  * `Customfile` containing DNS and synced folder settings
-  * `init-custom.sql` containing database setup
-  * `project.conf` containing server settings
-  * `wp-cli.local.yml` containing VM paths
+  * Create/append to `Customfile` containing DNS and synced folder settings
+  * Create/append to `init-custom.sql` for database creation and setup
+  * Create `$project.conf` containing Apache server settings
+  * Create `wp-cli.local.yml` containing SSH settings
 1. `tj` will provision the VM to put the new configuration into effect
 
-If you've never used `tj` before, then that last step might take awhile. After that's done, you should be able to access your new project at the specified url. It's that easy!
+If you've never used `tj` before, then that last step might take a little while. After that's done, you should be able to access your new project at the specified development url. It's that easy!
 
 ### Set up an existing project
 This sets up an existing local project within the development environment. You will go through a series of prompts to create the necessary files. This command is essentially an alias for `tj create --bare`.
@@ -91,7 +91,7 @@ tj delete
 ```
 
 ### Deploy a project
-This will deploy a project to the passed `<stage>` using [Capistrano](http://capistranorb.com/). Head over to the [docs](http://themejuice.it/deploy) to see all of the available commands. There's a quick getting started section there too for your first deployment!
+After configuring your `Juicefile` and setting up SSH keys for yourself, this will deploy a project to the passed `<stage>` using [Capistrano](http://capistranorb.com/). Head over to the [docs](http://themejuice.it/deploy) to see all of the available commands. There's a quick getting started section there too for your first deployment!
 
 ```
 tj deploy <stage>
@@ -119,18 +119,19 @@ Or, you can also check out [themejuice.it](http://themejuice.it) for a pretty we
 1. [Can I integrate my deployments with Slack?](#can-i-integrate-my-deployments-with-slack)
 1. [Can I use a self-signed SSL cert?](#can-i-use-a-self-signed-ssl-cert)
 1. [Can I define my own Capistrano tasks?](#can-i-define-my-own-capistrano-tasks)
+1. [Can I run `wp-cli` commands on my deployment stages?](#can-i-run-wp-cli-commands-on-my-deployment-stages)
 1. [Troubleshooting](#troubleshooting)
 
 ### Is Windows supported?
 Yes! But, since Windows doesn't support UTF-8 characters inside of the terminal, and is picky about ANSI color codes, you'll probably have to run `tj` with a couple flags.
 
-Something that has worked for me on one of my Windows machines is to run all commands through [git-scm](http://git-scm.com/downloads) with the `--boring --no-landrush` flags. This will disable all unicode characters and colors from being output, and will also disable [Landrush](https://github.com/phinze/landrush), which isn't fully supported on Windows.
+Something that has worked for me on one of my Windows machines is to run all commands through [git-scm](http://git-scm.com/downloads) with the `--boring` flags. This will disable all unicode characters and colors from being output. You may also use the `--no-landrush` flag to disable [Landrush](https://github.com/phinze/landrush), which currently has experimental Windows support (at least try it first and help report any bugs!).
 
-To set these globally via the `ENV`, set the following environment variables or run the commands below in your terminal:
+To set these globally via the `ENV`, set the following environment variables:
 
 ```bash
-export TJ_BORING=true
-export TJ_NO_LANDRUSH=true
+TJ_BORING=true
+TJ_NO_LANDRUSH=true
 ```
 
 In addition to that, `tj` uses the [OS gem](https://github.com/rdp/os) to sniff out your OS and it'll adjust a few things accordingly to make sure that nothing breaks.
@@ -141,15 +142,15 @@ _I don't regularly develop on Windows, so if you encounter any bugs, please let
 Definitely. If you want to use `tj` with Nginx and say, [VVV](https://github.com/Varying-Vagrant-Vagrants/VVV), it's as simple as running `tj` with a few flags:
 
 ```bash
-tj new --vm-box git@github.com:Varying-Vagrant-Vagrants/VVV.git --nginx
+tj new --vm-box git@github.com:Varying-Vagrant-Vagrants/VVV.git --vm-ip 192.168.50.4 --nginx
 ```
 
-To use these permanently, set the appropriate `ENV` variables through your `.bashrc` or similar, i.e. `export TJ_VM_BOX=git@github.com:Varying-Vagrant-Vagrants/VVV.git` and `export TJ_NGINX=true`.
+To use these permanently, set the appropriate `ENV` variables through your `.bashrc` or similar, i.e. `export TJ_VM_BOX=git@github.com:Varying-Vagrant-Vagrants/VVV.git`, `export TJ_VM_IP=192.168.50.4` and `export TJ_NGINX=true`.
 
-_Note: Before running this, you might want to either choose a new `vm-path`, or destroy any existing VMs inside of your `~/tj-vagrant` directory. If `tj` detects that a VM already installed, it will skip installing the new box._
+_Note: Before running this, you might want to either choose a new `vm-path`, or destroy and remove any existing VMs inside of your `~/tj-vagrant` directory. If `tj` detects that a VM already installed, it will skip installing the new box._
 
 ### So, does that mean I can use any Vagrant box?
-Yes and no; in order for `tj` to properly create a project, the Vagrant box needs to follow the same directory structure as [Graft](https://github.com/ezekg/theme-juice-vm), and include logic for a `Customfile`. Here is the required structure that `tj` needs in order to be able to create new projects:
+Yes and no; in order for `tj` to properly create a project, the Vagrant box needs to follow the same directory structure as [Graft](https://github.com/ezekg/graft), and include logic for a `Customfile`. Here is the required structure that `tj` needs in order to be able to create new projects:
 
 ```
 ├── config/
@@ -184,70 +185,72 @@ Yes and no; in order for `tj` to properly create a project, the Vagrant box need
 ```
 
 ### What is a `Customfile`?
-[It's a file that contains custom rules to add into the main `Vagrantfile`, without actually having to modify it](https://github.com/ezekg/theme-juice-vm/blob/master/Vagrantfile?ts=2#L96-L98). This allows us to easily modify the Vagrant box without causing merge conflicts if you were to update the VM source via `git pull`. Every file that `tj` modifies is _meant to be modified_, so at any time you may update your installation of Graft with a simple `git pull` without getting merge conflicts out the wazoo.
+[It's a file that contains custom rules to add into the main `Vagrantfile`, without actually having to modify it](https://github.com/ezekg/graft/blob/master/Vagrantfile?ts=2). This allows us to easily modify the Vagrant box without causing merge conflicts if you were to update the VM source via `git pull`. Every file that `tj` modifies is _meant to be modified_, so at any time you may update your installation of Graft with a simple `git pull` without getting merge conflicts out the wazoo.
 
 ### What is a `Juicefile`?
-A YAML configuration file called `Juicefile` can be used to store commonly-used build scripts, similar to [npm scripts](https://docs.npmjs.com/misc/scripts). Each command block sequence can be mapped to an individual project's build script, allowing a streamlined set of commands to be used across multiple projects that utilize different tools. If you plan to deploy using `tj`, this file will also house your [deployment configuration](http://themejuice.it/deploy).
+A YAML configuration file called a `Juicefile` can be used to store commonly-used build scripts, similar to [npm scripts](https://docs.npmjs.com/misc/scripts). Each command can be mapped to any build script you like, allowing you to define a set of commands that can be used across all of your projects. If you plan to deploy using `tj`, this file will also house your [deployment configuration](http://themejuice.it/deploy).
 
-Below is the config that comes baked into [our starter template](https://github.com/ezekg/theme-juice-starter):
+For reference, below is an example config: (see the config for our starter template, [Sprout](https://github.com/ezekg/theme-juice-starter))
 
 ```yml
-#
 # Manage command aliases for the current project
-#
 commands:
 
   # Run project install scripts
   install:
-    - composer install
-    - bundle install
     - npm install
-    - bower install
     - grunt build
 
   # Manage build tools
-  watch:
+  dev:
     - grunt %args%
 
   # Manage front-end dependencies
   assets:
-    - bower %args%
+    - npm %args%
 
   # Manage back-end dependencies
   vendor:
     - composer %args%
 
-  # Manage WP installation
-  wp:
-    - wp ssh --host=vagrant %args%
-
   # Create a backup of the current database with a nice timestamp
   backup:
     - mkdir -p backup
-    - wp ssh --host=vagrant db export backup/$(date +'%Y-%m-%d-%H-%M-%S').sql
+    - wp @dev db export backup/$(date +'%Y-%m-%d-%H-%M-%S').sql
+
+# Manage deployment settings for the current project
+deployment:
 
-  # Package up entire project into a gzipped tar file
-  dist:
-    - tar -zcvf dist.tar.gz .
+  application:
+    name: "example"
+
+  # ...
 ```
 
-Each list of commands is run within a single execution, with all `%args%`/`%argN%` being replaced with the corresponding argument index, when available. Here's a few example scenarios:
-```bash
-# Will contain all arguments stitched together by a space
-cmd1 %args%
-# Will contain each argument mapped to its respective index
-cmd2 '%arg1% %arg2% %arg3%'
-# Will only map argument 4, while ignoring 1-3
-cmd3 "%arg4%"
+The commands within the `commands` block can be run from the command line via `tj <command>`. For example, we can run the `dev` command by running `tj dev`, which will in turn run the command `grunt`.
+
+If you noticed in the example above, there are a few commands that contain `%args%`; each command list is run within a single execution via joining: `cmd1 && cmd2 [&& cmd3...]`, with all `%args%`/`%argN%` being replaced with the corresponding argument index, when available. Here's a few example scenarios:
+
+```yml
+commands:
+  example-command:
+    # Will contain all arguments joined by a space
+    - cmd1 %args%
+    # Will contain each argument mapped to its respective index
+    - cmd2 '%arg1% %arg2% %arg3%'
+    # Will only map argument 4, while ignoring 1-3
+    - cmd3 "%arg4%"
 ```
 
-You can specify an unlimited number of commands with an unlimited number of arguments; however, you should be careful with how this is used. Don't go including `sudo rm -rf %arg1%` in a command, while passing `/` as an argument. Keep it simple. These are meant to make your life easier by helping you manage build tools, not to do fancy scripting.
+To clarify a little bit more, we could run `tj dev build`, and since our `dev` command contains `%args%`, that will in turn run the command `grunt build`; if we can `tj dev some other task`, that would be interpreted and run as `grunt some other task`.
+
+You can specify an unlimited number of commands with an unlimited number of arguments within your `Juicefile`; however, you should be careful with how this is used. Don't go including `sudo rm -rf %arg1%` in a command, while passing `/` as an argument. Keep it simple. These are meant to make your life easier by helping you manage build tools, not to do fancy scripting.
 
 ### Does `tj` support subdomain multi-sites?
-If you're able to use [Landrush](https://github.com/phinze/landrush) for your DNS, then yes. All subdomains will resolve to their parent domain. Landrush comes pre-installed when you create your first project with `tj`. Having said that, unfortunately, if you're on Windows you'll probably have to manually add the subdomains due to Landrush not being fully supported. If you have the Windows chops, head over there and contribute to Landrush by squashing that bug. I'm sure he would appreciate it!
+If you're able to use [Landrush](https://github.com/phinze/landrush) for your DNS, then yes. All subdomains will resolve to their parent domain. Landrush comes pre-installed when you create your first project with `tj`. Having said that, unfortunately, if you're on Windows you'll might have to manually add the subdomains to your `/etc/hosts` file due to Landrush not being fully supported yet. If you have the Windows chops, head over there and contribute to Landrush by squashing that bug. I'm sure he would appreciate it!
 
 ### Can I access a project from another device (i.e. mobile)?
-Yes! Every project created with `tj` will automatically be set up to support using [xip.io](http://xip.io/). If you're using OSX, then everything should work out of the box. If you're not using OSX, then you'll need to point port `80` on your host machine to `8080`; Vagrant cannot do this by default for security reasons.
+Yes! Every project created with `tj` will automatically be set up to support using [xip.io](http://xip.io/). If you're using OSX, then everything should work out of the box. If you're not using OSX, then you'll need to point port `80` on your host machine to `8080`; Vagrant cannot do this by default for security reasons. You can also use a service like [ngrok](https://ngrok.com/), if you prefer.
 
 Once everything is good to go, you can access a project from another device on the same network by going to `<project-name>.<your-hosts-ip-address>.xip.io` e.g. `themejuice.192.168.1.1.xip.io`.
 
@@ -279,12 +282,12 @@ deployment:
 Check out [capistrano-slackify](https://github.com/onthebeach/capistrano-slackify) for more information.
 
 ### Can I use a self-signed SSL cert?
-Yes, unless you used the `--no-ssl` flag, `tj` will set up each new site to support SSL, [and the VM will generate a new self-signed certificate](https://github.com/ezekg/theme-juice-vm#automatically-generated-self-signed-ssl-certs). In order to take advantage of it, [you'll need to accept the self-signed certificate on your host machine](https://github.com/ezekg/theme-juice-vm#accepting-a-self-signed-ssl-cert).
+Yes, unless you used the `--no-ssl` flag, `tj` will set up each new site to support SSL, [and the VM will generate a new self-signed certificate](https://github.com/ezekg/graft#automatically-generated-self-signed-ssl-certs). In order to take advantage of it, [you'll need to accept the self-signed certificate on your host machine](https://github.com/ezekg/graft#accepting-a-self-signed-ssl-cert).
 
 ### Can I define my own Capistrano tasks?
 Yes. Any file within a directory called `deploy/` in your project with extensions `.rb`, `.cap` or `.rake` will be automatically loaded by Capistrano.
 
-For example, within our [starter template](https://github.com/ezekg/theme-juice-starter), you will find a `deploy/` directory, inside is an example task named `task.rb.example`. Open the file and you will see an example task invokable by `tj remote <stage> hello:world`.
+For example, within our [starter template](https://github.com/ezekg/theme-juice-starter), you will find a `deploy/` directory, inside is a few example tasks. Open one of them and you'll see an example task invokable by `tj remote <stage> <namespace:task>`.
 
 To learn more about Rake and how you can define your own Capistrano tasks, check out the [official Rake repository](https://github.com/ruby/rake) as well as the [official Capistrano tasks documentation](http://capistranorb.com/documentation/getting-started/tasks/).
 
@@ -304,6 +307,22 @@ namespace :db do
 end
 ```
 
+### Can I run `wp-cli` commands on my deployment stages?
+Sure can, and without the help of `tj`! As of version `0.24`, `wp-cli` does this out of the box. Whenever you create a new site, `tj` will add a file to your project's root directory called `wp-cli.local.yml` that contains something along the lines of:
+
+```yml
+@development:
+  ssh: vagrant@example.dev/srv/www/tj-example
+```
+
+You can then run `wp` commands like this,
+
+```bash
+wp @development plugin list
+```
+
+Feel free to add your other stages into that file as well!
+
 ## Troubleshooting
 
 1. [Help! It won't let me `git clone` anything!](#help-it-wont-let-me-git-clone-anything)

data/lib/theme-juice.rb

@@ -4,6 +4,7 @@ require "thor"
 require "faker"
 require "os"
 require "yaml"
+require "erb"
 require "shellwords"
 require "capistrano/all"
 

data/lib/theme-juice/cli.rb

@@ -88,7 +88,7 @@ module ThemeJuice
         if File.exist? man_path
           shell_escaped_man_path = man_path.shellescape
           if OS.windows?
-            @io.say File.read "#{shell_escaped_man_path}.txt", :color => :white
+            @io.say File.read("#{shell_escaped_man_path}.txt"), :color => :white
           else
             @util.run "man #{shell_escaped_man_path}", :verbose => @env.verbose
           end
@@ -121,7 +121,7 @@ module ThemeJuice
     end
 
     desc "init", "Initialize the VM"
-    method_option :provision, :type => :boolean, :desc => ""
+    method_option :vm_provision, :type => :boolean, :aliases => %w[--provision-vm --provision], :desc => ""
     def init
       @io.say "Initializing the VM...", {
         :color => [:black, :on_green, :bold],
@@ -148,7 +148,6 @@ module ThemeJuice
     method_option :no_config,        :type => :boolean, :aliases => %w[--no-juicefile],     :desc => ""
     method_option :wp_config_modify, :type => :boolean, :aliases => %w[--modify-wp-config], :desc => ""
     method_option :no_ssl,           :type => :boolean, :aliases => %w[--no-https],         :desc => ""
-    method_option :provision,        :type => :boolean,                                     :desc => ""
     def create
       @io.hello
       @create.new(options).execute
@@ -170,7 +169,6 @@ module ThemeJuice
     method_option :no_config,        :type => :boolean, :aliases => %w[--no-juicefile],     :desc => ""
     method_option :wp_config_modify, :type => :boolean, :aliases => %w[--modify-wp-config], :desc => ""
     method_option :no_ssl,           :type => :boolean, :aliases => %w[--no-https],         :desc => ""
-    method_option :provision,        :type => :boolean,                                     :desc => ""
     def setup
       @io.hello
       @create.new(options.dup.merge(:bare => true)).execute

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

@@ -41,11 +41,7 @@ module ThemeJuice
           tasks << Tasks::DNS.new
           tasks << Tasks::WPCLI.new
           tasks << Tasks::Repo.new
-          if @project.provision
-            tasks << Tasks::VMProvision.new
-          else
-            tasks << Tasks::VMRestart.new
-          end
+          tasks << Tasks::VMProvision.new
           tasks << Tasks::ImportDatabase.new
           tasks << Tasks::CreateSuccess.new
         end
@@ -54,6 +50,14 @@ module ThemeJuice
       private
 
       def init_project
+
+        # Assume bare if the project path isn't empty (template install will fail)
+        unless @opts[:bare] || Dir["#{@project.location}/*"].empty?
+          @opts[:template] = false
+          @opts[:bare]     = true
+          @io.notice "Project location is not empty. Assuming you meant to run a setup..."
+        end
+
         @project.use_defaults     = @opts.fetch("use_defaults")     { false }
         @project.bare             = @opts.fetch("bare")             { false }
         @project.skip_repo        = @opts.fetch("skip_repo")        { false }
@@ -64,11 +68,9 @@ module ThemeJuice
         @project.wp_config_modify = @opts.fetch("wp_config_modify") { false }
         @project.no_config        = @opts.fetch("no_config")        { false }
         @project.no_ssl           = @opts.fetch("no_ssl")           { false }
-        @project.provision        = @opts.fetch("provision")        { false }
         @project.no_env           = @opts.fetch("no_env")           { @project.wp_config_modify }
         @project.name             = @opts.fetch("name")             { name }
         @project.location         = @opts.fetch("location")         { location }
-        @project.location         = "#{Dir.pwd}" if @project.location == "."
         @project.url              = @opts.fetch("url")              { url }
         @project.xip_url          = @opts.fetch("xip_url")          { xip_url }
         @project.template         = @opts.fetch("template")         { template }
@@ -78,14 +80,34 @@ module ThemeJuice
         @project.db_user          = @opts.fetch("db_user")          { db_user }
         @project.db_pass          = @opts.fetch("db_pass")          { db_pass }
         @project.db_import        = @opts.fetch("db_import")        { db_import }
+        @project.vm_root
+        @project.vm_location
+        @project.vm_srv
+
+        # TODO: Think up a nicer way of implementing additional logic
+
+        # Special cases for location paths
+        case @project.location
+        when "."
+          @project.location = "#{Dir.pwd}"
+        when /^~/
+          @project.location = File.expand_path @project.location
+        end
       end
 
       def name
-        if @env.yolo
-          name = Faker::Internet.domain_word
-        else
-          name = @io.ask "What's the project name? (letters, numbers and dashes only)"
-        end
+        name =
+          begin
+            @io.say "Inferred project name '#{@config.project.name}' from existing config...", {
+              :color => :yellow, :icon => :notice }
+            @config.project.name
+          rescue NoMethodError
+            if @env.yolo
+              Faker::Internet.domain_word
+            else
+              @io.ask "What's the project name? (lowercase letters, numbers and dashes only)"
+            end
+          end
 
         valid_name? name
 
@@ -114,7 +136,7 @@ module ThemeJuice
         if @project.use_defaults
           location = File.absolute_path @project.name, path
         else
-          location = File.absolute_path @io.ask("Where do you want to setup the project?",
+          location = File.expand_path @io.ask("Where do you want to setup the project?",
             :default => path, :path => true), path
         end
 
@@ -122,11 +144,18 @@ module ThemeJuice
       end
 
       def url
-        if @project.use_defaults
-          url = "#{@project.name}.dev"
-        else
-          url = @io.ask "What do you want the development url to be? (this should end in '.dev')", :default => "#{@project.name}.dev"
-        end
+        url =
+          begin
+            @io.say "Inferred project url '#{@config.project.url}' from existing config...", {
+              :color => :yellow, :icon => :notice }
+            @config.project.url
+          rescue NoMethodError
+            if @project.use_defaults
+              "#{@project.name}.dev"
+            else
+              @io.ask "What do you want the development url to be? (this should end in '.dev')", :default => "#{@project.name}.dev"
+            end
+          end
 
         valid_url? url
 

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

@@ -32,6 +32,9 @@ module ThemeJuice
         @project.url        = @opts.fetch("url")        { url }
         @project.db_drop    = @opts.fetch("db_drop")    { false }
         @project.vm_restart = @opts.fetch("vm_restart") { false }
+        @project.vm_root
+        @project.vm_location
+        @project.vm_srv
       end
 
       def name
@@ -46,7 +49,7 @@ module ThemeJuice
 
       def url
         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

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

@@ -16,13 +16,16 @@ module ThemeJuice
           tasks << Tasks::VMCustomfile.new
           tasks << Tasks::Landrush.new
           tasks << Tasks::ForwardPorts.new
-          tasks << Tasks::VMProvision.new
+          tasks << Tasks::VMProvision.new if @project.vm_provision
           tasks << Tasks::InitSuccess.new
         end
       end
 
       def init_project
-        @project.provision = @opts.fetch("provision") { false }
+        @project.vm_provision = @opts.fetch("vm_provision") { false }
+        @project.vm_root
+        @project.vm_location
+        @project.vm_srv
       end
     end
   end

data/lib/theme-juice/config.rb

@@ -8,6 +8,8 @@ module ThemeJuice
     @util    = Util.new
     @config  = nil
 
+    attr_accessor :path
+
     def command(cmd, *args)
       return if @project.no_config
 
@@ -22,6 +24,12 @@ module ThemeJuice
       @io.say "Skipping...", :color => :yellow, :icon => :notice
     end
 
+    def project
+      config.project
+    rescue NoMethodError
+      {}
+    end
+
     def commands
       config.commands
     rescue NoMethodError
@@ -38,6 +46,10 @@ module ThemeJuice
       !capture { config }.nil?
     end
 
+    def refresh!
+      @config = read
+    end
+
     private
 
     def run(command)
@@ -69,17 +81,18 @@ module ThemeJuice
     end
 
     def config
-      @config = read_config if @config.nil?
-      @config
+      @config ||= read
     end
 
-    def read_config
+    def read
       @project.location ||= @env.from_path || Dir.pwd
       @project.name ||= File.basename @project.location
 
-      YAML.load_file Dir["#{@project.location}/*"].select { |f|
-        config_regex =~ File.basename(f) }.last ||
-        @io.error("Config file not found in '#{@project.location}'", LoadError)
+      @path = Dir["#{@project.location}/*"].select { |f|
+        config_regex =~ File.basename(f)
+      }.last || @io.error("Config file not found in '#{@project.location}'", LoadError)
+
+      YAML.load File.read(@path)
     rescue ::Psych::SyntaxError => err
       @io.error "Config file contains invalid YAML", SyntaxError do
         puts err
@@ -88,20 +101,30 @@ module ThemeJuice
       nil
     end
 
+    # Allowed:
+    # - Juicefile
+    # - Juicefile.yml
+    # - Juicefile.yaml
+    # - juicefile
+    # - juicefile.yml
+    # - juicefile.yaml
+    # - .tj
+    # - .tj.yml
+    # - .tj.yaml
     def config_regex
-      %r{^(((\.)?(tj)|((J|j)uicefile))(\.y(a)?ml)?$)}
+      %r{^(\.?(tj)|((J|j)uicefile))(\.ya?ml)?$}
     end
 
     def any_arg_regex
-      %r{(%arg(\w+)?%)|(%argument(\w+)?%)}
+      %r{%arg(?:ument)?[s\d]+%}
     end
 
     def multi_arg_regex
-      %r{(%args%)|(%arguments%)}
+      %r{%arg(?:ument)?s%}
     end
 
     def single_arg_regex(i)
-      %r{(%arg#{i}%)|(%argument#{i}%)}
+      %r{%arg(?:ument)?#{i}%}
     end
 
     def capture