octopress-deploy 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaf29f35bfa57acc33ee25af7d0f5c9b5adcadb2
-  data.tar.gz: f085e982084365aeef29b3ca26276f4d440478bb
+  metadata.gz: 9ff0f9e0959198ae73ff8b5de4129ded2bd17f35
+  data.tar.gz: 4c93019f735109467267faa368d09abff0dce862
 SHA512:
-  metadata.gz: 491ff56f994ec6f573776df8474162158ea1dc27b801e1296c2be0cb89780854b2eb4a644baa0995c3f28078f148db3c9dfe4ac7bcbd9eba01ca6441e1f4ed71
-  data.tar.gz: ff49d3b5e4469e5d4c1937cc7cc4309309ef857f1d7505fa158477e023591bdab921dc82683c653c3a79afc43b540042d0930e4c4dde424288ca3614cb1ef4c1
+  metadata.gz: 61a6e8bcd5edb808d9f9c182f1f52c298b49d9df6272abc5b8f333cc41d665375b8722a258518e30e7387b327229f1fc9ab5cc4c38716bcd913f118eabde8b40
+  data.tar.gz: bd42c36239eef26e3f11a95066d2e0c6c17aaf3016d46fef7cf91755556109d42de99fd2ad1ec5c51efa07838d0ce26bba9f6bd8268595395c6d9655c494f085

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.2.1 - 2015-04-25 
+
+- Fix: Rsync exclude and include options now work properly with multiple items.
+
 ### 1.2.0 - 2015-03-07 
 
 - Added Support for Cloudfront invalidation [#49](https://github.com/octopress/deploy/pull/49)

data/lib/octopress-deploy/rsync.rb

@@ -13,8 +13,8 @@ module Octopress
         @exclude_from = @options[:exclude_from]
         @exclude_from = File.expand_path(@exclude_from) if @exclude_from
         @include      = @options[:include]
-        @exclude_from = @options[:include_from]
-        @exclude_from = File.expand_path(@include_from) if @include_from
+        @include_from = @options[:include_from]
+        @include_from = File.expand_path(@include_from) if @include_from
         @delete       = @options[:delete] || false
         @pull_dir     = @options[:dir]
       end
@@ -35,11 +35,14 @@ module Octopress
 
         cmd    =  "rsync "
         cmd    << "#{@flags} "
-        cmd    << " -e"                               if @exclude_from || @exclude
         cmd    << " --exclude-from #{@exclude_from}"  if @exclude_from
-        cmd    << " --exclude #{@exclude}"            if @exclude
+        Array(@exclude).each do |e|
+          cmd  << " --exclude #{e}"
+        end
         cmd    << " --include-from #{@include_from}"  if @include_from
-        cmd    << " --include #{@include}"            if @include
+        Array(@include).each do |i|
+          cmd  << " --include #{i}"
+        end
         cmd    << " --rsh='ssh -p#{@port}'"           if @user && @port
         cmd    << " --delete "                        if @delete
 
@@ -68,7 +71,7 @@ module Octopress
 #{"# include-from: ".ljust(40)}  # Path to file containing list of files to include
 CONFIG
       end
-      
+
     end
   end
 end

data/lib/octopress-deploy/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Deploy
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

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