theme-juice 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a55344890082145f066a7f5a2145806b6f5c11
-  data.tar.gz: 82094878e10f5519dc216a7ff4810ec7f29f3290
+  metadata.gz: 520eb3831077f97fbcf1a4469178bfe86e399c0e
+  data.tar.gz: b15d8d8f8043ace8c6c1cf7a1d4112892cde0d38
 SHA512:
-  metadata.gz: 0652f70940144ca95ff7e32315cd3829978e48400af45fc7536d9ca7593e172b48ce8e7d2b6a8e8907e04eda8274db2f410b9bba6d9b54fdf77c8ae22fcf516c
-  data.tar.gz: dee31bc5b85a9a822763d6082f6906be6e73abe41b2b4592f3734444f601110b1d495c49224bb86fd5027e78f55a4a46ba9648085f1188165a7abc7079d9bc0f
+  metadata.gz: 265defc28090617635b3374cd1802e6d985bbb2b70ea7a08be57632d8f73c34e74541fe0881b3161bbece095dc2240b88d1ca14285348499b069dc539b995db9
+  data.tar.gz: e2f1e7adaf39dfd45c140d94e62b1e80e66d9ae2d6da6020c97087658676b2f79ca664b86ed9a5c128b3fa4348e02cc5b57772650b0332ef8af7364866baa360

data/README.md

@@ -18,7 +18,6 @@ server: bundle exec cap
 vendor: composer
 install:
     - composer install
-
 ```
 
 _Note: If you use a starter theme that doesn't have a `tj-config.yml` file, you'll be prompted through a series of steps in order to create one._
@@ -53,20 +52,21 @@ tj --version # Aliases: -v, version
 ### 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>] # Aliases: new, build, make
+tj create [<SITE-NAME>] # Aliases: new, add, build, make
 ```
 
 #### Option flags:
-| Flag                                    | Type   | Description                                      |
-|:--------------------------------------- |:------ |:------------------------------------------------ |
-| `-b, [--bare], [--no-bare]`             | Bool   | Create a VVV site without a starter theme        |
-| `-s, [--site=SITE]`                     | String | Name of the development site                     |
-| `-l, [--location=LOCATION]`             | Path   | Location of the local site                       |
-| `-t, [--theme=THEME]`                   | URL    | Starter theme to install (can use `none`)        |
-| `-u, [--url=URL]`                       | URL    | Development URL of the site (must end in `.dev`) |
-| `-r, [--repository]`                    | String | Initialize a new Git remote repository           |
-| `[--skip-repo], [--no-skip-repo]`       | Bool   | Skip repository prompts and set to `none`        |
-| `[--skip-db], [--no-skip-db]`           | Bool   | Skip database prompts and use defaults           |
+| Flag                        | Type   | Description                                      |
+|:--------------------------- |:------ |:------------------------------------------------ |
+| `-b, [--bare]`              | Bool   | Create a VVV site without a starter theme        |
+| `-s, [--site=SITE]`         | String | Name of the development site                     |
+| `-l, [--location=LOCATION]` | Path   | Location of the local site                       |
+| `-t, [--theme=THEME]`       | URL    | Starter theme to install (can use `none`)        |
+| `-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                |
 
 ### 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.
@@ -77,7 +77,7 @@ tj setup [<SITE-NAME>] # Aliases: init, prep
 ### 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> # Aliases: remove, teardown
+tj delete <SITE-NAME> # Aliases: remove, trash, teardown
 ```
 
 ### Listing all `tj` sites in the VM:

data/lib/theme-juice/cli.rb

@@ -1,15 +1,15 @@
 module ThemeJuice
     class CLI < ::Thor
 
-        map %w[--version -v]      => :version
-        map %w[new, build, make]  => :create
-        map %w[setup, init, prep] => :create
-        map %w[remove, teardown]  => :delete
-        map %w[sites, show]       => :list
-        map %w[dev]               => :watch
-        map %w[dep, deps]         => :vendor
-        map %w[deploy]            => :server
-        map %w[vagrant, vvv]      => :vm
+        map %w[--version -v]             => :version
+        map %w[new, add, build, make]    => :create
+        map %w[setup, init, prep]        => :create
+        map %w[remove, trash, teardown]  => :delete
+        map %w[sites, show]              => :list
+        map %w[dev]                      => :watch
+        map %w[dep, deps]                => :vendor
+        map %w[deploy]                   => :server
+        map %w[vagrant, vvv]             => :vm
 
         class_option :vvv_path, type: :string, alias: "-fp", default: nil, desc: "Force path to VVV installation"
 
@@ -53,14 +53,15 @@ module ThemeJuice
         # @return {Void}
         ###
         desc "create [SITE]", "Create new SITE and setup the VVV development environment"
