s3_website_monadic 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 544c3317c4db01041c932fdd6d3dc7a49879e019
-  data.tar.gz: a2671f82df2738ba303cf1c904bfe33235c7d1c7
+  metadata.gz: 0a588d29f02ef097314aa16ec55674fa6eccbe09
+  data.tar.gz: caf04222e53fdd2cacdadcc6897f9d59cfd7b850
 SHA512:
-  metadata.gz: bfad7b5247239f3a68f1e8ffb2dba18deccb5324553ce9eff9dd3f2095d4807954e798a2c575a96c3b680674557236abed540bb5d1ca2a8a9a5a8c5637383fb8
-  data.tar.gz: 1880cd8113663882568d7754f61b886040f9c35db400f1c12362ba0aa8a2d87fd40a415e095024577105bfc030a3957d886af8f03c9a05603e702e394232c176
+  metadata.gz: 61d6891706690b50a98966cd6860e0680ccd9e478f5a1ec2fc0c0c92a0af6e42777c546486d826177b85c73a3911eeabce9ec4b1a32f2b8a645778f99d7ad771
+  data.tar.gz: 0d49bbcd125387e1d9fcbd8346e784ff4f4957e30ecc0839fcb2714680a68c3a4bc9f7ddfacfc63238fd542d7dc013d63af61ed4a2d09d8d2cdb25cf17c273d3

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '0.0.34'
+  VERSION = '0.0.35'
 end

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

@@ -151,15 +151,20 @@ object Diff {
 
         val changesMissedByLocalDiff: Future[Either[ErrorReport, Seq[LocalFileFromDisk]]] = s3FilesFuture.map { errorOrS3Files =>
           for (s3Files <- errorOrS3Files.right) yield {
+            val remoteS3Keys = s3Files.map(_.s3Key).toSet
             val localS3Keys = unchangedAccordingToLocalDiff.map(_.s3Key).toSet
             val localMd5 = unchangedAccordingToLocalDiff.map(_.uploadFileMd5).toSet
-            val changedOnS3 = s3Files.filter { s3File =>
-              (localS3Keys contains s3File.s3Key) && !(localMd5 contains s3File.md5)
+            def isChangedOnS3(s3File: S3File) = (localS3Keys contains s3File.s3Key) && !(localMd5 contains s3File.md5)
+            val changedOnS3 = s3Files collect {
+              case s3File if isChangedOnS3(s3File) =>
+                LocalFileFromDisk(site resolveFile s3File, FileUpdate)
             }
-            logger.debug(s"Detected ${changedOnS3.length} object(s) that have changed on S3 but not on the local site")
-            changedOnS3 map { s3File =>
-              LocalFileFromDisk(site resolveFile s3File, FileUpdate)
+            val missingFromS3 = localS3Keys collect {
+              case localS3Key if !(remoteS3Keys contains localS3Key) =>
+                LocalFileFromDisk(site resolveFile localS3Key, NewFile)
+
             }
+            changedOnS3 ++ missingFromS3
           }
         }
 

data/src/test/scala/s3/website/S3WebsiteSpec.scala

@@ -27,6 +27,7 @@ import s3.website.Push.{push, CliArgs}
 import s3.website.CloudFront.CloudFrontSetting
 import s3.website.S3.S3Setting
 import org.apache.commons.codec.digest.DigestUtils
+import java.util.Date
 
 class S3WebsiteSpec extends Specification {
 
@@ -588,6 +589,15 @@ class S3WebsiteSpec extends Specification {
       push
       sentPutObjectRequests.length must equalTo(2)
     }
+
+    "push locally unchanged files that are missing from S3" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+      setLocalFileWithContentAndLastModified(("file.txt", "contents", new Date(1400000000000L)))
+      push
+      // Simulate the situation where someone else has deleted file.txt, and we push for the second time
+      setLocalFileWithContentAndLastModified(("file.txt", "contents", new Date(1400000000000L)))
+      push
+      sentPutObjectRequests.length must equalTo(2) // Even though we use the local db, we should notice that someone else has deleted file.txt
+    }
   }
 
   "Jekyll site" should {
@@ -785,11 +795,15 @@ class S3WebsiteSpec extends Specification {
   
   trait EmptySite extends Directories {
     type LocalFileWithContent = (String, String)
+    type LocalFileWithContentAndLastModified = (String, String, Date)
 
-    val localFilesWithContent: mutable.Set[LocalFileWithContent] = mutable.Set()
+    val localFilesWithContent: mutable.Set[LocalFileWithContentAndLastModified] = mutable.Set()
     def setLocalFile(fileName: String) = setLocalFileWithContent((fileName, ""))
     def setLocalFiles(fileNames: String*) = fileNames foreach setLocalFile
-    def setLocalFileWithContent(fileNameAndContent: LocalFileWithContent) = localFilesWithContent += fileNameAndContent
+    def setLocalFileWithContent(fileNameAndContent: LocalFileWithContent) =
+      setLocalFileWithContentAndLastModified((fileNameAndContent._1, fileNameAndContent._2, new Date))
+    def setLocalFileWithContentAndLastModified(fileNameAndContentAndLastModified: LocalFileWithContentAndLastModified) =
+      localFilesWithContent += fileNameAndContentAndLastModified
     def setLocalFilesWithContent(fileNamesAndContent: LocalFileWithContent*) = fileNamesAndContent foreach setLocalFileWithContent
     var config = ""
     val baseConfig =
@@ -802,15 +816,16 @@ class S3WebsiteSpec extends Specification {
     implicit def cliArgs: CliArgs = siteWithFilesAndContent(config, localFilesWithContent)
     def pushMode: PushMode // Represents the --dry-run switch
 
-    private def siteWithFilesAndContent(config: String = "", localFilesWithContent: mutable.Set[LocalFileWithContent]): CliArgs = {
+    private def siteWithFilesAndContent(config: String = "", localFilesWithContent: mutable.Set[LocalFileWithContentAndLastModified]): CliArgs = {
       localFilesWithContent.foreach {
-        case (filePath, content) =>
+        case (filePath, content, lastModified) =>
           val file = new File(siteDirectory, filePath)
           forceMkdir(file.getParentFile)
           file.createNewFile()
           write(file, content)
-          localFilesWithContent remove(filePath, content) // Remove the file from the set once we've persisted it on the disk.
+          file.setLastModified(lastModified.getTime)
       }
+      localFilesWithContent.clear() // Once we've persisted the changes on the disk, clear the queue. I.e., keep the state where it should be – on the disk.
       buildCliArgs(config)
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor