octopress-deploy 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b40f670b3da0ca63247f292839e1f3ac4078c12
-  data.tar.gz: 2dad3bffc5e0d5a73ebe993d8918c2d63d04fb2f
+  metadata.gz: 6606cff1ff42e965567713c41b4da108d87e9b6f
+  data.tar.gz: 2d2a9ddc507baaed0bb08b255a5092839ac8ed02
 SHA512:
-  metadata.gz: ea4356aae147e4a0f3de99ca98235b729fd48fc19e53fccecd2896b38e2f86b1c8e91c3652861ebadd52f03b5eee4886540a281352388b8274192bbb5a4cf3f1
-  data.tar.gz: 2c91be9d8efeea20adff8b408fb578394abbcd439315fcaa805d04a95180d77620ceece1ab6d290766908428be0e3ac21c11baa1737b90cf7889fdcc8109efe4
+  metadata.gz: d20780fe819e5233b6debeab56442de4fef9470bb6123869635b9bc614689a6c783cc81f36a12414c1110e3979309888ded340cb5229bd0dc03d7c585c43c41d
+  data.tar.gz: fb5bf4c2574fa50fa05301464426cfb13233d1bfbda31871ed1d5bc3c7d1a1cd01e08a671dfc5b8ca906348bb61c097f80b61d6b13f270645f82848a7672004b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.5 - 2015-02-06
+
+- Added incremental uploads to S3. [#46](https://github.com/octopress/deploy/pull/46)
+
 ### 1.0.5 - 2015-02-04
 
 - Fixed issue where an S3 pull wouldn't create some directories.

data/README.md

@@ -87,6 +87,7 @@ account access information.
 | `secret_access_key` | AWS secret key                                        |              |
 | `remote_path`       | Directory files should be synced to.                  | /            |
 | `verbose`           | [optional] Display all file actions during deploy.    | false        |
+| `incremental`       | [optional] Incremental deploy (only updated files)    | false        |
 | `region`            | [optional] Region for your AWS bucket                 | us-east-1    |
 | `delete`            | Delete files in `remote_path` not found in `site_dir` | false        |
 | `headers`           | Set headers for matched files                         | []           |

data/lib/octopress-deploy/commands.rb

@@ -75,6 +75,7 @@ module Octopress
               c.option 'region', '-r', '--region REGION', 'AWS region (default: us-east-1)'
               c.option 'remote_path', '-d', '--dir DIR', 'Deploy site into a subdirectory.'
               c.option 'verbose', '-v', '--verbose', 'Log verbose output when deploying'
+              c.option 'incremental', '-i', '--incremental', 'Only upload new/changed files'
               c.option 'delete', '--delete', 'Sync file deletion'
               add_common_init_options(c)
 

data/lib/octopress-deploy/s3.rb

@@ -19,6 +19,7 @@ module Octopress
         @region      = options[:region]            || ENV['AWS_DEFAULT_REGION'] || 'us-east-1'
         @remote_path = (options[:remote_path]      || '/').sub(/^\//,'')
         @verbose     = options[:verbose]
+        @incremental = options[:incremental]
         @delete      = options[:delete]
         @headers     = options[:headers]           || []
         @remote_path = @remote_path.sub(/^\//,'')  # remove leading slash
@@ -76,12 +77,21 @@ module Octopress
           s3_filename = remote_path(file)
           o = @bucket.objects[s3_filename]
           file_with_options = get_file_with_metadata(file, s3_filename);
+          s3sum = o.etag.tr('"','')
 
-          o.write(file_with_options)
-          if @verbose
-            puts "+ #{remote_path(file)}"
-          else
-            progress('+')
+          if @incremental && (s3sum == Digest::MD5.file(file).hexdigest)
+            if @verbose
+              puts "= #{remote_path(file)}"
+            else
+              progress('=')
+            end
+          else 
+            o.write(file_with_options)
+            if @verbose
+              puts "+ #{remote_path(file)}"
+            else
+              progress('+')
+            end
           end
         end
       end
@@ -229,10 +239,9 @@ module Octopress
 #{"secret_access_key: #{options[:secret_access_key]}".ljust(40)}  # Keep it safe; keep it secret. Keep this file in your .gitignore.
 #{"remote_path: #{options[:remote_path] || '/'}".ljust(40)}  # relative path on bucket where files should be copied.
 #{"region: #{options[:remote_path] || 'us-east-1'}".ljust(40)}  # Region where your bucket is located.
-#{"verbose: true".ljust(40)}  # Print out all file operations.
-
-#{"# delete: #{options[:delete] || 'true'}".ljust(40)}  # Remove files from destination which do not match source files.
-#{"# verbose: #{options[:verbose] || 'false'}".ljust(40)}  # Print out all file operations.
+#{"verbose: #{options[:verbose] || 'false'}".ljust(40)}  # Print out all file operations.
+#{"incremental: #{options[:incremental] || 'false'}".ljust(40)}  # Only upload new/changed files
+#{"delete: #{options[:delete] || 'false'}".ljust(40)}  # Remove files from destination which do not match source files.
 CONFIG
       end
 

data/lib/octopress-deploy/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Deploy
-    VERSION = "1.0.5"
+    VERSION = "1.1.0"
   end
 end

data/test/_clash.yml

@@ -5,7 +5,7 @@
     reset: 
       - cleanup
       - cp -r source/ _site
-      - ruby _garbage.rb
+      - ruby garbage.rb
 -
   title: Test local Rsync
   before: 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorator