theme-juice 0.26.3 → 0.27.0

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

@@ -18,9 +18,10 @@ module ThemeJuice
       def execute
         create_entry_file
         create_entry do
-%Q{if defined? Landrush
+%Q{case
+when Vagrant.has_plugin?("landrush")
   config.landrush.host '#{@project.url}', '#{@env.vm_ip}'
-elsif defined? VagrantPlugins::HostsUpdater
+when Vagrant.has_plugin?("vagrant-hostsupdater")
   config.hostsupdater.aliases << '#{@project.url}'
 end}
         end
@@ -35,7 +36,7 @@ end}
 
       def remove_landrush_entry
         return if @env.no_landrush
-        
+
         @io.log "Removing URL from Landrush"
         @util.run "vagrant landrush rm #{@project.url}", { :verbose => @env.verbose,
           :capture => @env.quiet }

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

@@ -24,8 +24,13 @@ module ThemeJuice
 
       # Required global settings
       def configure_required_settings
-        set :application,  @config.deployment.application.name
-        set :archive,      @env.archive
+        begin
+          set :application, @config.project.name
+        rescue NoMethodError
+          @io.notice "Deprecation Notice: 'config.deployment.application.name' has been deprecated! Please use 'config.project.name' instead."
+          set :application, @config.deployment.application.name
+        end
+        set :archive, @env.archive
 
         set :linked_files, fetch(:linked_files, []).concat(fetch(:shared_files, []))
         set :linked_dirs,  fetch(:linked_dirs, []).concat(fetch(:shared_dirs, []))

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

@@ -10,8 +10,9 @@ module ThemeJuice
 
       def execute
         return unless @project.template
-        
+
         clone_template
+        render_template_config_erb if @config.exist?
         install_template
       end
 
@@ -25,6 +26,19 @@ module ThemeJuice
         end
       end
 
+      def render_template_config_erb
+        @io.log "Rendering template config ERB"
+        save_template_config ERB.new(File.read(@config.path)).result(
+          @project.to_h.merge(@env.to_h).to_ostruct.instance_eval { binding }
+        )
+      end
+
+      def save_template_config(contents)
+        @io.log "Saving rendered template config"
+        File.open(@config.path, "w+") { |f| f << contents }
+        @config.refresh!
+      end
+
       def install_template
         @io.log "Running template installation"
         @config.command :install

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

@@ -9,9 +9,8 @@ module ThemeJuice
       end
 
       def execute
-        install_vagrant_plugin "vagrant-triggers", "0.5.0"
-        install_vagrant_plugin "vagrant-hostsupdater", "0.0.11"
-        install_vagrant_plugin "landrush", "0.18.0" unless @env.no_landrush
+        install_vagrant_plugin "vagrant-triggers", "0.5.3"
+        install_vagrant_plugin "landrush", "1.0.0" unless @env.no_landrush
       end
 
       private
@@ -22,7 +21,7 @@ module ThemeJuice
 
       def install_vagrant_plugin(plugin, version)
         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 }

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

@@ -32,14 +32,8 @@ module ThemeJuice
         @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:
-  vagrant:
-    url: #{@project.url}
-    path: #{@project.vm_srv}
-    cmd: cd #{@env.vm_path} && vagrant ssh-config > /tmp/vagrant_ssh_config && ssh -q %pseudotty% -F /tmp/vagrant_ssh_config default %cmd%
-
+%Q{@development:
+  ssh: vagrant@#{@env.vm_ip}#{@project.vm_srv}
 }
         end
       end

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.26.3
+  version: 0.27.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -218,7 +218,16 @@ homepage: http://themejuice.it
 licenses:
 - GPLv2
 metadata: {}
-post_install_message: 
+post_install_message: |-
+  ################################################################################
+                                   Hello there!
+
+   There have been a few changes since the last time you updated, so please head
+     over to https://github.com/ezekg/theme-juice-cli and check out the 0.27.0
+                   release to review everything that's changed.
+
+                          Thanks for using Theme Juice!
+  ################################################################################
 rdoc_options: []
 require_paths:
 - lib