pave 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aa6d9f3f5753a826b0fd82bf27a385bf9c4ca9a
-  data.tar.gz: 9ea1ce191daf766aabc27136ed78c61c4669a031
+  metadata.gz: 6423c30e10bd3cce7b5c9553be520a618a3b1dbc
+  data.tar.gz: 4d8f1ceccab04847564725e83db66cff7b998904
 SHA512:
-  metadata.gz: d575b3350c7758339e8ac7dad825d6125ab03a48b32436f08d61570e9040f29cf2627f83721df1a21d61aed8ec84484583a051486a98136b8190fd1b25b50680
-  data.tar.gz: 0ee8107ee3a592f105d1001d7dd7c21540337d1f6ee37949ddeaf3e36742cbf73cd7fc9c681e575e22bf43a1c69343538f7fe235b982e8db9eec611c61c63847
+  metadata.gz: c6f5c361651019a1f86b4753e6359a5ba1c8d1840eccca9ab27139fd73272acf6564c9031471b4bc1a9292ff7492af6f46fb738cff19c89e279244c2762572a2
+  data.tar.gz: 51d878220d60ea3dab49d55a3ad4e719d99f56311f025dd9b1b1557dc79e2ad8aed398028ae11b913f2427a07e2161f687f0e3ffe82486fcaf4d7bd54237bbfd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pave (0.12.1)
+    pave (0.13.0)
       commander (~> 4.1)
 
 GEM

data/README.md

@@ -24,7 +24,7 @@ This:
 4. Adds a `.gitignore` and `.keep`s
 5. Attempts to create a virtual host `mywebsite.site`
 
-## Deployments
+## Deployment
 
     $ pave deploy:setup
 
@@ -40,9 +40,9 @@ Deploys feature-branch to staging remote.
 
 ## Database
 
-    $ pave db:create mydatabase
+    $ pave db:create [mydatabase]
 
-Creates a local MySQL database called `mydatabase`
+Creates a local MySQL database called `mydatabase`. Omitting the database name will create a database with the same name as the current directory.
 
     $ pave db:push
 
@@ -70,13 +70,13 @@ Pulls the remote `files/*` folder and replaces your local version.
 
 *TODO:* Pulls newer remote files and pushes newer local files. Ignores cache and tmp files.
 
-## Virtual host setup
+## Virtual Host
 
-    $ sudo pave vh:create myhost.site
+    $ sudo pave vh:create [myhost.site]
 
-Sets up an Apache virtual host in the current directory on `myhost.site`.
+Sets up an Apache virtual host in the current directory on `myhost.site`. Omitting the hostname argument will create a virtual host with the same name as the current directory (i.e. `myapp.site` if the current directory is `myapp`).
 
-    $ sudo pave vh:remove myhost.site
+    $ sudo pave vh:remove [myhost.site]
 
 Removes myhost.site virtual host.
 
@@ -92,6 +92,16 @@ Restores your previously backed up virtual host file.
 
 Restarts Apache.
 
+## Themes
+
+    $ pave g:theme [mytheme]
+    
+Generates a theme in with the name `mytheme` in the `theme` directory. Omitting the theme name will create a theme with the same name as the current directory.
+
+    $ pave watch [browser] [mytheme]
+    
+Watches for changes in the `mytheme` directory. Compiles SASS and CoffeeScript files when they change and reloads the browser. The default the browser is Chrome but Safari and Firefox are also supported. A theme with the same name as the current directory is assumed unless a theme name is specified.
+
 ## Help
 
     $ pave help

data/bin/pave

@@ -77,7 +77,8 @@ command :"virtualhost:create" do |c|
   c.description = "Setup virtual host for Concrete5 project."
   c.action do |args|
     host = args.first || "#{File.basename(Dir.pwd)}.site"
-    Pave::VirtualHost.new(host).create_vhost
+    dir = args[1] || Dir.pwd
+    Pave::VirtualHost.new(host, dir).create_vhost
   end
 end
 alias_command :"vh:create", :"virtualhost:create"
@@ -87,7 +88,8 @@ command :"virtualhost:remove" do |c|
   c.description = "Delete virtual host."
   c.action do |args|
     host = args.first || "#{File.basename(Dir.pwd)}.site"
-    Pave::VirtualHost.new(host).remove_vhost
+    dir = args[1] || Dir.pwd
+    Pave::VirtualHost.new(host, dir).remove_vhost
   end
 end
 alias_command :"vh:remove", :"virtualhost:remove"
@@ -98,7 +100,7 @@ command :"virtualhost:backup" do |c|
   c.syntax = "pave virtualhost:backup"
   c.description = "Back up virtual hosts file. Restore with `pave virtualhost:restore`."
   c.action do
-    Pave::VirtualHost.new("").backup_vhost
+    Pave::VirtualHost.backup_vhost
   end
 end
 alias_command :"vh:backup", :"virtualhost:backup"
@@ -107,7 +109,7 @@ command :"virtualhost:restore" do |c|
   c.syntax = "pave virtualhost:restore"
   c.description = "Restore previously backed up virtual hosts file."
   c.action do
-    Pave::VirtualHost.new("").restore_vhost
+    Pave::VirtualHost.restore_vhost
   end
 end
 alias_command :"vh:restore", :"virtualhost:restore"
@@ -116,7 +118,7 @@ command :"virtualhost:restart" do |c|
   c.syntax = "pave virtualhost:restart"
   c.description = "Restarts apache."
   c.action do
-    Pave::VirtualHost.new("").restart_apache
+    Pave::VirtualHost.restart_apache
   end
 end
 alias_command :"vh:restart", :"virtualhost:restart"
@@ -242,7 +244,7 @@ end
 
 command :"generate:theme" do |c|
   c.syntax = "pave generate:theme THEME_NAME"
-  c.description = "Set up a blank theme with sass."
+  c.description = "Set up a blank theme with Sass and CoffeeScript support."
   c.action do |args|
     name = args.first || "#{File.basename(Dir.pwd)}"
     Pave::Theme.create(name)
@@ -252,7 +254,7 @@ alias_command :"g:theme", :"generate:theme"
 
 command :watch do |c|
   c.syntax = "pave watch BROWSER"
-  c.description = "Watch for sass changes."
+  c.description = "Watch for Sass and CoffeeScript changes."
   c.action do |args|
     browser = args.first || "chrome"
     name = args.last || "#{File.basename(Dir.pwd)}"

data/lib/pave/concrete.rb

@@ -86,10 +86,10 @@ HD
 
     def create_virtual_host
       say "* Setting up virtual host..."
-      if sh("sudo pave vh:create #{name}.site") == 0
+      if sh("sudo pave vh:create #{name}.site #{Dir.pwd}/#{name}") == 0
         say "Successfully setup virtual host #{name}.site."
       else
-        say "Virtual host not set up. Run `pave vh:create #{name}.site` to create it."
+        say "Virtual host not set up. Run `pave vh:create #{name}.site ./#{name}` to create it."
       end
     end
 

data/lib/pave/theme.rb

@@ -36,7 +36,7 @@ module Pave
     end
 
     def install_bitters
-      say "Installing Bitters"
+      say "Installing Bitters..."
       sh "gem install bitters"
       sh "cd themes/#{self.name}/css/ && bitters install && cd -"
     end
@@ -59,8 +59,9 @@ module Pave
       install_neat
       install_bitters
       create_project_css_folders
+      say "Docs for Bourbon: http://bourbon.io/docs/"
       say "Docs for Neat: http://neat.bourbon.io/"
-      say "Docs for Bitters: https://github.com/thoughtbot/bitters"
+      say "Docs for Bitters: http://bitters.bourbon.io/"
       say ""
       say "Theme installed. Run `pave watch` to generate css from your sass files."
     end

data/lib/pave/version.rb

@@ -1,3 +1,3 @@
 module Pave
-  VERSION = "0.13.0"
+  VERSION = "0.14.0"
 end

data/lib/pave/virtual_host.rb

@@ -4,34 +4,40 @@ module Pave
   class VirtualHost
     include Pave::Shell
 
-    attr_accessor :hostname
+    attr_accessor :hostname, :directory
 
-    def initialize(host)
+    VHOST_CONF_FILE = "/etc/apache2/extra/httpd-vhosts.conf".freeze
+    VHOST_CONF_FILE_BACKUP = "#{VHOST_CONF_FILE}.backup".freeze
+    HOSTS_FILE = "/etc/hosts".freeze
+    HOSTS_FILE_BACKUP = "#{HOSTS_FILE}.backup".freeze
+
+    def initialize(host, dir)
       @hostname = host
+      @directory = dir
     end
 
-    def restart_apache
+    def self.restart_apache
       `sudo apachectl restart`
       say "Apache restarted."
       true
     end
 
-    def backup_vhost
-      File.delete(vhosts_conf_file_backup) if File.exist?(vhosts_conf_file_backup)
-      FileUtils.cp vhosts_conf_file, vhosts_conf_file_backup
-      File.delete(hosts_file_backup) if File.exist?(hosts_file_backup)
-      FileUtils.cp hosts_file, hosts_file_backup
+    def self.backup_vhost
+      File.delete(VHOST_CONF_FILE_BACKUP) if File.exist?(VHOST_CONF_FILE_BACKUP)
+      FileUtils.cp VHOST_CONF_FILE, VHOST_CONF_FILE_BACKUP
+      File.delete(HOSTS_FILE_BACKUP) if File.exist?(HOSTS_FILE_BACKUP)
+      FileUtils.cp HOSTS_FILE, HOSTS_FILE_BACKUP
       say "Backed up vhosts conf and hosts file. Use `pave vh:restore` to restore them."
     end
 
-    def restore_vhost
-      return say "Couldn't find vhosts backup." unless File.exist?(vhosts_conf_file_backup)
-      File.delete(vhosts_conf_file)
-      FileUtils.cp vhosts_conf_file_backup, vhosts_conf_file
+    def self.restore_vhost
+      return say "Couldn't find vhosts backup." unless File.exist?(VHOST_CONF_FILE_BACKUP)
+      File.delete(VHOST_CONF_FILE)
+      FileUtils.cp VHOST_CONF_FILE_BACKUP, VHOST_CONF_FILE
 
-      return say "Couldn't find host file backup." unless File.exist?(hosts_file_backup)
-      File.delete(hosts_file)
-      FileUtils.cp hosts_file_backup, hosts_file
+      return say "Couldn't find host file backup." unless File.exist?(HOSTS_FILE_BACKUP)
+      File.delete(HOSTS_FILE)
+      FileUtils.cp HOSTS_FILE_BACKUP, HOSTS_FILE
 
       restart_apache
 
@@ -42,19 +48,19 @@ module Pave
       return say "No virtual host backup found. Run `pave vh:backup` before adding a virtual host." unless check_backup
       return say "No host name provided. Run `pave help` for more details." unless hostname.size > 0
 
-      add_vhost_to_conf && add_hosts_entry && restart_apache && say("Created virtual host for #{hostname}.")
+      add_vhost_to_conf && add_hosts_entry && self.class.restart_apache && say("Created virtual host for #{hostname}.")
     end
 
     def remove_vhost
       return say "No virtual host backup found. Run `pave vh:backup` before adding a virtual host." unless check_backup
 
-      remove_vhost_from_conf && remove_hosts_entry && restart_apache && say("Removed virtual host for #{hostname}.")
+      remove_vhost_from_conf && remove_hosts_entry && self.class.restart_apache && say("Removed virtual host for #{hostname}.")
     end
 
     private
 
     def add_hosts_entry
-      File.open(hosts_file, "a") do |f|
+      File.open(HOSTS_FILE, "a") do |f|
         f.puts "127.0.0.1 #{hostname}"
         f.puts "fe80::1%lo0 #{hostname}"
       end
@@ -70,14 +76,14 @@ module Pave
         end
       end
 
-      File.open(hosts_file, "w") do |f|
+      File.open(HOSTS_FILE, "w") do |f|
         f.puts host_array.compact.join("\n")
       end
       true
     end
 
     def add_vhost_to_conf
-      File.open(vhosts_conf_file, "a") do |f|
+      File.open(VHOST_CONF_FILE, "a") do |f|
         f.puts virtual_host_entry
       end
       true
@@ -93,7 +99,7 @@ module Pave
 
         # Set all those lines to nil (so we can compact them later)
         ((vhost_line - 6)..(vhost_line + 3)).each {|i| vhost_array[i] = nil }
-        File.open(vhosts_conf_file, "w") do |f|
+        File.open(VHOST_CONF_FILE, "w") do |f|
           f.puts vhost_array.compact.join("\n")
         end
         true
@@ -104,47 +110,27 @@ module Pave
     end
 
     def check_backup
-      File.exist?(vhosts_conf_file_backup)
+      File.exist?(VHOST_CONF_FILE_BACKUP)
     end
 
     def virtual_host_entry
-      "\n<Directory \"#{project_folder}\">\n" <<
+      "\n<Directory \"#{directory}\">\n" <<
       "  Allow From All\n" <<
       "  AllowOverride All\n" <<
       "  Options +Indexes\n" <<
       "</Directory>\n" <<
       "<VirtualHost *:80>\n" <<
       "  ServerName \"#{hostname}\"\n" <<
-      "  DocumentRoot \"#{project_folder}\"\n" <<
+      "  DocumentRoot \"#{directory}\"\n" <<
       "</VirtualHost>\n"
     end
 
-    def project_folder
-      Dir.pwd
-    end
-
     def vhosts_file_array
-      File.open(vhosts_conf_file).map {|l| l.rstrip}
+      File.open(VHOST_CONF_FILE).map(&:rstrip)
     end
 
     def hosts_file_array
-      File.open(hosts_file).map {|l| l.rstrip}
-    end
-
-    def vhosts_conf_file
-      "/etc/apache2/extra/httpd-vhosts.conf"
-    end
-
-    def vhosts_conf_file_backup
-      vhosts_conf_file + ".backup"
-    end
-
-    def hosts_file
-      "/etc/hosts"
-    end
-
-    def hosts_file_backup
-      hosts_file + ".backup"
+      File.open(HOSTS_FILE).map(&:rstrip)
     end
 
   end

data/templates/themes/blank/default.php

@@ -1,12 +1,12 @@
-<?php
+<?
   defined("C5_EXECUTE") or die("Access Denied.");
   $this->inc("elements/header.php");
 ?>
 
 <!-- block example -->
-<?php
+<?
   $a = new Area("Main");
   $a->display($c);
 ?>
 
-<?php  $this->inc("elements/footer.php"); ?>
+<? $this->inc("elements/footer.php"); ?>

data/templates/themes/blank/elements/footer.php

@@ -1,12 +1,12 @@
-		<?php defined("C5_EXECUTE") or die("Access Denied."); ?>
+		<? defined("C5_EXECUTE") or die("Access Denied."); ?>
 
     <!-- block example -->
-    <?php
+    <?
       $a = new GlobalArea("Footer - Meta");
       $a->display($c);
     ?>
 
-		<?php Loader::element("footer_required"); ?>
+		<? Loader::element("footer_required"); ?>
     <script src="<?= $this->getThemePath(); ?>/js/shared.js"></script>
     <?= page_specific_scripts($c, $this) ?>
 	</body>

data/templates/themes/blank/elements/header.php

@@ -1,9 +1,9 @@
-<?php
+<?
   defined("C5_EXECUTE") or die("Access Denied.");
   $this->inc("includes/view_helpers.php");
 ?>
 <!DOCTYPE html>
-<html lang="<?= LANGUAGE?>">
+<html lang="<?= LANGUAGE ?>">
   <head>
     <?php Loader::element("header_required"); ?>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
@@ -22,13 +22,13 @@
     <?= image_tag($this, "logo.png", ["class" => "main-logo"]); ?>
 
     <!-- block example -->
-    <?php
+    <?
       $a = new Area("Header");
       $a->display($c);
     ?>
 
     <!-- nav example -->
-    <?php
+    <?
       $nav = BlockType::getByHandle("autonav");
       $nav->controller->orderBy = "display_asc";
       $nav->controller->displayPages = "top";
@@ -36,4 +36,4 @@
       $nav->controller->displaySubPageLevels = "custom";
       $nav->controller->displaySubPageLevelsNum = 1;
       $nav->render("templates/header_menu");
-    ?>
+    ?>

data/templates/themes/blank/includes/view_helpers.php

@@ -5,7 +5,7 @@
     echo "<pre>";
     if($die) {
       die();
-    };
+    }
   }
 
   function is_edit_mode() {
@@ -40,6 +40,7 @@
 
   function image_tag($t, $img, $html_options = false) {
     $imgPath = ($t->getThemePath()) . "/images/";
+
     if ($html_options) {
       $options = " alt='" . explode(".", $img, 2)[0] . "'";
       foreach ($html_options as $k => $v) {
@@ -47,8 +48,49 @@
       }
     } else {
       $options = " alt='" . explode(".", $img, 2)[0] . "'";
-    };
-    echo "<img src='" . $imgPath . $img . "'" . $options . " />";
+    }
+
+    return "<img src='" . $imgPath . $img . "'" . $options . " />";
+  }
+
+  function image_placeholder_tag($width, $height = false, $text = false, $html_options = false) {
+    $img = "http://placehold.it/" . $width . ($height ? "x" . $height : "") . ($text ? "&text=" . $text : "");
+
+    if ($html_options) {
+      foreach ($html_options as $k => $v) {
+        $options .= " " . $k . "='" . addslashes($v) . "'";
+      }
+    }
+
+    return "<img src='" . $img . "'" . $options . " />";
+  }
+
+  function lorem() {
+    // Possible arguments:
+    //
+    // (integer) - The number of paragraphs to generate.
+    // short, medium, long, verylong - The average length of a paragraph.
+    // decorate - Add bold, italic and marked text.
+    // link - Add links.
+    // ul - Add unordered lists.
+    // ol - Add numbered lists.
+    // dl - Add description lists.
+    // bq - Add blockquotes.
+    // code - Add code samples.
+    // headers - Add headers.
+    // allcaps - Use ALL CAPS.
+    // prude - Prude version.
+    // plaintext - Return plain text, no HTML.
+    //
+    // See http://loripsum.net/ for more details.
+
+    $url = "http://loripsum.net/api/";
+    if (func_num_args()) {
+      $url .= implode("/", func_get_args());
+    } else {
+      $url .= "1";
+    }
+    return file_get_contents($url);
   }
 
   function page_specific_scripts($page, $t) {

data/templates/themes/blank/view.php

@@ -1,8 +1,8 @@
-<?php
-   defined("C5_EXECUTE") or die("Access Denied.");
-   $this->inc("elements/header.php");
+<?
+  defined("C5_EXECUTE") or die("Access Denied.");
+  $this->inc("elements/header.php");
 ?>
 
-	<?php  print $innerContent; ?>
+  <? print $innerContent; ?>
 
-<?php  $this->inc("elements/footer.php"); ?>
+<? $this->inc("elements/footer.php"); ?>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pave
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler