theme-juice 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 059ce849fd1f2d505d1e6daedf3985ad7600a99e
-  data.tar.gz: cf312295ddf93aceba229ed411c473c033f94e4b
+  metadata.gz: a53e76ff764ee9274d0607d7fd2095100260df47
+  data.tar.gz: 4185a029dd165675c3bd7d36173b7760babe5de3
 SHA512:
-  metadata.gz: fb0e8d619dcf9c11bbe1b99b5b18dc0f321a48b7fbb28d86fc2289e71ab6d49f3f994278662befa81be3532877b7730912ce9156007aad6ca0b6c0738b364335
-  data.tar.gz: 412a4434a2388fc22985ea52f61cb28ff4f8cad134d0883560412375cc91ddb8aee1298a5b240f721e3276bee8efea60460d21744775300d63a77788dc2e7ac4
+  metadata.gz: 0d96f30c99459f8e173e7422e336506f32b397dbf60a0f67d5fc21d8fa33e80a5a96c93ec79a2d9c36452880912cbfd9a40f27d6d2cb0025c405009921917526
+  data.tar.gz: b6fcb290f8770f46b55bc943402832ade82e9efcea9c9ca83278e62aeb11dc0006080f2161d8eb8e7a664f96366904c67fe7a1f6509dbd8cc68f89368659d886

data/lib/theme-juice/cli.rb

@@ -63,7 +63,7 @@ module ThemeJuice
             end
 
             # ask for the Site name if not passed directly
-            site ||= ask "What's the site name? (only ascii characters are allowed) :", :green
+            site ||= ask "What's the site name? (only ascii characters are allowed) :", :blue
 
             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
@@ -80,7 +80,7 @@ module ThemeJuice
                 ###
                 # Location of site installation
                 ###
-                site_location = ask "Where do you want to setup the site? :", :green,
+                site_location = ask "Where do you want to setup the site? :", :blue,
                     default: "#{Dir.pwd}/",
                     path: true
 
@@ -92,7 +92,7 @@ module ThemeJuice
 
                     starter_theme = nil
 
-                    say "Which starter theme would you like to use? :", :green
+                    say "Which starter theme would you like to use? :", :blue
                     choose do |menu|
                         menu.index_suffix = ") "
 
@@ -102,7 +102,7 @@ module ThemeJuice
                         end
 
                         menu.choice "other" do
-                            starter_theme = ask "What is the user/repository of the starter theme you would like to clone? :", :green
+                            starter_theme = ask "What is the user/repository of the starter theme you would like to clone? :", :blue
                         end
 
                         menu.choice "none" do |c|
@@ -115,7 +115,7 @@ module ThemeJuice
                 ###
                 # Development url
                 ###
-                dev_url = ask "What do you want the development url to be? (this should end in '.dev') :", :green,
+                dev_url = ask "What do you want the development url to be? (this should end in '.dev') :", :blue,
                     default: "#{site}.dev"
 
                 unless dev_url.match /(.dev)$/
@@ -126,8 +126,8 @@ module ThemeJuice
                 ###
                 # Initialize a git repository on setup
                 ###
-                if yes? "Would you like to initialize a new Git repository? (y/N) :", :green
-                    repository = ask "Remote URL :", :green
+                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
@@ -135,25 +135,25 @@ module ThemeJuice
                 ###
                 # Database host
                 ###
-                db_host = ask "Database host :", :green,
+                db_host = ask "Database host :", :blue,
                     default: "vvv"
 
                 ###
                 # Database name
                 ###
-                db_name = ask "Database name :", :green,
+                db_name = ask "Database name :", :blue,
                     default: "#{clean_site_name}_db"
 
                 ###
                 # Database username
                 ###
-                db_user = ask "Database username :", :green,
+                db_user = ask "Database username :", :blue,
                     default: "#{clean_site_name}_user"
 
                 ###
                 # Database password
                 ###
-                db_pass = ask "Database password :", :green,
+                db_pass = ask "Database password :", :blue,
                     default: SecureRandom.base64
 
                 ###

data/lib/theme-juice/scaffold.rb

@@ -88,16 +88,16 @@ module ThemeJuice
 
                         # Output setup info
                         say "Here's your installation info:", :yellow
-                        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
+                        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
@@ -176,6 +176,21 @@ module ThemeJuice
 
             private
 
+            ###
+            # Run system commands
+            #
+            # @param {Array} commands
+            #    Array of commands to run
+            # @param {Bool}  silent   (true)
+            #    Silence all output from command
+            #
+            # @return {Void}
+            ###
+            def run(commands = [], silent = true)
+                commands.map! { |cmd| cmd.to_s + " > /dev/null 2>&1" } if silent
+                system commands.join "&&"
+            end
+
             ###
             # Restart Vagrant
             #
@@ -186,11 +201,11 @@ module ThemeJuice
             # @return {Void}
             ###
             def restart_vagrant
-                system [
+                run [
                     "cd ~/vagrant",
                     "vagrant halt",
-                    "vagrant up --provision"
-                ].join " && "
+                    "vagrant up --provision",
+                ], false
             end
 
             ###
@@ -285,19 +300,19 @@ module ThemeJuice
             end
 
             ###
-            # Install plugins and clone VVV
+            # Install Vagrant plugins and clone VVV
             #
             # @return {Void}
             ###
             def setup_vvv
                 say "Installing VVV into '#{File.expand_path("~/vagrant")}'...", :yellow
-                system [
+                run [
                     "vagrant plugin install vagrant-hostsupdater",
                     "vagrant plugin install vagrant-triggers",
                     "vagrant plugin install landrush",
                     "git clone https://github.com/Varying-Vagrant-Vagrants/VVV.git ~/vagrant",
                     "cd ~/vagrant/database && touch init-custom.sql"
-                ].join " && "
+                ]
 
                 setup_wildcard_subdomains
             end
@@ -334,10 +349,10 @@ module ThemeJuice
             ###
             def setup_dev_site
                 say "Setting up new development site at '#{@opts[:dev_location]}'...", :yellow
-                system [
+                run [
                     "cd ~/vagrant/www",
-                    "mkdir tj-#{@opts[:site_name]}"
-                ].join " && "
+                    "mkdir tj-#{@opts[:site_name]}",
+                ]
             end
 
             ###
@@ -436,15 +451,27 @@ module ThemeJuice
                 say "Setting up WordPress...", :yellow
 
                 if @opts[:bare_setup]
+
                     # Create theme dir
-                    system "mkdir -p #{@opts[:site_location]}"
+                    run [
+                        "mkdir -p #{@opts[:site_location]}",
+                    ]
+
                 else
-                    # Clone starter, install WP
-                    system [
-                        "mkdir -p #{@opts[:site_location]} && cd $_",
+
+                    # Clone starter theme
+                    run [
+                        "mkdir -p #{@opts[:site_location]}",
+                        "cd #{@opts[:site_location]}",
                         "git clone --depth 1 https://github.com/#{@opts[:starter_theme]}.git .",
+                    ]
+
+                    # Install composer dependencies
+                    run [
+                        "cd #{@opts[:site_location]}",
                         "composer install",
-                    ].join " && "
+                    ], false
+
                 end
             end
 
@@ -479,17 +506,17 @@ module ThemeJuice
                 say "Setting up Git repository at '#{@opts[:repository]}'...", :yellow
 
                 if repo_is_setup?
-                    system [
+                    run [
                         "cd #{@opts[:site_location]}",
                         "rm -rf .git",
-                    ].join " && "
+                    ]
                 end
 
-                system [
+                run [
                     "cd #{@opts[:site_location]}",
                     "git init",
-                    "git remote add origin #{@opts[:repository]}"
-                ].join " && "
+                    "git remote add origin #{@opts[:repository]}",
+                ]
             end
 
             ##
@@ -518,7 +545,7 @@ module ThemeJuice
             ###
             def remove_dev_site
                 if system "rm -rf #{@opts[:dev_location]}"
-                    say "VVV installation for '#{@opts[:site_name]}' successfully removed.", :green
+                    say "VVV installation for '#{@opts[:site_name]}' successfully removed.", :yellow
                 else
                     say "Theme '#{@opts[:site_name]}' could not be removed. Make sure you have write capabilities.", :red
                 end
@@ -531,7 +558,7 @@ module ThemeJuice
             ###
             def remove_database
                 if remove_traces_from_file "~/vagrant/database/init-custom.sql"
-                    say "Database for '#{@opts[:site_name]}' successfully removed.", :green
+                    say "Database for '#{@opts[:site_name]}' successfully removed.", :yellow
                 end
             end
 
@@ -542,7 +569,7 @@ module ThemeJuice
             ###
             def remove_synced_folder
                 if remove_traces_from_file "~/vagrant/Vagrantfile"
-                    say "Synced folders for '#{@opts[:site_name]}' successfully removed.", :green
+                    say "Synced folders for '#{@opts[:site_name]}' successfully removed.", :yellow
                 end
             end
 

data/lib/theme-juice/version.rb

@@ -1,3 +1,3 @@
 module ThemeJuice
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor