pave 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dca6ce62e803a633172e15f128a10c1db7ddb46e
-  data.tar.gz: 6abf652c95be62aa92e2229c31299376a76c6aa1
+  metadata.gz: 51010f11d688daf56a02e4d565813dcec29436dc
+  data.tar.gz: a2e67566e859660b1f2ad07c0748ed6075b200ce
 SHA512:
-  metadata.gz: 99e429cd2172c75461de4812b0f614a29597d0d34b02c733a057877c5010e59e8b73a9b8e21f2d7d2515d906381068af99bd6fb4cbbc3ea017aa8531b6dae74b
-  data.tar.gz: 73b1a73e6e88ec5f22b81c16478a3b8b90ba98bed9d79cbc9119fbdb2e3183b42511d7e5f3bb370fa0e5b0a80dd32933fe12cf6f0c3828eb38bb7cddfc1356d1
+  metadata.gz: a0dee91466eb5f6092fcf3c7be14e66791ad505628a364ebabbeb214b8333e6d484d9f8db107c135a7de6e0ff16fa2a24bf7659b84209ebf7c07053c389b441b
+  data.tar.gz: 0d3cc447999ccb062a9b87d237c58e060f896d53e0c215d641ff43bf9dd997bba83d297e5f7739f4ba088d683327f4146f05e8b14b190c7539c54f508efcd8b3

data/README.md

@@ -10,7 +10,7 @@ Provides a set of command line tools for Concrete5.
 
 ## Usage
 
-Create a new Concrete5 website:
+#### Create a new Concrete5 website:
 
     $ pave new mywebsite
 
@@ -22,21 +22,30 @@ This:
 4. Builds an app folder of commonly used folders (symlinked into the root folder so Concrete5 can find them)
 5. Initializes a Git repo and adds the first ("Initial") commit.
 
-Other commands:
+#### Deployments
 
-    $ pave --help
-    
-Outputs common tasks that pave can do.
+    $ pave deploy:setup
+
+This sets up a deployment script to the remote server and deploys an initial version.
+
+    $ pave deploy
+
+Deploys the site using git.
 
-## TODO
+#### Database
 
-1. ? Create database (`pave database mydatabase`)
-1. Tell user to go set up Concrete5 in-browser once virtual host and db is set up
-1. Uninstall? `pave remove mywebsite` (including virtual host)
-1. Do database dumps. `pave db dump`
-1. Do live database download & replace local one. `pave db download` (confirmation first)
-1. Do local database upload & replace remote one. `pave db upload` (confirmation first)
+TODO:
 
+    $ pave db:create
+    $ pave db:push
+    $ pave db:pull
+    $ pave db:backup
+
+#### Help
+
+    $ pave --help
+    
+Outputs common tasks that pave can do.
 
 ## Contributing
 

data/bin/pave

@@ -146,3 +146,21 @@ command :"db:upload" do |c|
     say "`db:upload` command not implemented yet."
   end
 end
+
+command :"deploy" do |c|
+  c.syntax = "pave deploy"
+  c.description = "Deploy project to web server."
+  c.action do |args|
+    remote = args[0] || "production"
+    branch = args[1] || "master"
+    Pave::Deploy.new.deploy(remote, branch)
+  end
+end
+
+command :"deploy:setup" do |c|
+  c.syntax = "pave deploy:setup"
+  c.description = "Setup deployment via git to web server."
+  c.action do
+    Pave::Deploy.new.setup
+  end
+end

data/lib/pave/concrete.rb

@@ -47,7 +47,6 @@ module Pave
       gitkeep_folders.each{ |folder| sh "touch #{name}/#{folder}/.keep" }
       sh "touch #{name}/files/.keep"
       sh "touch #{name}/updates/.keep"
-      # sh "cd #{name} && git init && git add -A && git commit -m 'Initial'"
     end
 
     def gitignored_folders

data/lib/pave/database.rb

@@ -1,5 +1,3 @@
-require "pave/shell"
-
 module Pave
   class Database
     include Pave::Shell

data/lib/pave/deploy.rb

@@ -0,0 +1,25 @@
+module Pave
+  class Deploy
+    include Pave::Shell
+
+    def 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/): "
+      remote = ask "Desired git remote name (e.g. production): "
+      script = File.join(File.expand_path("../..", File.dirname(__FILE__)), "resources/deploy.sh")
+
+      puts "Piping shell script to #{server} for setup."
+      sh "ssh #{server} 'cd #{folder}; bash -s' < #{script}"
+
+      sh "git remote remove #{remote}"
+      sh "git remote add #{remote} #{server}:#{folder}/deploy.git"
+
+      puts "Finished! You may now run `pave deploy` to deploy your application."
+    end
+
+    def deploy(remote="production", branch="master")
+      sh "git push #{remote} #{branch}"
+    end
+  end
+end
+

data/lib/pave/version.rb

@@ -1,3 +1,3 @@
 module Pave
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/pave/virtual_host.rb

@@ -1,4 +1,3 @@
-require "pave/shell"
 require "fileutils"
 
 module Pave

data/lib/pave.rb

@@ -4,6 +4,7 @@ require "pave/shell"
 require "pave/concrete"
 require "pave/database"
 require "pave/virtual_host"
+require "pave/deploy"
 
 module Pave
   def update

data/resources/deploy.sh

@@ -0,0 +1,8 @@
+#!bin/bash
+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
+  chmod +x hooks/post-receive
+fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pave
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,10 +101,12 @@ files:
 - lib/pave.rb
 - lib/pave/concrete.rb
 - lib/pave/database.rb
+- lib/pave/deploy.rb
 - lib/pave/shell.rb
 - lib/pave/version.rb
 - lib/pave/virtual_host.rb
 - pave.gemspec
+- resources/deploy.sh
 - test/pave_test.rb
 homepage: https://github.com/jamonholmgren/pave
 licenses: