theme-juice 0.8.3 → 0.9.0

data/lib/theme-juice/project.rb

@@ -7,6 +7,7 @@ module ThemeJuice
     attr_accessor :name
     attr_accessor :location
     attr_accessor :url
+    attr_accessor :xip
     attr_accessor :theme
     attr_accessor :vm_root
     attr_accessor :vm_location

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

@@ -0,0 +1,50 @@
+# encoding: UTF-8
+
+module ThemeJuice
+  module Tasks
+    class Apache < Task
+
+      def initialize(opts = {})
+        super
+      end
+
+      def execute
+        create_apache_file
+      end
+
+      def unexecute
+        remove_apache_file
+      end
+
+      private
+
+      def apache_file
+        "#{@env.vm_path}/config/apache-config/sites/#{@project.name}.conf"
+      end
+
+      def apache_is_setup?
+        File.exist? apache_file
+      end
+
+      def create_apache_file
+        unless apache_is_setup?
+          @io.log "Creating apache conf file"
+          @util.create_file apache_file, :verbose => @env.verbose do
+%Q{<VirtualHost *:80>
+  DocumentRoot #{@project.vm_srv}
+  ServerName #{@project.url}
+  ServerAlias *.#{@project.url} #{@project.xip}.*.xip.io *.#{@project.xip}.*.xip.io
+</VirtualHost>
+
+}
+          end
+        end
+      end
+
+      def remove_apache_file
+        @io.log "Removing apache conf file"
+        @util.remove_file apache_file, :verbose => @env.verbose
+      end
+    end
+  end
+end

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

@@ -9,13 +9,22 @@ module ThemeJuice
       end
 
       def execute
+        is_user_a_smarty_pants?
         confirm
       end
 
       private
+      
+      def is_user_a_smarty_pants?
+        if @env.yolo && @project.use_defaults
+          @io.say "Well, don't you just have everything all figured out?", {
+            :color => :blue, :icon => :general }
+        end
+      end
 
       def confirm
         @io.list "Your settings :", :yellow, settings
+        
         unless @io.agree? "Do these settings look correct?"
           @io.error "Dang typos..."
         end

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

@@ -9,10 +9,18 @@ module ThemeJuice
       end
 
       def unexecute
+        boom?
         confirm
       end
 
       private
+      
+      def boom?
+        if @env.yolo
+          @io.say "Why in the world would you run this command with yolo? Anyways...", {
+            :color => :yellow, :icon => :general }
+        end
+      end
 
       def confirm
         unless @io.agree? "Are you sure you want to remove '#{@project.name}'?"

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

@@ -0,0 +1,54 @@
+# encoding: UTF-8
+
+module ThemeJuice
+  module Tasks
+    class ForwardPorts < Entry
+
+      def initialize(opts = {})
+        super
+
+        @entry = {
+          :project => "ports",
+          :file    => "#{@env.vm_path}/Customfile",
+          :name    => "ports",
+          :id      => "FP"
+        }
+      end
+
+      def execute
+        unless @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
+
+      def unexecute
+        remove_entry
+      end
+
+      private
+
+      # @TODO I'd like to eventually support every OS. I'm only familiar with
+      #  OSX, so that's why there's nothing else here
+      def forward_host_ports
+        if OS.osx?
+%Q{if defined? VagrantPlugins::Triggers
+  config.trigger.after [:up, :reload, :provision], :stdout => true do
+    system \%Q{echo "
+rdr pass inet proto tcp from any to any port 80 -> 127.0.0.1 port 8080
+rdr pass inet proto tcp from any to any port 443 -> 127.0.0.1 port 8443
+" | sudo pfctl -ef - >/dev/null 2>&1; echo "Forwarding ports (80 => 8080)\\nForwarding ports (443 => 8443)"}
+  end
+  config.trigger.after [:halt, :suspend, :destroy], :stdout => true do
+    system \%Q{sudo pfctl -F all -f /etc/pf.conf >/dev/null 2>&1; echo "Removing forwarded ports (80 => 8080)\\nRemoving forwarded ports (443 => 8443)"}
+  end
+end
+}
+        end
+      end
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module ThemeJuice
         if self.send(prop).empty?
           @io.log "Nothing to list"
         else
-          @io.list "Projects :", :green, self.send(prop)
+          @io.list "#{prop.capitalize} :", :green, self.send(prop)
         end
       end
 

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

@@ -19,7 +19,7 @@ module ThemeJuice
       private
 
       def nginx_file
-        "#{@project.location}/vvv-nginx.conf"
+        "#{@env.vm_path}/config/nginx-config/sites/#{@project.name}.conf"
       end
 
       def nginx_is_setup?
@@ -28,22 +28,23 @@ module ThemeJuice
 
       def create_nginx_file
         unless nginx_is_setup?
-          @io.log "Creating nginx file"
+          @io.log "Creating nginx conf file"
           @util.create_file nginx_file, :verbose => @env.verbose do
-%Q{server \{
-  listen 80;
-  server_name .#{@project.url};
-  root {vvv_path_to_folder};
-  include /etc/nginx/nginx-wp-common.conf;
-\}
-
+%Q(server {
+  listen       80;
+  listen       443 ssl;
+  server_name  .#{@project.url} ~(^|^[a-z0-9.-]*\\.)#{@project.xip}\\.\\d+\\.\\d+\\.\\d+\\.\\d+\\.xip\\.io$;
+  root         #{@project.vm_srv};
+  include      /etc/nginx/nginx-wp-common.conf;
 }
+
+)
           end
         end
       end
 
       def remove_nginx_file
-        @io.log "Removing nginx file"
+        @io.log "Removing nginx conf file"
         @util.remove_file nginx_file, :verbose => @env.verbose
       end
     end

data/lib/theme-juice/tasks/{vm.rb → vm_box.rb}

@@ -2,7 +2,7 @@
 
 module ThemeJuice
   module Tasks
-    class VM < Task
+    class VMBox < Task
 
       def initialize(opts = {})
         super

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

@@ -27,7 +27,7 @@ module ThemeJuice
 
         @util.inside @env.vm_path do
           res = @util.run("vagrant status --machine-readable", {
-            :verbose => @env.verbose, :capture => true}).include? "running"
+            :verbose => @env.verbose, :capture => true }).include? "running"
         end
 
         res

data/lib/theme-juice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: theme-juice
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Ezekiel Gabrielse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -53,78 +53,51 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '10.4'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
+        version: '3.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: fakefs
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: ronn
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '10.4'
 description: Theme Juice is a WordPress development command line utility that allows
-  you to scaffold out entire Vagrant development environments in seconds, manage dependencies
-  and build tools, and even handle deployments.
+  you to scaffold out an entire Vagrant development environment in seconds (using
+  an Apache fork of VVV called VVV-Apache as the VM). It also helps you manage dependencies
+  and build tools, and can even handle your deployments.
 email:
 - ezekg@yahoo.com
 executables:
@@ -149,12 +122,14 @@ files:
 - lib/theme-juice/man/tj-create.txt
 - lib/theme-juice/man/tj-delete
 - lib/theme-juice/man/tj-delete.txt
+- lib/theme-juice/man/tj-deploy
+- lib/theme-juice/man/tj-deploy.txt
 - lib/theme-juice/man/tj-setup
 - lib/theme-juice/man/tj-setup.txt
 - lib/theme-juice/man/tj.txt
-- lib/theme-juice/patches/option.rb
 - lib/theme-juice/project.rb
 - lib/theme-juice/task.rb
+- lib/theme-juice/tasks/apache.rb
 - lib/theme-juice/tasks/create_confirm.rb
 - lib/theme-juice/tasks/create_success.rb
 - lib/theme-juice/tasks/database.rb
@@ -163,7 +138,7 @@ files:
 - lib/theme-juice/tasks/dns.rb
 - lib/theme-juice/tasks/dot_env.rb
 - lib/theme-juice/tasks/entry.rb
-- lib/theme-juice/tasks/hosts.rb
+- lib/theme-juice/tasks/forward_ports.rb
 - lib/theme-juice/tasks/import_database.rb
 - lib/theme-juice/tasks/landrush.rb
 - lib/theme-juice/tasks/list.rb
@@ -172,7 +147,7 @@ files:
 - lib/theme-juice/tasks/repo.rb
 - lib/theme-juice/tasks/synced_folder.rb
 - lib/theme-juice/tasks/theme.rb
-- lib/theme-juice/tasks/vm.rb
+- lib/theme-juice/tasks/vm_box.rb
 - lib/theme-juice/tasks/vm_customfile.rb
 - lib/theme-juice/tasks/vm_location.rb
 - lib/theme-juice/tasks/vm_plugins.rb
@@ -183,7 +158,7 @@ files:
 - lib/theme-juice/version.rb
 homepage: https://themejuice.it
 licenses:
-- MIT
+- GNU
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/lib/theme-juice/patches/option.rb

@@ -1,34 +0,0 @@
-# encoding: UTF-8
-
-#
-# Monkey patch to not print out reverse bool options on --help
-#
-# @see https://github.com/erikhuda/thor/issues/417
-#
-class Thor
-  class Option < Argument
-    def usage(padding = 0)
-      sample = if banner && !banner.to_s.empty?
-        "#{switch_name}=#{banner}"
-      else
-        switch_name
-      end
-
-      sample = "[#{sample}]" unless required?
-
-      if aliases.empty?
-        (" " * padding) << sample
-      else
-        "#{aliases.join(', ')}, #{sample}"
-      end
-    end
-
-    VALID_TYPES.each do |type|
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{type}?
-          self.type == #{type.inspect}
-        end
-      RUBY
-    end
-  end
-end

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

@@ -1,43 +0,0 @@
-# encoding: UTF-8
-
-module ThemeJuice
-  module Tasks
-    class Hosts < Task
-
-      def initialize(opts = {})
-        super
-      end
-
-      def execute
-        create_hosts_file
-      end
-
-      def unexecute
-        remove_hosts_file
-      end
-
-      private
-
-      def hosts_file
-        "#{@project.location}/vvv-hosts"
-      end
-
-      def hosts_is_setup?
-        File.exist? hosts_file
-      end
-
-      def create_hosts_file
-        unless hosts_is_setup?
-          @io.log "Creating hosts file"
-          @util.create_file hosts_file, "#{@project.url}",
-            :verbose => @env.verbose
-        end
-      end
-
-      def remove_hosts_file
-        @io.log "Removing hosts file"
-        @util.remove_file hosts_file, :verbose => @env.verbose
-      end
-    end
-  end
-end