theme-juice 0.21.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 666e00c9b2d0d0a81fed922d0b12c2fc9a0e7e6f
-  data.tar.gz: 480f193d3ef55de7cdab07dfb3dfea47826cbaeb
+  metadata.gz: 7bfa46032c7a427c200ed6c42301423ac9c4e7c2
+  data.tar.gz: 38d98b4ec497bcd9e31cb113aca0804af7d91ed3
 SHA512:
-  metadata.gz: 2ca716d45416e22f9239c24869f37ec42a4bf1ff931fef111a2785e5dc7b9245bf98129526fa7671d13b01979b7a7ca088634143c6f7b220685fa3e2d08b08fb
-  data.tar.gz: d338bc871ea97449c27d5f27200ebd4f43aa83bd79901f6ee627032aeede498df0fb4f1408051ac10339d061da1db166f56669e8aaaeaff15f113753d5ad76a2
+  metadata.gz: 88129bf7d1e8c546b4433c3997d95fb4e07ce45c75c89ca7308b9f312858b6a6f37ac48044fc25bfcac14a99f97d7c839a87a773561d5b9332ef5043f232f68d
+  data.tar.gz: ccf8ecc6a246c23dae452d70eb66e66538e5407af30fef4e30e7fed66fd298326a65597882d0efae65ee0bf7a4573551e97e30e74d09ed246d2aa33ff12a0d3a

data/README.md

@@ -117,6 +117,7 @@ Or, you can also check out [themejuice.it](http://themejuice.it) for a pretty we
 1. [Can I access a project from another device (i.e. mobile)?](#can-i-access-a-project-from-another-device-ie-mobile)
 1. [Can I add my starter template, ________?](#can-i-add-my-starter-template-________)
 1. [Can I integrate my deployments with Slack?](#can-i-integrate-my-deployments-with-slack)
+1. [Can I use a self-signed SSL cert?](#can-i-use-a-self-signed-ssl-cert)
 1. [Troubleshooting](#troubleshooting)
 
 ### Is Windows supported?
@@ -275,6 +276,9 @@ deployment:
 
 Check out [capistrano-slackify](https://github.com/onthebeach/capistrano-slackify) for more information.
 
+### Can I use a self-signed SSL cert?
+Yes, unless you used the `--no-ssl` flag, `tj` will set up each new site to support SSL, [and the VM will generate a new self-signed certificate](https://github.com/ezekg/theme-juice-vvv#automatically-generated-self-signed-ssl-certs). In order to take advantage of it, [you'll need to accept the self-signed certificate on your host machine](https://github.com/ezekg/theme-juice-vvv#accepting-a-self-signed-ssl-cert).
+
 ## Troubleshooting
 
 1. [Help! It won't let me `git clone` anything!](#help-it-wont-let-me-git-clone-anything)

data/lib/theme-juice/cli.rb

@@ -141,6 +141,7 @@ module ThemeJuice
     method_option :no_provision,     :type => :boolean, :aliases => %w[--no-restart],       :desc => ""
     method_option :no_config,        :type => :boolean, :aliases => %w[--no-juicefile],     :desc => ""
     method_option :wp_config_modify, :type => :boolean, :aliases => %w[--modify-wp-config], :desc => ""
+    method_option :no_ssl,           :type => :boolean, :aliases => %w[--no-https],         :desc => ""
     def create
       @io.hello
       @create.new(options).execute
@@ -162,6 +163,7 @@ module ThemeJuice
     method_option :no_provision,     :type => :boolean, :aliases => %w[--no-restart],       :desc => ""
     method_option :no_config,        :type => :boolean, :aliases => %w[--no-juicefile],     :desc => ""
     method_option :wp_config_modify, :type => :boolean, :aliases => %w[--modify-wp-config], :desc => ""
+    method_option :no_ssl,           :type => :boolean, :aliases => %w[--no-https],         :desc => ""
     def setup
       @io.hello
       @create.new(options.dup.merge(:bare => true)).execute

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

@@ -60,6 +60,7 @@ module ThemeJuice
         @project.wp_config_modify = @opts.fetch("wp_config_modify") { false }
         @project.no_config        = @opts.fetch("no_config")        { false }
         @project.no_provision     = @opts.fetch("no_provision")     { false }
+        @project.no_ssl           = @opts.fetch("no_ssl")           { false }
         @project.no_env           = @opts.fetch("no_env")           { @project.wp_config_modify }
         @project.name             = @opts.fetch("name")             { name }
         @project.location         = @opts.fetch("location")         { location }

data/lib/theme-juice/man/tj

@@ -1,7 +1,7 @@
-.\" generated with Ronn/v0.7.0
-.\" http://github.com/rtomayko/ronn/tree/0.7.0
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "TJ" "1" "December 2015" "" "Theme Juice Manual"
+.TH "TJ" "1" "January 2016" "" "Theme Juice Manual"
 .
 .SH "NAME"
 \fBtj\fR \- WordPress development made easy
@@ -28,7 +28,7 @@ Force IP address of VM*
 Force directory prefix for project in VM*
 .
 .TP
-\fB\-\-yolo\fR
+\fB\-\-yolo\fR, \fB\-\-yes\fR
 Say yes to anything and everything, and maybe even get a few surprises
 .
 .TP
@@ -48,6 +48,10 @@ Prints all output without color
 Prints all output without animations**
 .
 .TP
+\fB\-\-robot\fR
+Prints all output with absolutely no formatting
+.
+.TP
 \fB\-\-no\-landrush\fR
 Disable the landrush(1) gem for managing DNS*
 .
@@ -111,6 +115,10 @@ Deploy and manage a project
 Print the current version
 .
 .TP
+\fBenv\fR, \fB\-\-env\fR=[\fIproperty\fR]
+Print environment properties
+.
+.TP
 \fBlist\fR, \fBls\fR, \fBprojects\fR, \fBapps\fR, \fBsites\fR
 List all projects
 .

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

@@ -1,7 +1,7 @@
-.\" generated with Ronn/v0.7.0
-.\" http://github.com/rtomayko/ronn/tree/0.7.0
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "TJ\-CREATE" "1" "December 2015" "" "Theme Juice Manual"
+.TH "TJ\-CREATE" "1" "April 2016" "" "Theme Juice Manual"
 .
 .SH "NAME"
 \fBtj\-create\fR \- Create a new project
@@ -91,6 +91,30 @@ Skip all prompts and use default settings
 Project is not a wordpress(7) install
 .
 .TP
+\fB\-\-no\-wp\-cli\fR, \fB\-\-no\-wp\-cli\-config\fR
+Skip creating the local wp\-cli(1) config file
+.
+.TP
 \fB\-\-no\-db\fR
 Project does not need a database
+.
+.TP
+\fB\-\-no\-env\fR
+Project does not need a \fB\.env\fR file
+.
+.TP
+\fB\-\-no\-provision\fR, \fB\-\-no\-restart\fR
+Do not provision VM after create(1)
+.
+.TP
+\fB\-\-no\-config\fR, \fB\-\-no\-juicefile\fR
+Project does not have a Juicefile(5) config
+.
+.TP
+\fB\-\-modify\-wp\-config\fR, \fB\-\-wp\-config\-modify\fR
+Modify \fBwp\-config\.php\fR file contents with project configuration (this flag automatically disables the \fB\.env\fR file when used)
+.
+.TP
+\fB\-\-no\-ssl\fR, \fB\-\-no\-https\fR
+Project does not need SSL support
 

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

@@ -73,10 +73,29 @@ GLOBAL OPTIONS
        --no-wp
 	      Project is not a wordpress(7) install
 
+       --no-wp-cli, --no-wp-cli-config
+	      Skip creating the local wp-cli(1) config file
+
        --no-db
 	      Project does not need a database
 
+       --no-env
+	      Project does not need a .env file
+
+       --no-provision, --no-restart
+	      Do not provision VM after create(1)
+
+       --no-config, --no-juicefile
+	      Project does not have a Juicefile(5) config
+
+       --modify-wp-config, --wp-config-modify
+	      Modify  wp-config.php  file  contents with project configuration
+	      (this flag automatically disables the .env file when used)
+
+       --no-ssl, --no-https
+	      Project does not need SSL support
+
 
 
 
-				 December 2015			  TJ-CREATE(1)
+				  April 2016			  TJ-CREATE(1)

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

@@ -1,5 +1,5 @@
-.\" generated with Ronn/v0.7.0
-.\" http://github.com/rtomayko/ronn/tree/0.7.0
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
 .TH "TJ\-DELETE" "1" "December 2015" "" "Theme Juice Manual"
 .

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

@@ -1,7 +1,7 @@
-.\" generated with Ronn/v0.7.0
-.\" http://github.com/rtomayko/ronn/tree/0.7.0
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "TJ\-DEPLOY" "1" "December 2015" "" "Theme Juice Manual"
+.TH "TJ\-DEPLOY" "1" "January 2016" "" "Theme Juice Manual"
 .
 .SH "NAME"
 \fBtj\-deploy\fR \- Deploy a project
@@ -12,6 +12,9 @@
 .SH "DESCRIPTION"
 Deploys a project to the passed \fBstage\fR\. All commands are transformed and then piped directly to capistrano(1) to handle deployment\.
 .
+.SH "REQUIREMENTS"
+The \fBremote\fR that is being deployed to needs to have wp\-cli(1) installed in order for tj(1) to be able to handle database migration\.
+.
 .SH "SETUP"
 Follow these steps to quickly get up and running:
 .
@@ -19,7 +22,7 @@ Follow these steps to quickly get up and running:
 Create a \fBdeploy\fR user on the \fBstage\fR server
 .
 .IP "2." 4
-Create SSH keys for the new \fBdeploy\fR user
+Set up SSH keys for the new \fBdeploy\fR user to SSH in without a password
 .
 .IP "3." 4
 Confirm the \fBdeploy\fR user owns the deploy path
@@ -35,6 +38,10 @@ Deploy!
 .SH "GLOBAL OPTIONS"
 .
 .TP
+\fB\-b\fR, \fB\-\-branch\fR=\fIbranch\fR
+Use an alternate git(1) branch for current deployment
+.
+.TP
 \fB\-\-archive\fR, \fB\-\-tar\fR, \fB\-\-gzip\fR, \fB\-\-zip\fR
 Archive directories with tar(1) when performing file transfers
 .

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

@@ -12,12 +12,17 @@ DESCRIPTION
        Deploys a project to the passed stage. All commands are transformed and
        then piped directly to capistrano(1) to handle deployment.
 
+REQUIREMENTS
+       The remote that is being deployed to needs to have wp-cli(1)  installed
+       in order for tj(1) to be able to handle database migration.
+
 SETUP
        Follow these steps to quickly get up and running:
 
        1.  Create a deploy user on the stage server
 
-       2.  Create SSH keys for the new deploy user
+       2.  Set	up  SSH keys for the new deploy user to SSH in without a pass-
+	   word
 
        3.  Confirm the deploy user owns the deploy path
 
@@ -28,6 +33,9 @@ SETUP
 
 
 GLOBAL OPTIONS
+       -b, --branch=branch
+	      Use an alternate git(1) branch for current deployment
+
        --archive, --tar, --gzip, --zip
 	      Archive directories with tar(1) when performing file transfers
 
@@ -177,4 +185,4 @@ CONFIG FILE
 
 
 
-				 December 2015			  TJ-DEPLOY(1)
+				 January 2016			  TJ-DEPLOY(1)

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

@@ -1,7 +1,7 @@
-.\" generated with Ronn/v0.7.0
-.\" http://github.com/rtomayko/ronn/tree/0.7.0
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "TJ\-SETUP" "1" "December 2015" "" "Theme Juice Manual"
+.TH "TJ\-SETUP" "1" "April 2016" "" "Theme Juice Manual"
 .
 .SH "NAME"
 \fBtj\-setup\fR \- Setup an existing project
@@ -51,6 +51,30 @@ Skip all prompts and use default settings
 Project is not a wordpress(7) install
 .
 .TP
+\fB\-\-no\-wp\-cli\fR, \fB\-\-no\-wp\-cli\-config\fR
+Skip creating the local wp\-cli(1) config file
+.
+.TP
 \fB\-\-no\-db\fR
 Project does not need a database
+.
+.TP
+\fB\-\-no\-env\fR
+Project does not need a \fB\.env\fR file
+.
+.TP
+\fB\-\-no\-provision\fR, \fB\-\-no\-restart\fR
+Do not provision VM after setup(1)
+.
+.TP
+\fB\-\-no\-config\fR, \fB\-\-no\-juicefile\fR
+Project does not have a Juicefile(5) config
+.
+.TP
+\fB\-\-modify\-wp\-config\fR, \fB\-\-wp\-config\-modify\fR
+Modify \fBwp\-config\.php\fR file contents with project configuration (this flag automatically disables the \fB\.env\fR file when used)
+.
+.TP
+\fB\-\-no\-ssl\fR, \fB\-\-no\-https\fR
+Project does not need SSL support
 

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

@@ -41,10 +41,29 @@ GLOBAL OPTIONS
        --no-wp
 	      Project is not a wordpress(7) install
 
+       --no-wp-cli, --no-wp-cli-config
+	      Skip creating the local wp-cli(1) config file
+
        --no-db
 	      Project does not need a database
 
+       --no-env
+	      Project does not need a .env file
+
+       --no-provision, --no-restart
+	      Do not provision VM after setup(1)
+
+       --no-config, --no-juicefile
+	      Project does not have a Juicefile(5) config
+
+       --modify-wp-config, --wp-config-modify
+	      Modify  wp-config.php  file  contents with project configuration
+	      (this flag automatically disables the .env file when used)
+
+       --no-ssl, --no-https
+	      Project does not need SSL support
+
 
 
 
-				 December 2015			   TJ-SETUP(1)
+				  April 2016			   TJ-SETUP(1)

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

@@ -21,7 +21,8 @@ GLOBAL OPTIONS
        --vm-prefix=string
 	      Force directory prefix for project in VM*
 
-       --yolo Say  yes	to  anything  and everything, and maybe even get a few
+       --yolo, --yes
+	      Say  yes	to  anything  and everything, and maybe even get a few
 	      surprises
 
        --boring
@@ -36,6 +37,9 @@ GLOBAL OPTIONS
        --no-animations
 	      Prints all output without animations**
 
+       --robot
+	      Prints all output with absolutely no formatting
+
        --no-landrush
 	      Disable the landrush(1) gem for managing DNS*
 
@@ -84,6 +88,9 @@ SECONDARY COMMANDS
        version, --version, -v
 	      Print the current version
 
+       env, --env=[property]
+	      Print environment properties
+
        list, ls, projects, apps, sites
 	      List all projects
 
@@ -231,4 +238,4 @@ ENVIRONMENT
 
 
 
-				 December 2015				 TJ(1)
+				 January 2016				 TJ(1)

data/lib/theme-juice/project.rb

@@ -29,6 +29,7 @@ module ThemeJuice
     attr_accessor :no_db
     attr_accessor :no_env
     attr_accessor :no_provision
+    attr_accessor :no_ssl
     attr_accessor :no_config
     attr_accessor :wp_config_modify
 

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

@@ -28,7 +28,7 @@ module ThemeJuice
 
       def create_apache_file
         return if apache_is_setup?
-        
+
         @io.log "Creating apache conf file"
         @util.create_file apache_file, { :verbose => @env.verbose,
           :capture => @env.quiet } do
@@ -38,6 +38,7 @@ module ThemeJuice
   ServerAlias *.#{@project.url} #{@project.xip_url}.*.xip.io *.#{@project.xip_url}.*.xip.io
 </VirtualHost>
 
+#{ssl_configuration}
 }
         end
       end
@@ -47,6 +48,19 @@ module ThemeJuice
         @util.remove_file apache_file, { :verbose => @env.verbose,
           :capture => @env.quiet }
       end
+
+      def ssl_configuration
+        return if @project.no_ssl
+%Q{<VirtualHost *:443>
+  DocumentRoot #{@project.vm_srv}
+  ServerName #{@project.url}
+  SSLEngine on
+  SSLCertificateFile "/etc/ssl/certs/#{@project.url}.pem"
+  SSLCertificateKeyFile "/etc/ssl/private/#{@project.url}.key"
+</VirtualHost>
+
+}
+      end
     end
   end
 end

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

@@ -28,17 +28,16 @@ module ThemeJuice
 
       def create_nginx_file
         return if nginx_is_setup?
-        
+
         @io.log "Creating nginx conf file"
         @util.create_file nginx_file, { :verbose => @env.verbose,
           :capture => @env.quiet } do
 %Q(server {
   listen       80;
-  listen       443 ssl;
   server_name  .#{@project.url} ~(^|^[a-z0-9.-]*\\.)#{@project.xip_url}\\.\\d+\\.\\d+\\.\\d+\\.\\d+\\.xip\\.io$;
   root         #{@project.vm_srv};
   include      /etc/nginx/nginx-wp-common.conf;
-}
+#{ssl_configuration}}
 
 )
         end
@@ -49,6 +48,15 @@ module ThemeJuice
         @util.remove_file nginx_file, { :verbose => @env.verbose,
           :capture => @env.quiet }
       end
+
+      def ssl_configuration
+        return if @project.no_ssl
+%Q{
+  listen              443 ssl;
+  ssl_certificate     {vvv_path_to_folder}/ssl/#{@project.url}.cert;
+  ssl_certificate_key {vvv_path_to_folder}/ssl/#{@project.url}.key;
+}
+      end
     end
   end
 end

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-03 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: WordPress development made easy