theme-juice 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a776df3c544a31881c70f1bdd63fdc32ff50423
-  data.tar.gz: c3b26a31fdfde2b1ce69a6ff44d4abb0f2fe5766
+  metadata.gz: 45986e3e185af0227b1519e087f5e788becedd96
+  data.tar.gz: b2db6200715f2a28eeaa369da9d5e70cb9d1f011
 SHA512:
-  metadata.gz: a2c2fcde5aec836834b7fbe77faf5bc71187d14b24891f93506c77a9b8aba46eee3e645b95dba08acfafe6f11dd569122b6e31c47ee2609000a559bab1423c57
-  data.tar.gz: bff98273a3d544cc258a500908857ba01d0cc54e112ccc1e1c41193dd9bf9633274912cf03b5e9625fe4ca0116a226948421ff72d9eaeb7485379dd390483fbf
+  metadata.gz: c8916cc2e1b45670d343a125006a047bd4450c28966347fe07c5214d195cdb452d589e2321be84da3b33ae2fb40f590ecc1b3a5dced4440333ff4d9196962fbc
+  data.tar.gz: 48951e85c92511d7f599c36d41439106cb6713d9ffcc192ca5af458116e99b1ee7c4acd079fae9567ce68175e0de2d9aca2909d2a8e4707f20a11fa9598ec6e8

data/README.md

@@ -8,9 +8,9 @@
 ![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/graft) for the virtual machine to spin up new development sites in seconds.
+The [Theme Juice CLI](http://cli.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).
+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://cli.themejuice.it).
 
 ## What problems does `tj` help solve?
 To get the most out of `tj`, it is recommended that you use our [starter template](https://github.com/ezekg/theme-juice-starter). Why? Keep on reading and we'll tell you. `tj` is built on top of tried and true open source libraries such as [Capistrano](http://capistranorb.com/) for deployment, [Vagrant](https://www.vagrantup.com/) for local development, and even a little bit of [WP-CLI](http://wp-cli.org) for database migration. Some of the main pain points `tj` helps solve are:
@@ -91,7 +91,7 @@ tj delete
 ```
 
 ### Deploy a project
-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!
+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://cli.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>
@@ -104,7 +104,7 @@ Want to check out all of the various flags and features `tj` offers? Just ask `t
 tj help
 ```
 
-Or, you can also check out [themejuice.it](http://themejuice.it) for a pretty website chock-full of the same documentation provided by `tj help`.
+Or, you can also check out [cli.themejuice.it](http://cli.themejuice.it) for a pretty website chock-full of the same documentation provided by `tj help`.
 
 ## FAQ
 
@@ -188,7 +188,7 @@ Yes and no; in order for `tj` to properly create a project, the Vagrant box need
 [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 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).
+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://cli.themejuice.it/deploy).
 
 For reference, below is an example config: (see the config for our starter template, [Sprout](https://github.com/ezekg/theme-juice-starter))
 

data/lib/theme-juice/man/tj

@@ -28,7 +28,7 @@ Force IP address of VM*
 Force directory prefix for project in VM*
 .
 .TP
-\fB\-\-vm\-revision\fR
+\fB\-\-vm\-revision\fR=\fIrevision\fR
 Revision hash or branch to checkout for VM (default is master)
 .
 .TP
@@ -37,7 +37,7 @@ Run Juicefile(5) commands from the passed path instead of from the current direc
 .
 .TP
 \fB\-\-from\-srv\fR, \fB\-\-in\-srv\fR=\fIpath\fR
-Run Juicefile(5) commands from the passed srv path instead of from the current host directory path when using the \fB\-\-inside\-vm\fR flag\.
+Run Juicefile(5) commands from the passed srv path instead of from the current host directory\.
 .
 .TP
 \fB\-\-inside\-vm\fR, \fB\-\-in\-vm\fR
@@ -266,77 +266,64 @@ will be replaced with,
 .P
 if those were the options chosen during a creation\. The following variables are available for use:
 .
-.TP
-\fBname\fR
-Project name
+.IP "\(bu" 4
+\fBname\fR: Project name
 .
-.TP
-\fBlocation\fR
-Project location
+.IP "\(bu" 4
+\fBlocation\fR: Project location
 .
-.TP
-\fBurl\fR
-Project URL
+.IP "\(bu" 4
+\fBurl\fR: Project URL
 .
-.TP
-\fBxip_url\fR
-Project xip\.io URL
+.IP "\(bu" 4
+\fBxip_url\fR: Project xip\.io URL
 .
-.TP
-\fBtemplate\fR
-Project template repository URL
+.IP "\(bu" 4
+\fBtemplate\fR: Project template repository URL
 .
-.TP
-\fBrepository\fR
-Initialized repository URL, if available
+.IP "\(bu" 4
+\fBrepository\fR: Initialized repository URL, if available
 .
-.TP
-\fBdb_host\fR
-Project database host
+.IP "\(bu" 4
+\fBdb_host\fR: Project database host
 .
-.TP
-\fBdb_name\fR
-Project database name
+.IP "\(bu" 4
+\fBdb_name\fR: Project database name
 .
-.TP
-\fBdb_user\fR
-Project database user
+.IP "\(bu" 4
+\fBdb_user\fR: Project database user
 .
-.TP
-\fBdb_pass\fR
-Project database password
+.IP "\(bu" 4
+\fBdb_pass\fR: Project database password
 .
-.TP
-\fBdb_import\fR
-Path to imported database file
+.IP "\(bu" 4
+\fBdb_import\fR: Path to imported database file
 .
-.TP
-\fBvm_box\fR
-Virtual machine box URL
+.IP "\(bu" 4
+\fBvm_box\fR: Virtual machine box URL
 .
-.TP
-\fBvm_ip\fR
-Virtual machine IP address
+.IP "\(bu" 4
+\fBvm_ip\fR: Virtual machine IP address
 .
-.TP
-\fBvm_path\fR
-Virtual machine location on the host machine
+.IP "\(bu" 4
+\fBvm_revision\fR Revision hash or branch to checkout for VM
 .
-.TP
-\fBvm_root\fR
-Web root of the VM on the host machine
+.IP "\(bu" 4
+\fBvm_path\fR: Virtual machine location on the host machine
 .
-.TP
-\fBvm_location\fR
-Project location within the VM on the host machine
+.IP "\(bu" 4
+\fBvm_root\fR: Web root of the VM on the host machine
 .
-.TP
-\fBvm_srv\fR
-Project location within the VM on the guest machine
+.IP "\(bu" 4
+\fBvm_location\fR: Project location within the VM on the host machine
 .
-.TP
-\fBvm_prefix\fR
-Virtual machine project location prefix
+.IP "\(bu" 4
+\fBvm_srv\fR: Project location within the VM on the guest machine
+.
+.IP "\(bu" 4
+\fBvm_prefix\fR: Virtual machine project location prefix
+.
+.IP "" 0
 .
 .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 tj(1) is run\. This is useful if you\'re using an alternate vagrant(1) box, or if you need to disable certain features due to limited support i\.e\. on Windows\.
@@ -346,18 +333,34 @@ All of the global options have a corresponding \fBENV\fR variable that can be se
 Force vagrant(1) box for use as VM
 .
 .TP
-\fBTJ_PATH\fR=\fIpath\fR
+\fBTJ_VM_PATH\fR=\fIpath\fR
 Force path to VM
 .
 .TP
-\fBTJ_IP\fR=\fIip\fR
+\fBTJ_VM_IP\fR=\fIip\fR
 Force IP address of VM
 .
 .TP
-\fBTJ_PREFIX\fR=\fIstring\fR
+\fBTJ_VM_REVISION\fR=\fIrevision\fR
+Revision hash or branch to checkout for VM (default is master)
+.
+.TP
+\fBTJ_VM_PREFIX\fR=\fIstring\fR
 Force directory prefix for project in VM
 .
 .TP
+\fBTJ_FROM_PATH\fR=\fIpath\fR
+Run Juicefile(5) commands from the passed path instead of from the current directory\.
+.
+.TP
+\fBTJ_FROM_SRV\fR=\fIpath\fR
+Run Juicefile(5) commands from the passed srv path instead of from the current host directory path\.
+.
+.TP
+\fBTJ_INSIDE_VM\fR=\fIbool\fR
+Run Juicefile(5) commands from inside of the virtual machine instead of your host machine\.
+.
+.TP
 \fBTJ_YOLO\fR=\fIbool\fR
 Say yes to anything and everything, and maybe even get a few surprises
 .

data/lib/theme-juice/man/tj-create

@@ -59,7 +59,7 @@ Location of the local project
 Starter template to install
 .
 .TP
-\fB\-\-template\-revision\fR, \fB\-\-template\-branch\fR
+\fB\-\-template\-revision\fR, \fB\-\-template\-branch\fR=\fIrevision\fR
 Revision hash or branch to checkout for starter template (default is master)
 .
 .TP

data/lib/theme-juice/man/tj-create.txt

@@ -49,7 +49,7 @@ GLOBAL OPTIONS
        -t, --template=repository
 	      Starter template to install
 
-       --template-revision, --template-branch
+       --template-revision, --template-branch=revision
 	      Revision	hash  or  branch  to  checkout	for  starter  template
 	      (default is master)
 

data/lib/theme-juice/man/tj.txt

@@ -21,7 +21,7 @@ GLOBAL OPTIONS
        --vm-prefix=string
 	      Force directory prefix for project in VM*
 
-       --vm-revision
+       --vm-revision=revision
 	      Revision hash or branch to checkout for VM (default is master)
 
        --from-path, --in-path=path
@@ -30,15 +30,14 @@ GLOBAL OPTIONS
 
        --from-srv, --in-srv=path
 	      Run Juicefile(5) commands from the passed srv  path  instead  of
-	      from  the current host directory path when using the --inside-vm
-	      flag.
+	      from the current host directory.
 
        --inside-vm, --in-vm
-	      Run Juicefile(5) commands from inside  of  the  virtual  machine
+	      Run  Juicefile(5)  commands  from  inside of the virtual machine
 	      instead of your host machine.
 
        --yolo, --yes
-	      Say  yes	to  anything  and everything, and maybe even get a few
+	      Say yes to anything and everything, and maybe  even  get	a  few
 	      surprises
 
        --boring
@@ -113,16 +112,16 @@ SECONDARY COMMANDS
 	      List all projects
 
        vm, vagrant, vvv=[command[,command]...]
-	      Manage  development  environment	via  vagrant(1).  Commands are
-	      proxied to your Vagrant installation so that  they  can  be  run
+	      Manage development  environment  via  vagrant(1).  Commands  are
+	      proxied  to  your  Vagrant  installation so that they can be run
 	      from any directory.
 
 CONFIG FILE
-       A  YAML	configuration  file called a Juicefile(5) can be used to store
-       commonly used build scripts, similar to npm(1)  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 deploy(1) con-
+       A YAML configuration file called a Juicefile(5) can be  used  to  store
+       commonly  used  build  scripts, similar to npm(1) 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 deploy(1)  con-
        figuration.
 
        For reference, below is an example config:
@@ -174,8 +173,8 @@ CONFIG COMMANDS
        dev, which will in turn run the command grunt.
 
        If you noticed in the example above, there are a few commands that con-
-       tain  %args%;  each  command  list is run within a single execution via
-       joining: cmd1 &&  cmd2  [&&  cmd3...],  with  all  %args%/%argN%  being
+       tain %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 commands using placeholders:
@@ -192,16 +191,16 @@ CONFIG COMMANDS
 
 
 
-       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 run tj dev some:other task, that would be interpreted and
+       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 run 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  num-
-       ber  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  com-
-       mand,  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
+       You  can specify an unlimited number of commands with an unlimited num-
+       ber 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 com-
+       mand, 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.
 
 CONFIG TEMPLATE STRINGS
@@ -233,73 +232,79 @@ CONFIG TEMPLATE STRINGS
        if those were the options chosen during a creation. The following vari-
        ables are available for use:
 
-       name   Project name
+       o   name: Project name
+
+       o   location: Project location
+
+       o   url: Project URL
+
+       o   xip_url: Project xip.io URL
 
-       location
-	      Project location
+       o   template: Project template repository URL
 
-       url    Project URL
+       o   repository: Initialized repository URL, if available
 
-       xip_url
-	      Project xip.io URL
+       o   db_host: Project database host
 
-       template
-	      Project template repository URL
+       o   db_name: Project database name
 
-       repository
-	      Initialized repository URL, if available
+       o   db_user: Project database user
 
-       db_host
-	      Project database host
+       o   db_pass: Project database password
 
-       db_name
-	      Project database name
+       o   db_import: Path to imported database file
 
-       db_user
-	      Project database user
+       o   vm_box: Virtual machine box URL
 
-       db_pass
-	      Project database password
+       o   vm_ip: Virtual machine IP address
 
-       db_import
-	      Path to imported database file
+       o   vm_revision Revision hash or branch to checkout for VM
 
-       vm_box Virtual machine box URL
+       o   vm_path: Virtual machine location on the host machine
 
-       vm_ip  Virtual machine IP address
+       o   vm_root: Web root of the VM on the host machine
 
-       vm_path
-	      Virtual machine location on the host machine
+       o   vm_location: Project location within the VM on the host machine
 
-       vm_root
-	      Web root of the VM on the host machine
+       o   vm_srv: Project location within the VM on the guest machine
 
-       vm_location
-	      Project location within the VM on the host machine
+       o   vm_prefix: Virtual machine project location prefix
 
-       vm_srv Project location within the VM on the guest machine
 
-       vm_prefix
-	      Virtual machine project location prefix
 
 ENVIRONMENT
        All of the global options have a corresponding ENV variable that can be
        set to permanently use the specified value each time tj(1) is run. This
-       is  useful  if you're using an alternate vagrant(1) box, or if you need
+       is useful if you're using an alternate vagrant(1) box, or if  you  need
        to disable certain features due to limited support i.e. on Windows.
 
        TJ_VM_BOX=repository
 	      Force vagrant(1) box for use as VM
 
-       TJ_PATH=path
+       TJ_VM_PATH=path
 	      Force path to VM
 
-       TJ_IP=ip
+       TJ_VM_IP=ip
 	      Force IP address of VM
 
-       TJ_PREFIX=string
+       TJ_VM_REVISION=revision
+	      Revision hash or branch to checkout for VM (default is master)
+
+       TJ_VM_PREFIX=string
 	      Force directory prefix for project in VM
 
+       TJ_FROM_PATH=path
+	      Run  Juicefile(5)  commands from the passed path instead of from
+	      the current directory.
+
+       TJ_FROM_SRV=path
+	      Run Juicefile(5) commands from the passed srv  path  instead  of
+	      from the current host directory path.
+
+       TJ_INSIDE_VM=bool
+	      Run  Juicefile(5)  commands  from  inside of the virtual machine
+	      instead of your host machine.
+
        TJ_YOLO=bool
 	      Say yes to anything and everything, and maybe  even  get	a  few
 	      surprises

data/lib/theme-juice/tasks/capistrano/dir.rb

@@ -51,7 +51,7 @@ namespace :dir do
       end
     else
       on roles(:app) do
-        upload! args[:dir], release_path.join(Pathname.new(args[:dir]).parent), {
+        upload! args[:dir], release_path.join(Pathname.new(args[:dir]).parent.to_s), {
           recursive: true
         }
       end
@@ -84,7 +84,7 @@ namespace :dir do
       end
     else
       on roles(:app) do
-        download! release_path.join(args[:dir]), Pathname.new(args[:dir]).parent, {
+        download! release_path.join(args[:dir]), Pathname.new(args[:dir]).parent.to_s, {
           recursive: true
         }
       end

data/lib/theme-juice/tasks/vm_update_box.rb

@@ -31,6 +31,7 @@ module ThemeJuice
             else
               cmds << "git checkout master"
             end
+            cmds << "git pull"
           end
         end
       end

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor