pave 0.11.2 → 0.12.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573d74804fac37b5033e61bacf54234f23e8e6ea
-  data.tar.gz: 492d87ec3af270309e419bf07f83921935b2c401
+  metadata.gz: ee3b26614af6ef5ee8b795c41f5612e11ecab9fa
+  data.tar.gz: f396a4f33229e3bca509d7df8899aee82481b565
 SHA512:
-  metadata.gz: 5b4c8b971d36d6a263bf41b84fbc7df57bae8ec555a900d97d0f844cf40409e42f81c6876cd48fdc1c22c02eced6482324a82cfbe941326e93e47e469adf5c64
-  data.tar.gz: ad54fc0690e349140eeef3a804118918e03486215ac593a763e9a67945f75cd70b129c71e8bb12ba6d6a51509061bbd79fccc474955598ef6c48f1228291ad21
+  metadata.gz: 53d7a5ada8f5320667b6ae1526b1f6a07754119138b9d0ca3450ce570f4098e4d029c931c3eb104ec70700df9a31695415a72994163e8deee55a5b91a24b61b6
+  data.tar.gz: b0a863b9bb0b74ea175e26e9049d97ccb5f8de6149368b75542b173e03235cd13549fae6eb25834cf8f581a1a797de15caafc09c3b72dec5f9a58b8708b4e521

data/README.md

@@ -28,16 +28,12 @@ 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. You may run it multiple times and setup as many deployment endpoints as you want.
+This sets up a Git-based deployment script to the remote server and deploys an initial version. SSH access is required.
 
     $ 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,6 +240,15 @@ 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/files.rb

@@ -2,27 +2,34 @@ module Pave
   class Files
     include Pave::Shell
 
+    def self.exclusions
+      " --exclude 'files/tmp' --exclude 'files/cache' "
+    end
+
+    def self.flags
+      " -uazh 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 "scp -r ./files #{server}:#{directory}/local_files;"
-      sh "ssh #{server} 'cd #{directory};
-          mv ./files ./old_files;
-          mv ./local_files ./files && rm -rf ./old_files;'"
+      sh "rsync #{flags} #{exclusions} ./files #{server}:#{directory}/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;"
+      sh "rsync #{flags} #{exclusions} #{server}:#{directory}/files ./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,12 +23,7 @@ module Pave
 
     def self.url(remote="live")
       remotes = shell("git remote -v").output
-      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
+      remotes.match(/#{remote}\s+(.*)\s+\(push\)/)[1]
     end
 
     def self.server(remote="live")

data/lib/pave/version.rb

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

data/resources/deploy.sh

@@ -3,9 +3,6 @@ if [ ! -d 'deploy.git' ]; then
   mkdir deploy.git && cd deploy.git
   git init --bare
   echo '#!/bin/sh' > 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
+  echo 'GIT_WORK_TREE=.. git checkout -f' >> hooks/post-receive
   chmod +x hooks/post-receive
 fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pave
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0.rc1
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 description: Provides a set of command line tools for Concrete5.
@@ -90,11 +90,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .floo
-- .flooignore
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".floo"
+- ".flooignore"
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -139,17 +139,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Provides a set of command line tools for Concrete5.