pave 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f225d50e675e7ea78f411af643399c0468c30991
-  data.tar.gz: 428edf61a64ccefb496684387d749e531248ad9e
+  metadata.gz: 7354b39224a85126b4cd03f209d204818e12f032
+  data.tar.gz: 997767c284e18070281dd72d852a0a4a94ab9d93
 SHA512:
-  metadata.gz: 9bbc1ba1a61a438409679c40e68e14da7009ffe5f934363a5d13e7959bde2e9e84e62ad9aa1e662078b6c0b88cefdcffdfd18cd82b0006b34f0430123858e878
-  data.tar.gz: 548a55a640eee5f9ffe30ab3407e0fbec88cfbd064664464a1a8d2902157758487b474670a82422659a7302e5590cda4b5bf265899ac7ebed86c7fcd5d2ca4ec
+  metadata.gz: 5160781b40875dbb819892172762631b3b62d4b08415af1c478519584541a090d992019db291999665c8ded5f56f2416d14299a294ae5732682fd049dd0baf01
+  data.tar.gz: 273e6788ccd1aea9ca961d8b8766fdf568596287a91f5cb39a01f5fad13ac0b12a8d8914d0011c3d38b35b898effb87dbd45a4a92d313e7b10f3a7a210008425

data/bin/pave

@@ -205,6 +205,24 @@ command :"db:push" do |c|
   end
 end
 
+command :"files:pull" do |c|
+  c.syntax = "pave files:pull"
+  c.description = "Download the project's live files directory."
+  c.action do |args|
+    remote = args.first || "live"
+    Pave::Files.pull(remote)
+  end
+end
+
+command :"files:push" do |c|
+  c.syntax = "pave files:push"
+  c.description = "Upload the project's local files directory."
+  c.action do |args|
+    remote = args.first || "live"
+    Pave::Files.push(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

@@ -48,20 +48,17 @@ module Pave
     def set_up_git
       say "* Setting up git..."
       sh "touch #{name}/.gitignore"
-      gitignored_folders.each{ |folder| sh "echo '#{folder}' >> #{name}/.gitignore" }
-      gitkeep_folders.each{ |folder| sh "touch #{name}/#{folder}/.keep" }
+      gitignored.each{ |ignored| sh "echo '#{ignored}' >> #{name}/.gitignore" }
+      gitkept_folders.each{ |folder| sh "touch #{name}/#{folder}/.keep" }
       sh "touch #{name}/files/.keep"
       sh "touch #{name}/updates/.keep"
     end
 
-    def gitignored_folders
+    def gitignored
       [
-        "files/avatars/*",
-        "files/cache/*",
-        "files/incoming/*",
-        "files/thumbnails/*",
-        "files/tmp/*",
-        "files/trash/*",
+        "files/*",
+        "!files/.keep",
+        ".DS_Store",
         ".sass-cache",
         "stylesheets"
       ]
@@ -69,7 +66,7 @@ module Pave
 
     def create_virtual_host
       say "* Setting up virtual host..."
-      if Pave::VirtualHost.new("#{name}.site").create_vhost
+      if sh("sudo pave vh:create #{name}.site") == 0
         say "Successfully setup virtual host #{name}.site."
       else
         say "Virtual host not set up. Run `pave vh:create #{name}.site` to create it."
@@ -98,7 +95,7 @@ module Pave
       %w{ blocks config packages files }
     end
 
-    def gitkeep_folders
+    def gitkept_folders
       [
         :blocks,
         :elements,

data/lib/pave/database.rb

@@ -75,8 +75,8 @@ module Pave
       server = Pave::Remote.server(remote)
       directory = Pave::Remote.directory(remote)
       db = remote_db
-      say "Remotely executing #{dump_file(:remote)} on live #{db['name']}"
-      sh "ssh #{server} \"cd #{directory}/db; gzip -dc #{dump_file(:remote)} | mysql -u#{db['user']} -p#{db['pass']} #{db['name']}\""
+      say "Remotely executing #{dump_file(:local)} on live #{db['name']}"
+      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")

data/lib/pave/files.rb

@@ -0,0 +1,22 @@
+module Pave
+  class Files
+    include Pave::Shell
+
+    def self.push(remote="live")
+      server = Pave::Remote.server(remote)
+      directory = Pave::Remote.directory(remote)
+      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 "scp -r #{server}:#{directory}/files ./remote_files;
+          mv ./files ./old_files;
+          mv ./remote_files ./files && rm -rf ./old_files;"
+    end
+  end
+end

data/lib/pave/version.rb

@@ -1,3 +1,3 @@
 module Pave
-  VERSION = "0.6.6"
+  VERSION = "0.7.0"
 end

data/lib/pave.rb

@@ -3,6 +3,7 @@ require "pave/version"
 require "pave/shell"
 require "pave/concrete"
 require "pave/database"
+require "pave/files"
 require "pave/virtual_host"
 require "pave/remote"
 require "pave/theme"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pave
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - lib/pave.rb
 - lib/pave/concrete.rb
 - lib/pave/database.rb
+- lib/pave/files.rb
 - lib/pave/remote.rb
 - lib/pave/shell.rb
 - lib/pave/theme.rb
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Provides a set of command line tools for Concrete5.