theme-juice 0.26.2 → 0.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18fed89907f2b222c1212bfc73e86af92d5256b3
-  data.tar.gz: b293d6edb73a89dcfee197170fc6fa9c0cf97021
+  metadata.gz: 993a7061f134c09e5214a50afd234d7c72f3e56a
+  data.tar.gz: cac7fcedefb39e8d768727237ed03014522f4dfe
 SHA512:
-  metadata.gz: d4438d9c8a2593149e2b835db3a47f2c2321b42b53b89de5d7edbd4ee641c748b7dbccc8f83ff7be7f12eabedbbb82c3997156893271a3229d185b86f88c60f0
-  data.tar.gz: e0475d25a7091f9de01eb5930f6cb8944c8d7307ba0800c5ac90fa74933d0958f50f4b8fbcbac57886769a6409f7f2bfeb19fd01080874e078ee0680d7eaf7b8
+  metadata.gz: 060a2da004e18ec839ab6e25d7bdd0fb95c9f1a50ac1e75e783056590e4ad25d804836987e4fb4406a3ef5b19c7bded3cc1126cc46ed022b9613a3bef4ab6295
+  data.tar.gz: 4e738554ac822d7e020f200b60570d8cf39b2cb022b0544d3e34cceb2d71c0cc947dd812012a07a26920e56fc142f424016f42963aa5075c425733b4e6ae4d07

data/lib/theme-juice/cli.rb

@@ -121,7 +121,7 @@ module ThemeJuice
     end
 
     desc "init", "Initialize the VM"
-    method_option :provision, :type => :boolean, :aliases => %w[--restart], :desc => ""
+    method_option :provision, :type => :boolean, :desc => ""
     def init
       @io.say "Initializing the VM...", {
         :color => [:black, :on_green, :bold],
@@ -148,6 +148,7 @@ module ThemeJuice
     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 => ""
+    method_option :provision,        :type => :boolean,                                     :desc => ""
     def create
       @io.hello
       @create.new(options).execute
@@ -169,6 +170,7 @@ module ThemeJuice
     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 => ""
+    method_option :provision,        :type => :boolean,                                     :desc => ""
     def setup
       @io.hello
       @create.new(options.dup.merge(:bare => true)).execute

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

@@ -41,7 +41,11 @@ module ThemeJuice
           tasks << Tasks::DNS.new
           tasks << Tasks::WPCLI.new
           tasks << Tasks::Repo.new
-          tasks << Tasks::VMRestart.new
+          if @project.provision
+            tasks << Tasks::VMProvision.new
+          else
+            tasks << Tasks::VMRestart.new
+          end
           tasks << Tasks::ImportDatabase.new
           tasks << Tasks::CreateSuccess.new
         end
@@ -60,6 +64,7 @@ module ThemeJuice
         @project.wp_config_modify = @opts.fetch("wp_config_modify") { false }
         @project.no_config        = @opts.fetch("no_config")        { false }
         @project.no_ssl           = @opts.fetch("no_ssl")           { false }
+        @project.provision        = @opts.fetch("provision")        { false }
         @project.no_env           = @opts.fetch("no_env")           { @project.wp_config_modify }
         @project.name             = @opts.fetch("name")             { name }
         @project.location         = @opts.fetch("location")         { location }
@@ -92,7 +97,7 @@ module ThemeJuice
           @io.error "Project name '#{name}' looks like it's empty. Aborting mission."
         end
 
-        "#{name}".match /[^0-9A-Za-z.\-]/ do |char|
+        "#{name}".match /[^0-9a-z\.\-]/ do |char|
           @io.error "Project name contains an invalid character '#{char}'. This name is used internally for a ton of stuff, so that's not gonna work. Aborting mission."
         end
 
@@ -133,6 +138,10 @@ module ThemeJuice
           @io.error "Your development url '#{url}' doesn't end with '.dev'. This is used internally by Landrush, so that's not gonna work. Aborting mission."
         end
 
+        "#{url}".match /[^0-9a-z\.\-]/ do |char|
+          @io.error "Your development url contains an invalid character '#{char}'. Aborting mission."
+        end
+
         true
       end
 

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

@@ -113,4 +113,8 @@ Modify \fBwp\-config\.php\fR file contents with project configuration (this flag
 .TP
 \fB\-\-no\-ssl\fR, \fB\-\-no\-https\fR
 Project does not need SSL support
+.
+.TP
+\fB\-\-provision\fR
+Run provisioners after creating project
 

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

@@ -92,6 +92,9 @@ GLOBAL OPTIONS
        --no-ssl, --no-https
 	      Project does not need SSL support
 
+       --provision
+	      Run provisioners after creating project
+
 
 
 

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

@@ -15,6 +15,6 @@ Initializes the virtual machine\.
 .SH "GLOBAL OPTIONS"
 .
 .TP
-\fB\-\-provision\fR, \fB\-\-restart\fR
+\fB\-\-provision\fR
 Run provisioners after initializing the virtual machine
 

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

@@ -12,7 +12,7 @@ DESCRIPTION
        Initializes the virtual machine.
 
 GLOBAL OPTIONS
-       --provision, --restart
+       --provision
 	      Run provisioners after initializing the virtual machine
 
 

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

@@ -73,4 +73,8 @@ Modify \fBwp\-config\.php\fR file contents with project configuration (this flag
 .TP
 \fB\-\-no\-ssl\fR, \fB\-\-no\-https\fR
 Project does not need SSL support
+.
+.TP
+\fB\-\-provision\fR
+Run provisioners after setting up project
 

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

@@ -60,6 +60,9 @@ GLOBAL OPTIONS
        --no-ssl, --no-https
 	      Project does not need SSL support
 
+       --provision
+	      Run provisioners after setting up project
+
 
 
 

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

@@ -9,11 +9,7 @@ module ThemeJuice
       end
 
       def execute
-        if @project.provision
-          provision
-        else
-          restart
-        end
+        provision
       end
 
       def unexecute
@@ -42,16 +38,6 @@ module ThemeJuice
           end
         end
       end
-
-      def restart
-        @io.log "Restarting VM"
-        @util.inside @env.vm_path do
-          @util.run [] do |cmds|
-            cmds << "vagrant halt" if vm_is_up?
-            cmds << "vagrant up --no-provision"
-          end
-        end
-      end
     end
   end
 end

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

@@ -13,18 +13,29 @@ module ThemeJuice
       end
 
       def unexecute
-        if @project.vm_restart
-          restart
-        end
+        restart if @project.vm_restart
       end
 
       private
 
+      def vm_is_up?
+        res = false
+
+        @util.inside @env.vm_path do
+          res = @util.run("vagrant status --machine-readable", {
+            :verbose => @env.verbose, :capture => true }).include? "running"
+        end
+
+        res
+      end
+
       def restart
         @io.log "Restarting VM"
         @util.inside @env.vm_path do
-          @util.run "vagrant reload", { :verbose => @env.verbose,
-            :capture => @env.quiet }
+          @util.run [] do |cmds|
+            cmds << "vagrant halt" if vm_is_up?
+            cmds << "vagrant up"
+          end
         end
       end
     end

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.26.3
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor