pave 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 614ab26bd643c762af9a70061e85247b7fa547ae
-  data.tar.gz: 6e83c061cefa13fd0e5ad7ad40a20da22acf7c77
+  metadata.gz: a32c736c3ff194d168d9f2cd6fc05f2e65492bef
+  data.tar.gz: 6e55111b71cb0e533939c1fba03d237d190966c4
 SHA512:
-  metadata.gz: 6ff74d448b97f49794e2a5b461d619afecfbcc70a7e0ca2948f91c41994be7b4a29dff3511deb0fc4a9350d80304a1b820362405ff9186fefc21dd5cb725db9f
-  data.tar.gz: 11141270ef0d63e9afd4dc773f561a84ee11ccedc3de1aad3ba0fa765dd58a9ae654aba8e0058ffea625e9eb37c5b8b3f295a7056942026aa6072746912afdb9
+  metadata.gz: bcebfee711427e2bd3331e8ac1a2a4da96cfc3346841ea4ca9c9214871b22f48fe9f5b13c8a1b255a0471e71134df36e35ff6b37be431d157dd02b7cdfa6554a
+  data.tar.gz: 3586b76889c4ef68da99655b9112345be3f30df4c443feaab76c37a10f54d461351080e7b6212974be9ae5bc7a251863d41d1919ce255b83de29315602ff6698

data/.gitignore

@@ -4,3 +4,4 @@ pkg
 html
 .gem
 *.gem
+.bundle

data/.ruby-gemset

@@ -0,0 +1 @@
+pave

data/Gemfile

@@ -1,6 +1,4 @@
 source "https://rubygems.org"
-ruby "2.0.0"
-#ruby-gemset=pave
 
 # Specify your gem's dependencies in pave.gemspec
 gemspec

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    pave (0.6.0)
-      commander (~> 4.1.5)
+    pave (0.9.0)
+      commander (~> 4.1)
 
 GEM
   remote: https://rubygems.org/
@@ -11,10 +11,8 @@ GEM
       highline (~> 1.6.11)
     diff-lcs (1.2.5)
     highline (1.6.20)
-    json (1.8.1)
-    rake (0.9.6)
-    rdoc (4.0.1)
-      json (~> 1.4)
+    rake (10.1.1)
+    rdoc (4.1.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -30,6 +28,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.3)
   pave!
-  rake (~> 0.9.2)
-  rdoc
+  rake (~> 10.1)
+  rdoc (~> 4.1)
   rspec (~> 2)

data/bin/pave

@@ -25,6 +25,14 @@ command :update do |c|
   end
 end
 
+command :clean do |c|
+  c.syntax = "pave clean"
+  c.description = "Removes cached files."
+  c.action do
+    Pave.clean
+  end
+end
+
 command :setup do |c|
   c.syntax = "pave setup APP_PATH"
   c.description = "Setup folders for project."

data/lib/pave.rb

@@ -18,6 +18,13 @@ module Pave
   end
   module_function :update
 
+  def clean
+    say "Cleaning up cached files..."
+    `rm -rf ~/.pave`
+    ($? == 0) ? (say "Done") : (say "Failed")
+  end
+  module_function :clean
+
   def template_folder
     script = File.join(File.expand_path("../", File.dirname(__FILE__)), "templates")
   end

data/lib/pave/database.rb

@@ -47,7 +47,7 @@ module Pave
       @dump_file_name[which_db] ||= "#{Time.now.strftime("%Y-%m-%d_%H-%M-%S")}-#{name}-#{which_db}.sql.gz"
     end
 
-    def dump
+    def dump_local
       if !File.directory?('db')
         sh "mkdir ./db"
         sh "echo '<?= die(); ?>' > ./db/index.php"
@@ -66,12 +66,12 @@ module Pave
       sh "ssh #{server} \"cd #{directory}/db; mysqldump -u#{db['user']} -p#{db['pass']} #{db['name']} | gzip > #{dump_file(:remote)}\""
     end
 
-    def execute
-      say "Executing #{dump_file(:local)} on #{name}"
-      sh "gzip -dc ./db/#{dump_file(:local)} | mysql -uroot #{name}"
+    def execute_remote_dump_on_local_db
+      say "Executing #{dump_file(:remote)} on #{name}"
+      sh "gzip -dc ./db/#{dump_file(:remote)} | mysql -uroot #{name}"
     end
 
-    def execute_remote(remote="live")
+    def execute_local_dump_on_remote_db(remote="live")
       server = Pave::Remote.server(remote)
       directory = Pave::Remote.directory(remote)
       db = remote_db
@@ -79,13 +79,13 @@ module Pave
       sh "ssh #{server} \"cd #{directory}/db; gzip -dc #{dump_file(:local)} | mysql -u#{db['user']} -p#{db['pass']} #{db['name']}\""
     end
 
-    def upload(remote="live")
+    def upload_local_dump_to_remote(remote="live")
       # Upload the project's local database dump to remotes db directory.
       say "Uploading ./db/#{dump_file(:local)} SQL dump to #{remote_url}/db/#{dump_file(:local)}"
       sh "scp ./db/#{dump_file(:local)} #{remote_url}/db/#{dump_file(:local)}"
     end
 
-    def download(remote="live")
+    def download_remote_to_local(remote="live")
       # Download the project's live database dump to local db directory.
       say "Downloading SQL dump from #{remote_url}/db/#{dump_file(:remote)} to ./db/#{dump_file(:remote)}"
       sh "scp #{remote_url}/db/#{dump_file(:remote)} ./db/#{dump_file(:remote)}"
@@ -94,18 +94,18 @@ module Pave
     def push(remote="live")
       # Upload the project's local database and replace the live database.
       dump_remote(remote) # for backup purposes
-      download(remote)
-      dump
-      upload(remote)
-      execute_remote(remote)
+      download_remote_to_local(remote)
+      dump_local
+      upload_local_dump_to_remote(remote)
+      execute_local_dump_on_remote_db(remote)
     end
 
     def pull(remote="live")
       # Download the project's live database and replace local database.
-      dump # for backup purposes
+      dump_local # for backup purposes
       dump_remote(remote)
-      download(remote)
-      execute
+      download_remote_to_local(remote)
+      execute_remote_dump_on_local_db
     end
   end
 end

data/lib/pave/version.rb

@@ -1,3 +1,3 @@
 module Pave
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

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

@@ -1,8 +1,9 @@
 <?
-  function editmode() {
+
+  function is_edit_mode() {
     global $c;
     if ($c->isEditMode()) {
-      echo "editMode";
+      echo "edit-mode";
     }
   }
 
@@ -11,4 +12,9 @@
     echo "<img src='" . $imgPath . $img . "' />";
   } 
 
+  function has_blocks($area) {
+    global $c;
+    return $area->getTotalBlocksInArea($c) > 0;
+  }
+
 ?>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pave
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,6 +91,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
@@ -122,7 +123,6 @@ files:
 - templates/themes/blank/description.txt
 - templates/themes/blank/elements/footer.php
 - templates/themes/blank/elements/header.php
-- templates/themes/blank/includes/functions.php
 - templates/themes/blank/includes/view_helpers.php
 - templates/themes/blank/js/scripts.js
 - templates/themes/blank/thumbnail.png

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

@@ -1,8 +0,0 @@
-<?
-  function editmode() {
-    global $c;
-    if ($c->isEditMode()) {
-      echo "editMode";
-    }
-  }
-?>