s3_website_monadic 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87c870c1dae2ea36e452f7df0b0f7565c5cec616
-  data.tar.gz: 4e8324a2207a37a3f991490d187c27d35139c04b
+  metadata.gz: f701f980a56f1ae501c3a926f7bf90c667670f0b
+  data.tar.gz: 6661ae37dfdbb82218ef2e51e0597830860d36a4
 SHA512:
-  metadata.gz: 5fdcff5e2fad65a9a895bc7669db2690f70c9dd4e7ab54be0962a99a279dda4f88542373eb476e7a6750c2580554888f329aa240ff9d346f26648128adc2a38c
-  data.tar.gz: 0221384872bd4914d9585f5f63074f0b9286600491abdce62f411c5e545d42bd41a484bdf04c686be79350fcb5d71e28d865004f371ef0e32f8caafc04660800
+  metadata.gz: 3609367267234c2e73d0f2aa3b97c8cd7c489b8e208c69a3c1dce34b18f3f1ededc87e05dab97b2f463b641ad1700c0423fab5867ceb7c291f0cfb85d03026a7
+  data.tar.gz: 745e768c92b07c378ba48a43059af8d72e487f0b972920e809d26105b530acc7d92fd0630980980ad3ed6674256791ae5352f09ef351e4826a0741034581db04

data/.gitignore

@@ -8,3 +8,4 @@ Gemfile.lock
 .idea
 target
 .idea_modules
+.vagrant

data/README.md

@@ -72,6 +72,12 @@ s3_bucket: blog.example.com
 roles](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UsingIAM.html#UsingIAMrolesWithAmazonEC2Instances),
 you can omit the `s3_id` and `s3_secret` keys in the config file.)
 
+S3_website implements supports for reading environment variables from a file using
+the [dotenv](https://github.com/bkeepers/dotenv) gem. You can create a `.env` file
+in the project's root directory to take advantage of this feature. Please have
+a look at [dotenv's usage guide](https://github.com/bkeepers/dotenv#usage) for
+syntax information.
+
 ## Project goals
 
 * Provide a command-line interface tool for deploying and managing S3 websites
@@ -141,13 +147,6 @@ gzip:
 Remember that the extensions here are referring to the *compiled* extensions,
 not the pre-processed extensions.
 
-#### Gzip zopfli
-
-By adding the line `gzip_zopfli: true` into the config file, you can benefit
-from the zopfli algorithm, which is 100% compatible with the traditional gzip
-algorithm. A zopfli compression takes longer but results in about 5% smaller
-files.
-
 ### Using non-standard AWS regions
 
 By default, `s3_website_monadic` uses the US Standard Region. You can upload your
@@ -408,6 +407,7 @@ Contributors (in alphabetical order)
 * Christopher Petersen
 * David Michael Barr
 * David Raffensperger
+* Douglas Teoh
 * Greg Karékinian
 * John Allison
 * Jordan White

data/additional-docs/development.md

@@ -0,0 +1,9 @@
+# Vagrant
+
+Use Vagrant for testing the installation procedure on Linux.
+
+Here's howto:
+
+1. Install <https://www.vagrantup.com/downloads.html>
+2. `cd vagrant && vagrant status`
+3. launch with `vagrant up <name>` and ssh into with `vagrant ssh <name>`

data/bin/s3_website_monadic

@@ -97,7 +97,7 @@ def resolve_jar(project_root, logger)
     project_root + '/target/scala-2.11/s3_website.jar'
   released_jar_lookup_paths = [
     project_root + "/s3_website-#{S3Website::VERSION}.jar",
-    ENV['TMPDIR'] + "/s3_website-#{S3Website::VERSION}.jar"
+    (ENV['TMPDIR'] || '/tmp') + "/s3_website-#{S3Website::VERSION}.jar"
   ]
   found_jar = ([development_jar_path] + released_jar_lookup_paths)
   .select { |jar_path|

data/changelog.md

@@ -40,6 +40,19 @@ This project uses [Semantic Versioning](http://semver.org).
 
 * You can no longer use this gem as a Ruby library
 
+* `gzip_zopfli: true`
+
+    At the time of writing, there does not exist a stable zopfli implementation
+    for Java.
+
+## 1.8.1
+
+* Do not push the *.env* file
+
+## 1.8.0
+
+* Add support for (dotenv)[https://github.com/bkeepers/dotenv]
+
 ## 1.7.6
 
 * Remove a test setting from *Gemfile*

data/lib/s3_website/version.rb

@@ -1,3 +1,3 @@
 module S3Website
-  VERSION = '0.0.32'
+  VERSION = '0.0.33'
 end

data/lib/s3_website.rb

@@ -1,4 +1,7 @@
 require 'rubygems'
 require 'thor'
+require 'dotenv'
+
+Dotenv.load
 
 require File.dirname(__FILE__) + "/s3_website/version"

data/release

@@ -6,6 +6,7 @@ require_relative 'lib/s3_website/version'
 version = S3Website::VERSION
 unless ENV['S3_WEBSITE_RELEASE_KEY']
   puts "Set the S3_WEBSITE_RELEASE_KEY environmental variable. It should be your personal GitHub access token."
+  exit 1
 end
 
 def run(cmd)

data/s3_website.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'thor', '= 0.18.1'
   s.add_dependency 'configure-s3-website', '= 1.5.5'
   s.add_dependency 'colored', '1.2'
+  s.add_dependency 'dotenv', '~> 0.11.1'
 
   s.add_development_dependency 'rake', '10.1.1'
   s.add_development_dependency 'octokit', '3.1.0'

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

@@ -122,7 +122,8 @@ object Files {
           (exclusionRegexes: Seq[String]) => exclusionRegexes exists (rubyRegexMatches(s3Key, _))
         )
       }
-      val doNotUpload = excludeByConfig || s3Key == "s3_website.yml"
+      val neverUpload = "s3_website.yml" :: ".env" :: Nil
+      val doNotUpload = excludeByConfig || (neverUpload contains s3Key)
       if (doNotUpload) logger.debug(s"Excluded $s3Key from upload")
       doNotUpload
     }

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

@@ -103,7 +103,14 @@ package object website {
         case exception: AmazonServiceException => Some(exception.getStatusCode)
         case _ => None
       }
-    httpStatusCode.exists(c => c >= 400 && c < 500)
+    val isAwsTimeoutException =
+      error match {
+        case exception: AmazonServiceException =>
+          // See http://docs.aws.amazon.com/AmazonS3/latest/API/ErrorResponses.html#ErrorCodeList
+          exception.getErrorCode == "RequestTimeout"
+        case _ => false
+      }
+    httpStatusCode.exists(c => c >= 400 && c < 500) && !isAwsTimeoutException
   }
   
   implicit class NumReport(val num: Int) extends AnyVal {

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

@@ -109,6 +109,26 @@ class S3WebsiteSpec extends Specification {
       verify(amazonS3Client, times(1)).putObject(Matchers.any(classOf[PutObjectRequest]))
     }
 
+    "try again if the request times out"  in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+      var attempt = 0
+      when(amazonS3Client putObject Matchers.any(classOf[PutObjectRequest])) thenAnswer new Answer[PutObjectResult] {
+        def answer(invocation: InvocationOnMock) = {
+          attempt += 1
+          if (attempt < 2) {
+            val e = new AmazonServiceException("Too long a request")
+            e.setStatusCode(400)
+            e.setErrorCode("RequestTimeout")
+            throw e
+          } else {
+            new PutObjectResult
+          }
+        }
+      }
+      setLocalFile("index.html")
+      val exitStatus = push
+      verify(amazonS3Client, times(2)).putObject(Matchers.any(classOf[PutObjectRequest]))
+    }
+
     "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)
@@ -274,6 +294,14 @@ class S3WebsiteSpec extends Specification {
     }
   }
 
+  ".env file" should { // The .env file is the https://github.com/bkeepers/dotenv file
+    "never be uploaded" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
+      setLocalFile(".env")
+      push
+      noUploadsOccurred must beTrue
+    }
+  }
+
   "exclude_from_upload: string" should {
     "result in matching files not being uploaded" in new AllInSameDirectory with EmptySite with MockAWS with DefaultRunMode {
       config = "exclude_from_upload: .DS_.*?"

data/vagrant/Vagrantfile

@@ -0,0 +1,25 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  vms = {
+    'ubuntu_14.04' => {
+      :box_url => 'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box',
+      :ip => '33.33.33.0'
+    },
+    'centos_6.5' => {
+      :box_url => 'http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-puppet.box',
+      :ip => '33.33.33.1'
+    }
+  }
+  vms.each do |vm_name, vm_opts|
+    config.vm.define vm_name do |node_config|
+      node_config.vm.box = vm_name
+      node_config.vm.box_url = vm_opts.fetch(:box_url)
+      node_config.vm.network :private_network, ip: vm_opts.fetch(:ip)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website_monadic
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +109,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- additional-docs/development.md
 - additional-docs/example-configurations.md
 - additional-docs/setting-up-aws-credentials.md
 - assembly.sbt
@@ -124,6 +139,7 @@ files:
 - src/main/scala/s3/website/model/ssg.scala
 - src/main/scala/s3/website/package.scala
 - src/test/scala/s3/website/S3WebsiteSpec.scala
+- vagrant/Vagrantfile
 homepage: https://github.com/laurilehmijoki/s3_website/tree/s3_website_monadic
 licenses:
 - MIT