middleman-s3_sync 3.0.14 → 3.0.15

data/.s3_sync.sample

@@ -0,0 +1,3 @@
+---
+aws_access_key_id: <AWS Access Key>
+aws_secret_access_key: <AWS Secret Access Key>

data/README.md

@@ -67,6 +67,37 @@ activate :s3_sync do |s3_sync|
 end
 ```
 
+### Providing AWS Credentials
+
+There are a few ways to provide the AWS credentials for s3_sync:
+
+#### Through ```config.rb```
+
+You can set the aws_access_key_id and aws_secret_access_key in the block
+that is passed to the activate method.
+
+#### Through ```.s3_sync``` File
+
+You can create a ```.s3_sync``` at the root of your middleman project.
+The credentials are passed in the YAML format. The keys match the
+options keys.
+
+The .s3_sync file takes precedence to the configuration passed in the
+activate method.
+
+A sample ```.s3_sync``` file is included at the root of this repo.
+
+#### Through Environment
+
+You can also pass the credentials through environment variables. They
+map to the following values:
+
+| aws_access_key_id     | ```ENV['AWS_ACCESS_KEY_ID```       |
+| aws_secret_access_key | ```ENV['AWS_SECRET_ACCESS_KEY']``` |
+
+The environment is used when the credentials are not set in the activate
+method or passed through the ```.s3_sync``` configuration file.
+
 ## Push All Content to S3
 
 There are situations where you might need to push the files to S3. In

data/lib/middleman-s3_sync/commands.rb

@@ -34,6 +34,15 @@ module Middleman
         shared_inst.s3_sync_options.bucket = options[:bucket] if options[:bucket]
         shared_inst.s3_sync_options.verbose = options[:verbose] if options[:verbose]
 
+        config_file = File.join(shared_inst.root_path, ".s3_sync")
+
+        if File.exist?(config_file)
+          config = YAML::load( File.open( config_file ) )
+
+          shared_inst.s3_sync_options.aws_secret_access_key = config["aws_secret_access_key"] if config["aws_secret_access_key"]
+          shared_inst.s3_sync_options.aws_access_key_id = config["aws_access_key_id"] if config["aws_access_key_id"]
+        end
+
         ::Middleman::S3Sync.sync
       end
     end

data/lib/middleman/s3_sync.rb

@@ -76,7 +76,7 @@ module Middleman
       end
 
       def remote_paths
-        @remote_paths ||= bucket.files.map{ |f| f.key }.reject { |p| p =~ %r{/$} }
+        @remote_paths ||= bucket.files.map{ |f| f.key }
       end
 
       def create_resources

data/lib/middleman/s3_sync/resource.rb

@@ -92,7 +92,12 @@ module Middleman
       end
 
       def ignore!
-        say_status "Ignoring".yellow + " #{path} #{ redirect? ? "(redirect)".white : "" }"
+        reason = if redirect?
+                   :redirect
+                 elsif directory?
+                   :directory
+                 end
+        say_status "Ignoring".yellow + " #{path} #{ reason ? "(#{reason})".white : "" }"
       end
 
       def to_delete?
@@ -120,7 +125,9 @@ module Middleman
       end
 
       def status
-        @status ||= if local? && remote?
+        @status ||= if directory?
+                      :ignored
+                    elsif local? && remote?
                       if content_md5 != remote_md5
                         :updated
                       else
@@ -147,6 +154,10 @@ module Middleman
         s3_resource.metadata.has_key? 'x-amz-website-redirect-location'
       end
 
+      def directory?
+        File.directory?(local_path)
+      end
+
       def relative_path
         @relative_path ||= local_path.gsub(/#{build_dir}/, '')
       end

data/lib/middleman/s3_sync/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module S3Sync
-    VERSION = "3.0.14"
+    VERSION = "3.0.15"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-s3_sync
 version: !ruby/object:Gem::Version
-  version: 3.0.14
+  version: 3.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -229,6 +229,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .s3_sync.sample
 - .travis.yml
 - Changelog.md
 - Gemfile
@@ -262,7 +263,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2891873384991304950
+      hash: -3960336143999785597
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2891873384991304950
+      hash: -3960336143999785597
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23