s3_website_monadic 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e67a3b50d099328d1163b4ab28bb19ab5ea70bb2
-  data.tar.gz: 87cb81ba31dcc20734987b90d194ea95a5d7d84a
+  metadata.gz: a489b6afb931e8384aa6d656acd8bf23a0c366be
+  data.tar.gz: 12234bf6f3689a83ad37a61c7029ce80900e2a67
 SHA512:
-  metadata.gz: dde895e0d896fca1d47dfa8bb5b2ed599f698c037ef4c3cb870cbe4cfe86603964b0eb87fed90e2d45f1253b79a59600f995653fcbe31470a95e955a5544d074
-  data.tar.gz: 479a0f6a3c586f26833a0fc2076bddbcc94618b2b40de911422337e874a3fa4c2018be98662e19571dfa81fab508776e9333f888b455a9eac66962d42218fbc4
+  metadata.gz: bbc33e009ccbe805fe72697433d59fd4c82691cc9edd3e95d4e8277fceb159715f8b0d4566fa2c1e85d092c20cab2eb37178e0cfde0db1fc2103682f90653a67
+  data.tar.gz: 6c8b915eab3220b1a7148d0912c267dfe7b05ac653367b033e83c9c6144d027d22d18ae2ec820314415b46433b0ec5335616a8f2cda730c46bab28577dbc8528

data/bin/s3_website_monadic

@@ -44,13 +44,11 @@ class Cli < Thor
   option(
     :site,
     :type => :string,
-    :default => 'infer automatically',
-    :desc => "The directory where your website files are. When not defined, s3_website will look for the site in #{S3Website::Paths.site_paths.join(' or ')}."
+    :desc => "The directory where your website files are. When not defined, s3_website will look for the site in either _site or public/output."
   )
   option(
     :config_dir,
     :type => :string,
-    :default => Dir.pwd,
     :desc => "The directory where your config file is. When not defined, s3_website will look in the current working directory."
   )
   option(
@@ -74,11 +72,10 @@ class Cli < Thor
     call_dir = Dir.pwd
     project_root = File.expand_path(File.dirname(__FILE__)+ '/..')
     logger = Logger.new(options[:verbose])
-    Dir.chdir(project_root) {
-      jar_file = resolve_jar project_root, logger
-      # Then run it
-      run_s3_website_jar(jar_file, call_dir, logger)
-    }
+    # Find the jar
+    jar_file = resolve_jar project_root, logger
+    # Then run it
+    run_s3_website_jar(jar_file, call_dir, logger)
   end
 
   desc 'cfg SUBCOMMAND ...ARGS', 'Operate on the config file'
@@ -86,15 +83,7 @@ class Cli < Thor
 end
 
 def run_s3_website_jar(jar_file, call_dir, logger)
-  site_path = File.expand_path(S3Website::Paths.infer_site_path options[:site], call_dir)
-  config_dir = File.expand_path options[:config_dir]
-
-  args = [
-    "--site=#{site_path}",
-    "--config-dir=#{config_dir}",
-    "#{'--verbose' if options[:verbose]}",
-    "#{'--dry-run' if options[:dry_run]}"
-  ].join ' '
+  args = ARGV.join(' ').sub('push', '')
   logger.debug_msg "Using #{jar_file}"
   if system("java -cp #{jar_file} s3.website.Push #{args}")
     exit 0
@@ -121,7 +110,9 @@ def resolve_jar(project_root, logger)
     else
       is_development = File.exists?(project_root + '/.git')
       if is_development
-        system "./sbt assembly"
+        Dir.chdir(project_root) {
+          system "./sbt assembly"
+        }
         development_jar_path
       else
         download_jar(released_jar_lookup_paths, logger)

data/changelog.md

@@ -4,8 +4,11 @@ This project uses [Semantic Versioning](http://semver.org).
 
 ## 2.0.0
 
-This release contains backward breaking changes. Please read the section below
-for more info.
+### New features
+
+* Simulate deployments with `push --dry-run`
+
+* Support CloudFront invalidations when the site contains over 3000 files
 
 ### Java is now required
 

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '0.0.29'
+  VERSION = '0.0.30'
 end

data/lib/s3_website.rb

@@ -2,6 +2,3 @@ require 'rubygems'
 require 'thor'
 
 require File.dirname(__FILE__) + "/s3_website/version"
-require File.dirname(__FILE__) + "/s3_website/paths"
-require File.dirname(__FILE__) + "/s3_website/jekyll"
-require File.dirname(__FILE__) + "/s3_website/nanoc"

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

@@ -25,6 +25,8 @@ import s3.website.CloudFront.CloudFrontSetting
 import s3.website.S3.SuccessfulUpload
 import s3.website.CloudFront.FailedInvalidation
 import scala.Int
+import java.io.File
+import com.lexicalscope.jewel.cli.CliFactory.parseArguments
 
 object Push {
 
@@ -185,35 +187,44 @@ object Push {
   trait CliArgs {
     import com.lexicalscope.jewel.cli.Option
 
-    @Option def site: String
-    @Option(longName = Array("config-dir")) def configDir: String
+    @Option(defaultToNull = true) def site: String
+    @Option(longName = Array("config-dir"), defaultToNull = true) def configDir: String
     @Option def verbose: Boolean
     @Option(longName = Array("dry-run")) def dryRun: Boolean
   }
 
   def main(args: Array[String]) {
-    val cliArgs = CliFactory.parseArguments(classOf[CliArgs], args:_*)
+    implicit val cliArgs = parseArguments(classOf[CliArgs], args:_*)
     implicit val s3Settings = S3Setting()
     implicit val cloudFrontSettings = CloudFrontSetting()
+    implicit val workingDirectory = new File(System.getProperty("user.dir")).getAbsoluteFile
+    System exit push
+  }
+
+  def push(implicit cliArgs: CliArgs, s3Settings: S3Setting, cloudFrontSettings: CloudFrontSetting, workingDirectory: File): ExitCode = {
     implicit val logger: Logger = new Logger(cliArgs.verbose)
     implicit val pushMode = new PushMode {
       def dryRun = cliArgs.dryRun
     }
-    val errorOrPushStatus = push(siteInDirectory = cliArgs.site, withConfigDirectory = cliArgs.configDir)
-    errorOrPushStatus.left foreach (err => logger.fail(s"Could not load the site: ${err.reportMessage}"))
-    System exit errorOrPushStatus.fold(_ => 1, pushStatus => pushStatus)
-  }
 
-  def push(siteInDirectory: String, withConfigDirectory: String)
-          (implicit s3Settings: S3Setting, cloudFrontSettings: CloudFrontSetting, logger: Logger, pushMode: PushMode) =
-    loadSite(withConfigDirectory + "/s3_website.yml", siteInDirectory)
-      .right
-      .map {
-      implicit site =>
-        val threadPool = newFixedThreadPool(site.config.concurrency_level)
-        implicit val executor = fromExecutor(threadPool)
-        val pushStatus = pushSite
-        threadPool.shutdownNow()
-        pushStatus
+    val errorOrSiteDir: ErrorOrFile =
+      Option(cliArgs.site).fold(Ssg.findSiteDirectory(workingDirectory))(siteDirFromCli => Right(new File(siteDirFromCli)))
+    def errorOrSite(siteInDirectory: File): Either[ErrorReport, Site] =
+      loadSite(Option(cliArgs.configDir).getOrElse(workingDirectory.getPath) + "/s3_website.yml", siteInDirectory.getAbsolutePath)
+
+    val errorOrPushStatus = for {
+      siteInDirectory <- errorOrSiteDir.right
+      loadedSite <- errorOrSite(siteInDirectory).right
+    } yield {
+      implicit val site = loadedSite
+      val threadPool = newFixedThreadPool(site.config.concurrency_level)
+      implicit val executor = fromExecutor(threadPool)
+      val pushStatus = pushSite
+      threadPool.shutdownNow()
+      pushStatus
     }
+
+    errorOrPushStatus.left foreach (err => logger.fail(s"Could not load the site: ${err.reportMessage}"))
+    errorOrPushStatus fold((err: ErrorReport) => 1, pushStatus => pushStatus)
+  }
 }

data/src/main/scala/s3/website/model/ssg.scala

@@ -0,0 +1,33 @@
+package s3.website.model
+
+import java.io.File
+import s3.website.{ErrorOrFile, ErrorReport}
+
+// ssg = static site generator
+trait Ssg {
+  def outputDirectory: String
+}
+
+object Ssg {
+  val automaticallySupportedSiteGenerators = Jekyll :: Nanoc :: Nil
+
+  val notFoundErrorReport =
+    new ErrorReport {
+      def reportMessage =
+        """|Could not find a website in any of the pre-defined directories.
+           |Specify the website location with the --site=path argument and try again.""".stripMargin
+    }
+
+  def findSiteDirectory(workingDirectory: File): ErrorOrFile =
+    LocalFile.recursiveListFiles(workingDirectory).find { file =>
+      file.isDirectory && automaticallySupportedSiteGenerators.exists(_.outputDirectory == file.getName)
+    }.fold(Left(notFoundErrorReport): ErrorOrFile)(Right(_))
+}
+
+case object Jekyll extends Ssg {
+  def outputDirectory = "_site"
+}
+
+case object Nanoc extends Ssg {
+  def outputDirectory = "public/output"
+}

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

@@ -6,6 +6,7 @@ import s3.website.Utils._
 import s3.website.S3.{PushSuccessReport, PushFailureReport}
 import com.amazonaws.AmazonServiceException
 import s3.website.model.{Config, Site}
+import java.io.File
 
 package object website {
   trait Report {
@@ -94,4 +95,6 @@ package object website {
   }
 
   implicit def site2Config(implicit site: Site): Config = site.config
+
+  type ErrorOrFile = Either[ErrorReport, File]
 }

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

@@ -1,6 +1,6 @@
 package s3.website
 
-import org.specs2.mutable.{After, Specification}
+import org.specs2.mutable.{BeforeAfter, After, Specification}
 import s3.website.model._
 import org.specs2.specification.Scope
 import org.apache.commons.io.FileUtils
@@ -10,7 +10,6 @@ import org.mockito.{Mockito, Matchers, ArgumentCaptor}
 import org.mockito.Mockito._
 import com.amazonaws.services.s3.AmazonS3
 import com.amazonaws.services.s3.model._
-import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.duration._
 import s3.website.S3.S3Setting
 import scala.collection.JavaConversions._
@@ -22,25 +21,26 @@ import com.amazonaws.services.cloudfront.model.{CreateInvalidationResult, Create
 import org.mockito.stubbing.Answer
 import org.mockito.invocation.InvocationOnMock
 import java.util.concurrent.atomic.AtomicInteger
-import org.apache.commons.io.FileUtils.write
+import org.apache.commons.io.FileUtils.{forceDelete, forceMkdir, write}
 import scala.collection.mutable
+import s3.website.Push.CliArgs
 
 class S3WebsiteSpec extends Specification {
 
   "gzip: true" should {
-    "update a gzipped S3 object if the contents has changed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "update a gzipped S3 object if the contents has changed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "gzip: true"
       setLocalFileWithContent(("styles.css", "<h1>hi again</h1>"))
       setS3Files(S3File("styles.css", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getKey must equalTo("styles.css")
     }
 
-    "not update a gzipped S3 object if the contents has not changed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "not update a gzipped S3 object if the contents has not changed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "gzip: true"
       setLocalFileWithContent(("styles.css", "<h1>hi</h1>"))
       setS3Files(S3File("styles.css", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
-      Push.pushSite
+      Push.push
       noUploadsOccurred must beTrue
     }
   }
@@ -49,159 +49,159 @@ class S3WebsiteSpec extends Specification {
     gzip:
       - .xml
   """ should {
-    "update a gzipped S3 object if the contents has changed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "update a gzipped S3 object if the contents has changed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |gzip:
         |  - .xml
       """.stripMargin
       setLocalFileWithContent(("file.xml", "<h1>hi again</h1>"))
       setS3Files(S3File("file.xml", "1c5117e5839ad8fc00ce3c41296255a1" /* md5 of the gzip of the file contents */))
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getKey must equalTo("file.xml")
     }
   }
 
   "push" should {
-    "not upload a file if it has not changed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "not upload a file if it has not changed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFileWithContent(("index.html", "<div>hello</div>"))
       setS3Files(S3File("index.html", md5Hex("<div>hello</div>")))
-      Push.pushSite
+      Push.push
       noUploadsOccurred must beTrue
     }
 
-    "update a file if it has changed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "update a file if it has changed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFileWithContent(("index.html", "<h1>old text</h1>"))
       setS3Files(S3File("index.html", md5Hex("<h1>new text</h1>")))
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getKey must equalTo("index.html")
     }
 
-    "create a file if does not exist on S3" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "create a file if does not exist on S3" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getKey must equalTo("index.html")
     }
 
-    "delete files that are on S3 but not on local file system" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "delete files that are on S3 but not on local file system" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
-      Push.pushSite
+      Push.push
       sentDelete must equalTo("old.html")
     }
 
-    "try again if the upload fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "try again if the upload fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 5)
-      Push.pushSite
+      Push.push
       verify(amazonS3Client, times(6)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
-    "not try again if the upload fails on because of invalid credentials" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "not try again if the upload fails on because of invalid credentials" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow {
         val e = new AmazonServiceException("your credentials are incorrect")
         e.setStatusCode(403)
         e
       }
-      Push.pushSite
+      Push.push
       verify(amazonS3Client, times(1)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
-    "try again if the delete fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "try again if the delete fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       deleteFailsAndThenSucceeds(howManyFailures = 5)
-      Push.pushSite
+      Push.push
       verify(amazonS3Client, times(6)).deleteObject(Matchers.anyString(), Matchers.anyString())
     }
 
-    "try again if the object listing fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "try again if the object listing fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       objectListingFailsAndThenSucceeds(howManyFailures = 5)
-      Push.pushSite
+      Push.push
       verify(amazonS3Client, times(6)).listObjects(Matchers.any(classOf[ListObjectsRequest]))
     }
   }
 
   "push with CloudFront" should {
-    "invalidate the updated CloudFront items" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "invalidate the updated CloudFront items" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFiles("css/test.css", "articles/index.html")
       setOutdatedS3Keys("css/test.css", "articles/index.html")
-      Push.pushSite
+      Push.push
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/css/test.css" :: "/articles/index.html" :: Nil).sorted)
     }
 
-    "not send CloudFront invalidation requests on new objects"  in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "not send CloudFront invalidation requests on new objects"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("newfile.js")
-      Push.pushSite
+      Push.push
       noInvalidationsOccurred must beTrue
     }
 
-    "not send CloudFront invalidation requests on redirect objects" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "not send CloudFront invalidation requests on redirect objects" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |cloudfront_distribution_id: EGM1J2JJX9Z
         |redirects:
         |  /index.php: index.html
       """.stripMargin
-      Push.pushSite
+      Push.push
       noInvalidationsOccurred must beTrue
     }
 
-    "retry CloudFront responds with TooManyInvalidationsInProgressException" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "retry CloudFront responds with TooManyInvalidationsInProgressException" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setTooManyInvalidationsInProgress(4)
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
-      Push.pushSite must equalTo(0) // The retries should finally result in a success
+      Push.push must equalTo(0) // The retries should finally result in a success
       sentInvalidationRequests.length must equalTo(4)
     }
 
-    "retry if CloudFront is temporarily unreachable" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "retry if CloudFront is temporarily unreachable" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       invalidationsFailAndThenSucceed(5)
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
-      Push.pushSite
+      Push.push
       sentInvalidationRequests.length must equalTo(6)
     }
 
-    "encode unsafe characters in the keys" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "encode unsafe characters in the keys" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("articles/arnold's file.html")
       setOutdatedS3Keys("articles/arnold's file.html")
-      Push.pushSite
+      Push.push
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/arnold's%20file.html" :: Nil).sorted)
     }
 
-    "invalidate the root object '/' if a top-level object is updated or deleted" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "invalidate the root object '/' if a top-level object is updated or deleted" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("maybe-index.html")
       setOutdatedS3Keys("maybe-index.html")
-      Push.pushSite
+      Push.push
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/" :: "/maybe-index.html" :: Nil).sorted)
     }
   }
 
   "cloudfront_invalidate_root: true" should {
-    "convert CloudFront invalidation paths with the '/index.html' suffix into '/'"  in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "convert CloudFront invalidation paths with the '/index.html' suffix into '/'"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |cloudfront_distribution_id: EGM1J2JJX9Z
         |cloudfront_invalidate_root: true
       """.stripMargin
       setLocalFile("articles/index.html")
       setOutdatedS3Keys("articles/index.html")
-      Push.pushSite
+      Push.push
       sentInvalidationRequest.getInvalidationBatch.getPaths.getItems.toSeq.sorted must equalTo(("/articles/" :: Nil).sorted)
     }
   }
 
   "a site with over 1000 items" should {
-    "split the CloudFront invalidation requests into batches of 1000 items" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "split the CloudFront invalidation requests into batches of 1000 items" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       val files = (1 to 1002).map { i => s"lots-of-files/file-$i"}
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFiles(files:_*)
       setOutdatedS3Keys(files:_*)
-      Push.pushSite
+      Push.push
       sentInvalidationRequests.length must equalTo(2)
       sentInvalidationRequests(0).getInvalidationBatch.getPaths.getItems.length must equalTo(1000)
       sentInvalidationRequests(1).getInvalidationBatch.getPaths.getItems.length must equalTo(2)
@@ -209,73 +209,73 @@ class S3WebsiteSpec extends Specification {
   }
 
   "push exit status" should {
-    "be 0 all uploads succeed" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be 0 all uploads succeed" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFiles("file.txt")
-      Push.pushSite must equalTo(0)
+      Push.push must equalTo(0)
     }
 
-    "be 1 if any of the uploads fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be 1 if any of the uploads fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFiles("file.txt")
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow(new AmazonServiceException("AWS failed"))
-      Push.pushSite must equalTo(1)
+      Push.push must equalTo(1)
     }
 
-    "be 1 if any of the redirects fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be 1 if any of the redirects fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |redirects:
         |  index.php: /index.html
       """.stripMargin
       when(amazonS3Client.putObject(Matchers.any(classOf[PutObjectRequest]))).thenThrow(new AmazonServiceException("AWS failed"))
-      Push.pushSite must equalTo(1)
+      Push.push must equalTo(1)
     }
 
-    "be 0 if CloudFront invalidations and uploads succeed"in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be 0 if CloudFront invalidations and uploads succeed"in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
-      Push.pushSite must equalTo(0)
+      Push.push must equalTo(0)
     }
 
-    "be 1 if CloudFront is unreachable or broken"in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be 1 if CloudFront is unreachable or broken"in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setCloudFrontAsInternallyBroken()
       config = "cloudfront_distribution_id: EGM1J2JJX9Z"
       setLocalFile("test.css")
       setOutdatedS3Keys("test.css")
-      Push.pushSite must equalTo(1)
+      Push.push must equalTo(1)
     }
 
-    "be 0 if upload retry succeeds" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be 0 if upload retry succeeds" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 1)
-      Push.pushSite must equalTo(0)
+      Push.push must equalTo(0)
     }
 
-    "be 1 if delete retry fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be 1 if delete retry fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
       uploadFailsAndThenSucceeds(howManyFailures = 6)
-      Push.pushSite must equalTo(1)
+      Push.push must equalTo(1)
     }
 
-    "be 1 if an object listing fails" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be 1 if an object listing fails" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setS3Files(S3File("old.html", md5Hex("<h1>old text</h1>")))
       objectListingFailsAndThenSucceeds(howManyFailures = 6)
-      Push.pushSite must equalTo(1)
+      Push.push must equalTo(1)
     }
   }
 
   "s3_website.yml file" should {
-    "never be uploaded" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "never be uploaded" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("s3_website.yml")
-      Push.pushSite
+      Push.push
       noUploadsOccurred must beTrue
     }
   }
 
   "exclude_from_upload: string" should {
-    "result in matching files not being uploaded" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "result in matching files not being uploaded" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "exclude_from_upload: .DS_.*?"
       setLocalFile(".DS_Store")
-      Push.pushSite
+      Push.push
       noUploadsOccurred must beTrue
     }
   }
@@ -285,23 +285,23 @@ class S3WebsiteSpec extends Specification {
        - regex
        - another_exclusion
   """ should {
-    "result in matching files not being uploaded" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "result in matching files not being uploaded" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |exclude_from_upload:
         |  - .DS_.*?
         |  - logs
       """.stripMargin
       setLocalFiles(".DS_Store", "logs/test.log")
-      Push.pushSite
+      Push.push
       noUploadsOccurred must beTrue
     }
   }
 
   "ignore_on_server: value" should {
-    "not delete the S3 objects that match the ignore value" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "not delete the S3 objects that match the ignore value" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "ignore_on_server: logs"
       setS3Files(S3File("logs/log.txt", ""))
-      Push.pushSite
+      Push.push
       noDeletesOccurred must beTrue
     }
   }
@@ -311,224 +311,228 @@ class S3WebsiteSpec extends Specification {
        - regex
        - another_ignore
   """ should {
-    "not delete the S3 objects that match the ignore value" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "not delete the S3 objects that match the ignore value" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |ignore_on_server:
         |  - .*txt
       """.stripMargin
       setS3Files(S3File("logs/log.txt", ""))
-      Push.pushSite
+      Push.push
       noDeletesOccurred must beTrue
     }
   }
 
   "max-age in config" can {
-    "be applied to all files" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be applied to all files" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "max_age: 60"
       setLocalFile("index.html")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=60")
     }
 
-    "be applied to files that match the glob" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be applied to files that match the glob" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |max_age:
         |  "*.html": 90
       """.stripMargin
       setLocalFile("index.html")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
-    "be applied to directories that match the glob" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be applied to directories that match the glob" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |max_age:
         |  "assets/**/*.js": 90
       """.stripMargin
       setLocalFile("assets/lib/jquery.js")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=90")
     }
 
-    "not be applied if the glob doesn't match" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "not be applied if the glob doesn't match" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |max_age:
         |  "*.js": 90
       """.stripMargin
       setLocalFile("index.html")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getMetadata.getCacheControl must beNull
     }
 
-    "be used to disable caching" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be used to disable caching" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "max_age: 0"
       setLocalFile("index.html")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("no-cache; max-age=0")
     }
   }
 
   "max-age in config" should {
-    "respect the more specific glob" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "respect the more specific glob" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |max_age:
         |  "assets/*": 150
         |  "assets/*.gif": 86400
       """.stripMargin
       setLocalFiles("assets/jquery.js", "assets/picture.gif")
-      Push.pushSite
+      Push.push
       sentPutObjectRequests.find(_.getKey == "assets/jquery.js").get.getMetadata.getCacheControl must equalTo("max-age=150")
       sentPutObjectRequests.find(_.getKey == "assets/picture.gif").get.getMetadata.getCacheControl must equalTo("max-age=86400")
     }
   }
 
   "s3_reduced_redundancy: true in config" should {
-    "result in uploads being marked with reduced redundancy" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "result in uploads being marked with reduced redundancy" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "s3_reduced_redundancy: true"
       setLocalFile("file.exe")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getStorageClass must equalTo("REDUCED_REDUNDANCY")
     }
   }
 
   "s3_reduced_redundancy: false in config" should {
-    "result in uploads being marked with the default storage class" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "result in uploads being marked with the default storage class" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "s3_reduced_redundancy: false"
       setLocalFile("file.exe")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getStorageClass must beNull
     }
   }
 
   "redirect in config" should {
-    "result in a redirect instruction that is sent to AWS" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "result in a redirect instruction that is sent to AWS" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |redirects:
         |  index.php: /index.html
       """.stripMargin
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getRedirectLocation must equalTo("/index.html")
     }
 
-    "result in max-age=0 Cache-Control header on the object" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "result in max-age=0 Cache-Control header on the object" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |redirects:
         |  index.php: /index.html
       """.stripMargin
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getMetadata.getCacheControl must equalTo("max-age=0, no-cache")
     }
   }
 
   "redirect in config and an object on the S3 bucket" should {
-    "not result in the S3 object being deleted" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "not result in the S3 object being deleted" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |redirects:
         |  index.php: /index.html
       """.stripMargin
       setLocalFile("index.php")
       setS3Files(S3File("index.php", "md5"))
-      Push.pushSite
+      Push.push
       noDeletesOccurred must beTrue
     }
   }
 
   "dotfiles" should {
-    "be included in the pushed files" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be included in the pushed files" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile(".vimrc")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getKey must equalTo(".vimrc")
     }
   }
 
   "content type inference" should {
-    "add charset=utf-8 to all html documents" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "add charset=utf-8 to all html documents" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("index.html")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
     }
 
-    "add charset=utf-8 to all text documents" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "add charset=utf-8 to all text documents" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("index.txt")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/plain; charset=utf-8")
     }
 
-    "add charset=utf-8 to all json documents" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "add charset=utf-8 to all json documents" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFile("data.json")
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getMetadata.getContentType must equalTo("application/json; charset=utf-8")
     }
 
-    "resolve the content type from file contents" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "resolve the content type from file contents" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       setLocalFileWithContent(("index", "<html><body><h1>hi</h1></body></html>"))
-      Push.pushSite
+      Push.push
       sentPutObjectRequest.getMetadata.getContentType must equalTo("text/html; charset=utf-8")
     }
   }
 
   "ERB in config file" should {
-    "be evaluated"  in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
+    "be evaluated"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = """
         |redirects:
         |<%= ('a'..'f').to_a.map do |t| '  '+t+ ': /'+t+'.html' end.join('\n')%>
       """.stripMargin
-      Push.pushSite
+      Push.push
       sentPutObjectRequests.length must equalTo(6)
       sentPutObjectRequests.forall(_.getRedirectLocation != null) must beTrue
     }
   }
 
-  "logging" should {
-    "print the debug messages when --verbose is defined" in new EmptySite with VerboseLogger with MockAWS with DefaultRunMode {
-      Push.pushSite
-      logEntries must contain("[debg] Querying S3 files")
-    }
-
-    "not print the debug messages by default" in new EmptySite with NonVerboseLogger with MockAWS with DefaultRunMode {
-      Push.pushSite
-      logEntries.forall(_.contains("[debg]")) must beFalse
-    }
-  }
-  
   "dry run" should {
-    "not push updates" in new EmptySite with VerboseLogger with MockAWS with DryRunMode {
+    "not push updates" in new AllInSameDirectory with EmptySite with MockAWS with DryRunMode {
       setLocalFileWithContent(("index.html", "<div>new</div>"))
       setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
-      Push.pushSite
+      Push.push
       noUploadsOccurred must beTrue
     }
 
-    "not push redirects" in new EmptySite with VerboseLogger with MockAWS with DryRunMode {
+    "not push redirects" in new AllInSameDirectory with EmptySite with MockAWS with DryRunMode {
       config =
         """
           |redirects:
           |  index.php: /index.html
         """.stripMargin
-      Push.pushSite
+      Push.push
       noUploadsOccurred must beTrue
     }
 
-    "not push deletes" in new EmptySite with VerboseLogger with MockAWS with DryRunMode {
+    "not push deletes" in new AllInSameDirectory with EmptySite with MockAWS with DryRunMode {
       setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
-      Push.pushSite
+      Push.push
       noUploadsOccurred must beTrue
     }
 
-    "not push new files" in new EmptySite with VerboseLogger with MockAWS with DryRunMode {
+    "not push new files" in new AllInSameDirectory with EmptySite with MockAWS with DryRunMode {
       setLocalFile("index.html")
-      Push.pushSite
+      Push.push
       noUploadsOccurred must beTrue
     }
     
-    "not invalidate files" in new EmptySite with VerboseLogger with MockAWS with DryRunMode {
+    "not invalidate files" in new AllInSameDirectory with EmptySite with MockAWS with DryRunMode {
       config = "cloudfront_invalidation_id: AABBCC"
       setS3Files(S3File("index.html", md5Hex("<div>old</div>")))
-      Push.pushSite
+      Push.push
       noInvalidationsOccurred must beTrue
     }
   }
 
+  "Jekyll site" should {
+    "be detected automatically" in new JekyllSite with EmptySite with MockAWS with DefaultRunMode {
+      setLocalFile("index.html")
+      Push.push
+      sentPutObjectRequests.length must equalTo(1)
+    }
+  }
+
+  "Nanoc site" should {
+    "be detected automatically" in new NanocSite with EmptySite with MockAWS with DefaultRunMode {
+      setLocalFile("index.html")
+      Push.push
+      sentPutObjectRequests.length must equalTo(1)
+    }
+  }
+
   trait DefaultRunMode {
     implicit def pushMode: PushMode = new PushMode {
       def dryRun = false
@@ -542,23 +546,6 @@ class S3WebsiteSpec extends Specification {
   }
 
   trait MockAWS extends MockS3 with MockCloudFront with Scope
-
-  trait VerboseLogger extends LogCapturer {
-    implicit val logger: Logger = new Logger(verboseOutput = true, logMessage = captureAndPrint)
-  }
-
-  trait NonVerboseLogger extends LogCapturer {
-    implicit val logger: Logger = new Logger(verboseOutput = false, logMessage = captureAndPrint)
-  }
-
-  trait LogCapturer {
-    val logEntries: mutable.Buffer[String] = mutable.Buffer()
-
-    def captureAndPrint(msg: String) {
-      logEntries += msg.replaceAll("\u001B\\[[;\\d]*m", "") // Remove ANSI coloring
-      println(msg)
-    }
-  }
   
   trait MockCloudFront extends MockAWSHelper {
     val amazonCloudFrontClient = mock(classOf[AmazonCloudFront])
@@ -599,8 +586,6 @@ class S3WebsiteSpec extends Specification {
       }).when(amazonCloudFrontClient).createInvalidation(Matchers.anyObject())
     }
 
-
-
     def setCloudFrontAsInternallyBroken() {
       when(amazonCloudFrontClient.createInvalidation(Matchers.anyObject())).thenThrow(new AmazonServiceException("CloudFront is down"))
     }
@@ -699,16 +684,40 @@ class S3WebsiteSpec extends Specification {
     }
   }
 
-  trait SiteDirectory extends After {
-    val siteDir = new File(FileUtils.getTempDirectory, "site" + Random.nextLong())
-    siteDir.mkdir()
+  trait Directories extends BeforeAfter {
+    implicit final val workingDirectory: File = new File(FileUtils.getTempDirectory, "s3_website_dir" + Random.nextLong())
+    val siteDirectory: File // Represents the --site=X option
+    val configDirectory: File = workingDirectory // Represents the --config-dir=X option
+
+    lazy val allDirectories = workingDirectory :: siteDirectory :: configDirectory :: Nil
+
+    def before {
+      allDirectories foreach forceMkdir
+    }
 
     def after {
-      FileUtils.forceDelete(siteDir)
+      allDirectories foreach { dir =>
+        if (dir.exists) forceDelete(dir)
+      }
     }
   }
+
+  /**
+   * Represents the situation where the current working directory, site dir and config dir are in the same directory
+   */
+  trait AllInSameDirectory extends Directories {
+    val siteDirectory = workingDirectory
+  }
+
+  trait JekyllSite extends Directories {
+    val siteDirectory = new File(workingDirectory, "_site")
+  }
+
+  trait NanocSite extends Directories {
+    val siteDirectory = new File(workingDirectory, "public/output")
+  }
   
-  trait EmptySite extends SiteDirectory {
+  trait EmptySite extends Directories {
     type LocalFileWithContent = (String, String)
 
     val localFilesWithContent: mutable.Buffer[LocalFileWithContent] = mutable.Buffer()
@@ -717,15 +726,15 @@ class S3WebsiteSpec extends Specification {
     def setLocalFileWithContent(fileNameAndContent: LocalFileWithContent) = localFilesWithContent += fileNameAndContent
     def setLocalFilesWithContent(fileNamesAndContent: LocalFileWithContent*) = fileNamesAndContent foreach setLocalFileWithContent
     var config = ""
-    var baseConfig =
+    val baseConfig =
     """
       |s3_id: foo
       |s3_secret: bar
       |s3_bucket: bucket
     """.stripMargin
 
-    implicit lazy val testSite: Site = siteWithFilesAndContent(config, localFilesWithContent)
-    implicit def logger: Logger
+    implicit lazy val cliArgs: CliArgs = siteWithFilesAndContent(config, localFilesWithContent)
+    def pushMode: PushMode // Represents the --dry-run switch
 
     def buildSite(
                     config: String = "",
@@ -735,24 +744,30 @@ class S3WebsiteSpec extends Specification {
                         |s3_secret: bar
                         |s3_bucket: bucket
                       """.stripMargin
-                    ): Site = {
-      val configFile = new File(siteDir, "s3_website.yml")
+                    ): CliArgs = {
+      val configFile = new File(configDirectory, "s3_website.yml")
       write(configFile,
         s"""
           |$baseConfig
           |$config
         """.stripMargin
       )
-      val errorOrSite: Either[ErrorReport, Site] = Site.loadSite(configFile.getAbsolutePath, siteDir.getAbsolutePath)(logger)
-      errorOrSite.left.foreach (error => throw new RuntimeException(error.reportMessage))
-      errorOrSite.right.get
+      new CliArgs {
+        override def verbose = true
+
+        override def dryRun = pushMode.dryRun
+
+        override def site = siteDirectory.getAbsolutePath
+
+        override def configDir = configDirectory.getAbsolutePath
+      }
     }
 
-    def siteWithFilesAndContent(config: String = "", localFilesWithContent: Seq[LocalFileWithContent]): Site = {
+    def siteWithFilesAndContent(config: String = "", localFilesWithContent: Seq[LocalFileWithContent]): CliArgs = {
       localFilesWithContent.foreach {
         case (filePath, content) =>
-          val file = new File(siteDir, filePath)
-          FileUtils.forceMkdir(file.getParentFile)
+          val file = new File(siteDirectory, filePath)
+          forceMkdir(file.getParentFile)
           file.createNewFile()
           write(file, content)
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-12 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -102,9 +102,6 @@ files:
 - build.sbt
 - changelog.md
 - lib/s3_website.rb
-- lib/s3_website/jekyll.rb
-- lib/s3_website/nanoc.rb
-- lib/s3_website/paths.rb
 - lib/s3_website/version.rb
 - project/assembly.sbt
 - project/build.properties
@@ -124,6 +121,7 @@ files:
 - src/main/scala/s3/website/model/Site.scala
 - src/main/scala/s3/website/model/errors.scala
 - src/main/scala/s3/website/model/push.scala
+- src/main/scala/s3/website/model/ssg.scala
 - src/main/scala/s3/website/package.scala
 - src/test/scala/s3/website/S3WebsiteSpec.scala
 homepage: https://github.com/laurilehmijoki/s3_website/tree/s3_website_monadic

data/lib/s3_website/jekyll.rb

@@ -1,5 +0,0 @@
-module S3Website
-  module Jekyll
-    SITE_PATH = '_site'
-  end
-end

data/lib/s3_website/nanoc.rb

@@ -1,5 +0,0 @@
-module S3Website
-  module Nanoc
-    SITE_PATH = 'public/output'
-  end
-end

data/lib/s3_website/paths.rb

@@ -1,40 +0,0 @@
-module S3Website
-  class Paths
-    def self.site_paths
-      [Nanoc::SITE_PATH, Jekyll::SITE_PATH]
-    end
-
-    def self.infer_site_path(candidate_path, pwd)
-      if candidate_path == 'infer automatically'
-        infer_automatically pwd
-      else
-        candidate_path_if_exists candidate_path
-      end
-    end
-
-    private
-
-    def self.candidate_path_if_exists(candidate_path)
-      raise NoWebsiteDirectoryFound.new(
-        "Can't find a website in " + candidate_path
-      ) unless File.exists? candidate_path
-      candidate_path
-    end
-
-    def self.infer_automatically(pwd)
-      site_path = site_paths.
-        map do |site_path|
-        pwd + '/' + site_path
-        end.
-          find do |site_path|
-          File.exists? site_path
-          end
-        if site_path
-          site_path
-        else
-          puts "Could not find a website directory. Specify one with the --site parameter."
-          exit
-        end
-    end
-  end
-end