theme-juice 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 964a8ffb47c2eb9e67a2b0481a9c6bbb2376d43f
-  data.tar.gz: 4472173c815c9d389bcc190f1c2f5a8ee414e554
+  metadata.gz: 63c52fd656dcfb57f5f07f15a924c0cd174c48b9
+  data.tar.gz: 4676d9a168acf7dd7829947cad646b8031d805ba
 SHA512:
-  metadata.gz: 27c921f287e5cc822f5e597ba619946d5999f73767a20228a5f5bc7d60095d21f98cec629b156b62f82d40f126d1e40a11a582d505dd18ebac936714e41a70ce
-  data.tar.gz: 9e8f085dfb997465220e4ec70c438fc4415a61162b0cbf0aaef60cb41f4bc3b3092219ea63d2efbf24c06a508ee3320f1181c8198c68dfe34a2fb6d5a948f71d
+  metadata.gz: fc55911c12aa9e7a71b5d1401efa2ca4b662987fade550d1dd6288a4618e96702e6000be28716021e659992fc40dd356a350929fbe08f256679873bdefb70df1
+  data.tar.gz: e27f7320c22ac6e0dcc0c8bf17ab506a9a44168d932cc1c12e23cf82016c0ee94d182cc7e749426bb5be035c045a4f961f97395338e9ff3d30c67a2f29a1f247

data/LICENSE

@@ -1,22 +1,339 @@
-Copyright (c) 2014 Ezekiel Gabrielse
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

data/README.md

@@ -4,7 +4,7 @@ Command line interface to scaffold out a new WordPress development environment a
 ## 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).
-* Finally, you can run: `$ gem install theme-juice-cli`
+* Finally, install with: `gem install theme-juice`
 
 That`s it!
 
@@ -16,64 +16,70 @@ List all commands for `tj`.
 tj
 ```
 
+#### Print version:
+This command will print the current version of `tj`.
+```bash
+tj version
+```
+
 #### Setup VVV:
 This command will _only_ setup [Varying Vagrant Vagrants](https://github.com/Varying-Vagrant-Vagrants/VVV). It will not prompt you to create a new site. _Note: This is automatically run when you create your first site._
 ```bash
 tj init
 ```
 
-#### Create a new development site:
+#### 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.
 ```bash
 tj create [<SITE-NAME>]
 ```
 
-#### Setup an existing site:
+#### 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.
 ```bash
 tj setup [<SITE-NAME>] # Alias for 'tj create [<SITE-NAME>] --bare'
 ```
 
-#### Delete a site from the VM: _(Does not remove your local site)_
+#### 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._
 ```bash
 tj delete <SITE-NAME>
 ```
 
-#### List all sites in the VM:
+#### Listing all `tj` sites in the VM:
 Use this to list all sites within your development environment that were generated by `tj`.
 ```bash
 tj list
 ```
 
-#### Watch and compile assets: _(Guard)_
+#### Watching and compiling assets: _(Guard)_
 Use this to watch and compile assets with [Guard](https://github.com/guard/guard). This is simply a wrapper for Guard commands.
 ```bash
-tj watch # Alias for 'bundle exec guard [COMMANDS]'
+tj watch # Alias for 'bundle exec guard [<COMMANDS>]'
 ```
 
-#### Use for managing development environment: _(Vagrant)_
+#### Managing development environment: _(Vagrant)_
 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.
 ```bash
-tj vm # Alias for 'cd ~/vagrant && vagrant [COMMANDS]'
+tj vm # Alias for 'cd ~/vagrant && vagrant [<COMMANDS>]'
 ```
 
-#### Use for managing vendor dependencies: _(Composer)_
+#### Managing vendor dependencies: _(Composer)_
 Use this to easily manage your [Composer](https://github.com/composer/composer) dependencies. This is simply a wrapper for Composer commands.
 ```bash
-tj vendor # Alias for 'composer [COMMANDS]'
+tj vendor # Alias for 'composer [<COMMANDS>]'
 ```
 
-#### Use for managing deployment and migration: _(Capistrano)_
+#### Managing deployment and migration: _(Capistrano)_
 Use this to easily manage your deployment and migration with [Capistrano](https://github.com/capistrano/capistrano). This is simply a wrapper for Capistrano commands.
 ```bash
-tj server # Alias for 'bundle exec cap [COMMANDS]'
+tj server # Alias for 'bundle exec cap [<COMMANDS>]'
 ```
 
 #### 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.yml` file with all of your development environment paths.
+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.
 ```bash
-wp ssh --host=vagrant [COMMANDS]
+wp ssh --host=vagrant [<COMMANDS>]
 
 # Create an alias
 alias wpv="wp ssh --host=vagrant"

data/lib/theme-juice/cli.rb

@@ -59,116 +59,157 @@ module ThemeJuice
         # @return {Void}
         ###
         desc "create [SITE]", "Setup SITE and the VVV development environment"
-        method_option :bare, type: :boolean, desc: "Create a VVV site without the starter theme"
+        method_option :bare,
+            type: :boolean,
+            aliases: "-b",
+            desc: "Create a VVV site without a starter theme"
+        method_option :site,
+            type: :string,
+            aliases: "-s",
+            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: :boolean,
+            aliases: "-r",
+            default: false,
+            desc: "Initialize a new Git remote repository"
         def create(site = nil, bare_setup = false)
             self.welcome
 
-            ###
-            # Theme setup
-            ###
-            if site.nil?
+            if options[:site]
+                site = options[:site]
+            end
+
+            # Check if user passed all required options through flags
+            if options.all? { |opt, val| val != false }
+                say "Well... looks like you just have everything all figured out, huh?", :yellow
+            elsif site.nil?
                 say "Just a few questions before we begin...", :yellow
             else
-                say "Your site name shall be #{site}! Just a few more questions before we begin...", :yellow
+                say "Your site name shall be '#{site}'! Just a few more questions before we begin...", :yellow
             end
 
-            # ask for the Site name if not passed directly
+            # Ask for the Site name if not passed directly
             site ||= ask "What's the site name? (only ascii characters are allowed) :", :blue
 
+            # Make sure site name is valid
             if site.match /[^0-9A-Za-z.\-]/
                 say "Site name contains invalid non-ascii characters. This name is used for creating directories, so that's not gonna work. Aborting mission.", :red
                 exit 1
             end
 
-            # Bare install
+            # Bare install?
             bare_setup ||= options[:bare]
 
             # Make sure Site name was given, else throw err
             unless site.empty?
                 clean_site_name = site.gsub(/[^\w]/, "_")[0..10]
 
-                ###
                 # Location of site installation
-                ###
-                site_location = ask "Where do you want to setup the site? :", :blue,
-                    default: "#{Dir.pwd}/",
-                    path: true
+                if options[:location]
+                    site_location = options[:location]
+                else
+                    site_location = ask "Where do you want to setup the site? :", :blue, default: "#{Dir.pwd}/", path: true
+                end
 
-                ###
                 # Starter theme to clone
-                ###
                 unless bare_setup
-                    require "highline/import"
 
-                    starter_theme = nil
+                    if options[:theme]
+                        starter_theme = options[:theme]
+                    else
+                        require "highline/import"
 
-                    say "Which starter theme would you like to use? :", :blue
-                    choose do |menu|
-                        menu.index_suffix = ") "
+                        starter_theme = nil
 
-                        menu.choice "ezekg/theme-juice-starter" do |c|
-                            say "Awesome choice!", :green
-                            starter_theme = c
-                        end
+                        say "Which starter theme would you like to use? :", :blue
+                        choose do |menu|
+                            menu.index_suffix = ") "
 
-                        menu.choice "other" do
-                            starter_theme = ask "What is the user/repository of the starter theme you would like to clone? :", :blue
-                        end
+                            menu.choice "ezekg/theme-juice-starter" do |c|
+                                say "Awesome choice!", :green
+                                starter_theme = c
+                            end
+
+                            menu.choice "other" do
+                                starter_theme = ask "What is the user/repository of the starter theme you would like to clone? :", :blue
+                            end
 
-                        menu.choice "none" do |c|
-                            say "Next time you want to create a site without a starter theme, you can just run the 'setup' command instead.", :yellow
-                            starter_theme, bare_setup = c, true
+                            menu.choice "none" do |c|
+                                say "Next time you want to create a site without a starter theme, you can just run the 'setup' command instead.", :yellow
+                                starter_theme, bare_setup = c, true
+                            end
                         end
                     end
                 end
 
-                ###
                 # Development url
-                ###
-                dev_url = ask "What do you want the development url to be? (this should end in '.dev') :", :blue,
-                    default: "#{site}.dev"
+                if options[:url]
+                    dev_url = options[:url]
+                else
+                    dev_url = ask "What do you want the development url to be? (this should end in '.dev') :", :blue, default: "#{site}.dev"
+                end
 
                 unless dev_url.match /(.dev)$/
                     say "Your development url doesn't end with '.dev'. This is used within Vagrant, so that's not gonna work. Aborting mission.", :red
                     exit 1
                 end
 
-                ###
                 # Initialize a git repository on setup
-                ###
-                if yes? "Would you like to initialize a new Git repository? (y/N) :", :blue
-                    repository = ask "What is the repository's URL? :", :blue
+                if options[:repository]
+                    repository = options[:repository]
                 else
-                    repository = false
+                    if yes? "Would you like to initialize a new Git repository? (y/N) :", :blue
+                        repository = ask "What is the repository's URL? :", :blue
+                    else
+                        repository = false
+                    end
                 end
 
-                ###
                 # Database host
-                ###
-                db_host = ask "Database host :", :blue,
-                    default: "vvv"
+                if options[:db_host]
+                    db_host = options[:db_host]
+                else
+                    db_host = ask "Database host :", :blue, default: "vvv"
+                end
 
-                ###
                 # Database name
-                ###
-                db_name = ask "Database name :", :blue,
-                    default: "#{clean_site_name}_db"
+                if options[:db_name]
+                    db_name = options[:db_name]
+                else
+                    db_name = ask "Database name :", :blue, default: "#{clean_site_name}_db"
+                end
 
-                ###
                 # Database username
-                ###
-                db_user = ask "Database username :", :blue,
-                    default: "#{clean_site_name}_user"
+                if options[:db_user]
+                    db_user = options[:db_user]
+                else
+                    db_user = ask "Database username :", :blue, default: "#{clean_site_name}_user"
+                end
 
-                ###
                 # Database password
-                ###
-                db_pass = ask "Database password :", :blue,
-                    default: SecureRandom.base64
+                if options[:db_pass]
+                    db_pass = options[:db_pass]
+                else
+                    db_pass = ask "Database password :", :blue, default: SecureRandom.base64
+                end
 
-                ###
                 # Save options
-                ###
                 opts = {
                     site_name: site,
                     site_location: File.expand_path(site_location),
@@ -183,8 +224,24 @@ module ThemeJuice
                     db_pass: db_pass,
                 }
 
-                # Create the theme!
-                ::ThemeJuice::Scaffold::create opts
+                # Verify that all the options are correct
+                say "---> Site name: #{opts[:site_name]}", :green
+                say "---> Site location: #{opts[:site_location]}", :green
+                say "---> Starter theme: #{opts[:starter_theme]}", :green
+                say "---> Development location: #{opts[:dev_location]}", :green
+                say "---> Development url: http://#{opts[:dev_url]}", :green
+                say "---> Initialized repository: #{opts[:repository]}", :green
+                say "---> Database host: #{opts[:db_host]}", :green
+                say "---> Database name: #{opts[:db_name]}", :green
+                say "---> Database username: #{opts[:db_user]}", :green
+                say "---> Database password: #{opts[:db_pass]}", :green
+
+                if yes? "Do the options above look correct? (y/N) :", :blue
+                    ::ThemeJuice::Scaffold::create opts
+                else
+                    say "Alrighty then! Aborting mission.", :red
+                    exit 1
+                end
             else
                 say "Site name is required. Aborting mission.", :red
                 exit 1

data/lib/theme-juice/scaffold.rb

@@ -39,6 +39,10 @@ module ThemeJuice
                     setup_vvv
                 end
 
+                unless wildcard_subdomains_is_setup?
+                    setup_wildcard_subdomains
+                end
+
                 unless hosts_is_setup?
                     setup_hosts
                 end
@@ -88,16 +92,16 @@ module ThemeJuice
 
                         # Output setup info
                         say "Here's your installation info:", :yellow
-                        say "Site name: #{@opts[:site_name]}", :blue
-                        say "Site location: #{@opts[:site_location]}", :blue
-                        say "Starter theme: #{@opts[:starter_theme]}", :blue
-                        say "Development location: #{@opts[:dev_location]}", :blue
-                        say "Development url: http://#{@opts[:dev_url]}", :blue
-                        say "Initialized repository: #{@opts[:repository]}", :blue
-                        say "Database host: #{@opts[:db_host]}", :blue
-                        say "Database name: #{@opts[:db_name]}", :blue
-                        say "Database username: #{@opts[:db_user]}", :blue
-                        say "Database password: #{@opts[:db_pass]}", :blue
+                        say "---> Site name: #{@opts[:site_name]}", :blue
+                        say "---> Site location: #{@opts[:site_location]}", :blue
+                        say "---> Starter theme: #{@opts[:starter_theme]}", :blue
+                        say "---> Development location: #{@opts[:dev_location]}", :blue
+                        say "---> Development url: http://#{@opts[:dev_url]}", :blue
+                        say "---> Initialized repository: #{@opts[:repository]}", :blue
+                        say "---> Database host: #{@opts[:db_host]}", :blue
+                        say "---> Database name: #{@opts[:db_name]}", :blue
+                        say "---> Database username: #{@opts[:db_user]}", :blue
+                        say "---> Database password: #{@opts[:db_pass]}", :blue
                     end
                 else
                     say "Setup failed. Running cleanup...", :red
@@ -116,8 +120,8 @@ module ThemeJuice
             def delete(site, restart)
 
                 ###
-                # @TODO - This is a really hacky way to remove the theme.
-                #   Eventually I'd like to handle state.
+                # @TODO This is a really hacky way to remove the theme. Eventually,
+                #   I'd like to handle state within a config file.
                 ###
                 @opts = {
                     site_name: site,
@@ -180,9 +184,9 @@ module ThemeJuice
             # Run system commands
             #
             # @param {Array} commands
-            #    Array of commands to run
+            #   Array of commands to run
             # @param {Bool}  silent   (true)
-            #    Silence all output from command
+            #   Silence all output from command
             #
             # @return {Void}
             ###
@@ -226,21 +230,28 @@ module ThemeJuice
             # @return {Bool}
             ###
             def vvv_is_setup?
-                File.exists? File.expand_path("~/vagrant")
+                File.exist? File.expand_path("~/vagrant")
+            end
+
+            ###
+            # @return {Bool}
+            ###
+            def wildcard_subdomains_is_setup?
+                File.readlines(File.expand_path("~/vagrant/Vagrantfile")).grep(/(config.landrush.enabled = true)/m).any?
             end
 
             ###
             # @return {Bool}
             ###
             def dev_site_is_setup?
-                File.exists? "#{@opts[:dev_location]}"
+                File.exist? "#{@opts[:dev_location]}"
             end
 
             ###
             # @return {Bool}
             ###
             def hosts_is_setup?
-                File.exists? "#{@opts[:site_location]}/vvv-hosts"
+                File.exist? "#{@opts[:site_location]}/vvv-hosts"
             end
 
             ###
@@ -254,14 +265,14 @@ module ThemeJuice
             # @return {Bool}
             ###
             def nginx_is_setup?
-                File.exists? "#{@opts[:site_location]}/vvv-nginx.conf"
+                File.exist? "#{@opts[:site_location]}/vvv-nginx.conf"
             end
 
             ###
             # @return {Bool}
             ###
             def wordpress_is_setup?
-                File.exists? File.expand_path("#{@opts[:site_location]}/app")
+                File.exist? File.expand_path("#{@opts[:site_location]}/app")
             end
 
             ###
@@ -275,21 +286,21 @@ module ThemeJuice
             # @return {Bool}
             ###
             def repo_is_setup?
-                File.exists? File.expand_path("#{@opts[:site_location]}/.git")
+                File.exist? File.expand_path("#{@opts[:site_location]}/.git")
             end
 
             ###
             # @return {Bool}
             ###
             def env_is_setup?
-                File.exists? File.expand_path("#{@opts[:site_location]}/.env.development")
+                File.exist? File.expand_path("#{@opts[:site_location]}/.env.development")
             end
 
             ###
             # @return {Bool}
             ###
             def wpcli_is_setup?
-                File.exists? File.expand_path("#{@opts[:site_location]}/wp-cli.local.yml")
+                File.exist? File.expand_path("#{@opts[:site_location]}/wp-cli.local.yml")
             end
 
             ###
@@ -306,8 +317,6 @@ module ThemeJuice
                     "git clone https://github.com/Varying-Vagrant-Vagrants/VVV.git ~/vagrant",
                     "cd ~/vagrant/database && touch init-custom.sql"
                 ]
-
-                setup_wildcard_subdomains
             end
 
             ###

data/lib/theme-juice/version.rb

@@ -1,3 +1,3 @@
 module ThemeJuice
-    VERSION = "0.1.9"
+    VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -68,7 +68,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='