jekyll-s3-yearofmoo 0.0.26 → 0.0.27

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

@@ -42,14 +42,22 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
         end
       end
 
-      def local_files(pattern=nil)
+      def local_files(campaign=nil)
         dir = @production_directory || SITE_DIR
         paths = []
 
-        pattern ||= '**/*'
-        if pattern.is_a?(Array)
+        campaign = @config['campaigns'][campaign]
+        if campaign
+          include_files = campaign['include_files']
+          exclude_files = campaign['exclude_files']
+        end
+
+        include_pattern ||= '**/*'
+        exclude_pattern ||= nil
+
+        if include_pattern.is_a?(Array)
           files = []
-          pattern.each do |pat|
+          include_pattern.each do |pat|
             files |= Dir[dir + '/' + pat]
           end
         else
@@ -63,8 +71,20 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
           f.gsub(dir + '/', '')
         }
 
-        if @config['exclude_files']
-          patterns = @config['exclude_files'].map do |p|
+        if exclude_pattern
+          exclude_pattern = exclude_pattern.is_a?(Array) ? exclude_pattern : [exclude_pattern]
+        end
+
+        exclude_pattern ||= []
+
+        p = @config['exclude_files']
+        if p
+          p = p.is_a?(Array) ? p : [p]
+          exclude_pattern |= p
+        end
+
+        if exclude_pattern.length > 0
+          patterns = exclude_pattern.map do |p|
             Regexp.new(p)
           end
           files.each do |file|
@@ -125,17 +145,15 @@ cloudfront_distribution_id: YOUR_CLOUDFRONT_DIST_ID (OPTIONAL)
       def upload_to_s3!(campaign=nil)
 
         if campaign
-          raise campaign.to_s+'-'+@config.to_yaml
           campaign = @config['campaigns'][campaign]
         end
 
-        remove_files = true
-        pattern = '**/*'
         if campaign
-          pattern = campaign['files']
           remove_files = false
+          puts "Deploying *#{campaign}* to #{@s3_bucket}"
+        else
+          puts "Deploying _site/#{pattern} to #{@s3_bucket}"
         end
-        puts "Deploying _site/#{pattern} to #{@s3_bucket}"
 
         AWS::S3::Base.establish_connection!(
             :access_key_id     => @s3_id,
@@ -152,7 +170,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(pattern)
+        to_upload = local_files(campaign)
         to_upload.each do |f|
           run_with_retry do
             path = "#{dir}/#{f}"

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

@@ -1,5 +1,5 @@
 module Jekyll
   module S3
-    VERSION = "0.0.26"
+    VERSION = "0.0.27"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 26
-  version: 0.0.26
+  - 27
+  version: 0.0.27
 platform: ruby
 authors: 
 - Philippe Creux