theme-juice 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 887133839cd619caf478e83517cd079722997dcb
-  data.tar.gz: f4b1067326aa598fdb346f933f0ae13a7c0a3889
+  metadata.gz: 8faea6ee55d26406a1ec3ad715e843ec0780a2f4
+  data.tar.gz: 42a01a719dc792239ae5b32c34a715eafee59440
 SHA512:
-  metadata.gz: 908ed121cf481f62f75e0ca298818c3aef7029854e85e5ed437f6ec4e1350b235868a5662292766fb2a4cf78ed322ba5f181b70f47127e860442650f7b6e5d0d
-  data.tar.gz: 10b9f21a9ee6b9ce657c61be80f1eec6f5a24faf0d3916a94d78e83a41655fad9a45506551f69d82fead0216001db687a3742bc8cef853bbd3df56cacd756882
+  metadata.gz: bc48633cb614d435ab717a9013377398d00535e44a6c89b8db0ef1f921154f5d5bf62fe80ee32cac6a3389b5fc60c59fd173ca8fa866003e98a3f4fe661480dc
+  data.tar.gz: 5c993eb4ef4b00f36d5f0585394550d7244e9ac8ee0e105ecf20ec9c3f90bd0f0babaf0976024a4a094ff077417408434f34aeeeaf7c19577f5b8da38d120116

data/README.md

@@ -8,21 +8,22 @@ What is it? Theme Juice is a command line interface created to scaffold out a ne
 That`s it!
 
 ## Config
-Because everybody likes to use different tools, you can create a `tj-config.yml` file that will house all of your theme-specific commands. This allows you to use a streamlined set of commands that will act as aliases to your per-project configuration.
+Because everybody likes to use different tools, you can create a `tj.yml` file (with an optional preceding `.`) that will house all of your theme-specific commands. This allows you to use a streamlined set of commands that will act as aliases to your per-project configuration, as well as starter-theme specific information, such as deployment configuration, etc. For right now, we'll just stick to the `commands` section.
 
 If you're into [Grunt](https://github.com/gruntjs/grunt), then use it. Prefer [Guard](https://github.com/guard/guard)? Go right ahead. This is obviously relative to the starter theme you use, since you can't exactly use Grunt with a starter theme that doesn't support it. Below is the config that comes baked into [our starter theme](https://github.com/ezekg/theme-juice-starter):
 
 ```yml
-watch: bundle exec guard
-server: bundle exec cap
-vendor: composer
-install:
-    - composer install
+commands:
+    watch: bundle exec guard
+    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._
+_Note: If you use a starter theme that doesn't have a `tj.yml` file, you'll be prompted through a series of steps in order to create one._
 
-#### Config options:
+#### Command options:
 | Option    | Usage                                                                         |
 |:--------- |:----------------------------------------------------------------------------- |
 | `watch`   | Command to be aliased when you run `tj watch` for bulding assets              |
@@ -89,7 +90,7 @@ tj list # Aliases: sites, show
 ```
 
 ### Watching and compiling assets:
-Use this to watch and compile assets with your preferred build tool, whether that be [Grunt](https://github.com/gruntjs/grunt), [Gulp](https://github.com/gulpjs/gulp), [Guard](https://github.com/guard/guard), or whatever. This is simply a wrapper for whatever command is in your `tj-config.yml` file.
+Use this to watch and compile assets with your preferred build tool, whether that be [Grunt](https://github.com/gruntjs/grunt), [Gulp](https://github.com/gulpjs/gulp), [Guard](https://github.com/guard/guard), or whatever. This is simply a wrapper for whatever command is in your `tj.yml` file.
 ```bash
 tj watch # Aliases: dev, assets
 ```
@@ -101,13 +102,13 @@ tj vm # Aliases: vagrant, vvv
 ```
 
 ### Managing vendor dependencies:
-Use this to easily manage your dependencies with [Composer](https://github.com/composer/composer), or whatever other command you set in your `tj-config.yml`. This is a wrapper for whatever command is in your config file.
+Use this to easily manage your dependencies with [Composer](https://github.com/composer/composer), or whatever other command you set in your `tj.yml`. This is a wrapper for whatever command is in your config file.
 ```bash
 tj vendor # Aliases: deps, dependencies
 ```
 
 ### Managing deployment and migration:
-Use this to easily manage your deployment and migration with [Capistrano](https://github.com/capistrano/capistrano) (or again, anything else set within your `tj-config.yml`). This is just a wrapper for your chosen command.
+Use this to easily manage your deployment and migration with [Capistrano](https://github.com/capistrano/capistrano) (or again, anything else set within your `tj.yml`). This is just a wrapper for your chosen command.
 ```bash
 tj server # Aliases: deploy, remote
 ```
@@ -124,8 +125,8 @@ alias wpv="wp ssh --host=vagrant"
 ## Contributing
 
 1. First, create an [issue](https://github.com/ezekg/theme-juice-cli/issues) for your proposed feature. If it's a bug fix, go right to step 2.
-2. [Fork the repository](https://github.com/ezekg/theme-juice-cli/fork).
-3. Create a new feature branch. (`git checkout -b my-new-feature`)
-4. Commit your changes. (`git commit -am `Add some feature``)
-5. Push to the new branch. (`git push origin my-new-feature`)
-6. Create a new Pull Request.
+1. [Fork the repository](https://github.com/ezekg/theme-juice-cli/fork).
+1. Create a new feature branch. (`git checkout -b my-new-feature`)
+1. Commit your changes. (`git commit -am 'add some feature'`)
+1. Push to the new branch. (`git push origin my-new-feature`)
+1. Create a new Pull Request.

data/bin/tj

@@ -3,10 +3,20 @@
 
 require "thor"
 
+Signal.trap "INT" do
+    ThemeJuice::UI.speak "Bye bye!", {
+        color: :yellow,
+        icon: :general,
+        newline: true
+    }
+
+    exit 130
+end
+
 begin
     require_relative "../lib/theme-juice"
 rescue LoadError => err
-warn err
+    warn err
     exit 1
 end
 

data/lib/theme-juice.rb

@@ -7,6 +7,7 @@ require "tempfile"
 require "rubygems"
 require "thor"
 require "yaml"
+require "os"
 
 module ThemeJuice
 end

data/lib/theme-juice/cli.rb

@@ -17,61 +17,6 @@ module ThemeJuice
         class_option :no_colors,  type: :boolean, alias: "-nc",               desc: "Disable colored output"
         class_option :vvv_path,   type: :string,  alias: "-fp", default: nil, desc: "Force path to VVV installation"
 
-        ###
-        # Non-Thor commands
-        ###
-        no_commands do
-
-            ###
-            # Disable unicode characters if flag is passed
-            #
-            # @return {Void}
-            ###
-            def use_unicode_chars?
-                ::ThemeJuice::Utilities.no_unicode = true if options[:no_unicode]
-            end
-
-            ###
-            # Disable unicode characters if flag is passed
-            #
-            # @return {Void}
-            ###
-            def use_terminal_colors?
-                ::ThemeJuice::Utilities.no_colors = true if options[:no_colors]
-            end
-
-            ###
-            # Set VVV path
-            #
-            # @return {Void}
-            ###
-            def force_vvv_path?
-                if options[:vvv_path].nil?
-                    ::ThemeJuice::Utilities.vvv_path = File.expand_path("~/vagrant")
-                else
-                    ::ThemeJuice::Utilities.vvv_path = options[:vvv_path]
-                    ::ThemeJuice::UI.notice "You're using a custom VVV path : (#{::ThemeJuice::Utilities.vvv_path})"
-
-                    unless ::ThemeJuice::UI.agree? "Is the path correct?"
-                        ::ThemeJuice::UI.error "Good call. Let's create a working dev environment, not a broken computer. Aborting mission."
-                    end
-                end
-
-                unless Dir.exist? ::ThemeJuice::Utilities.vvv_path
-                    ::ThemeJuice::UI.error "Cannot load VVV path (#{::ThemeJuice::Utilities.vvv_path}). Aborting mission before something bad happens."
-                end
-            end
-
-            ###
-            # Output welcome message
-            #
-            # @return {Void}
-            ###
-            def welcome_message
-                ::ThemeJuice::UI.success "Welcome to Theme Juice!"
-            end
-        end
-
         ###
         # Print current version
         #
@@ -83,7 +28,7 @@ module ThemeJuice
 
             ::ThemeJuice::UI.speak ::ThemeJuice::VERSION, {
                 color: :green,
-                icon: :arrow_right
+                icon: :notice
             }
         end
 
@@ -110,43 +55,36 @@ module ThemeJuice
         def create(site = nil)
             self.use_terminal_colors?
             self.use_unicode_chars?
-
-            self.welcome_message
-
             self.force_vvv_path?
 
             if options[:site]
                 site = options[:site]
             end
 
+            # Make sure site name is valid
+            unless site.nil?
+                self.validate_site_name(site)
+            end
+
+            # No errors yet, say hi
+            self.welcome_message
+
             # Check if user passed all required options through flags
             if options.length >= 6 || options[:use_defaults]
-                ::ThemeJuice::UI.speak "Well... looks like you just have everything all figured out, huh?", {
-                    color: [:black, :on_green],
-                    icon: :arrow_right,
-                    full_width: true
-                }
+                ::ThemeJuice::UI.success "Well... looks like you just have everything all figured out, huh?"
             elsif site.nil?
                 ::ThemeJuice::UI.speak "Just a few questions before we begin...", {
                     color: [:black, :on_green],
-                    icon: :arrow_right,
-                    full_width: true
+                    icon: :notice,
+                    row: true
                 }
             else
-                ::ThemeJuice::UI.speak "Your site name shall be '#{site}'! Just a few more questions before we begin...", {
-                    color: [:black, :on_green],
-                    icon: :arrow_right,
-                    full_width: true
-                }
+                ::ThemeJuice::UI.success "Your site name shall be '#{site}'! Just a few more questions before we begin..."
             end
 
             # Ask for the Site name if not passed directly
-            site ||= ::ThemeJuice::UI.prompt "What's the site name? (only ascii characters are allowed)"
-
-            # Make sure site name is valid
-            if site.match /[^0-9A-Za-z.\-]/
-                ::ThemeJuice::UI.error "Site name contains invalid non-ascii characters. This name is used for creating directories, so that's not gonna work. Aborting mission."
-            end
+            site ||= ::ThemeJuice::UI.prompt "What's the site name? (letters, numbers and dashes only)"
+            self.validate_site_name(site)
 
             # Bare install?
             bare_setup ||= options[:bare]
@@ -186,21 +124,29 @@ module ThemeJuice
                         else
                             ::ThemeJuice::UI.speak "Which starter theme would you like to use? (partial name is acceptable)", {
                                 color: :blue,
-                                icon: :bullet_hollow
+                                icon: :question
                             }
 
                             choose do |menu|
-                                menu.index = "   #{::ThemeJuice::UI::BULLET_HOLLOW}"
-                                menu.prompt = set_color " #{::ThemeJuice::UI::ARROW_RIGHT} Choose one :".ljust(16), :blue
+                                menu.index = ::ThemeJuice::UI::speak "", {
+                                    icon: :question,
+                                    indent: 2,
+                                    empty: true,
+                                    quiet: true
+                                }
+
+                                menu.prompt = ::ThemeJuice::UI::speak "Choose one :", {
+                                    color: :blue,
+                                    icon: :question,
+                                    width: 16,
+                                    quiet: true
+                                }
 
                                 themes.each do |theme, repo|
                                     menu.choice theme do
 
                                         if theme == "theme-juice/theme-juice-starter"
-                                            ::ThemeJuice::UI.speak "Awesome choice!", {
-                                                color: :green,
-                                                icon: :arrow_up
-                                            }
+                                            ::ThemeJuice::UI.success "Awesome choice!"
                                         end
 
                                         starter_theme = repo
@@ -347,8 +293,8 @@ module ThemeJuice
 
             ::ThemeJuice::UI.speak "Are you sure you want to delete '#{site}'? (y/N)", {
                 color: [:white, :on_red],
-                icon: :arrow_right,
-                full_width: true
+                icon: :notice,
+                row: true
             }
 
             if ::ThemeJuice::UI.agree? "", { color: :red, simple: true }
@@ -380,6 +326,7 @@ module ThemeJuice
         def install
             self.use_terminal_colors?
             self.use_unicode_chars?
+            self.force_vvv_path?
 
             ::ThemeJuice::Executor::install options[:config]
         end
@@ -396,6 +343,7 @@ module ThemeJuice
         def watch(*commands)
             self.use_terminal_colors?
             self.use_unicode_chars?
+            self.force_vvv_path?
 
             ::ThemeJuice::Executor::subcommand "#{__method__}", commands.join(" ")
         end
@@ -412,6 +360,7 @@ module ThemeJuice
         def vendor(*commands)
             self.use_terminal_colors?
             self.use_unicode_chars?
+            self.force_vvv_path?
 
             ::ThemeJuice::Executor::subcommand "#{__method__}", commands.join(" ")
         end
@@ -449,5 +398,76 @@ module ThemeJuice
 
             system "cd #{::ThemeJuice::Utilities.vvv_path} && vagrant #{commands.join(" ")}"
         end
+
+        ###
+        # Non-Thor commands
+        ###
+        no_commands do
+
+            ###
+            # Disable unicode characters if flag is passed
+            #
+            # @return {Void}
+            ###
+            def use_unicode_chars?
+                ::ThemeJuice::Utilities.no_unicode = true if options[:no_unicode]
+            end
+
+            ###
+            # Disable unicode characters if flag is passed
+            #
+            # @return {Void}
+            ###
+            def use_terminal_colors?
+                ::ThemeJuice::Utilities.no_colors = true if options[:no_colors]
+            end
+
+            ###
+            # Set VVV path
+            #
+            # @return {Void}
+            ###
+            def force_vvv_path?
+                if options[:vvv_path].nil?
+                    ::ThemeJuice::Utilities.vvv_path = File.expand_path("~/vagrant")
+                else
+                    ::ThemeJuice::Utilities.vvv_path = options[:vvv_path]
+                    ::ThemeJuice::UI.notice "You're using a custom VVV path : (#{::ThemeJuice::Utilities.vvv_path})"
+
+                    unless ::ThemeJuice::UI.agree? "Is the path correct?"
+                        ::ThemeJuice::UI.error "Good call. Let's create a working dev environment, not a broken computer. Aborting mission."
+                    end
+                end
+
+                unless Dir.exist? ::ThemeJuice::Utilities.vvv_path
+                    ::ThemeJuice::UI.error "Cannot load VVV path (#{::ThemeJuice::Utilities.vvv_path}). Aborting mission before something bad happens."
+                end
+            end
+
+            ###
+            # Make sure site name is valid
+            #
+            # @param {String} site
+            #
+            # @return {Void}
+            ###
+            def validate_site_name(site)
+                site.match /[^0-9A-Za-z.\-]/ do |char|
+                    ::ThemeJuice::UI.error "Site name contains an invalid character '#{char}'. This name is used for creating directories, so that's not gonna work. Aborting mission."
+                end
+            end
+
+            ###
+            # Output welcome message
+            #
+            # @return {Void}
+            ###
+            def welcome_message
+                ::ThemeJuice::UI.speak "Welcome to Theme Juice!", {
+                    color: [:black, :on_green, :bold],
+                    row: true
+                }
+            end
+        end
     end
 end

data/lib/theme-juice/executor.rb

@@ -18,7 +18,7 @@ module ThemeJuice
 
                 use_config config_path
 
-                @config["install"].each do |command|
+                @config["commands"]["install"].each do |command|
                     run ["cd #{config_path}", command], false
                 end
             end
@@ -27,19 +27,19 @@ module ThemeJuice
             # Run subcommand from config
             #
             # @param {String} subcommand
-            # @param {String} commands
+            # @param {String} command
             #
             # @return {Void}
             ###
-            def subcommand(subcommand, commands)
+            def subcommand(subcommand, command)
                 config_path = File.expand_path(Dir.pwd)
 
                 use_config config_path
 
-                if @config[subcommand]
-                    run ["#{@config[subcommand]} #{commands}"], false
+                if @config["commands"][subcommand]
+                    run ["#{@config["commands"][subcommand]} #{command}"], false
                 else
-                    ::ThemeJuice::UI.error "Unable to find '#{subcommand}' command in '#{config_path}/tj-config.yml'. Aborting mission."
+                    ::ThemeJuice::UI.error "Unable to find '#{subcommand}' command in '#{config_path}/tj.yml'. Aborting mission."
                 end
             end
 
@@ -113,14 +113,14 @@ module ThemeJuice
                     ::ThemeJuice::UI.success "Setup complete!"
                     ::ThemeJuice::UI.speak "In order to finish creating your site, you need to provision Vagrant. Do it now? (y/N)", {
                         color: [:black, :on_blue],
-                        icon: :arrow_reload,
-                        full_width: true
+                        icon: :restart,
+                        row: true
                     }
 
                     if ::ThemeJuice::UI.agree? "", { simple: true }
                         ::ThemeJuice::UI.speak "Restarting VVV...", {
                             color: :yellow,
-                            icon: :bullet_solid
+                            icon: :general
                         }
 
                         if restart_vagrant
@@ -140,6 +140,14 @@ module ThemeJuice
                                 "Database password: #{@opts[:db_pass]}"
                             ]
                         end
+
+                        unless OS.windows?
+                            ::ThemeJuice::UI.notice "Do you want to open up your new site 'http://#{@opts[:dev_url]}' now? (y/N)"
+
+                            if ::ThemeJuice::UI.agree? "", { color: :yellow, simple: true }
+                                run ["open http://#{@opts[:dev_url]}"]
+                            end
+                        end
                     else
                         ::ThemeJuice::UI.notice "Remember, Vagrant needs to be provisioned before you can use your new site. Exiting..."
                         exit
@@ -190,7 +198,7 @@ module ThemeJuice
                     if restart
                         ::ThemeJuice::UI.speak "Restarting VVV...", {
                             color: :yellow,
-                            icon: :bullet_solid
+                            icon: :general
                         }
 
                         restart_vagrant
@@ -215,7 +223,7 @@ module ThemeJuice
                 if sites.empty?
                     ::ThemeJuice::UI.speak "Nothing to list. Why haven't you created a site yet?", {
                         color: :yellow,
-                        icon: :bullet_solid
+                        icon: :general
                     }
                 else
                     ::ThemeJuice::UI.list "Your sites :", :green, sites
@@ -251,9 +259,9 @@ module ThemeJuice
             def use_config(config_path)
 
                 if config_is_setup? config_path
-                    @config = YAML.load_file "#{config_path}/tj-config.yml"
+                    @config = YAML.load_file(Dir["#{config_path}/*"].select { |f| File.basename(f) =~ /^(\.)?(tj.y(a)?ml)/ }.last)
                 else
-                    ::ThemeJuice::UI.notice "Unable to find 'tj-config.yml' file in '#{config_path}'."
+                    ::ThemeJuice::UI.notice "Unable to find 'tj.yml' file in '#{config_path}'."
 
                     if ::ThemeJuice::UI.agree? "Would you like to create one?"
 
@@ -312,7 +320,7 @@ module ThemeJuice
             # @return {Bool}
             ###
             def config_is_setup?(config_path)
-                File.exist? "#{config_path}/tj-config.yml"
+                !Dir["#{config_path}/*"].select { |f| File.basename(f) =~ /^(\.)?(tj.y(a)?ml)/ }.empty?
             end
 
             ###
@@ -400,7 +408,7 @@ module ThemeJuice
             def setup_vvv
                 ::ThemeJuice::UI.speak "Installing VVV into '#{File.expand_path("#{::ThemeJuice::Utilities.vvv_path}")}'...", {
                     color: :yellow,
-                    icon: :bullet_solid
+                    icon: :general
                 }
 
                 run [
@@ -420,7 +428,7 @@ module ThemeJuice
             def setup_project_dir
                 ::ThemeJuice::UI.speak "Creating project directory tree in '#{@opts[:site_location]}'...", {
                     color: :yellow,
-                    icon: :bullet_solid
+                    icon: :general
                 }
 
                 run ["mkdir -p #{@opts[:site_location]}"]
@@ -437,10 +445,10 @@ module ThemeJuice
             def setup_wildcard_subdomains
                 ::ThemeJuice::UI.speak "Setting up wildcard subdomains...", {
                     color: :yellow,
-                    icon: :bullet_solid
+                    icon: :general
                 }
 
-                open File.expand_path("#{::ThemeJuice::Utilities.vvv_path}/Vagrantfile"), "a+" do |file|
+                open File.expand_path("#{::ThemeJuice::Utilities.vvv_path}/Vagrantfile"), "ab+" do |file|
                     file.puts "\n"
                     file.puts "###"
                     file.puts "# Enable wildcard subdomains"
@@ -463,7 +471,7 @@ module ThemeJuice
             def setup_dev_site
                 ::ThemeJuice::UI.speak "Setting up new development site at '#{@opts[:dev_location]}'...", {
                     color: :yellow,
-                    icon: :bullet_solid
+                    icon: :general
                 }
 
                 run [
@@ -473,7 +481,7 @@ module ThemeJuice
             end
 
             ###
-            # Create tj-config.yml file for theme settings
+            # Create tj.yml file for theme settings
             #
             # @param {String} config_path
             #
@@ -485,21 +493,22 @@ module ThemeJuice
                 vendor  = ::ThemeJuice::UI.prompt "Vendor command to use",            indent: 2, default: "composer"
                 install = ::ThemeJuice::UI.prompt "Commands to run on theme install", indent: 2, default: "composer install"
 
-                File.open "#{config_path}/tj-config.yml", "w" do |file|
-                    file.puts "watch: #{watch}"
-                    file.puts "server: #{server}"
-                    file.puts "vendor: #{vendor}"
-                    file.puts "install:"
+                File.open "#{config_path}/tj.yml", "wb" do |file|
+                    file.puts "commands:"
+                    file.puts "\s\swatch: #{watch}"
+                    file.puts "\s\sserver: #{server}"
+                    file.puts "\s\svendor: #{vendor}"
+                    file.puts "\s\sinstall:"
                     file.puts "\s\s\s\s- #{install}"
                 end
 
                 if config_is_setup? config_path
-                    ::ThemeJuice::UI.speak "Successfully added 'tj-config.yml' file.", {
+                    ::ThemeJuice::UI.speak "Successfully added 'tj.yml' file.", {
                         color: :green,
-                        icon: :bullet_solid
+                        icon: :general
                     }
                 else
-                    ::ThemeJuice::UI.error "Could not create 'tj-config.yml' file. Make sure you have write capabilities to '#{@opts[:site_location]}'."
+                    ::ThemeJuice::UI.error "Could not create 'tj.yml' file. Make sure you have write capabilities to '#{@opts[:site_location]}'."
                 end
             end
 
@@ -509,14 +518,14 @@ module ThemeJuice
             # @return {Void}
             ###
             def setup_hosts
-                File.open "#{@opts[:site_location]}/vvv-hosts", "w" do |file|
+                File.open "#{@opts[:site_location]}/vvv-hosts", "wb" do |file|
                     file.puts @opts[:dev_url]
                 end
 
                 if hosts_is_setup?
                     ::ThemeJuice::UI.speak "Successfully added 'vvv-hosts' file.", {
                         color: :green,
-                        icon: :bullet_solid
+                        icon: :general
                     }
                 else
                     ::ThemeJuice::UI.error "Could not create 'vvv-hosts' file. Make sure you have write capabilities to '#{@opts[:site_location]}'."
@@ -529,7 +538,7 @@ module ThemeJuice
             # @return {Void}
             ###
             def setup_database
-                File.open File.expand_path("#{::ThemeJuice::Utilities.vvv_path}/database/init-custom.sql"), "a+" do |file|
+                File.open File.expand_path("#{::ThemeJuice::Utilities.vvv_path}/database/init-custom.sql"), "ab+" do |file|
                     file.puts "### Begin '#{@opts[:site_name]}'"
                     file.puts "#"
                     file.puts "# This block is automatically generated by ThemeJuice. Do not edit."
@@ -543,7 +552,7 @@ module ThemeJuice
                 if database_is_setup?
                     ::ThemeJuice::UI.speak "Successfully added database to 'init-custom.sql'.", {
                         color: :green,
-                        icon: :bullet_solid
+                        icon: :general
                     }
                 else
                     ::ThemeJuice::UI.error "Could not add database info for '#{@opts[:site_name]}' to 'init-custom.sql'. Make sure you have write capabilities to '#{@opts[:site_location]}'."
@@ -556,7 +565,7 @@ module ThemeJuice
             # @return {Void}
             ###
             def setup_nginx
-                File.open "#{@opts[:site_location]}/vvv-nginx.conf", "w" do |file|
+                File.open "#{@opts[:site_location]}/vvv-nginx.conf", "wb" do |file|
                     file.puts "server {"
                     file.puts "\tlisten 80;"
                     file.puts "\tserver_name .#{@opts[:dev_url]};"
@@ -568,7 +577,7 @@ module ThemeJuice
                 if nginx_is_setup?
                     ::ThemeJuice::UI.speak "Successfully added 'vvv-nginx.conf' file.", {
                         color: :green,
-                        icon: :bullet_solid
+                        icon: :general
                     }
                 else
                     ::ThemeJuice::UI.error "Could not create 'vvv-nginx.conf' file. Make sure you have write capabilities to '#{@opts[:site_location]}'."
@@ -581,7 +590,7 @@ module ThemeJuice
             # @return {Void}
             ###
             def setup_env
-                File.open "#{@opts[:site_location]}/.env.development", "w" do |file|
+                File.open "#{@opts[:site_location]}/.env.development", "wb" do |file|
                     file.puts "DB_NAME=#{@opts[:db_name]}"
                     file.puts "DB_USER=#{@opts[:db_user]}"
                     file.puts "DB_PASSWORD=#{@opts[:db_pass]}"
@@ -593,7 +602,7 @@ module ThemeJuice
                 if env_is_setup?
                     ::ThemeJuice::UI.speak "Successfully added '.env.development' file.", {
                         color: :green,
-                        icon: :bullet_solid
+                        icon: :general
                     }
                 else
                     ::ThemeJuice::UI.error "Could not create '.env.development' file. Make sure you have write capabilities to '#{@opts[:site_location]}'."
@@ -610,7 +619,7 @@ module ThemeJuice
             def setup_wordpress
                 ::ThemeJuice::UI.speak "Setting up WordPress...", {
                     color: :yellow,
-                    icon: :bullet_solid
+                    icon: :general
                 }
 
                 unless @opts[:bare_setup]
@@ -629,10 +638,10 @@ module ThemeJuice
             def install_theme_dependencies
                 ::ThemeJuice::UI.speak "Installing theme dependencies...", {
                     color: :yellow,
-                    icon: :bullet_solid
+                    icon: :general
                 }
 
-                @config["install"].each do |command|
+                @config["commands"]["install"].each do |command|
                     run ["cd #{@opts[:site_location]}", command], false
                 end
             end
@@ -645,10 +654,10 @@ module ThemeJuice
             def setup_synced_folder
                 ::ThemeJuice::UI.speak "Syncing host theme directory '#{@opts[:site_location]}' with VM theme directory '/srv/www/tj-#{@opts[:site_name]}'...", {
                     color: :yellow,
-                    icon: :bullet_solid
+                    icon: :general
                 }
 
-                open File.expand_path("#{::ThemeJuice::Utilities.vvv_path}/Vagrantfile"), "a+" do |file|
+                open File.expand_path("#{::ThemeJuice::Utilities.vvv_path}/Vagrantfile"), "ab+" do |file|
                     file.puts "### Begin '#{@opts[:site_name]}'"
                     file.puts "#"
                     file.puts "# This block is automatically generated by ThemeJuice. Do not edit."
@@ -670,7 +679,7 @@ module ThemeJuice
             def setup_repo
                 ::ThemeJuice::UI.speak "Setting up Git repository at '#{@opts[:repository]}'...", {
                     color: :yellow,
-                    icon: :bullet_solid
+                    icon: :general
                 }
 
                 if repo_is_setup?
@@ -693,7 +702,7 @@ module ThemeJuice
             # @return {Void}
             ###
             def setup_wpcli
-                File.open "#{@opts[:site_location]}/wp-cli.local.yml", "a+" do |file|
+                File.open "#{@opts[:site_location]}/wp-cli.local.yml", "ab+" do |file|
                     file.puts "require:"
                     file.puts "\t- vendor/autoload.php"
                     file.puts "ssh:"
@@ -707,7 +716,7 @@ module ThemeJuice
                 if wpcli_is_setup?
                     ::ThemeJuice::UI.speak "Successfully added ssh settings to 'wp-cli.local.yml' file.", {
                         color: :green,
-                        icon: :bullet_solid
+                        icon: :general
                     }
                 else
                     ::ThemeJuice::UI.error "Could not create 'wp-cli.local.yml' file. Make sure you have write capabilities to '#{@opts[:site_location]}'."
@@ -728,8 +737,8 @@ module ThemeJuice
 
                 if run ["rm -rf #{@opts[:dev_location]}"]
                     ::ThemeJuice::UI.speak "VVV installation for '#{@opts[:site_name]}' successfully removed.", {
-                        color: :green,
-                        icon: :bullet_solid
+                        color: :yellow,
+                        icon: :general
                     }
                 else
                     ::ThemeJuice::UI.error "Theme '#{@opts[:site_name]}' could not be removed. Make sure you have write capabilities to '#{@opts[:dev_location]}'."
@@ -745,7 +754,7 @@ module ThemeJuice
                 if remove_traces_from_file "#{::ThemeJuice::Utilities.vvv_path}/database/init-custom.sql"
                     ::ThemeJuice::UI.speak "Database for '#{@opts[:site_name]}' successfully removed.", {
                         color: :yellow,
-                        icon: :bullet_solid
+                        icon: :general
                     }
                 end
             end
@@ -759,7 +768,7 @@ module ThemeJuice
                 if remove_traces_from_file "#{::ThemeJuice::Utilities.vvv_path}/Vagrantfile"
                     ::ThemeJuice::UI.speak "Synced folders for '#{@opts[:site_name]}' successfully removed.", {
                         color: :yellow,
-                        icon: :bullet_solid
+                        icon: :general
                     }
                 end
             end
@@ -783,8 +792,7 @@ module ThemeJuice
                     # Move temp file to actual file location
                     FileUtils.mv output_file, File.expand_path(input_file)
                 rescue LoadError => err
-                    say " ↑ #{err}".ljust(terminal_width), [:white, :on_red]
-                    exit 1
+                    ::ThemeJuice::UI.error "#{err}"
                 ensure
                     # Make sure that the tempfile closes and is cleaned up, regardless of errors
                     output_file.close

data/lib/theme-juice/ui.rb

@@ -3,17 +3,14 @@
 module ThemeJuice
     module UI
 
-        QUESTION_MARK = "?"
-        BULLET_HOLLOW = "\u25CB"
-        BULLET_SOLID  = "\u2022"
-        ARROW_UP      = "\u2191"
-        ARROW_RIGHT   = "\u2192"
-        ARROW_DOWN    = "\u2193"
-        ARROW_LEFT    = "\u2190"
-        ARROW_RELOAD  = "\u21AA"
-        BLOCK_LARGE   = "\u2588"
-        BLOCK_MED     = "\u258D"
-        BLOCK_SMALL   = "\u258F"
+        # List of icons
+        SUCCESS  = "\u2713"
+        ERROR    = "\u2191"
+        NOTICE   = "\u2192"
+        QUESTION = "\u003F"
+        GENERAL  = "\u002D"
+        RESTART  = "\u21AA"
+        LIST     = "\u2022"
 
         class << self
             include ::Thor::Actions
@@ -31,7 +28,7 @@ module ThemeJuice
                 format_message! message, opts
 
                 # Check if we're suppressing terminal output
-                if opts.key? :suppress
+                if opts.key? :quiet
                     message
                 else
                     say message
@@ -48,7 +45,8 @@ module ThemeJuice
             def success(message)
                 self.speak message, {
                     color: [:black, :on_green, :bold],
-                    full_width: true
+                    icon: :success,
+                    row: true
                 }
             end
 
@@ -62,8 +60,8 @@ module ThemeJuice
             def notice(message)
                 self.speak message, {
                     color: [:black, :on_yellow],
-                    icon: :arrow_right,
-                    full_width: true
+                    icon: :notice,
+                    row: true
                 }
             end
 
@@ -78,8 +76,8 @@ module ThemeJuice
             def error(message)
                 self.speak message, {
                     color: [:white, :on_red],
-                    icon: :arrow_up,
-                    full_width: true
+                    icon: :error,
+                    row: true
                 }
 
                 yield if block_given?
@@ -99,14 +97,14 @@ module ThemeJuice
             def list(header, color, list)
                 self.speak header, {
                     color: [:black, :"on_#{color}"],
-                    icon: :arrow_right,
-                    full_width: true
+                    icon: :notice,
+                    row: true
                 }
 
                 list.each do |item|
                     self.speak item, {
                         color: :"#{color}",
-                        icon: :bullet_solid
+                        icon: :general
                     }
                 end
             end
@@ -122,7 +120,7 @@ module ThemeJuice
             def prompt(question, *opts)
                 format_message! question, {
                     color: :blue,
-                    icon: :bullet_hollow
+                    icon: :question
                 }
 
                 opts.each do |opt|
@@ -159,7 +157,7 @@ module ThemeJuice
 
                 format_message! question, {
                     color: opts[:color],
-                    icon: :bullet_hollow
+                    icon: :question
                 }
 
                 if opts.key? :simple
@@ -181,28 +179,38 @@ module ThemeJuice
             ###
             def format_message!(message, opts = {})
 
-                # Check if we're using an icon
                 unless ::ThemeJuice::Utilities.no_unicode
                     if opts.key? :icon
-                        set!(message) { |msg| " #{self.const_get(opts[:icon].to_s.upcase)} " << msg if opts[:icon].is_a? Symbol }
+                        if opts.key? :empty
+                            set!(message) { |msg| " #{self.const_get(opts[:icon].to_s.upcase)}" }
+                        else
+                            set!(message) { |msg| " #{self.const_get(opts[:icon].to_s.upcase)} " << msg }
+                        end
                     else
                         set!(message) { |msg| " " << msg }
                     end
                 end
 
-                # Check if message should take up entire width
-                #  of the terminal window
-                if opts.key? :full_width
+                if opts.key? :indent
+                    set!(message) { |str| (" " * opts[:indent]) << str }
+                end
+
+                if opts.key? :row
                     set!(message) { |msg| msg.ljust(terminal_width) }
+                elsif opts.key? :width
+                    set!(message) { |msg| msg.ljust(opts[:width]) }
                 end
 
-                # Check if we're using colors
                 unless ::ThemeJuice::Utilities.no_colors
                     if opts.key? :color
                         set!(message) { |msg| set_color(msg, *opts[:color]) }
                     end
                 end
 
+                if opts.key? :newline
+                    set!(message) { |msg| "\n" << msg }
+                end
+
                 message
             end
 

data/lib/theme-juice/utilities.rb

@@ -40,14 +40,14 @@ module ThemeJuice
                 if ::Gem::Version.new(local_version) < ::Gem::Version.new(remote_version)
                     ::ThemeJuice::UI.speak "Your version of Theme Juice (#{local_version}) is outdated. There is a newer version (#{remote_version}) available. Please update now.", {
                         color: [:black, :on_yellow],
-                        icon: :arrow_right,
-                        full_width: true
+                        icon: :notice,
+                        row: true
                     }
                 else
                     ::ThemeJuice::UI.speak "Your version of Theme Juice (#{local_version}) up to date.", {
                         color: [:black, :on_green],
-                        icon: :arrow_right,
-                        full_width: true
+                        icon: :notice,
+                        row: true
                     }
                 end
             end

data/lib/theme-juice/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -25,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: os
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='