microstatic 0.4.2 → 0.5.0

data/lib/microstatic/rake.rb

@@ -4,7 +4,7 @@ require 'rake/tasklib'
 module Microstatic module Rake
 
 class S3DeployTask < ::Rake::TaskLib
-  attr_accessor :name, :bucket_name, :source_dir, :aws_access_key_id, :aws_secret_access_key
+  attr_accessor :name, :bucket_name, :source_dir, :exclude, :aws_access_key_id, :aws_secret_access_key
 
   def initialize( opts = {} )
     if opts.is_a?(String) || opts.is_a?(Symbol)
@@ -16,6 +16,7 @@ class S3DeployTask < ::Rake::TaskLib
     @aws_secret_access_key = opts.fetch( :aws_secret_access_key ) { ENV.fetch('AWS_SECRET_ACCESS_KEY') }
     @bucket_name = opts.fetch( :bucket_name, false )
     @source_dir = opts.fetch( :source_dir, false )
+    @exclude = opts.fetch( :exclude, false )
   end
 
   def define
@@ -34,6 +35,7 @@ class S3DeployTask < ::Rake::TaskLib
     desc "deploy to the '#{bucket_name}' S3 bucket" unless ::Rake.application.last_comment
     task name do
       deployer = Microstatic::S3Deployer.new( source_dir, bucket_name, aws_creds )
+      deployer.file_list.exclude(@exclude) if @exclude
       deployer.upload
     end
   end

data/lib/microstatic/s3_deployer.rb

@@ -1,5 +1,6 @@
 require 'digest/md5'
 require 'pathname'
+require 'rake/file_list'
 
 module Microstatic
 
@@ -7,16 +8,21 @@ module Microstatic
 # shared by Giles Alexander (@gga)
 class S3Deployer
   include UsesFog
+
+  attr_reader :file_list # TODO: don't expose this directly
+
   def initialize( local_dir, bucket, aws_creds )
     check_and_store_aws_creds(aws_creds)
 
     @local_dir = Pathname.new(local_dir)
+    @file_list = ::Rake::FileList.new( (@local_dir+"**/*").to_s )
     @bucket = bucket
   end
 
   def upload
-    Pathname.glob(@local_dir+"**/*") do |child|
-      upload_file(child) unless child.directory?
+    @file_list.each do |entry|
+      entry = Pathname.new(entry)
+      upload_file(entry) unless entry.directory?
     end
   end
 

data/lib/microstatic/version.rb

@@ -1,3 +1,3 @@
 module Microstatic
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/microstatic.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "fog", ">=1"
   gem.add_runtime_dependency "thor", ">=0.15" # 0.15 is an arbitrary guess at what might be API-compatible
   gem.add_runtime_dependency "rainbow", ">= 2.0"
+  gem.add_runtime_dependency "rake"           # we use Rake::FileList to specify which files to upload
 
-  gem.add_development_dependency "rake"
   gem.add_development_dependency "bundler"
   gem.add_development_dependency "rspec", "~>2.13.0"
   gem.add_development_dependency "pry-nav", "~> 0.2.3"

data/spec/integration/fixtures/subdir/ignored/ignored-file.txt

@@ -0,0 +1 @@
+please ignore me

data/spec/integration/upload_to_test_bucket_spec.rb

@@ -20,6 +20,7 @@ describe 'uploading to a test bucket' do
 
   it 'succeeds' do
     deployer = S3Deployer.new( test_dir, test_bucket, aws_creds )
+    deployer.file_list.exclude(%r|ignored/|)
     deployer.upload
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microstatic
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -67,7 +67,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -153,6 +153,7 @@ files:
 - spec/integration/fixtures/example_file.txt
 - spec/integration/fixtures/subdir/another_file.txt
 - spec/integration/fixtures/subdir/foo.txt
+- spec/integration/fixtures/subdir/ignored/ignored-file.txt
 - spec/integration/fixtures/subdir/subsubdir/deep.txt
 - spec/integration/spec_helper.rb
 - spec/integration/upload_to_test_bucket_spec.rb
@@ -171,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2300278806799071674
+      hash: -1270358842069851857
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2300278806799071674
+      hash: -1270358842069851857
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -191,6 +192,7 @@ test_files:
 - spec/integration/fixtures/example_file.txt
 - spec/integration/fixtures/subdir/another_file.txt
 - spec/integration/fixtures/subdir/foo.txt
+- spec/integration/fixtures/subdir/ignored/ignored-file.txt
 - spec/integration/fixtures/subdir/subsubdir/deep.txt
 - spec/integration/spec_helper.rb
 - spec/integration/upload_to_test_bucket_spec.rb