theme-juice 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45986e3e185af0227b1519e087f5e788becedd96
-  data.tar.gz: b2db6200715f2a28eeaa369da9d5e70cb9d1f011
+  metadata.gz: 3d3330b94b90b336c9ac48a2a0a37377ccddb7bb
+  data.tar.gz: 67f3c26154eeb10c53f33e4c6ac86191f47de21a
 SHA512:
-  metadata.gz: c8916cc2e1b45670d343a125006a047bd4450c28966347fe07c5214d195cdb452d589e2321be84da3b33ae2fb40f590ecc1b3a5dced4440333ff4d9196962fbc
-  data.tar.gz: 48951e85c92511d7f599c36d41439106cb6713d9ffcc192ca5af458116e99b1ee7c4acd079fae9567ce68175e0de2d9aca2909d2a8e4707f20a11fa9598ec6e8
+  metadata.gz: f12970fdd0a8e4fbdc74d8450de0727f6857971ca2cef7241fce1bd28cf8fff386cac1086360cbf50847e661d185901f49bd2135d2fdb073672704ba1fd764b6
+  data.tar.gz: 6b7b4bd22c1d21732e78df853a2d12d01a06606222cbe40245e5145eeeae176415edd1a0fd93d8700c403310c9e80aa2a896ef70a56a7763411059346de1e812

data/README.md

@@ -1,6 +1,6 @@
 # Theme Juice CLI
 [![Gem Version](http://img.shields.io/gem/v/theme-juice.svg?style=flat-square)](https://rubygems.org/gems/theme-juice)
-[![Travis](https://img.shields.io/travis/ezekg/theme-juice-cli.svg?style=flat-square)](https://travis-ci.org/ezekg/theme-juice-cli)
+[![Travis](https://img.shields.io/travis/ezekg/tj.svg?style=flat-square)](https://travis-ci.org/ezekg/tj)
 [![Code Climate](https://img.shields.io/codeclimate/github/ezekg/theme-juice-cli.svg?style=flat-square)](https://codeclimate.com/github/ezekg/theme-juice-cli)
 [![Code Climate](https://img.shields.io/codeclimate/coverage/github/ezekg/theme-juice-cli.svg?style=flat-square)](https://codeclimate.com/github/ezekg/theme-juice-cli)
 [![Gitter](https://img.shields.io/gitter/room/ezekg/theme-juice-cli.svg?style=flat-square)](https://gitter.im/ezekg/theme-juice-cli)

data/lib/theme-juice/commands/create.rb

@@ -74,7 +74,7 @@ module ThemeJuice
         @project.url               = @opts.fetch("url")               { url }
         @project.xip_url           = @opts.fetch("xip_url")           { xip_url }
         @project.template          = @opts.fetch("template")          { template }
-        @project.template_revision = @opts.fetch("template_revision") { nil }
+        @project.template_revision = @opts.fetch("template_revision") { template_revision }
         @project.repository        = @opts.fetch("repository")        { repository }
         @project.db_host           = @opts.fetch("db_host")           { db_host }
         @project.db_name           = @opts.fetch("db_name")           { db_name }
@@ -192,18 +192,18 @@ module ThemeJuice
           choice = @io.choose "Which starter template would you like to use?", :blue, TEMPLATES.keys
 
           case choice
-          when /(themejuice)/
+          when /themejuice/i
             @io.say "Awesome choice!", :color => :green, :icon => :success
-          when /(wordpress)/
-            @project.wp_config_modify = true
-            @project.no_config        = true
-            @project.no_wp_cli        = true
-            @project.no_env           = true
+          when /wordpress/i
+            @project.wp_config_modify  = true
+            @project.no_config         = true
+            @project.no_wp_cli         = true
+            @project.no_env            = true
             @io.say "This is a stock WordPress install, so I'll go ahead and modify the 'wp-config' file for you.", {
               :color => :yellow, :icon => :notice }
-          when /(other)/
+          when /other/i
             TEMPLATES[choice] = @io.ask "What is the repository URL of the starter template that you would like to clone?"
-          when /(none)/
+          when /none/i
             @project.bare = true
             @io.say "Next time you need to create a project without a starter template, you can just run the 'setup' command instead.", {
               :color => :yellow, :icon => :notice }
@@ -215,6 +215,20 @@ module ThemeJuice
         template
       end
 
+      def template_revision
+        return nil if @project.bare
+
+        revision = nil
+
+        case @project.template
+        when /wordpress/i
+          revision = @io.ask "Which version of WordPress would you like to use?", {
+            :default => "master" }
+        end
+
+        revision
+      end
+
       def repository
         return false if @project.skip_repo || @project.use_defaults
 

data/lib/theme-juice/man/tj

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "TJ" "1" "August 2016" "" "Theme Juice Manual"
+.TH "TJ" "1" "September 2016" "" "Theme Juice Manual"
 .
 .SH "NAME"
 \fBtj\fR \- WordPress development made easy
@@ -37,7 +37,7 @@ Run Juicefile(5) commands from the passed path instead of from the current direc
 .
 .TP
 \fB\-\-from\-srv\fR, \fB\-\-in\-srv\fR=\fIpath\fR
-Run Juicefile(5) commands from the passed srv path instead of from the current host directory\.
+Run Juicefile(5) commands from the passed srv path instead of from the current host directory path when using the \fB\-\-inside\-vm\fR flag\.
 .
 .TP
 \fB\-\-inside\-vm\fR, \fB\-\-in\-vm\fR
@@ -306,7 +306,7 @@ if those were the options chosen during a creation\. The following variables are
 \fBvm_ip\fR: Virtual machine IP address
 .
 .IP "\(bu" 4
-\fBvm_revision\fR Revision hash or branch to checkout for VM
+\fBvm_revision\fR Revision hash or branch of VM
 .
 .IP "\(bu" 4
 \fBvm_path\fR: Virtual machine location on the host machine
@@ -349,12 +349,12 @@ Revision hash or branch to checkout for VM (default is master)
 Force directory prefix for project in VM
 .
 .TP
-\fBTJ_FROM_PATH\fR=\fIpath\fR
+\fBTJ_FROM_PATH\fR\fI=path\fR
 Run Juicefile(5) commands from the passed path instead of from the current directory\.
 .
 .TP
-\fBTJ_FROM_SRV\fR=\fIpath\fR
-Run Juicefile(5) commands from the passed srv path instead of from the current host directory path\.
+\fBTJ_FROM_SRV\fR\fI=path\fR
+Run Juicefile(5) commands from the passed srv path instead of from the current host directory path when \fBTJ_INSIDE_VM\fR is enabled\.
 .
 .TP
 \fBTJ_INSIDE_VM\fR=\fIbool\fR

data/lib/theme-juice/man/tj-deploy

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "TJ\-DEPLOY" "1" "August 2016" "" "Theme Juice Manual"
+.TH "TJ\-DEPLOY" "1" "September 2016" "" "Theme Juice Manual"
 .
 .SH "NAME"
 \fBtj\-deploy\fR \- Deploy a project

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

@@ -312,4 +312,4 @@ CONFIG FILE
 
 
 
-				  August 2016			  TJ-DEPLOY(1)
+				September 2016			  TJ-DEPLOY(1)

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

@@ -30,14 +30,15 @@ GLOBAL OPTIONS
 
        --from-srv, --in-srv=path
 	      Run Juicefile(5) commands from the passed srv  path  instead  of
-	      from the current host directory.
+	      from  the current host directory path when using the --inside-vm
+	      flag.
 
        --inside-vm, --in-vm
-	      Run  Juicefile(5)  commands  from  inside of the virtual machine
+	      Run Juicefile(5) commands from inside  of  the  virtual  machine
 	      instead of your host machine.
 
        --yolo, --yes
-	      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
 
        --boring
@@ -112,16 +113,16 @@ 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 FILE
-       A YAML configuration file called a Juicefile(5) can be  used  to  store
-       commonly  used  build  scripts, similar to npm(1) scripts. Each command
-       can be mapped to any build script you like, allowing you  to  define  a
-       set  of	commands  that can be used across all of your projects. If you
-       plan to deploy using tj, this file will also house your deploy(1)  con-
+       A  YAML	configuration  file called a Juicefile(5) can be used to store
+       commonly used build scripts, similar to npm(1)  scripts.  Each  command
+       can  be	mapped	to any build script you like, allowing you to define a
+       set of commands that can be used across all of your  projects.  If  you
+       plan  to deploy using tj, this file will also house your deploy(1) con-
        figuration.
 
        For reference, below is an example config:
@@ -173,8 +174,8 @@ CONFIG COMMANDS
        dev, which will in turn run the command grunt.
 
        If you noticed in the example above, there are a few commands that con-
-       tain %args%; each command list is run within  a	single	execution  via
-       joining:  cmd1  &&  cmd2  [&&  cmd3...],  with  all %args%/%argN% being
+       tain  %args%;  each  command  list is run within a single execution via
+       joining: cmd1 &&  cmd2  [&&  cmd3...],  with  all  %args%/%argN%  being
        replaced with the corresponding argument index, when available.
 
        Here's a few example commands using placeholders:
@@ -191,16 +192,16 @@ CONFIG COMMANDS
 
 
 
-       To clarify a little bit more, we could run tj dev build, and since  our
-       dev  command  contains  %args%, that will in turn run the command grunt
-       build; if we run tj dev some:other task, that would be interpreted  and
+       To  clarify a little bit more, we could run tj dev build, and since our
+       dev command contains %args%, that will in turn run  the	command  grunt
+       build;  if we run tj dev some:other task, that would be interpreted and
        run as grunt some:other task.
 
-       You  can specify an unlimited number of commands with an unlimited num-
-       ber of arguments within your Juicefile; however, you should be  careful
-       with  how this is used. Don't go including sudo rm -rf %arg1% in a com-
-       mand, while passing / as an argument. Keep it simple. These  are  meant
-       to  make  your life easier by helping you manage build tools, not to do
+       You can specify an unlimited number of commands with an unlimited  num-
+       ber  of arguments within your Juicefile; however, you should be careful
+       with how this is used. Don't go including sudo rm -rf %arg1% in a  com-
+       mand,  while  passing / as an argument. Keep it simple. These are meant
+       to make your life easier by helping you manage build tools, not	to  do
        fancy scripting.
 
 CONFIG TEMPLATE STRINGS
@@ -258,7 +259,7 @@ CONFIG TEMPLATE STRINGS
 
        o   vm_ip: Virtual machine IP address
 
-       o   vm_revision Revision hash or branch to checkout for VM
+       o   vm_revision Revision hash or branch of VM
 
        o   vm_path: Virtual machine location on the host machine
 
@@ -275,7 +276,7 @@ CONFIG TEMPLATE STRINGS
 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 i.e. on Windows.
 
        TJ_VM_BOX=repository
@@ -294,12 +295,13 @@ ENVIRONMENT
 	      Force directory prefix for project in VM
 
        TJ_FROM_PATH=path
-	      Run  Juicefile(5)  commands from the passed path instead of from
+	      Run Juicefile(5) commands from the passed path instead  of  from
 	      the current directory.
 
        TJ_FROM_SRV=path
-	      Run Juicefile(5) commands from the passed srv  path  instead  of
-	      from the current host directory path.
+	      Run  Juicefile(5)  commands  from the passed srv path instead of
+	      from the	current  host  directory  path	when  TJ_INSIDE_VM  is
+	      enabled.
 
        TJ_INSIDE_VM=bool
 	      Run  Juicefile(5)  commands  from  inside of the virtual machine
@@ -345,4 +347,4 @@ ENVIRONMENT
 
 
 
-				  August 2016				 TJ(1)
+				September 2016				 TJ(1)

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

@@ -12,8 +12,11 @@ module ThemeJuice
         return unless @project.template
 
         clone_template
-        render_template_config_erb if @config.exist?
-        install_template
+
+        if @config.exist?
+          render_template_config_erb
+          install_template
+        end
       end
 
       private
@@ -23,9 +26,10 @@ module ThemeJuice
         @util.inside @project.location do
           @util.run [], { :verbose => @env.verbose,
             :capture => @env.quiet } do |cmds|
-            cmds << "git clone #{@project.template} ."
             if @project.template_revision
-              cmds << "git checkout #{@project.template_revision}"
+              cmds << "git clone '#{@project.template}' --depth 1 --branch '#{@project.template_revision}' --single-branch ."
+            else
+              cmds << "git clone '#{@project.template}' --depth 1 ."
             end
           end
         end

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

@@ -27,11 +27,11 @@ module ThemeJuice
             :capture => @env.quiet } do |cmds|
             cmds << "git fetch"
             if @env.vm_revision
-              cmds << "git checkout #{@env.vm_revision}"
+              cmds << "git checkout '#{@env.vm_revision}'"
             else
               cmds << "git checkout master"
             end
-            cmds << "git pull"
+            cmds << "git reset --hard"
           end
         end
       end

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor