s3_website 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa302f564f10bd6a80e4546d57391ca24b6fd62c
-  data.tar.gz: 5d635271f8d56b12bc0deeadb851630e2d59ba68
+  metadata.gz: 4acd7c3971ddeb0a2a7f45fd36d95b4e3a5dc975
+  data.tar.gz: 3f99adc5acc4969a62757e8625f1eadae54a7943
 SHA512:
-  metadata.gz: dc4b64789f6cc979a590a691be7db4bacad61b63b81fd2cc0a94898c19f560c33ed46179ca560bbf2b0b14f1352eb45e8e834792c238f6dd183cde3221eaa200
-  data.tar.gz: 39354284635e44a32fb0b42146c89a6f11d0fa8b85697331c6b677fbd6de94389ebede9cb4191fbf5447c2e538d8cecef136f04e41a08275b3488b4a6b2c2eb2
+  metadata.gz: 5bcacaea0b63ba38e67152798e80be5f3c9330f618dcd805067b4540110a308e7e844037b79d5a4266d24adb305cac4e2b071931bb288f171491489e4ff00ab5
+  data.tar.gz: 463d4bf65e459674878a7de91a04e8e3f4b092add4c725d1901caadeaa1ae278ed18a7cad4bcb5ccbc1a78501c0eb5b0a6b0a9edaf7115cf1f19ad9ee95c82f0

data/bin/s3_website

@@ -164,7 +164,7 @@ def resolve_jar(project_root, logger)
     if expected_checksum == found_checksum
       true
     else
-      logger.info_msg "The jar is corrupted. (Expected checksum #{expected_checksum} but got #{found_checksum}.)"
+      logger.info_msg "The jar file is corrupted. (Expected checksum #{expected_checksum} but got #{found_checksum}.)"
       false
     end
   end

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 2.1.3
+
+* Fix boolean logic in reason-for-upload
+
 ## 2.1.2
 
 * Show a more informative message if the jar file is corrupted.

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

data/src/main/scala/s3/website/Diff.scala

@@ -213,16 +213,16 @@ object Diff {
       if (isUpdate) {
         val lengthChanged = !(databaseIndices.fileLenghtIndex contains truncatedKey.fileLength)
         val mtimeChanged = !(databaseIndices.lastModifiedIndex contains truncatedKey.fileModified)
-        if (lengthChanged)
-          "file length has changed according to the local database"
+        if (mtimeChanged && lengthChanged)
+          "file mtime and length have changed"
+        else if (lengthChanged)
+          "file length has changed"
         else if (mtimeChanged)
-          "file mtime has changed according to the local database"
-        else if (mtimeChanged && lengthChanged)
-          "file mtime and length have changed according to the local database"
+          "file mtime has changed"
         else
           "programmer error: faulty logic in inferring the reason for upload"
       }
-      else "file is new according to the local database"
+      else "file is new according"
     }
 
     private def getOrCreateDbFile(implicit site: Site, logger: Logger) =

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor