jekyll-s3-yearofmoo 0.0.20 → 0.0.21

data/lib/jekyll-s3-yearofmoo/uploader.rb

@@ -42,11 +42,12 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
         end
       end
 
-      def local_files
+      def local_files(pattern=nil)
         dir = @production_directory || SITE_DIR
         paths = []
 
-        files = Dir[dir + '/**/*']
+        pattern ||= '**/*'
+        files = Dir[dir + '/' + pattern]
         files = files.delete_if { |f|
           File.directory?(f)
         }.map { |f|
@@ -112,8 +113,19 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
 
 
       # Please spec me!
-      def upload_to_s3!
-        puts "Deploying _site/* to #{@s3_bucket}"
+      def upload_to_s3!(campaign=nil)
+
+        if campaign
+          campaign = @config['campaigns'][campaign]
+        end
+
+        remove_files = true
+        pattern = '**/*'
+        if campaign
+          pattern = campaign['files']
+          remove_files = false
+        end
+        puts "Deploying _site/#{pattern} to #{@s3_bucket}"
 
         AWS::S3::Base.establish_connection!(
             :access_key_id     => @s3_id,
@@ -130,7 +142,7 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
         remote_files = bucket.objects.map { |f| f.key }
 
         dir = @production_directory || SITE_DIR
-        to_upload = local_files
+        to_upload = local_files(pattern)
         to_upload.each do |f|
           run_with_retry do
             path = "#{dir}/#{f}"
@@ -143,34 +155,41 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
           end
         end
 
-        to_delete = remote_files - local_files
-
-        delete_all = false
-        keep_all = false
-        to_delete.each do |f|
-          delete = false
-          keep = false
-          until delete || delete_all || keep || keep_all
-            puts "#{f} is on S3 but not in your _site directory anymore. Do you want to [d]elete, [D]elete all, [k]eep, [K]eep all?"
-            case STDIN.gets.chomp
-            when 'd' then delete = true
-            when 'D' then delete_all = true
-            when 'k' then keep = true
-            when 'K' then keep_all = true
+        if remove_files
+          to_delete = remote_files - local_files
+
+          delete_all = false
+          keep_all = false
+          to_delete.each do |f|
+            delete = false
+            keep = false
+            until delete || delete_all || keep || keep_all
+              puts "#{f} is on S3 but not in your _site directory anymore. Do you want to [d]elete, [D]elete all, [k]eep, [K]eep all?"
+              case STDIN.gets.chomp
+              when 'd' then delete = true
+              when 'D' then delete_all = true
+              when 'k' then keep = true
+              when 'K' then keep_all = true
+              end
             end
-          end
-          if (delete_all || delete) && !(keep_all || keep)
-            run_with_retry do
-              if AWS::S3::S3Object.delete(f, @s3_bucket)
-                puts("Delete #{f}: Success!")
-              else
-                puts("Delete #{f}: FAILURE!")
+            if (delete_all || delete) && !(keep_all || keep)
+              run_with_retry do
+                if AWS::S3::S3Object.delete(f, @s3_bucket)
+                  puts("Delete #{f}: Success!")
+                else
+                  puts("Delete #{f}: FAILURE!")
+                end
               end
             end
           end
         end
 
-        puts "Done! Go visit: http://#{@s3_bucket}.s3.amazonaws.com/index.html"
+        domain = 'http://#{@s3_bucket}.s3.amazonaws.com/index.html'
+        if @config['www']
+          domain = @config['www']
+        end
+        puts "Done! Go visit: #{domain}"
+
         true
       end
 

data/lib/jekyll-s3-yearofmoo/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module S3
-    VERSION = "0.0.20"
+    VERSION = "0.0.21"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 20
-  version: 0.0.20
+  - 21
+  version: 0.0.21
 platform: ruby
 authors: 
 - Philippe Creux
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-28 00:00:00 -04:00
+date: 2012-09-26 00:00:00 -04:00
 default_executable: jekyll-s3-yearofmoo
 dependencies: 
 - !ruby/object:Gem::Dependency