jekyll-s3 2.2.3 → 2.2.4

data/changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.2.4
+
+* Print the web site URL instead of the bucket URL
+  ([#22](https://github.com/laurilehmijoki/jekyll-s3/issues/22)).
+
 ## 2.2.3
 
 * Allow bugfixes for transitive dependencies *filey-diff*,

data/features/instructions-for-new-user.feature

@@ -1,5 +1,9 @@
 Feature: Instructions for a new user
 
+  As a new Jekyll-s3 user
+  I would like to get helpful feedback when running `jekyll-s3`
+  So that I can upload my Jekyll site to S3 without headache
+
   Scenario: Run jekyll-s3 in the wrong directory
     When I run `jekyll-s3`
     Then the output should contain:
@@ -65,3 +69,12 @@ Feature: Instructions for a new user
       s3_secret: YOUR_AWS_S3_SECRET_ACCESS_KEY
       s3_bucket: your.blog.bucket.com
       """
+
+  @new-files
+  Scenario: Print the URL of the site to the user
+    When my Jekyll site is in "features/support/test_site_dirs/my.blog.com"
+    Then jekyll-s3 will push my blog to S3
+    And the output should contain
+      """
+      Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
+      """

data/features/jekyll-s3-cloudfront.feature

@@ -16,7 +16,7 @@ Feature: Invalidate the Cloudfront distribution
       Uploading 2 new file(s)
       Upload css/styles.css: Success!
       Upload index.html: Success!
-      Done! Go visit: http://jekyll-s3-test.net.s3.amazonaws.com/index.html
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
       Invalidating Cloudfront items...
         /
       succeeded
@@ -32,7 +32,7 @@ Feature: Invalidate the Cloudfront distribution
       Deploying _site/* to jekyll-s3-test.net
       Uploading 1 changed file(s)
       Upload index.html: Success!
-      Done! Go visit: http://jekyll-s3-test.net.s3.amazonaws.com/index.html
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
       Invalidating Cloudfront items...
         /index.html
         /

data/features/jekyll-s3-delete.feature

@@ -13,6 +13,6 @@ Feature: remove a Jekyll blog post from S3
       Deploying _site/* to jekyll-s3-test.net
       No new or changed files to upload
       Delete index.html: Success!
-      Done! Go visit: http://jekyll-s3-test.net.s3.amazonaws.com/index.html
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
 
       """

data/features/jekyll-s3-upload.feature

@@ -14,7 +14,7 @@ Feature: upload Jekyll site to S3
       Uploading 2 new file(s)
       Upload css/styles.css: Success!
       Upload index.html: Success!
-      Done! Go visit: http://jekyll-s3-test.net.s3.amazonaws.com/index.html
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
 
       """
 
@@ -28,7 +28,7 @@ Feature: upload Jekyll site to S3
       Uploading 1 new and 1 changed file(s)
       Upload css/styles.css: Success!
       Upload index.html: Success!
-      Done! Go visit: http://jekyll-s3-test.net.s3.amazonaws.com/index.html
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
 
       """
 
@@ -41,7 +41,7 @@ Feature: upload Jekyll site to S3
       Deploying _site/* to jekyll-s3-test.net
       Uploading 1 changed file(s)
       Upload index.html: Success!
-      Done! Go visit: http://jekyll-s3-test.net.s3.amazonaws.com/index.html
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
 
       """
 
@@ -53,6 +53,6 @@ Feature: upload Jekyll site to S3
       """
       Deploying _site/* to jekyll-s3-test.net
       No new or changed files to upload
-      Done! Go visit: http://jekyll-s3-test.net.s3.amazonaws.com/index.html
+      Done! Go visit: http://jekyll-s3-test.net.s3-website-us-east-1.amazonaws.com/index.html
 
       """

data/features/step_definitions/steps.rb

@@ -17,6 +17,10 @@ Then /^the output should equal$/ do |expected_console_output|
   @console_output.should eq(expected_console_output)
 end
 
+Then /^the output should contain$/ do |expected_console_output|
+  @console_output.should include(expected_console_output)
+end
+
 Then /^report that it uploaded (\d+) new and (\d+) changed files into S3$/ do
   |new_count, changed_count|
   @amount_of_new_files.should == new_count.to_i

data/jekyll-s3.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "jekyll-s3"
-  s.version     = "2.2.3"
+  s.version     = "2.2.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Philippe Creux", "Lauri Lehmijoki"]
   s.email       = ["pcreux@gmail.com", "lauri.lehmijoki@iki.fi"]

data/lib/jekyll-s3/uploader.rb

@@ -14,12 +14,21 @@ module Jekyll
         deleted_files_count = remove_superfluous_files(
           s3, config['s3_bucket'], site_dir, in_headless_mode)
 
-        puts "Done! Go visit: http://#{config['s3_bucket']}.s3.amazonaws.com/index.html"
+        print_done_report config
+
         [new_files_count, changed_files_count, deleted_files_count, changed_files]
       end
 
       private
 
+      def self.print_done_report(config)
+        bucket_name = config['s3_bucket']
+        s3_end_point = "us-east-1"
+        web_site_host_name =
+          "%s.s3-website-%s.amazonaws.com" % [bucket_name, s3_end_point]
+        puts "Done! Go visit: http://#{web_site_host_name}/index.html"
+      end
+
       def self.upload_files(s3, config, site_dir)
         changed_files, new_files = DiffHelper.resolve_files_to_upload(
           s3.buckets[config['s3_bucket']], site_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-s3
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk