Commit graph

149 commits

Author SHA1 Message Date
Derek Watson 669763b878 rmeoved conflicts 2014-02-22 23:22:24 -05:00
Derek Watson 4e46a4e3e7 Merge branch 'features/environments_readme' of github.com:derek-watson/middleman-deploy into features/environments_readme
Conflicts:
	README.md
2014-02-22 23:19:34 -05:00
Derek Watson a7e90214f2 documented multiple environment config 2014-02-22 23:18:38 -05:00
Derek Watson 260665eef9 documented multiple environment config 2014-02-22 23:13:13 -05:00
Tom Vaughan 83c24d7443 Merge pull request #53 from cveneziani/refactoring
Refactoring
2014-01-18 05:15:23 -08:00
Cecile Veneziani 11860dd930 Refactoring
- Create a class per method
- Create a class per git strategy
- Extract USAGE into a file
- Refactor git and ftp/sftp methods
2014-01-16 16:52:52 +01:00
Tom Vaughan 064b17add2 Merge pull request #49 from cveneziani/git_submodule_strategy
Add strategy option to git method
2013-12-23 10:55:11 -08:00
Cecile Veneziani 23c6b8c1f6 Add strategy option to git method
- Set force push as default strategy (avoid breaking change)
- Add submodule strategy
2013-11-30 21:28:35 +01:00
Tom Vaughan b0f7cde56a bump 2013-11-23 17:17:25 -03:00
Tom Vaughan 26f2e43a52 Add new rsync flags option to error message. 2013-11-19 20:36:02 -03:00
Tom Vaughan 64ffb98d14 Merge pull request #48 from jasonsemko/jason
Adding "flags" option for rsync
2013-11-19 15:26:03 -08:00
Jason Semko eaedc962b8 updating readme 2013-11-18 17:59:58 -08:00
Jason Semko 5b1723ab34 adding a flags option to override default rsync flags 2013-11-18 17:42:55 -08:00
Tom Vaughan 63a9e82bd2 Add a prominent link to the wiki. 2013-11-18 10:37:42 -03:00
Tom Vaughan 23cace3319 Merge pull request #41 from sDaniel/master
Quotes-Fix - deploying/comitting to github on a windows machine is not woking
2013-10-03 06:20:14 -07:00
Sebastian Daniel 36785eb98f fix for quotes not woking when comitting on a windows machine. + comment since change didn't show up on github 2013-10-01 20:14:23 +02:00
Sebastian Daniel 273174f427 fix for quotes not woking when comitting on a windows machine. 2013-10-01 19:43:02 +02:00
Tom Vaughan 0b0f447117 This is misleading. There are no tests. 2013-09-21 13:37:36 -03:00
Tom Vaughan 4f03a0eaa1 Prefer README.md over the GitHub pages site. 2013-09-21 13:21:15 -03:00
Tom Vaughan 0f1a55a82b Because why not. 2013-09-21 12:13:07 -04:00
Tom Vaughan d845e9f42d Bump. 2013-09-21 12:33:45 -03:00
Tom Vaughan c981ca3aa0 Pull-in new middleman extension defaults. 2013-09-21 12:32:19 -03:00
Tom Vaughan fd5fa8c04d Oddly this is no longer required. 2013-09-21 12:29:10 -03:00
Tom Vaughan 268ddb1a14 Add username and password are optional to sftp docs. 2013-09-21 12:06:25 -03:00
Tom Vaughan 2f8d236ee4 Make username optional for sftp deployment. Like rsync. 2013-09-21 12:05:56 -03:00
Tom Vaughan cbead1ee4b Merge pull request #39 from MSch/patch-1
Make password optional for sftp deployment
2013-09-12 12:18:59 -07:00
Martin Schürrer 6eed387731 Make password optional for sftp deployment
Some people use public key authentication
2013-09-12 20:33:06 +02:00
Tom Vaughan 336fcd3c0e Catch specific exception. Fixes #38 (I think). 2013-08-24 11:16:22 -04:00
Tom Vaughan a738143f3e bump 2013-08-08 19:46:10 -04:00
Tom Vaughan c9d44ba5e7 Comment and separate default options. 2013-08-08 19:44:03 -04:00
Tom Vaughan 6cb77153d4 Add port to list of possible options. 2013-08-08 19:41:46 -04:00
Tom Vaughan d749a99fbe Let user be optional in the rsync method. 2013-08-08 19:39:10 -04:00
Tom Vaughan 87b71cc7c9 Merge pull request #35 from rmm5t/kill-global-constants
Removed use of global constants (VERSION and PACKAGE)
2013-08-04 06:58:57 -07:00
Ryan McGeary 81fd3ad4c5 Removed use of global constants (VERSION and PACKAGE)
Fixes #33
2013-08-03 18:06:38 -04:00
Tom Vaughan a5d8d9c4f3 bump 2013-07-29 19:58:39 -04:00
Tom Vaughan 02eb3a9095 Switch to github's .io domain for static sites.
Because of this:
https://github.com/blog/1452-new-github-pages-domain-github-io
2013-07-29 19:48:13 -04:00
Tom Vaughan 966d90f7ba 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-07-24 00:03:00 -04:00
Tom Vaughan e1c44aa9d3 Call middleman build to work-around a problem in middleman. 2013-07-23 21:43:15 -04:00
Tom Vaughan 4c64a8a046 Merge pull request #30 from rmm5t/require-compass
Compass warning during test suite
2013-07-21 19:05:26 -07:00
Tom Vaughan 0ac2b4ad82 Merge pull request #32 from rmm5t/readme-improvements
Reorganized the readme for better readability
2013-07-21 19:05:11 -07:00
Ryan McGeary 0ea49a47ce Reorganized the readme for better readability
This should make it easier for people to quickly grok the possible
extension behaviors and get started.
2013-07-21 13:23:06 -04:00
Ryan McGeary caced07f0f Added compass to avoid warning during test suite 2013-07-21 12:54:04 -04:00
Tom Vaughan 60dc1fee0e sorry but i can't keep up with the number of contributors 2013-07-16 22:54:58 -04:00
Tom Vaughan 9c925ff0e5 some ftp/sftp related clean-ups 2013-07-16 22:25:06 -04:00
Tom Vaughan c0a974d6a0 bump 2013-07-16 22:08:33 -04:00
Tom Vaughan 4aa98a0035 add that we removed deploy from the after_build hook 2013-07-16 22:02:26 -04:00
Tom Vaughan 8cb0500c0d remove the --clean command-line option 2013-07-16 21:53:11 -04:00
Tom Vaughan 62248cb099 update tagline and ensure required settings are provided for sftp 2013-07-16 21:43:00 -04:00
Tom Vaughan 757272d6af whitespace clean-up 2013-07-16 21:40:33 -04:00
Tom Vaughan f0a60edf29 work-around a problem with running build in an extension 2013-07-16 21:24:45 -04:00