theme-juice 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2daf93c3af67ac83117ca46ba72e8d1fc6c02b41
-  data.tar.gz: 1ecd546f8da3c3305bf21314f704bfe45b04cb50
+  metadata.gz: c141fd94370ee7a1fba783f494a38cd9ee78902f
+  data.tar.gz: 887ff3470169bd7dd7b4b50d9a09af5fb043a2f0
 SHA512:
-  metadata.gz: 30c03563416e26d5241e19d9ebc0060d77ba7e651da18b3103e5562a2d561cfc5fd15c2a99df84b63538c037bab7893f04719e96a12918fdcb48c64e60734fa5
-  data.tar.gz: 56f8a3348b4c08fed0314568252b8fd5d9c52d38f0c1b1d26d6bfe2c949bd80f76537af08c91ae930723bc365a544a1c3d59acc40fe6d89e99143cb7a4c12fd0
+  metadata.gz: 72d13f7ceb2fee6f182ce1666040ddca5e27abd86bbc1fd26338e80bff13182564061cbbf98512b4b90ee7d926b947822524bbee79d8c4927a3ac52c19f6d05e
+  data.tar.gz: e6d2989c65d4c4fe9e933e5716b48dad0a1b650598ab4fd48dd1372a6dbb3c3ccad44c66926cc319960125a592c3ea1c870bc9c1ffbc11c8c1555ece3c2d97b2

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

@@ -27,10 +27,11 @@ module ThemeJuice
       end
 
       def create_apache_file
-        unless apache_is_setup?
-          @io.log "Creating apache conf file"
-          @util.create_file apache_file, { :verbose => @env.verbose,
-            :capture => @env.quiet } do
+        return if apache_is_setup?
+        
+        @io.log "Creating apache conf file"
+        @util.create_file apache_file, { :verbose => @env.verbose,
+          :capture => @env.quiet } do
 %Q{<VirtualHost *:80>
   DocumentRoot #{@project.vm_srv}
   ServerName #{@project.url}
@@ -38,7 +39,6 @@ module ThemeJuice
 </VirtualHost>
 
 }
-          end
         end
       end
 

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

@@ -33,16 +33,15 @@ GRANT ALL PRIVILEGES ON `#{@project.db_name}`.* TO '#{@project.db_user}'@'localh
       private
 
       def drop_database
-        if @project.db_drop
-
-          # 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,
-              :capture => @env.quiet } do |cmds|
-              cmds << "cd #{@project.vm_srv}"
-              cmds << "wp db drop --yes"
-            end
+        return unless @project.db_drop
+
+        # 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,
+            :capture => @env.quiet } do |cmds|
+            cmds << "cd #{@project.vm_srv}"
+            cmds << "wp db drop --yes"
           end
         end
       end

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

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

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

@@ -9,9 +9,9 @@ module ThemeJuice
       end
 
       def execute
-        unless @project.no_wp
-          create_dot_env_file
-        end
+        return if @project.no_wp
+
+        create_dot_env_file
       end
 
       def unexecute
@@ -29,10 +29,11 @@ module ThemeJuice
       end
 
       def create_dot_env_file
-        unless dot_env_is_setup?
-          @io.log "Creating .env file"
-          @util.create_file dot_env_file, { :verbose => @env.verbose,
-            :capture => @env.quiet } do
+        return if dot_env_is_setup?
+
+        @io.log "Creating .env file"
+        @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}
@@ -43,7 +44,6 @@ WP_HOME=http://#{@project.url}
 WP_SITEURL=http://#{@project.url}/wp
 
 }
-          end
         end
       end
 

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

@@ -16,11 +16,11 @@ module ThemeJuice
       end
 
       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,
-            :capture => @env.quiet }
-        end
+        return if entry_file_is_setup?
+
+        @io.log "Creating #{@entry.fetch(:name)} file"
+        @util.create_file @entry.fetch(:file), nil, { :verbose => @env.verbose,
+          :capture => @env.quiet }
       end
 
       def entry_is_setup?
@@ -28,17 +28,17 @@ module ThemeJuice
       end
 
       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,
-            :capture => @env.quiet } do
+        return if entry_is_setup?
+        
+        @io.log "Creating #{@entry.fetch(:name)} entry"
+        @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}
 # End '#{@entry.fetch(:project)}' #{@entry.fetch(:id)}
 
 }
-          end
         end
       end
 

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

@@ -16,12 +16,12 @@ module ThemeJuice
       end
 
       def execute
-        unless @env.no_port_forward
-          create_entry_file
-          create_entry do
+        return if @env.no_port_forward
+        
+        create_entry_file
+        create_entry do
 %Q{#{forward_host_ports}config.vm.network "forwarded_port", guest: 80,  host: 8080
 config.vm.network "forwarded_port", guest: 443, host: 8443}
-          end
         end
       end
 

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

@@ -16,12 +16,12 @@ module ThemeJuice
       end
 
       def execute
-        unless @env.no_landrush
-          create_entry_file
-          create_entry do
+        return if @env.no_landrush
+        
+        create_entry_file
+        create_entry do
 %Q{config.landrush.enabled = true
 config.landrush.tld = 'dev'}
-          end
         end
       end
 

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

@@ -27,10 +27,11 @@ module ThemeJuice
       end
 
       def create_nginx_file
-        unless nginx_is_setup?
-          @io.log "Creating nginx conf file"
-          @util.create_file nginx_file, { :verbose => @env.verbose,
-            :capture => @env.quiet } do
+        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;
@@ -40,7 +41,6 @@ module ThemeJuice
 }
 
 )
-          end
         end
       end
 

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

@@ -9,9 +9,9 @@ module ThemeJuice
       end
 
       def execute
-        if @project.repository
-          create_repo
-        end
+        return unless @project.repository
+
+        create_repo
       end
 
       private

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

@@ -9,10 +9,10 @@ module ThemeJuice
       end
 
       def execute
-        if @project.template
-          clone_template
-          install_template
-        end
+        return unless @project.template
+        
+        clone_template
+        install_template
       end
 
       private

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

@@ -19,11 +19,11 @@ module ThemeJuice
       end
 
       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, :capture => @env.quiet }
-        end
+        return if box_is_installed?
+        
+        @io.log "Installing Vagrant box"
+        @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

@@ -27,11 +27,11 @@ module ThemeJuice
       end
 
       def create_custom_file
-        unless custom_file_is_setup?
-          @io.log "Creating customfile"
-          @util.create_file custom_file, nil, { :verbose => @env.verbose,
-            :capture => @env.quiet }
-        end
+        return if custom_file_is_setup?
+        
+        @io.log "Creating customfile"
+        @util.create_file custom_file, nil, { :verbose => @env.verbose,
+          :capture => @env.quiet }
       end
 
       def remove_custom_file

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

@@ -21,11 +21,11 @@ module ThemeJuice
       end
 
       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, :capture => @env.quiet }
-        end
+        return if vagrant_plugin_is_installed? plugin
+        
+        @io.log "Installing #{plugin}"
+        @util.run "vagrant plugin install #{plugin} --plugin-version #{version}", {
+          :verbose => @env.verbose, :capture => @env.quiet }
       end
     end
   end

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

@@ -27,10 +27,11 @@ module ThemeJuice
       end
 
       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,
-            :capture => @env.quiet } do
+        return if wp_cli_is_setup? || @project.no_wp
+
+        @io.log "Creating WP-CLI file"
+        @util.create_file wp_cli_file, { :verbose => @env.verbose,
+          :capture => @env.quiet } do
 %Q{require:
   - vendor/autoload.php
 ssh:
@@ -40,7 +41,6 @@ ssh:
     cmd: cd #{@env.vm_path} && vagrant ssh-config > /tmp/vagrant_ssh_config && ssh -q %pseudotty% -F /tmp/vagrant_ssh_config default %cmd%
 
 }
-          end
         end
       end
 

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor