s3_website 2.1.13 → 2.1.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/build.sbt +2 -0
  3. data/changelog.md +4 -0
  4. data/lib/s3_website/version.rb +1 -1
  5. data/src/main/resources/log4j.properties +6 -0
  6. data/src/main/scala/s3/website/model/Config.scala +1 -0
  7. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7f58dc2a4c31a05615ccfabc88ab06787fe6d9c2
4
- data.tar.gz: 4848ab9653a8c796ee94fbd97ec59691d9b1e17b
3
+ metadata.gz: a1968031f85b0c1d45d317a9763484a9d535d42b
4
+ data.tar.gz: da89fe3f5d96568f7a110ca83bfd491bc2147aa1
5
5
  SHA512:
6
- metadata.gz: 33d258cac936218cd84292e0111dfa5edb4dcd792cf2a81693abcb446f161bb6bd33bb2a0cba3c6496df0d573307c1f0d34e735ce40d2c360483b58478ee75e5
7
- data.tar.gz: af4dce07242118c7d680c252a10877347bca41ddba90a595c2bb4fd22bd5b4e93bd36a0e079e3a168e1d7c1c61f566d748220b352daba7992487546e7421cf2b
6
+ metadata.gz: 605ea089be2257843179c8c9393a815ed28846d9d5e701d20d70d172ef84babf6d5f6c645437643b8cf25a69641c202da87e1e21cfb78800378b9250ab35819e
7
+ data.tar.gz: 5e871bdacbc86a19acfed9bc220fdddeee87c366a9d34ca1a00f1a94ab918c54f887e5208036c424ca156c32a94af5fd6b2a7ae61fbf17545c0da87e0413bd3e
data/build.sbt CHANGED
@@ -22,6 +22,8 @@ libraryDependencies += "org.jruby" % "jruby" % "1.7.11"
22
22
 
23
23
  libraryDependencies += "com.amazonaws" % "aws-java-sdk" % "1.7.7"
24
24
 
25
+ libraryDependencies += "log4j" % "log4j" % "1.2.17"
26
+
25
27
  libraryDependencies += "commons-codec" % "commons-codec" % "1.9"
26
28
 
27
29
  libraryDependencies += "commons-io" % "commons-io" % "2.4"
data/changelog.md CHANGED
@@ -2,6 +2,10 @@
2
2
 
3
3
  This project uses [Semantic Versioning](http://semver.org).
4
4
 
5
+ ## 2.1.14
6
+
7
+ * Fix https://github.com/laurilehmijoki/s3_website/issues/104
8
+
5
9
  ## 2.1.13
6
10
 
7
11
  * Print JVM stack trace on error and `--verbose`
data/lib/s3_website/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module S3Website
2
- VERSION = '2.1.13'
2
+ VERSION = '2.1.14'
3
3
  end
data/src/main/resources/log4j.properties ADDED
@@ -0,0 +1,6 @@
1
+ log4j.rootLogger=WARN, A1
2
+ log4j.appender.A1=org.apache.log4j.ConsoleAppender
3
+ log4j.appender.A1.layout=org.apache.log4j.PatternLayout
4
+ log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
5
+ # Or you can explicitly enable WARN and ERROR messages for the AWS Java clients
6
+ log4j.logger.com.amazonaws=WARN
data/src/main/scala/s3/website/model/Config.scala CHANGED
@@ -158,6 +158,7 @@ object Config {
158
158
  val erbStringWithoutComments = erbString.replaceAll("^\\s*#.*", "")
159
159
  rubyRuntime.evalScriptlet(
160
160
  s"""
161
+ |# encoding: utf-8
161
162
  |require 'erb'
162
163
  |
163
164
  |str = <<-ERBSTR
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: s3_website
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.13
4
+ version: 2.1.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lauri Lehmijoki
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-28 00:00:00.000000000 Z
11
+ date: 2014-06-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -127,6 +127,7 @@ files:
127
127
  - s3_website.gemspec
128
128
  - sbt
129
129
  - src/main/java/s3/website/ByteHelper.java
130
+ - src/main/resources/log4j.properties
130
131
  - src/main/scala/s3/website/CloudFront.scala
131
132
  - src/main/scala/s3/website/Diff.scala
132
133
  - src/main/scala/s3/website/Logger.scala