-        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: :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 :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: :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 promps and use default settings"
         def create(site = nil)
             self.force_vvv_path?
 
@@ -71,7 +72,7 @@ module ThemeJuice
             end
 
             # Check if user passed all required options through flags
-            if options.length >= 6
+            if options.length >= 6 || options[:use_defaults]
                 say " → Well... looks like you just have everything all figured out, huh?".ljust(terminal_width), [:black, :on_green]
             elsif site.nil?
                 say " → Just a few questions before we begin...".ljust(terminal_width), [:black, :on_green]
@@ -96,10 +97,14 @@ module ThemeJuice
                 clean_site_name = site.gsub(/[^\w]/, "_")[0..10]
 
                 # Location of site installation
-                if options[:location]
-                    site_location = options[:location]
+                if options[:use_defaults]
+                    site_location = "#{Dir.pwd}/"
                 else
-                    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
                 end
 
                 # Starter theme to clone
@@ -117,39 +122,47 @@ module ThemeJuice
                             "theme-juice/theme-juice-starter" => "https://github.com/ezekg/theme-juice-starter.git"
                         }
 
-                        say " ○ Which starter theme would you like to use? (partial name is acceptable)", :blue
-                        choose do |menu|
-                            menu.index = "   ○"
-                            menu.prompt = set_color " → Choose one :".ljust(16), :blue
+                        if options[:use_defaults]
+                            theme = themes["theme-juice/theme-juice-starter"]
+                        else
+                            say " ○ Which starter theme would you like to use? (partial name is acceptable)", :blue
+                            choose do |menu|
+                                menu.index = "   ○"
+                                menu.prompt = set_color " → Choose one :".ljust(16), :blue
+
+                                themes.each do |theme, repo|
+                                    menu.choice theme do
 
-                            themes.each do |theme, repo|
-                                menu.choice theme do
+                                        if theme == "theme-juice/theme-juice-starter"
+                                            say " ↑ Awesome choice!", :green
+                                        end
 
-                                    if theme == "theme-juice/theme-juice-starter"
-                                        say " ↑ Awesome choice!", :green
+                                        starter_theme = repo
                                     end
-
-                                    starter_theme = repo
                                 end
-                            end
 
-                            menu.choice "other" do
-                                starter_theme = ask "   ○ What is the repository URL for the starter theme you would like to clone? :", :blue
-                            end
+                                menu.choice "other" do
+                                    starter_theme = ask "   ○ What is the repository URL for the starter theme you would like to clone? :", :blue
+                                end
 
-                            menu.choice "none" do |opt|
-                                say " → Next time you need to create a site without a starter theme, you can just run the 'setup' command instead.".ljust(terminal_width), [:black, :on_yellow]
-                                starter_theme, bare_setup = opt, true
+                                menu.choice "none" do |opt|
+                                    say " → Next time you need to create a site without a starter theme, you can just run the 'setup' command instead.".ljust(terminal_width), [:black, :on_yellow]
+                                    starter_theme, bare_setup = opt, true
+                                end
                             end
                         end
                     end
                 end
 
                 # Development url
-                if options[:url]
-                    dev_url = options[:url]
+                if options[:use_defaults]
+                    dev_url = "#{site}.dev"
                 else
-                    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
                 end
 
                 unless dev_url.match /(.dev)$/
@@ -158,7 +171,7 @@ module ThemeJuice
                 end
 
                 # Initialize a git repository on setup
-                if options[:skip_repo]
+                if options[:use_defaults] || options[:skip_repo]
                     repository = false
                 else
                     if options[:repository]
@@ -173,28 +186,28 @@ module ThemeJuice
                 end
 
                 # Database host
-                if options[:skip_db]
+                if options[:use_defaults] || options[:skip_db]
                     db_host = "vvv"
                 else
                     db_host = ask " ○ Database host :", :blue, default: "vvv"
                 end
 
                 # Database name
-                if options[:skip_db]
+                if options[:use_defaults] || options[:skip_db]
                     db_name = "#{clean_site_name}_db"
                 else
                     db_name = ask " ○ Database name :", :blue, default: "#{clean_site_name}_db"
                 end
 
                 # Database username
-                if options[:skip_db]
+                if options[:use_defaults] || options[:skip_db]
                     db_user = "#{clean_site_name}_user"
                 else
                     db_user = ask " ○ Database username :", :blue, default: "#{clean_site_name}_user"
                 end
 
                 # Database password
-                if options[:skip_db]
+                if options[:use_defaults] || options[:skip_db]
                     db_pass = SecureRandom.base64
                 else
                     db_pass = ask " ○ Database password :", :blue, default: SecureRandom.base64

data/lib/theme-juice/version.rb

@@ -1,3 +1,3 @@
 module ThemeJuice
-    VERSION = "0.3.6"
+    VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor