Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
This comparison is big! We’re only showing the most recent 250 commits
Commits on May 22, 2014
@laurilehmijoki Clarify 2434208
@laurilehmijoki Shorten d9203b1
@laurilehmijoki Unify 166997c
Commits on May 25, 2014
@dteoh dteoh Add documentation about dotenv support 4403d21
Commits on May 26, 2014
@laurilehmijoki Sync changes with S3 bucket f968056
@laurilehmijoki Pump up version 5ef7e0a
@laurilehmijoki Merge branch 'dteoh-dotenv-support' 16d1f5b
@laurilehmijoki Add Douglas Teoh to the list of contributors 64e4c4e
@laurilehmijoki Pump up version 78c1f24
@laurilehmijoki Merge remote-tracking branch 'origin/master' into s3_website_monadic
Conflicts:
	changelog.md
	s3_website.gemspec
c0f1fe2
@laurilehmijoki Do not push the .env file 9fd83c3
Commits on May 27, 2014
@laurilehmijoki Merge remote-tracking branch 'origin/master' into s3_website_monadic
Conflicts:
	changelog.md
	lib/s3_website/upload.rb
	s3_website.gemspec
	spec/lib/upload_spec.rb
8ab6f34
@laurilehmijoki Remove feature gzip_zopfli 2482111
@laurilehmijoki Retry if request times out 45a8b68
@laurilehmijoki Add vagrant for testing 82a9e33
@laurilehmijoki TMPDIR env is not defined on ubuntu f77f3df
@laurilehmijoki Pump up test version a8b1f24
@laurilehmijoki Die if release key missing dd172f3
@laurilehmijoki Run sbt clean before assembly d60e7e5
Commits on May 28, 2014
@laurilehmijoki On 2nd run, push files that are missing from S3 d8d3f7a
@laurilehmijoki Pump up test version ed0e381
@laurilehmijoki Clarify tests 09a6ec1
@laurilehmijoki Add Ruby 1.8 compatibility bce2d1c
@laurilehmijoki Auto-install Java if apt-get or yum found 6ec9d15
@laurilehmijoki Add migration guide 75c9cd6
@laurilehmijoki Add tip on using from within Ruby code f1629e6
@laurilehmijoki Clarify "faster uploads" afa146a
@laurilehmijoki Tune changelog fd069b7
@laurilehmijoki Tune readme b3044a1
@laurilehmijoki Move down the security note e2aa587
@laurilehmijoki Tune development.md efecf84
@laurilehmijoki Tune readme 6d29559
Commits on May 29, 2014
@laurilehmijoki Add IAM Roles support 8db64c5
@laurilehmijoki Pump up test version 477cdc1
@laurilehmijoki Upgrade to Scala 2.11.1 7f3f5c6
@laurilehmijoki Remove test code 785f22a
@laurilehmijoki Add zopfli note 948c287
@laurilehmijoki Pump up test version c0f36b8
@laurilehmijoki Tune zopfli note 9503a6d
@laurilehmijoki Shorten with collect 56c6861
@laurilehmijoki Improve readability 2dd83ed
@laurilehmijoki Remove joda library ebaa285
@laurilehmijoki Rename 8957976
@laurilehmijoki Shorten ebca627
@laurilehmijoki Consistent naming 3611861
@laurilehmijoki Remove unused field 73c4325
@laurilehmijoki Document unsafe IO with Try 645b6ee
@laurilehmijoki Reduce visibility of localFile 0fa5e6a
Commits on Jun 02, 2014
@laurilehmijoki Write test files straight to disk f852ac6
@laurilehmijoki Add 1.x note 3bfb847
@laurilehmijoki Rename to LocalFile ac19efa
Commits on Jun 03, 2014
@laurilehmijoki Pump up test version 0e465c9
@laurilehmijoki Add links to java and ruby b706ab7
@laurilehmijoki Rename s3_website_monadic –> s3_website dd8f0a6
@laurilehmijoki Merge branch 's3_website_monadic' 17d4d0b
@laurilehmijoki Bump up version b23db49
@laurilehmijoki Fix gem name 204d55e
@laurilehmijoki Rename executable to s3_website c393db8
@laurilehmijoki Bump up version aa53e54
@laurilehmijoki Add changelog entry on 2.0.1 6633368
@laurilehmijoki Remove obsolete project goal ccbb4e5
@laurilehmijoki Add link to 1.x branch 81b14c6
@laurilehmijoki v1 is in maintenance mode 0ada59a
@laurilehmijoki Use relative links in README 7549d1e
Commits on Jun 06, 2014
@laurilehmijoki Rename LocalFile to Upload 2f8ce55
@laurilehmijoki Show the upload reason in verbose mode 396c9da
@laurilehmijoki Verify s3_website.jar checksum 204072e
@laurilehmijoki Fix Ruby syntax dfe75d9
@laurilehmijoki Show a more informative corruption message c62b0f9
@laurilehmijoki Improve the jar corrupted message 058e97c
Commits on Jun 08, 2014
@laurilehmijoki Fix boolean logic in reason-for-upload 794cb8f
@laurilehmijoki Shorten reason-for-upload strings 9f0b4d4
@laurilehmijoki Explain need for Java 1a6525c
@laurilehmijoki Fix upload reason msg b40226b
@laurilehmijoki Bump up version f7e0571
@laurilehmijoki Specify local db contents after delete e5c04e8
Commits on Jun 09, 2014
@laurilehmijoki Target JVM 1.6 47375c1
@laurilehmijoki The redirects need the slash prefix
Fix issue #99

Thanks to https://github.com/ivoanjo for pointing out this problem.
067bae0
@laurilehmijoki Automatically add slash to redirects if needed 55cd169
@laurilehmijoki Remove local database b71d3f4
Commits on Jun 12, 2014
@laurilehmijoki Remove dead code e33f895
@laurilehmijoki Ease development ec176ce
Commits on Jun 13, 2014
@laurilehmijoki Remove space (removes Ruby 1.8 warning) 223782f
@laurilehmijoki Bump up version 71c23fd
Commits on Jun 25, 2014
@justinlatimer justinlatimer Update --config-dir argument in docs
This has changed in v2 from --config_dir to --config-dir, update README to reflect the changes.
d5f7d92
@laurilehmijoki Add Justin Latimer to the list of contributors 671ea5f
@laurilehmijoki Fix --config-dir in bin/s3_website e6d6df8
@laurilehmijoki Document backward incompatible change a2aa06a
@laurilehmijoki Bump up version a706f62
Commits on Jun 27, 2014
@laurilehmijoki Fix unexpected Thor exit status 60b3cf8
Commits on Jun 28, 2014
@laurilehmijoki Print stack trace on --verbose and failure 5f7827b
Commits on Jun 29, 2014
@laurilehmijoki Set AWS SDK log level to WARN 7ddada7
Commits on Jun 30, 2014
@laurilehmijoki Specify AWS SDK log level 6274b08
@laurilehmijoki Support non-US-ASCII dirs when using max_age 898967d
@laurilehmijoki Rephrase 2.1.14 changelog entry deda470
Commits on Jul 06, 2014
@laurilehmijoki Support non-US-ASCII files when using `ignore_on_server` 208497b
Commits on Jul 08, 2014
@laurilehmijoki Remove dead code 1bd3feb
Commits on Jul 30, 2014
@laurilehmijoki Convert ByteHelper.java to ByteHelper.scala ea0b9f9
Commits on Jul 31, 2014
@laurilehmijoki Define site location in s3_website.yml 58bcba0
@laurilehmijoki Fix Nanoc auto detection 9871ae8
@laurilehmijoki Upgrade to Scala 2.11.2 ea7bae6
Commits on Aug 08, 2014
@laurilehmijoki Support --headless when running cfg apply 7ca4512
@laurilehmijoki Improve release doc 55d32ec
Commits on Aug 14, 2014
@grobmeier grobmeier minor typo e297904
Commits on Aug 15, 2014
@laurilehmijoki Merge pull request #110 from grobmeier/patch-1
minor typo
2615b73
@laurilehmijoki Add Christian Grobmeier to contributors 83aa838
Commits on Aug 17, 2014
@maxberger maxberger Support windows by replacing File.separator with / 1073a74
Commits on Aug 18, 2014
@laurilehmijoki Pump up version 032d3ee
@laurilehmijoki Add maxberger to contributors 84309de
Commits on Oct 14, 2014
@laurilehmijoki Add option for never deleting anything on bucket c64c749
Commits on Oct 15, 2014
@laurilehmijoki Run against JDK 6, 7 and 8 on Travis 04db4bd
@laurilehmijoki Run against Scala 2.11.2 on Travis
Use the same Scala version that we declare on build.sbt
cd96bba
@laurilehmijoki Reduce noice with import Files.listSiteFiles 7b995e3
@laurilehmijoki Rename PushMode –> PushOptions c2d5e2c
@laurilehmijoki Add push --force option 76b1491
@laurilehmijoki Rename Diff.scala –> UploadHelper.scala 6f97cae
@laurilehmijoki Add DryRun test trait 524494d
@laurilehmijoki Pump up version e74d5ec
@laurilehmijoki Print Would have updated|redirected|created dd41b87
Commits on Oct 20, 2014
@rodrigoreis22 rodrigoreis22 Update example-configurations.md
Tip to add multiple CNAMEs
e3e8543
@laurilehmijoki Merge pull request #123 from rodrigoreis22/patch-1
Update example-configurations.md
572c9d8
@laurilehmijoki Add Rodrigo Reis to contributors bc0360d
Commits on Oct 22, 2014
@Ross-Hunter Ross-Hunter Adds config-dir as option to `cfg apply` 791c7dc
Commits on Nov 02, 2014
@laurilehmijoki Add Ross Hunter to contributors 076775c
@laurilehmijoki Release 2.6.0 c5d13cf
Commits on Nov 05, 2014
@tombell tombell Invalidate the root /index.html when invalidating
When using the cloudfront_invalidate_root config option, it will correctly
invalidate all default root objects from /index.html to /, however this causes
an issue on the root /index.html for the website, as some browsers redirect
http://example.org/ to http://example.org which will request the /index.html and
as this hasn't been invalidated will serve the cached index.html.

This change just adds /index.html to the paths to be invalidated if the config
option is set to true

This helps somewhat with the issue #106
29d54eb
@laurilehmijoki Add spec for invalidating the root index html
See #130 for discussion
fffcb10
@laurilehmijoki Shorten: Option.exists -> Option.contains da3730c
@laurilehmijoki Release 2.6.1 e5fa2a7
@laurilehmijoki Add Tom Bell to contributors 3cd91d4
Commits on Nov 21, 2014
@laurilehmijoki Remove redundant comment 2167029
Commits on Nov 23, 2014
@laurilehmijoki Add test helper setS3File 335397f
@laurilehmijoki Add option treat_zero_length_objects_as_redirects 7dadfd9
@laurilehmijoki Release 2.7.0 422008e
@laurilehmijoki Link to v 2.7.0 discussion 535bca2
@laurilehmijoki Mark settings as Markdown YAML ad4688a
@laurilehmijoki Mark cloudfront_distribution_id as Markdown YAML dadca68
@laurilehmijoki Clarify treat_zero_length_objects_as_redirects doc 2092057
@laurilehmijoki Clarify treat_zero_length_objects_as_redirects doc a7281fc
@laurilehmijoki Futher clarify README 4af85b3
Commits on Nov 25, 2014
@MrJoy MrJoy Whitespace. d76f780
@MrJoy MrJoy Specify multiple tasks to reduce needless Java startup overhead. f4cc542
@MrJoy MrJoy Update dotenv dependency, and allow thor dependency to float a bit more. a5925a0
Commits on Nov 27, 2014
@laurilehmijoki Add Jon Frisby to contributors 1dec5c3
@laurilehmijoki Release 2.7.1 d3b4c88
Commits on Dec 03, 2014
@almirsarajcic almirsarajcic Fix #105 26ab5ee
Commits on Dec 04, 2014
@laurilehmijoki Merge pull request #137 from almirsarajcic/master
Fix #105
b4e557c
@laurilehmijoki Add Almir Sarajčić to contributors 782ffe8
@laurilehmijoki Release 2.7.2 32991d2
Commits on Jan 05, 2015
@laurilehmijoki Unpack tuple b49639f
@laurilehmijoki Fix typo in test e3efbf1
@laurilehmijoki Support valid URI chars in max_age glob 06ddfc4
@laurilehmijoki Release 2.7.3 312fce8
Commits on Jan 21, 2015
@laurilehmijoki Add support for testing log messages 16c4975
@laurilehmijoki Show a helpful error msg if site dir does not exist d4766da
@laurilehmijoki Remove Try as unnecessary b1ae12e
@laurilehmijoki Release 2.7.4 d4549fd
@laurilehmijoki Rephrase test 37ed0c9
@laurilehmijoki Format code f3419b8
@laurilehmijoki Derive verbose output value b6cf9fc
@laurilehmijoki Remove superfluous dot from error message dea0c8b
@laurilehmijoki Release 2.7.5 3b582b2
Commits on Feb 03, 2015
@laurilehmijoki Remove needless for comprehension 302bc66
@laurilehmijoki Remove noisy type annotations 20234eb
@laurilehmijoki Inline value 568152e
@laurilehmijoki Remove type annotation 2399dbf
@laurilehmijoki Format code 799d5f1
@laurilehmijoki Remove type annotations 56cfb63
@laurilehmijoki Format code 2ede0db
@laurilehmijoki Rename function f688d38
@laurilehmijoki Null-check the result of File.listFiles 25fb7ce
@laurilehmijoki Release 2.7.6 fd49f1b
Commits on Feb 07, 2015
@laurilehmijoki Remove obsolete imports 84757a7
Commits on Feb 15, 2015
@ianhattendorf ianhattendorf Gzip .ico by default, closes #147 b76294b
Commits on Feb 16, 2015
@laurilehmijoki Release 2.8.0 5c1297b
@laurilehmijoki Add Ian Hattendorf to the list of contributors 94a9109
@laurilehmijoki Specify automatically gzipped file extensions 2166833
Commits on Feb 19, 2015
@laurilehmijoki Change CloudFront OriginProtocolPolicy to http-only d847619
Commits on Feb 22, 2015
@laurilehmijoki Invalidate CF items only when pushes occurred de511ad
@laurilehmijoki Re-release because of failed upload f50e119
@laurilehmijoki Release 2.8.3 5c95a83
@laurilehmijoki Fix typo in comment db46f01
@laurilehmijoki Simplify 7c47de6
@laurilehmijoki Refactor 26f2fd2
@laurilehmijoki Simplify 7904b5d
@laurilehmijoki Remove obsolete comment e24d8c3
Commits on Mar 01, 2015
@laurilehmijoki Accept ' in exclude_from_upload and ignore_on_server 2f75720
@laurilehmijoki Split #toInvalidationPath into smaller pieces b884f28
@laurilehmijoki URL encude ' in invalidation path b301c03
@laurilehmijoki Release 2.8.4 37c3845
Commits on Mar 08, 2015
@atbaker atbaker Adding mention of --headless option to README a6c49e5
Commits on Mar 09, 2015
@laurilehmijoki Merge pull request #154 from atbaker/add-headless-option-to-readme
Adding mention of --headless option to README
c0412db
@laurilehmijoki Add Andrew T. Baker to contributors 2e53637
Commits on Apr 10, 2015
@laurilehmijoki URL encode (ä|ö|ü) in invalidation path 009dbf8
@laurilehmijoki Fix typo f07b0dc
@laurilehmijoki Detect change even if contents of two files are same f905047
Commits on May 30, 2015
@laurilehmijoki Mention unsupported eu-central-1 region in README 7fe6cfb
Commits on Jun 03, 2015
@laurilehmijoki Add Logger.warn 6dc2f08
@laurilehmijoki Cache control can be undefined 38e4bd4
@laurilehmijoki Add cache_control setting 213b7c6
@laurilehmijoki Bump up version 9004469
Commits on Jun 04, 2015
@laurilehmijoki Allow glob-match based cache_control 6acfdc1
@laurilehmijoki Bump up version 282767b
@laurilehmijoki Most specific cache_control glob must win edde63d
@laurilehmijoki Most specific max_age glob must win f139f5e
Commits on Jun 08, 2015
@swgn swgn Adds additional static website options
Adds options to set index and error documents for AWS Static Website
Hosting
ae97858
@laurilehmijoki Merge pull request #166 from swgn/add-static-website-options
Document options for defining the index and error files
fc87540
Commits on Jul 03, 2015
@code-tree code-tree Added missing documentation for --autocreate-cloudfront-dist option f888e04
@laurilehmijoki Merge pull request #171 from code-tree/master
Added missing documentation for --autocreate-cloudfront-dist option
1543023
Commits on Jul 27, 2015
@laurilehmijoki Remove dead code f76682e
@laurilehmijoki Upgrade to scala 2.11.7 2d4f75f
@laurilehmijoki Convert S3Key into case class (for type safety) 09d8d48
@laurilehmijoki Add type safe S3KeyGlob 4ddc7ed
@laurilehmijoki Benefit from S3KeyGlob in max_age e391f9d
@laurilehmijoki Add S3KeyRegex (a refactoring) dad3a83
@laurilehmijoki Refactor max_age test 075c1f6
@laurilehmijoki Fix formatting in README.md 220c849
@laurilehmijoki Add s3_key_prefix 4dbcc0e
@laurilehmijoki Bump up version to 2.11.0 643d9e1
Commits on Sep 18, 2015
@laurilehmijoki Support Nanoc on Windows cf86479
@laurilehmijoki Add recursion limit to file listing b3d0d37
@laurilehmijoki Prevent runaway recursion in file listing 62082e1
@laurilehmijoki Bump up version to 2.11.1 bfd26af
@pjkelly pjkelly Added support for Middleman sites. 51ff535
@pjkelly pjkelly Removed reference to md5. 975ac1d
@laurilehmijoki A new fix for issue #181 8398a92
Commits on Sep 21, 2015
@laurilehmijoki Merge pull request #182 from pjkelly/middleman-support
Middleman support
57b9a63
@laurilehmijoki Add PJ Kelly to the list of contributors cb87d97
@laurilehmijoki Bump up version to 2.12.0 68b40cf
@laurilehmijoki Revert "Removed reference to md5."
This reverts commit 975ac1d.
eff1646
@laurilehmijoki Bump up version to 2.12.1 a17868b
Commits on Oct 02, 2015
@msonsona msonsona closes #185: adding version block
As per http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies_grammar.html#policies-grammar-bnf, a version block seems needed to validate the policy document
cabfc8e
Commits on Oct 03, 2015
@laurilehmijoki Merge pull request #188 from msonsona/master
closes #185: adding version block
ba9a753
Commits on Oct 16, 2015
@akshaykarle akshaykarle utf-8 encode all non-ascii characters while generating invalidation p…
…aths
4d96c9b
@laurilehmijoki Merge pull request #190 from akshaykarle/master
utf-8 encode all non-ascii characters while generating invalidation paths
2fd9f79
@laurilehmijoki Add Akshay Karle to the list of contributors cbb7712
@laurilehmijoki Bump up version 682bcfb
Commits on Oct 28, 2015
@csillag csillag Describe website updating
... based on the information provided by @laurilehmijoki.

