pave 0.12.0.rc3 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a787e2be397da57ae99291fa5b3daaaff04fedc2
-  data.tar.gz: 40926a59b9fe330275321d5f0a0ec3338b6ead46
+  metadata.gz: d2d5fe7f671471fe1459f0e2c0f6271b049cd05f
+  data.tar.gz: a4fc1c031ed597d9a0bffbdfedf87e58926f7103
 SHA512:
-  metadata.gz: 4e60d994a5d206ab0c5b35b78768e4319c60b5d8f002c885ab57dbbaea558d0a088b01cd1a9537053b0293835da04d410d2bfda219433c3d3ed26e7201ce3370
-  data.tar.gz: 4a308a668ca4097a47edb3a36a845e0a876c3e07382f174040d6af7d89592c880940109e6a19898f524c4e9780fa845125585395e270693b36604bed0e284a44
+  metadata.gz: 67b610b8f2502646e66d0fc9d771fd234590121e5b6c2499e2c27a5d9f443d879bd5e39c056b58c01dc27d101fecd5f3a61b130de146f20642fdeb6a50d7f297
+  data.tar.gz: 530dac82d7450405d707204e574387dba9b6a468b9aeb4a98a7655258c41a7d3f1cc54be82ff355bad9fcb92905cb742ba7f63de53a6adf892dbaf069fa3d507

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    pave (0.9.0)
+    pave (0.11.24)
       commander (~> 4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    commander (4.1.5)
+    commander (4.2.0)
       highline (~> 1.6.11)
     diff-lcs (1.2.5)
-    highline (1.6.20)
+    highline (1.6.21)
     rake (10.1.1)
     rdoc (4.1.0)
     rspec (2.14.1)

data/README.md

@@ -28,12 +28,16 @@ This:
 
     $ pave deploy:setup
 
-This sets up a Git-based deployment script to the remote server and deploys an initial version. SSH access is required.
+This sets up a Git-based deployment script to the remote server and deploys an initial version. SSH access is required. You may run it multiple times and setup as many deployment endpoints as you want.
 
     $ pave deploy
 
 Deploys the site using git. Files and databases are not deployed (see below for how to do that).
 
+    $ pave deploy staging feature-branch
+
+Deploys feature-branch to staging remote.
+
 ## Database
 
     $ pave db:create mydatabase

data/bin/pave

@@ -240,15 +240,6 @@ command :"files:push" do |c|
   end
 end
 
-command :"files:sync" do |c|
-  c.syntax = "pave files:sync"
-  c.description = "Syncronize local and remote files directories."
-  c.action do |args|
-    remote = args.first || "live"
-    Pave::Files.sync(remote)
-  end
-end
-
 command :"generate:theme" do |c|
   c.syntax = "pave generate:theme THEME_NAME"
   c.description = "Set up a blank theme with sass."

data/lib/pave/concrete.rb

@@ -19,6 +19,7 @@ module Pave
       set_up_pave
       clone_concrete5
       set_up_folders
+      add_config_customizations
       set_up_git
       create_virtual_host
       self
@@ -54,6 +55,25 @@ module Pave
       sh "touch #{name}/updates/.keep"
     end
 
+    def add_config_customizations
+      config_file = "#{name}/concrete/core/controllers/single_pages/install.php"
+      insert_pattern = "'{$salt}');\\n\";"
+      file_insert config_file, insert_pattern, config_customizations
+    end
+
+    def config_customizations
+      command =<<HD
+$configuration .= '
+define(\"ENABLE_NEWSFLOW_OVERLAY\", false);
+define(\"PERMISSIONS_MODEL\", \"advanced\");
+define(\"STATISTICS_TRACK_PAGE_VIEWS\", false);
+define(\"WHITE_LABEL_DASHBOARD_BACKGROUND_SRC\", \"/concrete/images/spacer.gif\");
+define(\"ENABLE_INTELLIGENT_SEARCH_HELP\", false);
+';
+HD
+      command
+    end
+
     def gitignored
       [
         "files/*",

data/lib/pave/files.rb

@@ -2,34 +2,27 @@ module Pave
   class Files
     include Pave::Shell
 
-    def self.exclusions
-      " --exclude 'files/tmp' --exclude 'files/cache' "
-    end
-
-    def self.flags
-      " -uazh -e ssh --progress "
-    end
-
     def self.clear_cache
       sh "rm -rf ./files/tmp/*; rm -rf ./files/cache/*;"
     end
 
     def self.push(remote="live")
+      clear_cache
       server = Pave::Remote.server(remote)
       directory = Pave::Remote.directory(remote)
-      sh "rsync #{flags} #{exclusions} ./files/* #{server}:#{directory}/files/*"
+      sh "scp -r ./files #{server}:#{directory}/local_files;"
+      sh "ssh #{server} 'cd #{directory};
+          mv ./files ./old_files;
+          mv ./local_files ./files && rm -rf ./old_files;'"
     end
 
     def self.pull(remote="live")
       server = Pave::Remote.server(remote)
       directory = Pave::Remote.directory(remote)
-      sh "rsync #{flags} #{exclusions} #{server}:#{directory}/files/* ./files/*"
+      sh "scp -r #{server}:#{directory}/files ./remote_files;
+          mv ./files ./old_files;
+          mv ./remote_files ./files && rm -rf ./old_files;"
       clear_cache
     end
-
-    def self.sync(remote="live")
-      pull(remote)
-      push(remote)
-    end
   end
 end

data/lib/pave/remote.rb

@@ -4,7 +4,7 @@ module Pave
 
     def self.setup
       server = ask "Username and hostname of the remote server (e.g. user@server.com): "
-      folder = ask "Name of the remote directory (e.g. ~/webapps/appname/): "
+      folder = ask "Name of the remote directory (e.g. ~/webapps/appname): "
       remote = ask "Desired git remote name (e.g. live): "
       script = File.join(File.expand_path("../..", File.dirname(__FILE__)), "resources/deploy.sh")
 
@@ -23,7 +23,12 @@ module Pave
 
     def self.url(remote="live")
       remotes = shell("git remote -v").output
-      remotes.match(/#{remote}\s+(.*)\s+\(push\)/)[1]
+      begin
+        remotes.match(/#{remote}\s+(.*)\s+\(push\)/)[1]
+      rescue NoMethodError
+        puts "Could not find remote named #{remote}. Please run `pave deploy:setup` to create it."
+        exit
+      end
     end
 
     def self.server(remote="live")

data/lib/pave/shell.rb

@@ -9,10 +9,15 @@ module Pave
       Struct.new(:status, :output).new($?, output)
     end
 
-    def sh(command)
-      result = shell(command)
+    def sh(cmd)
+      result = shell(cmd)
       puts result.output
       result.status
     end
+
+    def file_insert(insert_file, insert_pattern, insert_lines)
+      file_string = File.read(insert_file).sub(insert_pattern, "#{insert_pattern}\n#{insert_lines}")
+      File.write(insert_file, file_string)
+    end
   end
 end

data/lib/pave/theme.rb

@@ -44,6 +44,12 @@ module Pave
       sh "cp -a #{Pave.template_folder}/themes/blank #{Dir.pwd}/themes/#{self.name}"
     end
 
+    def create_project_css_folders
+      sh "cd themes/#{self.name}/css/ && mkdir -p #{self.name}/{components,layouts}"
+      sh "cd themes/#{self.name}/css/#{self.name} && touch ./components/_components.scss && touch ./layouts/_layouts.scss"
+      sh "cd themes/#{self.name}/css/ && echo \"@import 'components/components';\" >> ./styles.scss && echo \"@import 'layouts/layouts';\" >> ./styles.scss"
+    end
+
     def setup
       say "Creating theme..."
       copy_theme
@@ -51,6 +57,7 @@ module Pave
       install_bourbon
       install_neat
       install_bitters
+      create_project_css_folders
       say "Docs for Neat: http://neat.bourbon.io/"
       say "Docs for Bitters: https://github.com/thoughtbot/bitters"
       say ""

data/lib/pave/version.rb

@@ -1,3 +1,3 @@
 module Pave
-  VERSION = "0.12.0.rc3"
+  VERSION = "0.12.0"
 end

data/resources/deploy.sh

@@ -3,6 +3,9 @@ if [ ! -d 'deploy.git' ]; then
   mkdir deploy.git && cd deploy.git
   git init --bare
   echo '#!/bin/sh' > hooks/post-receive
-  echo 'GIT_WORK_TREE=.. git checkout -f' >> hooks/post-receive
+  echo 'while read oldrev newrev ref' >> hooks/post-receive
+  echo 'do' >> hooks/post-receive
+  echo 'GIT_WORK_TREE=.. git checkout -f -B `basename "$ref"` "$newrev"' >> hooks/post-receive
+  echo 'done' >> hooks/post-receive
   chmod +x hooks/post-receive
 fi

data/templates/themes/blank/css/styles.scss

@@ -1,2 +1,3 @@
-@import 'bourbon/_bourbon';
-@import 'neat/_neat';
+@import 'bourbon/bourbon';
+@import 'neat/neat';
+@import 'bitters/bitters';

data/templates/themes/blank/default.php

@@ -3,10 +3,10 @@
   $this->inc("elements/header.php");
 ?>
 
-	<?php
-	  $a = new Area("Main");
-	  $a->display($c);
-	?>
-
+<!-- block example -->
+<?php
+  $a = new Area("Main");
+  $a->display($c);
+?>
 
-<?php  $this->inc("elements/footer.php"); ?>
+<?php  $this->inc("elements/footer.php"); ?>

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

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

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

@@ -3,9 +3,10 @@
   $this->inc("includes/view_helpers.php");
 ?>
 <!DOCTYPE html>
-<html lang="<?php echo LANGUAGE?>">
+<html lang="<?= LANGUAGE?>">
   <head>
     <?php Loader::element("header_required"); ?>
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
 
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/2.1.3/normalize.min.css" />
     <link rel="stylesheet" href="<?= $this->getThemePath(); ?>/css/styles.css" />
@@ -14,15 +15,19 @@
       <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.2/html5shiv.js"></script>
     <![endif]-->
   </head>
-  <body class="<?= $c->getCollectionTypeHandle(); ?>">
+  <body class="<?= page_classes($c) ?>">
 
-    <!-- BLOCK EXAMPLE -->
+
+    <!-- image_tag helper example -->
+    <?= image_tag($this, "logo.png", ["class" => "main-logo"]); ?>
+
+    <!-- block example -->
     <?php
       $a = new Area("Header");
       $a->display($c);
     ?>
 
-    <!-- NAV EXAMPLE -->
+    <!-- nav example -->
     <?php
       $nav = BlockType::getByHandle("autonav");
       $nav->controller->orderBy = "display_asc";
@@ -31,4 +36,4 @@
       $nav->controller->displaySubPageLevels = "custom";
       $nav->controller->displaySubPageLevelsNum = 1;
       $nav->render("templates/header_menu");
-    ?>
+    ?>

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

@@ -1,17 +1,21 @@
 <?
+  function pretty_r($var, $die=true) {
+    echo "<pre>";
+    var_dump($var);
+    echo "<pre>";
+    if($die) {
+      die();
+    };
+  }
 
   function is_edit_mode() {
     global $c;
-    if ($c->isEditMode()) {
-      echo "edit-mode";
-    }
+    return $c->isEditMode();
   }
 
   function is_logged_in() {
     global $u;
-    if ($u -> isLoggedIn ()) {
-      echo "logged-in";
-    }
+    return $u->isLoggedIn();
   }
 
   function has_blocks($area) {
@@ -19,6 +23,21 @@
     return $area->getTotalBlocksInArea($c) > 0;
   }
 
+  function is_admin() {
+    $u = new User();
+    $g = Group::getByName('Administrators');
+    return $u->isSuperUser()||$u->inGroup($g);
+  }
+
+  function current_url() {
+    Loader::helper('navigation');
+    return NavigationHelper::getLinkToCollection(Page::getCurrentPage(), true);
+  }
+
+  function page_classes($c) {
+    return $c->getCollectionTypeHandle() . " " . $c->getCollectionHandle() . " " . (is_admin() ? 'admin' : '');
+  }
+
   function image_tag($t, $img, $html_options = false) {
     $imgPath = ($t->getThemePath()) . "/images/";
     if ($html_options) {
@@ -32,4 +51,26 @@
     echo "<img src='" . $imgPath . $img . "'" . $options . " />";
   }
 
+  function page_specific_scripts($page, $t) {
+    $script_html = "";
+
+    $handle = $page->getCollectionTypeHandle();
+    if (isset($handle) === true) {
+      $script_path = __DIR__ . "/../js/template_" . $handle . ".js";
+      if (file_exists($script_path) === true) {
+        $script_html .= "<script src='" . $t->getThemePath() . "/js/template_" . $handle . ".js'></script>";
+      }
+    }
+
+    $page_name = $page->getCollectionHandle();
+    if (isset($page_name) === true) {
+      $script_path = __DIR__ . "/../js/page_" . $page_name . ".js";
+      if (file_exists($script_path) === true) {
+        $script_html .= "<script src='" . $t->getThemePath() . "/js/page_" . $page_name . ".js'></script>";
+      }
+    }
+
+    return $script_html;
+  }
+
 ?>

data/templates/themes/blank/js/page_default.js

@@ -0,0 +1 @@
+// loaded if page handle is 'default'

data/templates/themes/blank/js/template_default.js

@@ -0,0 +1 @@
+// loaded if page template handle is 'default'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pave
 version: !ruby/object:Gem::Version
-  version: 0.12.0.rc3
+  version: 0.12.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,7 +126,9 @@ files:
 - templates/themes/blank/elements/footer.php
 - templates/themes/blank/elements/header.php
 - templates/themes/blank/includes/view_helpers.php
-- templates/themes/blank/js/scripts.js
+- templates/themes/blank/js/page_default.js
+- templates/themes/blank/js/shared.js
+- templates/themes/blank/js/template_default.js
 - templates/themes/blank/thumbnail.png
 - templates/themes/blank/view.php
 homepage: https://github.com/jamonholmgren/pave
@@ -144,12 +146,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides a set of command line tools for Concrete5.