Commit Graph

215 Commits

Author SHA1 Message Date
Brandon Mathis
1d210675b7 Merge pull request #874 from imathis/catch_deploy_failures
Catch deploy failures
2012-12-19 21:51:59 -08:00
Parker Moore
d089889772 Printing the repo_url when failing. #866 2012-12-20 00:47:38 -05:00
Parker Moore
51fb2bcc5a #866 - using 'raise' instead of 'puts' for the error 2012-12-20 00:43:54 -05:00
Parker Moore
80fad2180e Checking to see if 'git push' worked in deploy. #866. 2012-12-20 00:43:53 -05:00
Parker Moore
569ed588e3 Updated URL parser for setup_github_pages. Fixes #868 2012-12-20 00:37:48 -05:00
Parker Moore
31db12fc49 DRY'd up that user regex. 2012-12-20 00:02:36 -05:00
Parker Moore
1e300fbb03 Catching malformed repo URLs #689 2012-12-19 23:46:33 -05:00
Parker Moore
3c92c5b407 Added support for https:// repo URLs. #867. 2012-12-19 23:45:34 -05:00
Parker Moore
dbb1487ba0 Slightly different syntax for setting server_host/_port. #780 2012-12-17 14:14:25 -05:00
Parker Moore
bb8f531d54 Using OCTOPRESS_-prefixed ENV vars. Modification to #780. 2012-12-17 14:06:45 -05:00
Parker Moore
6827f314b1 Printing HOST and PORT on rake preview 2012-12-17 13:59:35 -05:00
Max Lincoln
329d2c5bda Grab IP and PORT env vars and bind rack to both 2012-12-17 13:58:09 -05:00
Parker Moore
7e720ebe33 rake :generate strictly compiles 2012-12-16 12:44:57 -05:00
Brandon Mathis
773be70c29 Disabled Rsync delete by default. #787 2012-10-13 15:37:03 -05:00
Henrik N
b0a60e44f3 Unbreak generate_only task.
The isolate task would overwrite the stash_dir local,
breaking the integrate task.
2012-07-22 21:15:34 +02:00
Brandon Mathis
cf0fd14476 fixed some typos 2012-06-17 11:20:05 -05:00
Brandon Mathis
c2e14bf88e Added combined javascript to .gitignore. Rake minify now uses configuration for the source directory 2012-06-17 09:36:56 -05:00
Brandon Mathis
17368e93c4 Added minification and concatenation of Javascript files 2012-06-16 18:36:58 -05:00
Brandon Mathis
28e99b3c38 Added plugins/config.rb for reading and writing _config.yml. Added option to use Albino and default Python Pygments by setting pygments:true in _config.yml 2012-06-15 12:50:44 -05:00
Brandon Mathis
b1276f082c Better method for customizing the favicon. Closes #594 2012-06-07 14:27:25 -05:00
Brandon Mathis
d0257bd930 Removing .sass-cache in update_style task to ensure that Sass caches don't cause problems when users update. Related to issue #555 2012-06-03 17:22:09 -05:00
Hong Xu
c1b2b43b32 Use a more portable way to create .nojekyll file when deploying to github pages. 2012-05-27 13:49:35 +08:00
Brandon Mathis
0b088433ca Added configurable array for adding hidden files to be deployed with copydot task 2012-05-26 11:52:23 -05:00
Brandon Mathis
e81e1c8289 Removed .nojekyll from source directory as it only makes sense to add to GitHub pages deployments. Added .nojekyll creation to push rake task for GitHub pages 2012-05-24 10:18:28 -05:00
Brandon Mathis
934e3b3040 Rake task 'clean' deletes each file inside of specified cache directories and generated stylesheets 2012-05-22 19:21:29 -05:00
Brandon Mathis
09a2e3754d Copydot rake task now includes .nojekyll and .htaccess files. Since some OSes or applications create unimportant hidden files, this only copies hidden files known to be useful for blogging. This closes #303 #348 #419 2012-05-22 17:13:55 -05:00
Brandon Mathis
439f0a774a Added generate_only task (combines isolate, generate, integrate) for speedier rendering checks on a blog post. Added more optional stdin dialogs to better support zsh. Improved feedback on set_root_dir 2012-05-22 13:12:48 -05:00
Brandon Mathis
bfa5255188 Rake new post now accepts:
- Inline input as in `rake new_post["Your post title"]
- Input from stdin if in-line input isn't given.

This should help zhs users who've been frustrated by globbing issues.
Fixes #117
2012-05-21 08:57:49 -05:00
Brandon Mathis
741107291b Added 404, moved archives from /blog/archives to /archives, added migration in update_source rake task. Closes #375 2012-05-20 22:23:18 -05:00
Brandon Mathis
c7d74c0d82 Added instruction regarding management of _deploy/ for GitHub pages users. Removed preview mode check from deploy script 2012-05-20 17:27:27 -05:00
Brandon Mathis
654a2937b8 Improvements to hosting with Github Pages:
1. Push deployment task pulls first, avoiding a --force push
  2. Improvements to rake task setup_github_pages:
    - Now only rewrites _config.yml if in default state
    - Attempts a pull from deploy repo before setting up as a new project
    - Detects conflicts between CNAME and _config.yml url
    - Links to GitHub's help documentation for CNAME setup
Fixes #561
2012-05-20 10:38:56 -05:00
Brandon Mathis
ba98467538 removed poorly implemented monkey patch for compiling draft posts 2012-02-12 17:00:01 -06:00
Brandon Mathis
eb540a4404 update_source now correctly updates the archive page if it has been moved to source/archive and removes empty directories 2012-02-12 13:11:23 -06:00
Brandon Mathis
23c876021e Refactored the template a bit more and improved blog and archive styling for linklogs 2012-02-12 12:27:17 -06:00
Brandon Mathis
101a503f5a Added linklog publishing. 2012-02-12 07:12:22 -06:00
Brandon Mathis
ce0d25100b now Github repo url can be specified inline setup_github_pages command 2011-12-18 15:38:11 -06:00
Brandon Mathis
39ec55b605 Removed offending paren in Rakefile 2011-12-10 18:30:33 -06:00
Brandon Mathis
bdc3cb8bd3 Rsync --delete option can be turned off in Rakefile configuration and users can exclude directories from sync by adding an rsync-exclude file to their root directory. fixes #247 2011-12-10 18:18:34 -06:00
Frederic Hemberger
e220fcc610 Merge branch 'master' of github.com:imathis/octopress 2011-12-10 14:48:35 +01:00
Frederic Hemberger
254cdd35d6 :copydot ignores thumbnail files starting with '._' 2011-12-10 14:46:13 +01:00
Frederic Hemberger
e5c262cb8f Merge pull request #225 from imathis/post_names
Add more flexibility to :new_page task
2011-12-10 04:04:48 -08:00
Frederic Hemberger
6714e5c7f5 Set flag in preview mode and re-generate files before deployment if necessary 2011-11-29 15:13:50 +01:00
Frederic Hemberger
f1ebf35869 Introduce distinction between preview/productive site generation
Posts which contain the YAML attribute `published: false` are usually
not generated by Jekyll. With this patch they can be previewed just
like published posts on localhost using `rake watch`or `rake preview`.

NOTICE: Before pushing to the productive environment, use `rake generate`
to update the public directory and remove posts which are flagged not to be
published.
2011-11-23 14:37:30 +01:00
Frederic Hemberger
ffa68a1fe3 Fixes typo in :push task 2011-10-17 08:18:41 +02:00
Frederic Hemberger
fc138b2e35 Adds more flexibility to :new_page task
Page filenames/directories are lowercased and sanitized by default to
allow a greater flexibility:

- new_page["/path/to/file"] # => source/path/to/file/index.markdown
- new_page["path/to/file"] # => source/path/to/file/index.markdown
- new_page["my path/my file"] # => source/my-path/my-file/index.markdown
- new_page["lorem.ipsum.dolor"] # => source/lorem-dot-ipsum.dolor
- new_page["Questions & Answers"] # => source/questions-and-answers/index.markdown
2011-10-16 16:22:37 +02:00
Frederic Hemberger
82942bd088 Replaces system call with cross-platform cp_r, fixes #200 2011-10-16 13:07:31 +02:00
Frederic Hemberger
4b87a2fb7d Removes 'titlecase' from page name, fixes #202 2011-10-16 11:49:18 +02:00
Frederic Hemberger
fe19c2aaae Removes duplicate mkdir_p 2011-10-16 11:43:55 +02:00
Brandon Mathis
86c72a4ca6 ensures compiled /source/stylesheets/screen.css exists before running watch and preview tasks, fixes #214 2011-10-11 15:14:41 -05:00
Frederic Hemberger
35ebe0d647 Allows '-' in deployment branch names, fixes #213 2011-10-11 14:20:52 +02:00
Brandon Mathis
09057190d9 fixed issue where update_source failed if source/index was any extension other than .html 2011-10-01 23:36:52 -05:00
Brandon Mathis
d833d9fe78 wildcards broke rake update_source. fixes that 2011-10-01 21:42:24 -05:00
Brandon Mathis
bdf904adff Retains customized favicon on update_source fixes #189, Copies index.* from source.old fixes #188 2011-09-30 08:08:07 -05:00
Brandon Mathis
3bd4ed026e Merge branch 'master' of github.com:imathis/octopress into compass 2011-09-28 14:51:24 -05:00
Manu
af1f2af48f Typo. 2011-09-26 00:16:15 +03:00
Manu
a4177e1471 Changed it so the ssh port is configurable as well. (As I ran into the same issue already described at https://github.com/imathis/octopress/issues/30 ) 2011-09-26 00:13:42 +03:00
Frederic Hemberger
3ad7715901 Fix generation of stylesheets 2011-09-24 11:31:57 +02:00
Brandon Mathis
aa1abd0827 now Github pages :push task forces 2011-09-22 16:16:54 -05:00
Brandon Mathis
4d49149404 renamed github pages configuration task 2011-09-22 04:45:44 -05:00
Frederic Hemberger
ab61a62d30 Removes compass_compiler.rb 2011-09-22 11:43:33 +02:00
Brandon Mathis
fcb730b5bf Restored copying public into _deploy. fixes #169 2011-09-22 04:43:09 -05:00
Brandon Mathis
4efb29394f improved github configuration raketask 2011-09-22 04:41:40 -05:00
Frederic Hemberger
92ff4a9c67 copydot task can be called with parameters, no need for separate copydot_deploy 2011-09-22 10:17:31 +02:00
Brandon Mathis
a5d55fe80f Fixed issue where dotfiles were not being copied to _deploy for github pages deployments 2011-09-21 18:54:54 -05:00
Brandon Mathis
5b2b0c508b fixed issue where public was being copied into _deploy 2011-09-21 18:44:21 -05:00
Tom Miller
ec91c370d5 Removing glob because globbing does not pick up dotfiles. 2011-09-19 22:46:21 -05:00
Frederic Hemberger
31adeee1df Wraps git commit message in double quotes, fixes #139 2011-09-18 14:07:43 +02:00
Frederic Hemberger
f6bf894387 Aligns naming of .pygments-cache, .gist-cache and .sass-cache 2011-09-18 13:45:25 +02:00
Chris Sims
1a562b9580 Fixes #150. Strip leading path before checking for excluded file. 2011-09-17 18:34:09 -05:00
Brandon Mathis
48cd2793cf added itegration to gen_deploy 2011-09-12 14:51:49 -05:00
fhemberger
565648300b Fix an issue in 'watch' and 'preview' where main process is terminated with child processes still running 2011-09-12 21:36:14 +02:00
fhemberger
04973e0948 Move generate + deploy to separate task 2011-09-12 20:48:26 +02:00
fhemberger
960a57c256 Generate site before deploying, execute tasks in sequence 2011-09-12 19:49:18 +02:00
fhemberger
5c275542c3 Copy dotfiles also for subdirectories 2011-09-12 19:46:11 +02:00
Brandon Mathis
7c1c24f899 moved from Posix::Span to Process.span, fixing #46 2011-09-08 11:54:18 -05:00
Brandon Mathis
b812500f39 Updated new_post and new_page taks to use new ask method for dialogs 2011-09-04 08:47:36 -05:00
Brandon Mathis
ed0c220523 Merge branch 'master' of https://github.com/fhemberger/octopress into fhemberger-master
Conflicts:
	plugins/category_generator.rb
2011-09-04 08:37:22 -05:00
fhemberger
f03c4cdb2a install: Adds confirmation before overwriting existing source_dir 2011-09-04 14:25:04 +02:00
Brandon Mathis
3f07677276 Added prompt for overwriting posts and pages when a new_post and new_page tasks are run and the file already exists. Fixes #130 2011-09-03 08:06:36 -05:00
Brandon Mathis
724fd1dbc8 fixed bug where update_source Rake task was not copying over changes from .themes 2011-09-02 17:24:42 -05:00
Ryan Gibbons
aa095689e4 not using cd in copydot, breaks chained task when further cd's are called 2011-08-28 22:29:30 -05:00
Brandon Mathis
9b52d40a54 removed octopress.org rsync deploy config from Rakefile. Oops 2011-08-25 16:58:02 -04:00
Brandon Mathis
35a158dd14 Somehow I replaced Rakefile with oder version, oops 2011-08-25 10:52:43 -04:00
Brandon Mathis
b38b613908 Added warning if users try to add posts, pages, or generate their site
before installing an Octopress theme, fixes #116
2011-08-25 10:45:01 -04:00
Brandon Mathis
94fcb60958 removed unnecessary mkdir_p in update_style, fixed #67 2011-08-25 10:25:41 -04:00
Brandon Mathis
ebd5fb002b sleeps wait, cleaned up rake preview and rake watch a bit 2011-08-25 10:05:22 -04:00
Benjamin R Doerr
efb7522491 Do not rely on system specifc syntax for preview or watch. 2011-08-23 22:56:06 -04:00
Benjamin R Doerr
5f08abe6dd Removes system specific File IO from Rakefile, rather we make use of FileUtils. 2011-08-22 23:05:55 -04:00
Ben Doerr
9d57455e0f Makes update_source and update_style much more windows friendly. 2011-08-23 03:22:18 -03:00
Brandon Mathis
9f830dd96f added support for deploying "dot" files (eg. .htaccess), fixes #104 2011-08-21 18:38:18 -04:00
Pavel Pravosud
5ec1f014a0 added stringex gem for permalink url generation 2011-08-20 10:24:15 +07:00
Brandon Mathis
59521e3db8 added blog_index_dir configuration and improved update_source 2011-08-16 01:50:34 -04:00
Brandon Mathis
5958810eb2 Merge branch 'master' of github.com:imathis/octopress 2011-08-11 19:56:54 -04:00
Brandon Mathis
313c3859aa now using rack instead of Jekyll's webrick server, fixes #90 2011-08-11 19:56:25 -04:00
marutanm
a817f99785 fix rake-list 2011-08-11 21:13:30 +09:00
Brandon Mathis
0e072543da added support for preserving customized source/index.html during template updates. Moved the blog index code to a partial in source/_includes/blog_index.html 2011-08-10 18:15:10 -04:00
Brandon Mathis
5d24e0ba2b udpated rake udpate_source task to preserve custom includes instaed of preserving navigation and footer 2011-07-31 13:24:56 -04:00
Brandon Mathis
df86e647b1 Rake task update_source now preserves footer as well as navigation 2011-07-28 22:12:50 -04:00
Brandon Mathis
0911eabb9b fixed update style 2011-07-27 18:34:50 -04:00
Luke Armstrong
6244feae22 Fixed rake update_source and rake update_style 2011-07-28 00:22:57 +02:00