s3_website 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29a254f2801e9e63b44ad767609e498309bf1002
-  data.tar.gz: e0262bc0a34a7a94ddc0dab19bcaecfc7981ab06
+  metadata.gz: 55cbf48ece87058d058773afa873397466a7bb46
+  data.tar.gz: 23e1d2f8b50bad5582a3954fff956e5d401a4855
 SHA512:
-  metadata.gz: 4a1feb02a3114c23a620152f409d5985759ce518399856ec7324fc09bebc8e2b535f92b76307da15ab3c861db280686b5947bebd94666664ce7564f177526e7c
-  data.tar.gz: b3aa31a71a4430a2ebb35a713eb9a2d6ff87ebac3d90a7c9b7b875f35037b930c9f8400de955de6c7a430e9ef5905beaf67a6d712739624590ded98ae8adc6a0
+  metadata.gz: e23239516c9d32cf5a29bc826a5809635e17e20adfd8aa083a620e6ca9aa2ad8e8da29d467c2aeebe5732ea7516bd1f3a6024551739c85fe59ae13199fa3ad84
+  data.tar.gz: f6857264ecd3e9f88b92979c55d89a54800a14d2f07b325dce5871edc8eb5e6aeb4720c50d685dcdacbde379c3a3d3a76e707f2c01145e3539d5ea6ac5fe0f97

data/bin/s3_website

@@ -6,6 +6,8 @@ class Cfg < Thor
   desc 'create', 'Create a config file with placeholder values'
   def create
     S3Website::Tasks.config_create Dir.pwd
+  rescue Exception => e
+    puts S3Website.error_report e
   end
 
   desc 'apply', 'Apply the configuration on the AWS services'
@@ -19,7 +21,13 @@ class Cfg < Thor
   LONGDESC
   def apply
     puts 'Applying the configurations in s3_website.yml on the AWS services ...'
-    system('configure-s3-website --config-file s3_website.yml')
+    require 'configure-s3-website'
+    config_source = ConfigureS3Website::FileConfigSource.new 's3_website.yml'
+    ConfigureS3Website::Runner.run({
+      :config_source => config_source
+    })
+  rescue Exception => e
+    puts S3Website.error_report e
   end
 end
 
@@ -50,6 +58,8 @@ class Cli < Thor
   def push
     site_path = S3Website::Paths.infer_site_path options[:site]
     S3Website::Tasks.push(options[:config_dir], site_path, options[:headless])
+  rescue Exception => e
+    puts S3Website.error_report e
   end
 
   desc 'cfg SUBCOMMAND ...ARGS', 'Operate on the config file'

data/changelog.md

@@ -2,6 +2,12 @@
 
 This project uses [Semantic Versioning](http://semver.org).
 
+## 1.6.4
+
+* Add systematic error handling
+
+  Fixes issue https://github.com/laurilehmijoki/s3_website/issues/52.
+
 ## 1.6.3
 
 * Invalidate a deleted file on CloudFront

data/features/error_reporting.feature

@@ -0,0 +1,17 @@
+Feature: reporting errors to the user
+
+  Background: we want to show a non-technical error report to the user.
+    Consequently, we do not print the stack trace of the error.
+
+  @starts-new-os-process
+  @network-io
+  Scenario: The S3 credentials are invalid
+    When I run `s3_website push --site ../../features/support/test_site_dirs/my.blog.com --config_dir ../../features/support/test_site_dirs/my.blog.com`
+    Then the output should contain:
+      """
+      The AWS Access Key Id you provided does not exist in our records. (AWS::S3::Errors::InvalidAccessKeyId)
+      """
+    And the output should not contain:
+      """
+      throw
+      """

data/lib/s3_website/diff_helper.rb

@@ -47,17 +47,17 @@ module S3Website
         @end_msg = end_msg
         @ordinal_direction = 'n' # start from north
         print init_msg
-        print '  '
+        print '   '
         render_next_step
       end
 
       def render_next_step
         @ordinal_direction = DiffProgressIndicator.next_ordinal_direction @ordinal_direction
-        print("\b" + DiffProgressIndicator.render_ordinal_direction(@ordinal_direction))
+        print("\b\b" + DiffProgressIndicator.render_ordinal_direction(@ordinal_direction) + ' ')
       end
 
       def finish
-        print "\b"
+        print "\b\b"
         print @end_msg
       end
 

data/lib/s3_website/errors.rb

@@ -31,4 +31,12 @@ module S3Website
       super(message)
     end
   end
+
+  def self.error_report(error)
+    if error.is_a? S3WebsiteError
+      "#{error.message}"
+    else
+      "#{error.message} (#{error.class})"
+    end
+  end
 end

data/lib/s3_website/paths.rb

@@ -10,9 +10,6 @@ module S3Website
       else
         candidate_path_if_exists candidate_path
       end
-    rescue NoWebsiteDirectoryFound => e
-      puts e.message
-      exit 1
     end
 
     private

data/lib/s3_website/tasks.rb

@@ -15,16 +15,10 @@ module S3Website
         :invalidated_items_count => invalidated_items_count,
         :changed_redirects_count => changed_redirects.size
       }
-    rescue S3WebsiteError => e
-      puts e.message
-      exit 1
     end
 
     def self.config_create(dir)
       ConfigLoader.check_s3_configuration dir
-    rescue S3WebsiteError => e
-      puts e.message
-      exit 1
     end
 
     private

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.6.3"
+  s.version     = "1.6.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Lauri Lehmijoki"]
   s.email       = ["lauri.lehmijoki@iki.fi"]

data/spec/lib/error_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'error reporting' do
+  it 'prints the class name of the error' do
+    S3Website::error_report(SocketError.new('network is down')).should include(
+      'SocketError'
+    )
+  end
+
+  it 'prints the message of the error' do
+    S3Website::error_report(SocketError.new('network is down')).should eq(
+      'network is down (SocketError)'
+    )
+  end
+
+  it "only prints the message if the error is an #{S3Website::S3WebsiteError}" do
+    S3Website::error_report(S3Website::NoWebsiteDirectoryFound.new()).should eq(
+      "I can't find any website. Are you in the right directory?"
+    )
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_website
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Lauri Lehmijoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-02 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -239,6 +239,7 @@ files:
 - features/cloudfront.feature
 - features/command-line-help.feature
 - features/delete.feature
+- features/error_reporting.feature
 - features/instructions-for-new-user.feature
 - features/jekyll-support.feature
 - features/nanoc-support.feature
@@ -326,6 +327,7 @@ files:
 - spec/lib/cloudfront/invalidator_spec.rb
 - spec/lib/config_loader_spec.rb
 - spec/lib/endpoint_spec.rb
+- spec/lib/error_spec.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/parallelism_spec.rb
 - spec/lib/paths_spec.rb
@@ -381,6 +383,7 @@ test_files:
 - features/cloudfront.feature
 - features/command-line-help.feature
 - features/delete.feature
+- features/error_reporting.feature
 - features/instructions-for-new-user.feature
 - features/jekyll-support.feature
 - features/nanoc-support.feature
@@ -451,6 +454,7 @@ test_files:
 - spec/lib/cloudfront/invalidator_spec.rb
 - spec/lib/config_loader_spec.rb
 - spec/lib/endpoint_spec.rb
+- spec/lib/error_spec.rb
 - spec/lib/keyboard_spec.rb
 - spec/lib/parallelism_spec.rb
 - spec/lib/paths_spec.rb