Tom Vaughan
ef47e6321a
Merge branch 'master' of github.com:tvaughan/middleman-deploy
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-06-11 00:07:36 -04:00
Tom Vaughan
f175024f5f
The default skeleton provided by middleman now omits versions.
2013-06-11 00:06:36 -04:00
Tom Vaughan
264f1082b2
Merge pull request #24 from jm3/force-build
...
(optionally) force a build before any deploy
2013-06-10 21:03:06 -07:00
Tom Vaughan
04fccda46b
Merge pull request #28 from tobiaswerner/master
...
Add SFTP deployment
2013-06-08 16:15:31 -07:00
tobiaswerner
a1ae241553
Added SFTP deployment
2013-06-08 22:46:43 +02:00
Tom Vaughan
e393283264
Merge pull request #27 from rmm5t/gemspec-license
...
Add license declaration to gemspec
2013-05-30 16:31:28 -07:00
Ryan McGeary
f474cbd298
Added license declaration to gemspec
2013-05-30 19:19:42 -04:00
Tom Vaughan
36ba3b9086
Merge pull request #26 from rmm5t/fix-branch-check
...
Fix branch selection logic for git deploys
2013-05-30 08:10:00 -07:00
Ryan McGeary
e854adb5a6
Fixed branch selection logic for git deploys
...
* Before, because the logic was revered (see
c0e46393c6
), a brand new deploy would
result in assuming that the deploy branch existed when it actually
did not. This would cause initial deploys to fail.
* This new logic is more concise, more readable, and still backwards
compatible with ruby 1.8.
2013-05-30 10:25:03 -04:00
John Manoogian III
92e7724a1a
(optionally) force a build before any deploy
2013-05-06 16:39:19 -07:00
Tom Vaughan
00e00ee96d
Clean-up README.md (remove step 1 as it is redundant).
2013-05-05 20:51:13 -04:00
Tom Vaughan
5931dfc748
bump
2013-05-05 20:14:12 -04:00
Tom Vaughan
41f33b69d2
Fix #23 . use build_dir
as specified in config.rb
2013-05-05 20:13:14 -04:00
Tom Vaughan
73fad02a78
give ftp some props
2013-05-05 20:04:55 -04:00
Tom Vaughan
50283f2d0a
use a secure transport to fetch gems (or else they can be compromised?)
2013-05-05 20:04:43 -04:00
Tom Vaughan
46286a2729
bump
2013-03-15 22:57:41 -03:00
Tom Vaughan
bc38de72dd
Merge pull request #16 from bzalasky/master
...
Nothing major, just a typo in the readme
2013-03-14 05:51:24 -07:00
Benjamin Zalasky
6ff92c0607
Update README.md
...
Fixed a typo on the first line, delpoy to deploy.
2013-03-13 21:58:33 -07:00
Tom Vaughan
2ba1b86d06
Merge pull request #15 from reefab/master
...
Very small bugfix to make middleman deploy work on ruby 1.8
2013-03-01 10:05:30 -08:00
Fabien Piuzzi
c0e46393c6
Fixing deploy for ruby 1.8
...
.keep_if is not present in Ruby 1.8, using delete_if and reversing the test should be equivalent and more universal.
2013-03-01 18:07:33 +01:00
Tom Vaughan
0c84e7ec6e
also bump
2013-01-20 10:58:43 -03:00
Tom Vaughan
7f2b18b2de
bump
2013-01-20 10:56:03 -03:00
Tom Vaughan
8c6bbae53a
Display help on config.rb when ftp method is not setup correctly. Update printf's.
2013-01-20 10:51:22 -03:00
Tom Vaughan
4f41240306
Merge pull request #11 from danielbayerlein/ftp-hidden-files
...
[deploy_ftp] Add support for hidden files.
2013-01-13 18:35:50 -08:00
Tom Vaughan
32a3dfbac2
Merge pull request #12 from danielbayerlein/readme-improvements
...
Some README improvements.
2013-01-13 18:34:33 -08:00
Daniel Bayerlein
586f70c571
Some README improvements.
2013-01-13 20:04:21 +01:00
Daniel Bayerlein
fd926b183d
[deploy_ftp] Add support for hidden files.
2013-01-13 19:41:58 +01:00
Tom Vaughan
73258f3c5c
bump
2013-01-05 13:43:18 -03:00
Tom Vaughan
dbc310ec11
Merge pull request #10 from benben/9_git_deploy_fix
...
git: remove origin fetching, fixes #9
2013-01-03 04:31:16 -08:00
Benjamin Knofe
6b6f928e75
git: remove origin fetching, fixes #9
2013-01-02 22:38:24 +01:00
Tom Vaughan
1877938c8a
bump
2012-12-01 20:52:53 -03:00
Tom Vaughan
3876a2f986
Clean-up documentation.
2012-12-01 20:52:26 -03:00
Tom Vaughan
95a796ab41
Merge pull request #8 from benben/git-deploy
...
Better git deployment.
* Remove outdated git gem.
* Support git remotes other than "origin".
* Use "build" directory as tmp git repo.
2012-11-28 04:27:32 -08:00
Benjamin Knofe
95f3a8429f
updated README.md
2012-11-28 11:31:04 +01:00
Benjamin Knofe
327a41fd05
refactored the whole git deploy process, fixes #7
2012-11-28 11:17:24 +01:00
Tom Vaughan
d4ae8de561
bump
2012-11-13 20:33:45 -03:00
Tom Vaughan
2137e353f3
whoa! three deploy methods! sweet! exclamation points!!!
2012-11-13 20:33:13 -03:00
Tom Vaughan
358ed821f3
thanks everybody! for reals!
2012-11-13 20:29:47 -03:00
Tom Vaughan
ca049388fc
document that we support the after_build hook
2012-11-13 20:29:20 -03:00
Tom Vaughan
b71dc4d8df
Merge pull request #6 from benben/master
...
FTP deployment
2012-11-08 08:18:36 -08:00
Benjamin Knofe
963971bb15
added ftp to error message
2012-11-08 16:53:45 +01:00
Benjamin Knofe
817ac132c0
added FTP deployment
2012-11-08 16:45:57 +01:00
Tom Vaughan
2b33d3d409
call deploy via middleman's built-in after_build hook
...
TODO: pass "--clean" or "--no-clean" to deploy as passed to build
2012-10-31 17:49:30 -03:00
Tom Vaughan
aa59736914
bump
2012-10-05 00:44:18 -03:00
Tom Vaughan
2f0914595b
per recent updates
2012-10-05 00:44:12 -03:00
Tom Vaughan
01eb463045
allow remotes other than "origin" in the git deploy method
2012-10-05 00:44:02 -03:00
Tom Vaughan
54ebdd153e
per recent updates
2012-10-04 15:22:16 -03:00
Tom Vaughan
82a4915250
Update lib/middleman-deploy/extension.rb
...
clean-up whitespace
2012-09-26 15:46:21 -07:00
Tom Vaughan
96725beb12
Merge pull request #4 from grossws/master
...
Option to push branch other than gh-pages when deploying to git
2012-09-26 15:45:11 -07:00
Konstantin Gribov
62e6d4429f
Added support for non-default (gh-pages) branch on github
2012-09-27 02:27:15 +04:00