s3_deployer 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e01bbc563f1a11c5e277f503cecfc6a67fe5f26
-  data.tar.gz: be58e8d8fb4f176114bc25da6df2927f013b0430
+  metadata.gz: 43287530ea09e3506c51488fe99d99ed4292c921
+  data.tar.gz: 4f81042d4d272e90de8f7ae326eaad06dc2b07e4
 SHA512:
-  metadata.gz: 33772a6a16d9efc56276e0a489921b642d9acfffd8a4b1617acf1ad04d42a5e25f064ca046fd6af10a8f211d7f60a3f564da5a576629a6a865cd17b9210930aa
-  data.tar.gz: 4e5eb10244d9034651d4524828c55565be876a95fb3017073028e5732021b8137bcfbf0fddf8f16d58e4a7fba0508b28ac8f5e3f25d4cf1d7d07985c3ea03372
+  metadata.gz: 5bba3665ac748d0da69efe60ad1d5f4b30632a7c85ca0421570ad43c55bd38e65487775c1393de6c928789153c1e079944bebf7fc9eea3cad24b9a04d641a8e2
+  data.tar.gz: eae25b2818d5575ef1ff10ea8c10c09fbfe5c9c223953876a32322cb2aa118ca7915e8ef9e9cec86293133108c64522d102b002ab2d05ca1a3f2bdd1d52904ef

data/lib/s3_deployer.rb

@@ -37,14 +37,14 @@ class S3Deployer
     end
 
     def deploy!
-      revision = time_zone.now.strftime(DATE_FORMAT)
+      revision = config.revision || time_zone.now.strftime(DATE_FORMAT)
       config.before_deploy[revision] if config.before_deploy
       stage!(revision)
       switch!(revision)
       config.after_deploy[revision] if config.after_deploy
     end
 
-    def stage!(revision = time_zone.now.strftime(DATE_FORMAT))
+    def stage!(revision = (config.revision || time_zone.now.strftime(DATE_FORMAT)))
       puts "Staging #{colorize(:green, revision)}"
       config.before_stage[revision] if config.before_stage
       copy_files_to_s3(revision)
@@ -62,9 +62,8 @@ class S3Deployer
         warn "You must specify the revision by REVISION env variable"
         exit(1)
       end
-      revision = normalize_revision(revision)
       config.before_switch[current_revision, revision] if config.before_switch
-      prefix = config.app_path.empty? ? revision : File.join(config.app_path, revision)
+      prefix = config.app_path.empty? ? revision : File.join(revisions_path, revision)
       list_of_objects = []
       Aws::S3::Resource.new.bucket(config.bucket).objects(prefix: prefix).each do |object_summary|
         list_of_objects << object_summary
@@ -124,13 +123,13 @@ class S3Deployer
     end
 
     def sha_of_revision(revision)
-      shas_by_revisions[normalize_revision(revision)]
+      shas_by_revisions[revision]
     end
 
     private
 
       def copy_files_to_s3(rev)
-        dir = File.join(config.app_path, rev)
+        dir = File.join(revisions_path, rev)
         Parallel.each(source_files_list, in_threads: 20) do |file|
           s3_file = Pathname.new(file).relative_path_from(Pathname.new(config.dist_dir)).to_s
           store_value(File.join(dir, s3_file), File.read(file))
@@ -138,11 +137,9 @@ class S3Deployer
       end
 
       def get_list_of_revisions
-        prefix = File.join(config.app_path)
+        prefix = revisions_path
         body = Aws::S3::Client.new.list_objects({bucket: config.bucket, delimiter: '/', prefix: prefix + "/"})
-        body.common_prefixes.map(&:prefix).map { |e| e.gsub(prefix, "").gsub("/", "") }.select do |dir|
-          !!(Time.strptime(dir, DATE_FORMAT) rescue nil)
-        end.sort
+        body.common_prefixes.map(&:prefix).map { |e| e.gsub(prefix, "").gsub("/", "") }.sort
       end
 
       def app_path_with_bucket
@@ -168,6 +165,10 @@ class S3Deployer
         File.join(config.app_path, CURRENT_REVISION)
       end
 
+      def revisions_path
+        File.join(config.app_path, "revisions")
+      end
+
       def get_value(key)
         puts "Retrieving value #{key} on S3"
         retry_block(RETRY_TIMES.dup) do
@@ -176,14 +177,14 @@ class S3Deployer
       end
 
       def store_current_revision(revision)
-        store_value(current_revision_path, revision)
+        store_value(current_revision_path, revision, cache_control: "max-age=0, no-cache")
       end
 
       def store_git_hash(time)
         value = shas_by_revisions.
           merge(time => `git rev-parse HEAD`.strip).
           map { |sha, rev| "#{sha} - #{rev}" }.join("\n")
-        store_value(File.join(config.app_path, "SHAS"), value)
+        store_value(File.join(config.app_path, "SHAS"), value, cache_control: "max-age=0, no-cache")
         @shas_by_revisions = nil
       end
 
@@ -193,8 +194,8 @@ class S3Deployer
         nil
       end
 
-      def store_value(key, value)
-        options = {acl: "public-read"}
+      def store_value(key, value, options = {})
+        options = {acl: "public-read"}.merge(options)
         if config.cache_control && !config.cache_control.empty?
           options[:cache_control] = config.cache_control
         end

data/lib/s3_deployer/config.rb

@@ -4,7 +4,10 @@ class S3Deployer
 
     def initialize
       @version = ENV["VERSION"] || ""
-      @revision = ENV["REVISION"] || ""
+      @revision = ENV["REVISION"]
+      @access_key_id = ENV["AWS_ACCESS_KEY_ID"]
+      @secret_access_key = ENV["AWS_SECRET_ACCESS_KEY"]
+      
       @env = ENV["ENV"] || "production"
       @env_settings = {}
       colorize true

data/lib/s3_deployer/version.rb

@@ -1,3 +1,3 @@
 class S3Deployer
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_deployer
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Anton Astashov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple gem for deploying client apps to S3