theme-juice 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 837a7dea5806960df71dc8b43e799891a55b6e97
-  data.tar.gz: 78e3efeaeb878a91607f48b1b6b97df18713433a
+  metadata.gz: 091252d696eee2ad02f569c28e95b6901c649e76
+  data.tar.gz: a63aab4998a739e8d966732bb7c30785a5b02f56
 SHA512:
-  metadata.gz: 6b632d35abfd2df9ef2359c524cc05028aa778a0fbf9fbf90e322bdb3d8750fae62dbed987e5ecd90161f991c1a6a4f1e6f7854e001c8d998fc55eae5e198b81
-  data.tar.gz: fd693fbf56dabc408a1bfc41206506d9aa0042beca7729e1318ebc898ad784521516c98a508995885a5db626c5ddd4b7b033c7bab5560091a5e4982b57b5e01b
+  metadata.gz: e7d59843ab720bcc8df6f3fec468378201deae5630c36999e925caf458c982540dcf26f008049a9dc877d5afc2662e3a99d1d22c1c6619a41b5e50ca1758b40d
+  data.tar.gz: 19dd21d5e6b65b723e5b8e456ea031b37e0cf07aa3d2db8d0fc03f00275a89d93fb76b217c18d320528e22816a5786883ce764267c4ef57033b753c907fe0f3f

data/README.md

@@ -8,7 +8,7 @@
 
 _This project is currently under active development and will not be completely 'stable' per-say until we hit `1.0`. Everything here is subject to change without notice. (We will of course semantically version all of our releases, with the minor version being incremented with new features/breaking changes.) Feel free to contribute to the development with new features, ideas or bug fixes._
 
-_The master branch contains features currently in development (such as deployment), so don't expect it to work at all times. Grab the newest RubyGem instead of building directly from master._
+_The master branch contains features currently in development, so don't expect it to work at all times. Grab the newest RubyGem instead of building directly from master._
 
 [View our contributing guidelines to get started!](#contributing)
 
@@ -65,7 +65,7 @@ tj delete
 ```
 
 #### Deploying a project
-This will deploy a project to the passed `stage` using [Capistrano](http://capistranorb.com/). Head over to the [docs](http://themejuice.it/deploy) to get started.
+This will deploy a project to the passed `<stage>` using [Capistrano](http://capistranorb.com/). Head over to the [docs](http://themejuice.it/deploy) to get started with your first deployment.
 
 ```
 tj deploy <stage>

data/lib/theme-juice/cli.rb

@@ -34,6 +34,8 @@ module ThemeJuice
         @env.no_landrush     = options[:no_landrush]
         @env.no_port_forward = options[:no_port_forward]
         @env.verbose         = options[:verbose]
+        @env.quiet           = options[:quiet]
+        @env.trace           = options[:trace]
         @env.dryrun          = options[:dryrun]
         @env.nginx           = options[:nginx]
       end
@@ -68,6 +70,8 @@ module ThemeJuice
     class_option :no_landrush,     :type => :boolean,                                     :desc => ""
     class_option :no_port_forward, :type => :boolean, :aliases => "--no-port-forwarding", :desc => ""
     class_option :verbose,         :type => :boolean,                                     :desc => ""
+    class_option :quiet,           :type => :boolean, :aliases => "--shh",                :desc => ""
+    class_option :trace,           :type => :boolean,                                     :desc => ""
     class_option :dryrun,          :type => :boolean, :aliases => "--dry-run",            :desc => ""
     class_option :nginx,           :type => :boolean, :aliases => "--no-apache",          :desc => ""
 

data/lib/theme-juice/config.rb

@@ -26,7 +26,8 @@ module ThemeJuice
 
     def run(command)
       @util.inside @project.location do
-        @util.run command, :verbose => @env.verbose
+        @util.run command, { :verbose => @env.verbose,
+          :capture => @env.quiet }
       end
     end
 

data/lib/theme-juice/env.rb

@@ -16,6 +16,8 @@ module ThemeJuice
     attr_accessor :no_landrush
     attr_accessor :no_port_forward
     attr_accessor :verbose
+    attr_accessor :quiet
+    attr_accessor :trace
     attr_accessor :dryrun
     attr_accessor :nginx
     attr_accessor :stage
@@ -69,6 +71,14 @@ module ThemeJuice
       @verbose = val ||= ENV.fetch("TJ_VERBOSE") { false }
     end
 
+    def quiet=(val)
+      @quiet = val ||= ENV.fetch("TJ_QUIET") { false }
+    end
+
+    def trace=(val)
+      @trace = val ||= ENV.fetch("TJ_TRACE") { false }
+    end
+
     def dryrun=(val)
       @dryrun = val ||= ENV.fetch("TJ_DRYRUN") { false }
     end

data/lib/theme-juice/io.rb

@@ -106,7 +106,7 @@ module ThemeJuice
 
       yield if block_given?
 
-      if @env.verbose
+      if @env.trace
         raise code
       else
         exit 1

data/lib/theme-juice/man/tj

@@ -60,7 +60,15 @@ Disable automatic port forwarding
 .
 .TP
 \fB\-\-verbose\fR
-Prints out additional logging information and raises any exceptions caught during runtime
+Prints out additional logging information
+.
+.TP
+\fB\-\-quiet\fR, \fB\-\-shh\fR
+Suppresses all command output
+.
+.TP
+\fB\-\-trace\fR
+Raises any exceptions caught during runtime
 .
 .TP
 \fB\-\-dryrun\fR, \fB\-\-dry\-run\fR
@@ -243,7 +251,15 @@ Disable automatic port forwarding
 .
 .TP
 \fBTJ_VERBOSE\fR=\fIbool\fR
-Prints out additional logging information and raises any exceptions caught during runtime
+Prints out additional logging information
+.
+.TP
+\fBTJ_QUIET\fR=\fIbool\fR
+Suppresses all command output
+.
+.TP
+\fBTJ_TRACE\fR=\fIbool\fR
+Raises any exceptions caught during runtime
 .
 .TP
 \fBTJ_DRYRUN\fR=\fIbool\fR

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

@@ -51,8 +51,13 @@ GLOBAL OPTIONS
 	      Disable automatic port forwarding
 
        --verbose
-	      Prints  out additional logging information and raises any excep-
-	      tions caught during runtime
+	      Prints out additional logging information
+
+       --quiet, --shh
+	      Suppresses all command output
+
+       --trace
+	      Raises any exceptions caught during runtime
 
        --dryrun, --dry-run
 	      Run a command without actually doing anything
@@ -83,12 +88,12 @@ SECONDARY COMMANDS
 	      List all projects
 
        vm, vagrant, vvv=[command[,command]...]
-	      Manage development  environment  via  vagrant(1).  Commands  are
-	      proxied  to  your  Vagrant  installation so that they can be run
+	      Manage  development  environment	via  vagrant(1).  Commands are
+	      proxied to your Vagrant installation so that  they  can  be  run
 	      from any directory.
 
 CONFIG COMMANDS
-       These run the corresponding command from your  project's  config  file.
+       These  run  the	corresponding command from your project's config file.
        They accept any number of arguments, since the behavior and handling of
        input is defined within the config file itself.
 
@@ -117,9 +122,9 @@ CONFIG COMMANDS
 	      Manage and run project tests
 
 CONFIG FILE
-       A YAML Juicefile(5) configuration can be used  to  store  commonly-used
+       A  YAML	Juicefile(5)  configuration can be used to store commonly-used
        build scripts. Each command block sequence can be mapped to an individ-
-       ual project's build tool, allowing a streamlined set of commands to  be
+       ual  project's build tool, allowing a streamlined set of commands to be
        used across multiple projects that utilize different tools.
 
        commands
@@ -149,7 +154,7 @@ CONFIG FILE
        commands.test
 	      Command used to manage and run project tests
 
-       Placeholder  arguments can be used within any command block sequence to
+       Placeholder arguments can be used within any command block sequence  to
        allow splat or indexed arguments to be passed to the corresponding com-
        mand when executed.
 
@@ -159,8 +164,8 @@ CONFIG FILE
        %argN%, %argumentN%
 	      Where n is the argument index e.g. cmd %arg1% | cmd %arg2%
 
-       When  naming your configuration file, use the recommended Juicefile, or
-       .tj.yaml naming convention. The raw filename regex matcher is below  if
+       When naming your configuration file, use the recommended Juicefile,  or
+       .tj.yaml  naming convention. The raw filename regex matcher is below if
        you want to be a little different.
 
        /^(((\.)?(tj)|((J|j)uicefile))(\.y(a)?ml)?$)/
@@ -168,7 +173,7 @@ CONFIG FILE
 ENVIRONMENT
        All of the global options have a corresponding ENV variable that can be
        set to permanently use the specified value each time tj(1) is run. This
-       is  useful  if you're using an alternate vagrant(1) box, or if you need
+       is useful if you're using an alternate vagrant(1) box, or if  you  need
        to disable certain features due to limited support e.g. on Windows.
 
        TJ_VM_BOX=repository
@@ -184,7 +189,7 @@ ENVIRONMENT
 	      Force directory prefix for project in VM
 
        TJ_YOLO=bool
-	      Say yes to anything and everything, and maybe  even  get	a  few
+	      Say  yes	to  anything  and everything, and maybe even get a few
 	      surprises
 
        TJ_BORING=bool
@@ -206,8 +211,13 @@ ENVIRONMENT
 	      Disable automatic port forwarding
 
        TJ_VERBOSE=bool
-	      Prints  out additional logging information and raises any excep-
-	      tions caught during runtime
+	      Prints out additional logging information
+
+       TJ_QUIET=bool
+	      Suppresses all command output
+
+       TJ_TRACE=bool
+	      Raises any exceptions caught during runtime
 
        TJ_DRYRUN=bool
 	      Run a command without actually doing anything

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

@@ -29,7 +29,8 @@ module ThemeJuice
       def create_apache_file
         unless apache_is_setup?
           @io.log "Creating apache conf file"
-          @util.create_file apache_file, :verbose => @env.verbose do
+          @util.create_file apache_file, { :verbose => @env.verbose,
+            :capture => @env.quiet } do
 %Q{<VirtualHost *:80>
   DocumentRoot #{@project.vm_srv}
   ServerName #{@project.url}
@@ -43,7 +44,8 @@ module ThemeJuice
 
       def remove_apache_file
         @io.log "Removing apache conf file"
-        @util.remove_file apache_file, :verbose => @env.verbose
+        @util.remove_file apache_file, { :verbose => @env.verbose,
+          :capture => @env.quiet }
       end
     end
   end

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

@@ -38,7 +38,8 @@ GRANT ALL PRIVILEGES ON `#{@project.db_name}`.* TO '#{@project.db_user}'@'localh
           # Double check that the database should be dropped
           if @io.agree? "Are you sure you want to drop the database for '#{@project.name}'?"
             @io.log "Dropping database"
-            @util.run_inside_vm [], :verbose => @env.verbose do |cmds|
+            @util.run_inside_vm [], { :verbose => @env.verbose,
+              :capture => @env.quiet } do |cmds|
               cmds << "cd #{@project.vm_srv}"
               cmds << "wp db drop --yes"
             end

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

@@ -36,8 +36,8 @@ end}
       def remove_landrush_entry
         unless @env.no_landrush
           @io.log "Removing URL from Landrush"
-          @util.run "vagrant landrush rm #{@project.url}",
-            :verbose => @env.verbose
+          @util.run "vagrant landrush rm #{@project.url}", { :verbose => @env.verbose,
+            :capture => @env.quiet }
         end
       end
     end

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

@@ -31,7 +31,8 @@ module ThemeJuice
       def create_dot_env_file
         unless dot_env_is_setup?
           @io.log "Creating .env file"
-          @util.create_file dot_env_file, :verbose => @env.verbose do
+          @util.create_file dot_env_file, { :verbose => @env.verbose,
+            :capture => @env.quiet } do
 %Q{DB_NAME=#{@project.db_name}
 DB_USER=#{@project.db_user}
 DB_PASSWORD=#{@project.db_pass}
@@ -48,7 +49,8 @@ WP_SITEURL=http://#{@project.url}/wp
 
       def remove_dot_env_file
         @io.log "Removing .env file"
-        @util.remove_file dot_env_file, :verbose => @env.verbose
+        @util.remove_file dot_env_file, { :verbose => @env.verbose,
+          :capture => @env.quiet }
       end
     end
   end

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

@@ -18,7 +18,8 @@ module ThemeJuice
       def create_entry_file
         unless entry_file_is_setup?
           @io.log "Creating #{@entry.fetch(:name)} file"
-          @util.create_file @entry.fetch(:file), nil, :verbose => @env.verbose
+          @util.create_file @entry.fetch(:file), nil, { :verbose => @env.verbose,
+            :capture => @env.quiet }
         end
       end
 
@@ -29,7 +30,8 @@ module ThemeJuice
       def create_entry(&block)
         unless entry_is_setup?
           @io.log "Creating #{@entry.fetch(:name)} entry"
-          @util.append_to_file @entry.fetch(:file), :verbose => @env.verbose do
+          @util.append_to_file @entry.fetch(:file), { :verbose => @env.verbose,
+            :capture => @env.quiet } do
 %Q{# Begin '#{@entry.fetch(:project)}' #{@entry.fetch(:id)}
 # The contents below are automatically generated by Theme Juice. Do not modify.
 #{yield}
@@ -43,7 +45,7 @@ module ThemeJuice
       def remove_entry
         @io.log "Removing #{@entry.fetch(:name)} entry"
         @util.gsub_file @entry.fetch(:file), /(#(#*)? Begin '#{@entry.fetch(:project)}' #{@entry.fetch(:id)})(.*?)(#(#*)? End '#{@entry.fetch(:project)}' #{@entry.fetch(:id)})\n+/m,
-          "", :verbose => @env.verbose
+          "", { :verbose => @env.verbose, :capture => @env.quiet }
       end
     end
   end

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

@@ -17,7 +17,8 @@ module ThemeJuice
       def import_db
         if @project.db_import
           @io.log "Importing existing database"
-          @util.run_inside_vm [], :verbose => @env.verbose do |cmds|
+          @util.run_inside_vm [], { :verbose => @env.verbose,
+            :capture => @env.quiet } do |cmds|
             cmds << "cd #{@project.vm_srv}"
             cmds << "wp db import #{@project.db_import}"
           end

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

@@ -16,7 +16,8 @@ module ThemeJuice
 
       def create_path
         @io.log "Creating project location"
-        @util.empty_directory @project.location, :verbose => @env.verbose
+        @util.empty_directory @project.location, { :verbose => @env.verbose,
+          :capture => @env.quiet }
       end
     end
   end

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

@@ -29,7 +29,8 @@ module ThemeJuice
       def create_nginx_file
         unless nginx_is_setup?
           @io.log "Creating nginx conf file"
-          @util.create_file nginx_file, :verbose => @env.verbose do
+          @util.create_file nginx_file, { :verbose => @env.verbose,
+            :capture => @env.quiet } do
 %Q(server {
   listen       80;
   listen       443 ssl;
@@ -45,7 +46,8 @@ module ThemeJuice
 
       def remove_nginx_file
         @io.log "Removing nginx conf file"
-        @util.remove_file nginx_file, :verbose => @env.verbose
+        @util.remove_file nginx_file, { :verbose => @env.verbose,
+          :capture => @env.quiet }
       end
     end
   end

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

@@ -30,7 +30,8 @@ module ThemeJuice
         remove_repo if repo_is_setup?
 
         @util.inside @project.location do
-          @util.run [], :verbose => @env.verbose do |cmds|
+          @util.run [], { :verbose => @env.verbose,
+            :capture => @env.quiet } do |cmds|
             cmds << "git init"
             cmds << "git remote add origin #{@project.repository}"
           end
@@ -39,7 +40,8 @@ module ThemeJuice
 
       def remove_repo
         if @io.agree? "Do you want to overwrite the current repo in '#{@project.location}'?"
-          @util.remove_dir git_dir, :verbose => @env.verbose
+          @util.remove_dir git_dir, { :verbose => @env.verbose,
+            :capture => @env.quiet }
         else
           @io.error "Run the command again without a repository, or remove the repository currently in '#{@project.location}'"
         end

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

@@ -20,8 +20,8 @@ module ThemeJuice
       def clone_theme
         @io.log "Cloning theme"
         @util.inside @project.location do
-          @util.run "git clone --depth 1 #{@project.theme} .",
-            :verbose => @env.verbose
+          @util.run "git clone --depth 1 #{@project.theme} .", {
+            :verbose => @env.verbose, :capture => @env.quiet }
         end
       end
 

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

@@ -21,8 +21,8 @@ module ThemeJuice
       def install_box
         unless box_is_installed?
           @io.log "Installing Vagrant box"
-          @util.run "git clone #{@env.vm_box} #{@env.vm_path} --depth 1",
-            :verbose => @env.verbose
+          @util.run "git clone #{@env.vm_box} #{@env.vm_path} --depth 1", {
+            :verbose => @env.verbose, :capture => @env.quiet }
         end
       end
     end

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

@@ -29,13 +29,15 @@ module ThemeJuice
       def create_custom_file
         unless custom_file_is_setup?
           @io.log "Creating customfile"
-          @util.create_file custom_file, nil, :verbose => @env.verbose
+          @util.create_file custom_file, nil, { :verbose => @env.verbose,
+            :capture => @env.quiet }
         end
       end
 
       def remove_custom_file
         @io.log "Removing customfile"
-        @util.remove_file custom_file, :verbose => @env.verbose
+        @util.remove_file custom_file, { :verbose => @env.verbose,
+          :capture => @env.quiet }
       end
     end
   end

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

@@ -20,12 +20,14 @@ module ThemeJuice
 
       def create_path
         @io.log "Creating project location in VM"
-        @util.empty_directory @project.vm_location, :verbose => @env.verbose
+        @util.empty_directory @project.vm_location, { :verbose => @env.verbose,
+          :capture => @env.quiet }
       end
 
       def remove_path
         @io.log "Removing project location in VM"
-        @util.remove_dir @project.vm_location, :verbose => @env.verbose
+        @util.remove_dir @project.vm_location, { :verbose => @env.verbose,
+          :capture => @env.quiet }
       end
     end
   end

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

@@ -23,8 +23,8 @@ module ThemeJuice
       def install_vagrant_plugin(plugin, version)
         unless vagrant_plugin_is_installed? plugin
           @io.log "Installing #{plugin}"
-          @util.run "vagrant plugin install #{plugin} --plugin-version #{version}",
-            :verbose => @env.verbose
+          @util.run "vagrant plugin install #{plugin} --plugin-version #{version}", {
+            :verbose => @env.verbose, :capture => @env.quiet }
         end
       end
     end

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

@@ -36,7 +36,7 @@ module ThemeJuice
       def provision
         @io.log "Provisioning VM"
         @util.inside @env.vm_path do
-          @util.run [], :verbose => @env.verbose do |cmds|
+          @util.run [] do |cmds|
             cmds << "vagrant halt" if vm_is_up?
             cmds << "vagrant up --provision"
           end

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

@@ -23,7 +23,8 @@ module ThemeJuice
       def restart
         @io.log "Restarting VM"
         @util.inside @env.vm_path do
-          @util.run "vagrant reload", :verbose => @env.verbose
+          @util.run "vagrant reload", { :verbose => @env.verbose,
+            :capture => @env.quiet }
         end
       end
     end

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

@@ -29,7 +29,8 @@ module ThemeJuice
       def create_wp_cli_file
         unless wp_cli_is_setup?
           @io.log "Creating WP-CLI file"
-          @util.create_file wp_cli_file, :verbose => @env.verbose do
+          @util.create_file wp_cli_file, { :verbose => @env.verbose,
+            :capture => @env.quiet } do
 %Q{require:
   - vendor/autoload.php
 ssh:
@@ -45,7 +46,7 @@ ssh:
 
       def remove_wp_cli_file
         @io.log "Removing WP-CLI file"
-        @util.remove_file wp_cli_file, :verbose => @env.verbose
+        @util.remove_file wp_cli_file
       end
     end
   end

data/lib/theme-juice/util.rb

@@ -24,7 +24,7 @@ module ThemeJuice
       def run(command, config = {}, &block)
         if command.is_a? Array
           yield command if block_given?
-          _run command.join("&&"), config
+          _run command.join(" && "), config
         else
           _run command, config
         end
@@ -34,7 +34,7 @@ module ThemeJuice
         inside @env.vm_path do
           if command.is_a? Array
             yield command if block_given?
-            _run %Q[vagrant ssh -c "#{command.join("&&")}"], config
+            _run %Q[vagrant ssh -c "#{command.join(" && ")}"], config
           else
             _run %Q[vagrant ssh -c "#{command}"], config
           end

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor