jekyll-publish 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d11770d3fd4c0dabbcca06a46302f7ef49ff588c
-  data.tar.gz: ec2c57be1228f1276fd8b1d6c29985447ea51956
+  metadata.gz: 84853e6b379d82877ad54d958105da9e51fe30e2
+  data.tar.gz: 17f167187eaa0764977eae1ed239beeb2c4e5ea9
 SHA512:
-  metadata.gz: deec7400657525fb43aada741874120fa5a45b30404602b1771a1bff7c8a5a1edcf83cabf1597896041df3c45b02de9bd329b890c96320800c7d58062ed173dd
-  data.tar.gz: ffed4d4b4c1c835a6f1f30220c2a6a62066dea8f0ed2f487f9d569caf2f697b443117630df5131d2e7456944db36db92ead6cb66d32dcbfcea13e1e6a9bc597a
+  metadata.gz: 4fd3fd2d8e152783f7f70fe10bf57548fe62f401a132b76b2baa29575dd763b26865638b1d9a9fb674f1b4db964eb18d59f7f3bf51a00c48e544a18ad12078b1
+  data.tar.gz: 6bb23720960f1b4432f290bd599de4498e68ae444ab48809f076d38dfff2fbcf4b9c309d46cc14e724b960e740cb84eb4756897f147dd3e18c6b3bb91beaf889

data/lib/jekyll-publish.rb

@@ -1,36 +1,49 @@
 require 'aws-sdk'
 class Publish < Jekyll::Command
   class << self
-
-    def set_aws_region(options)
-      if options['region'].to_s != ''
-        return options['region']
-      elsif Jekyll.configuration({})['aws_region'].to_s != ''
-        return Jekyll.configuration({})['aws_region']
+    def get_aws_region()
+      if @config['aws_region'].to_s != ''
+        region = @config['aws_region']
+        Jekyll.logger.info "AWS Region:", region
+        return region
       else
         raise "No region defined - use -r AWS_REGION or set aws_region: AWS_REGION in _config.yml"
       end
     end
 
-    def set_bucket_name(options)
-      if options['bucket_name'].to_s != ''
-        bucket_name = options['bucket_name']
-      elsif Jekyll.configuration({})['bucket_name'].to_s != ''
-        bucket_name = Jekyll.configuration({})['bucket_name']
+    def get_bucket_name()
+      if @config['bucket_name'].to_s != ''
+        bucket_name = @config['bucket_name']
+        Jekyll.logger.info "AWS Bucket Name:", bucket_name
+        return bucket_name
       else
         raise "No bucket_name defined - use -b BUCKET_NAME or set bucket_name: BUCKET_NAME in _config.yml"
       end
     end
 
-    def upload_to_s3(region, bucket_name)
+    def get_files()
       Dir.chdir("./_site")
+      if @config['include_file_extensions'].to_s != ''
+        extensions = "html,css,js,xml,#{@config['include_file_extensions']}"
+      else
+        extensions = "html,css,js,xml"
+      end
+      Jekyll.logger.info "File Extensions:", extensions
+      file_regex = "./**/*.{#{extensions}}"
+      return Dir[file_regex]
+    end
+
+    def upload_to_s3(region, bucket_name, files)
       s3 = Aws::S3::Resource.new(region: region)
-      Dir['./**/*.{html,css,js,xml}'].each do |file|
+      Jekyll.logger.info "Uploading:"
+      files.each do |file|
         key = file[2..-1]
-        puts "Uploading -> #{key}"
         obj = s3.bucket(bucket_name).object(key)
         obj.upload_file(File.absolute_path(file))
+        Jekyll.logger.info "", key
       end
+      Jekyll.logger.info "Done!"
+      Jekyll.logger.info "Published to:", s3.bucket(bucket_name).url
     end
 
     def init_with_program(prog)
@@ -38,16 +51,16 @@ class Publish < Jekyll::Command
         c.syntax "publish [options]"
         c.description 'Publish Jekyll site to AWS S3.'
 
-        c.option 'region', '-r AWS_REGION', 'Region with the S3 Bucket.'
-        c.option 'bucket_name', '-b BUCKET_NAME', 'Region with the S3 Bucket.'
+        c.option 'aws_region', '-r AWS_REGION', 'Region with the S3 Bucket.'
+        c.option 'bucket_name', '-b BUCKET_NAME', 'Name of the S3 Bucket'
+        c.option 'include_file_extensions', '-e FILE_EXTENSION', 'Additionally uploads files with specified extension'
 
         c.action do |args, options|
-          region = set_aws_region options
-          bucket_name = set_bucket_name options
-          puts "AWS Region: #{region}"
-          puts "AWS Bucket Name: #{bucket_name}"
-          upload_to_s3 region, bucket_name
-          puts "Done!"
+          @config = configuration_from_options options
+          region = get_aws_region
+          bucket_name = get_bucket_name
+          files = get_files
+          upload_to_s3 region, bucket_name, files
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-publish
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sean Rankine
@@ -31,7 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/jekyll-publish.rb
-homepage: http://rubygems.org/gems/jekyll_publish
+homepage: https://github.com/theseanything/jekyll-publish
 licenses:
 - MIT
 metadata: {}