Closes #193.
2d99d02
@laurilehmijoki Merge pull request #194 from csillag/master
Describe website updating
ff0519b
Commits on Feb 03, 2016
@laurilehmijoki Fix Cache-Control header format 294e0e7
@laurilehmijoki Bump up version to 2.12.3 859e1ca
Commits on Feb 24, 2016
@xtuc xtuc Direct links to additional-doc examples 3d8659c
@laurilehmijoki Merge pull request #213 from xtuc/master
Direct links to additional-doc examples
100e219
Commits on Mar 29, 2016
@laurilehmijoki Add debugging doc fe6c03f
Commits on Apr 03, 2016
@FreedomBen FreedomBen Add dnf support for auto install java 3e4cf1b
Commits on Apr 04, 2016
@laurilehmijoki Merge pull request #216 from FreedomBen/FreedomBen-dnf-support
Add dnf support for auto install java
e5799bd
@laurilehmijoki Release 2.13.0 323fa85
@laurilehmijoki Test only on Oracle JDK 8 169d9d8
Commits on Apr 11, 2016
@dalmat36 dalmat36 Update setting-up-aws-credentials.md
changed the AWS policy version to 2012. The 2008 version would not would not validate for me.
8909a66
Commits on Apr 25, 2016
@laurilehmijoki Mention alternatives 66bc08d