s3_website 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2028b50197c43a95e0e1963ed6d74cfa5266d239
-  data.tar.gz: 7e4e1967b2ebe1dfe468ad031e0de5dc25a59449
+  metadata.gz: 561234b232d8d9b1224e698eaf666b85f5bd5c2e
+  data.tar.gz: 676365b786bb1917db01cf2892c38e8d1213c3ff
 SHA512:
-  metadata.gz: 561ab252bb5f20f8c0d1988aa954836ad002d7cc67eb362cef40a03b6403bfc85946fe8d3b61b019fee6ee80d9224df8cd03a713cdf6dcbd81e0ee6aed196dbc
-  data.tar.gz: ef8227835fa2f8545f94e0fee1be0b50764d32b6d104059e2c3e8f70b501e79f22b41cc30aecb4066085d266a3a661df33c25d7dcbf7fcaf0d29fea5a0a6c639
+  metadata.gz: 85a28d6ed372877f119e5eb98b3d7785e28438c14218c552ff136a812262960f174451a508fd6946a47cd759d6a06a96a3b22a92a88420ec0437932204cc5662
+  data.tar.gz: 0ad1d01d491b2e3a44e8075d2df2aee92116f391752e93e6d206194f425d3b34a5f4af28b46c5b68736060046c3ee7caa51be8c1cd7d41010d95d2bd7429dfe6

data/changelog.md

@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 1.3.0
+
+* Show a progress indicator when calculating diff
+
 ## 1.2.1
 
 * Use `print` instead of `puts` when printing to stdout in a concurrent context

data/features/cloudfront.feature

@@ -24,6 +24,7 @@ Feature: Invalidate the Cloudfront distribution
     And the output should equal
       """
       Deploying features/support/test_site_dirs/cdn-powered.with-one-change.blog.fi/_site/* to s3-website-test.net
+      Calculating diff ... done
       Uploading 1 changed file(s)
       Upload index.html: Success!
       Done! Go visit: http://s3-website-test.net.s3-website-us-east-1.amazonaws.com/index.html

data/features/delete.feature

@@ -11,6 +11,7 @@ Feature: remove an S3 website page from S3
     And the output should equal
       """
       Deploying features/support/test_site_dirs/unpublish-a-post.com/_site/* to s3-website-test.net
+      Calculating diff ... done
       No new or changed files to upload
       Delete index.html: Success!
       Done! Go visit: http://s3-website-test.net.s3-website-us-east-1.amazonaws.com/index.html

data/features/jekyll-support.feature

@@ -7,6 +7,7 @@ Feature: upload a Jekyll site
     And the output should contain
       """
       Deploying features/support/test_site_dirs/jekyllrb.com/_site/* to s3-website-test.net
+      Calculating diff ... done
       Uploading 2 new file(s)
       """
     And the output should contain

data/features/nanoc-support.feature

@@ -7,6 +7,7 @@ Feature: upload a Nanoc site
     And the output should contain
       """
       Deploying features/support/test_site_dirs/nanoc.ws/public/output/* to s3-website-test.net
+      Calculating diff ... done
       Uploading 2 new file(s)
       """
     And the output should contain

data/features/push.feature

@@ -11,6 +11,7 @@ Feature: upload S3 website to S3
     And the output should contain
       """
       Deploying features/support/test_site_dirs/my.blog.com/_site/* to s3-website-test.net
+      Calculating diff ... done
       Uploading 2 new file(s)
       """
     And the output should contain
@@ -55,6 +56,7 @@ Feature: upload S3 website to S3
     And the output should contain
       """
       Deploying features/support/test_site_dirs/new-and-changed-files.com/_site/* to s3-website-test.net
+      Calculating diff ... done
       Uploading 1 new and 1 changed file(s)
       """
     And the output should contain
@@ -78,6 +80,7 @@ Feature: upload S3 website to S3
     And the output should equal
       """
       Deploying features/support/test_site_dirs/only-changed-files.com/_site/* to s3-website-test.net
+      Calculating diff ... done
       Uploading 1 changed file(s)
       Upload index.html: Success!
       Done! Go visit: http://s3-website-test.net.s3-website-us-east-1.amazonaws.com/index.html
@@ -91,6 +94,7 @@ Feature: upload S3 website to S3
     And the output should equal
       """
       Deploying features/support/test_site_dirs/no-new-or-changed-files.com/_site/* to s3-website-test.net
+      Calculating diff ... done
       No new or changed files to upload
       Done! Go visit: http://s3-website-test.net.s3-website-us-east-1.amazonaws.com/index.html
 

data/features/security.feature

@@ -8,6 +8,7 @@ Feature: Security
     And the output should equal
       """
       Deploying features/support/test_site_dirs/site-that-contains-s3-website-file.com/_site/* to another-s3-website-test.net
+      Calculating diff ... done
       No new or changed files to upload
       Done! Go visit: http://another-s3-website-test.net.s3-website-us-east-1.amazonaws.com/index.html
 

data/features/step_definitions/steps.rb

@@ -58,6 +58,24 @@ def push_files
   }
 end
 
+module S3Website
+  class DiffHelper
+    class DiffProgressIndicator
+      def initialize(start_msg, end_msg)
+        puts "#{start_msg} #{end_msg}"
+      end
+
+      def render_next_step
+        # Simplify testing of stdout by doing nothing here.
+      end
+
+      def finish
+        # Simplify testing of stdout by doing nothing here.
+      end
+    end
+  end
+end
+
 module Kernel
   require 'stringio'
 

data/lib/s3_website/diff_helper.rb

@@ -1,12 +1,22 @@
 module S3Website
   class DiffHelper
     def self.resolve_files_to_upload(s3_bucket, site_dir, config)
-      s3_data_source = Filey::DataSources::AwsSdkS3.new(s3_bucket, config)
-      fs_data_source = Filey::DataSources::FileSystem.new(site_dir)
-      changed_local_files =
-        Filey::Comparison.list_changed(fs_data_source, s3_data_source)
-      new_local_files =
-        Filey::Comparison.list_missing(fs_data_source, s3_data_source)
+      progress_indicator = DiffProgressIndicator.new('Calculating diff', "... done\n")
+      s3_data_source = Filey::DataSources::AwsSdkS3.new(s3_bucket, config) { |filey|
+        progress_indicator.render_next_step
+      }
+      fs_data_source = Filey::DataSources::FileSystem.new(site_dir) { |filey|
+        progress_indicator.render_next_step
+      }
+      changed_local_files = Filey::Comparison.list_changed(
+        fs_data_source,
+        s3_data_source
+      )
+      new_local_files = Filey::Comparison.list_missing(
+        fs_data_source,
+        s3_data_source
+      )
+      progress_indicator.finish
       [ normalise(changed_local_files), normalise(new_local_files) ]
     end
 
@@ -17,5 +27,73 @@ module S3Website
         filey.full_path.sub(/\.\//, '')
       }
     end
+
+    class DiffProgressIndicator
+      def initialize(init_msg, end_msg)
+        @end_msg = end_msg
+        @ordinal_direction = 'n' # start from north
+        print init_msg
+        print '  '
+        DiffProgressIndicator.render_ordinal_direction @ordinal_direction
+      end
+
+      def render_next_step
+        @ordinal_direction = DiffProgressIndicator.next_ordinal_direction @ordinal_direction
+        print("\b" + DiffProgressIndicator.render_ordinal_direction(@ordinal_direction))
+      end
+
+      def finish
+        print "\b"
+        print @end_msg
+      end
+
+      private
+
+      def self.render_ordinal_direction(ordinal_direction)
+        case ordinal_direction
+        when 'n'
+          '|'
+        when 'ne'
+          '/'
+        when 'e'
+          '-'
+        when 'se'
+          '\\'
+        when 's'
+          '|'
+        when 'sw'
+          '/'
+        when 'w'
+          '-'
+        when 'nw'
+          '\\'
+        else
+          raise 'Unknown ordinal direction ' + ordinal_direction
+        end
+      end
+
+      def self.next_ordinal_direction(current_ordinal_direction)
+        case current_ordinal_direction
+        when 'n'
+          'ne'
+        when 'ne'
+          'e'
+        when 'e'
+          'se'
+        when 'se'
+          's'
+        when 's'
+          'sw'
+        when 'sw'
+          'w'
+        when 'w'
+          'nw'
+        when 'nw'
+          'n'
+        else
+          raise 'Unknown ordinal direction ' + current_ordinal_direction
+        end
+      end
+    end
   end
 end

data/s3_website.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "s3_website"
-  s.version     = "1.2.1"
+  s.version     = "1.3.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.default_executable = %q{s3_website}
 
   s.add_dependency 'aws-sdk', '~> 1.8.5'
-  s.add_dependency 'filey-diff', '~> 1.3'
+  s.add_dependency 'filey-diff', '~> 1.4'
   s.add_dependency 'simple-cloudfront-invalidator', '~> 1'
   s.add_dependency 'erubis', '~> 2.7.0'
   s.add_dependency 'mime-types', '= 1.19'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: simple-cloudfront-invalidator
   requirement: !ruby/object:Gem::Requirement