usmu 0.3.3-java → 0.3.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cdfef5411ad7a8fbd0961057afa4bb15e2da4cf
-  data.tar.gz: 19de27e21991678e176c18a786640ff33bf88f9d
+  metadata.gz: fd837a0bd2268a8c59adea7a23b73a98bcc63cc6
+  data.tar.gz: dcd4850e8638d73f485fd9201d7f7041bcf85be5
 SHA512:
-  metadata.gz: ab83d63473d2237451de2acd92602e1aa0ac276ed18922d0e981db64db6e1d378d3822aa8605a0f095edcdc3fa13cace6e3d08fd425b8a45958af5cd694c5f51
-  data.tar.gz: 8e5ab26797b38d7ebf56e528e1da15f1ad62bfed68872137ba32880343134994889c6c6c8f639f277b71af6032284b4b779d6261599a71062168cba70c4e4503
+  metadata.gz: dc9b2c0be7428ba30b892db0321fa80763016e5e6d7b18633048ca12f83959ade1193f2382b0eecf2880241993744a57428335afe5083fa3f14b91179533df25
+  data.tar.gz: ee271e9654c2ade75d048def639c71e98b722ab8221eed83a9e8509832489fe8193958126b5d2e4417246217c83596f3e17e09692b8b4cc5330a99d618f27e7d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Usmu Change Log
 
+## 0.3.4
+
+Matthew Scharley <matt.scharley@gmail.com>
+
+* Don't allow directories in DirectoryDiff#local_files_list (e33c689c99673c975fe5f78082bb4022d3c79939)
+
 ## 0.3.3
 
 Matthew Scharley <matt.scharley@gmail.com>
@@ -7,16 +13,16 @@ Matthew Scharley <matt.scharley@gmail.com>
 * Disallow mutant on 2.2 (f6afd151d54c8fefb6a9af68a7cea1bae8f32265)
 * Cleanup gem builds to use the same gemspec (48cce89d6936e0b0668bf9714989d786ac573aaf)
 * Cleanup Travis since we don't need includes (as much) (8453421218e0b63755bccae6b2e01754225bbe7a)
-* [skip ci] Add a minimum Ruby requirement (c90711ac1e41c8a9973e987aa308a88c951e05dc)
+* Add a minimum Ruby requirement (c90711ac1e41c8a9973e987aa308a88c951e05dc)
 * Hopefully fix rbx (e6a51d07986b4347394ae3b571bb6b2a16ad1db3)
-* [skip ci] minor cleanup (662e0e6e82aa01fe0883e794dc9fea0407dfdadc)
-* [#15][#16] Add an example of directory metadata and static parsing (b369fdde02a5b7c25f60e86fabc248a448b68b19)
-* [#15] Add directory metadata (66dd094ffdcafb8ecced06a9ad7c578b64885689)
-* [#16] add a metadata value to force static parsing (02dc5794f9dc3efc2655d375cd2dd17c45e8cea7)
+* minor cleanup (662e0e6e82aa01fe0883e794dc9fea0407dfdadc)
+* [\[#15\]][GH-15][\[#16\]][GH-16] Add an example of directory metadata and static parsing (b369fdde02a5b7c25f60e86fabc248a448b68b19)
+* [\[#15\]][GH-15] Add directory metadata (66dd094ffdcafb8ecced06a9ad7c578b64885689)
+* [\[#16\]][GH-16] add a metadata value to force static parsing (02dc5794f9dc3efc2655d375cd2dd17c45e8cea7)
 * Fix minor regression from #15 (e179fd27d133d647d7025d82a697e6d1f202224b)
-* [#21] Add some ignored classes for mutant (0bf4a328e6aebf87ed489bcf3d6f19ea111fa95e)
-* [#21] Cover Usmu::Deployment::DirectoryDiff (d4836b1ddb950223786e35b024e2692e106a2c41)
-* [#18] Initialise logging before commander (6117299b6303b54249c06d894e074cbb437623c2)
+* [\[#21\]][GH-21] Add some ignored classes for mutant (0bf4a328e6aebf87ed489bcf3d6f19ea111fa95e)
+* [\[#21\]][GH-21] Cover Usmu::Deployment::DirectoryDiff (d4836b1ddb950223786e35b024e2692e106a2c41)
+* [\[#18\]][GH-16] Initialise logging before commander (6117299b6303b54249c06d894e074cbb437623c2)
 
 ## 0.3.2
 
@@ -188,4 +194,8 @@ Matthew Scharley <matt.scharley@gmail.com>
   [GH-12]: https://github.com/usmu/usmu/issues/12
   [GH-13]: https://github.com/usmu/usmu/issues/13
   [GH-14]: https://github.com/usmu/usmu/issues/14
+  [GH-15]: https://github.com/usmu/usmu/issues/15
+  [GH-16]: https://github.com/usmu/usmu/issues/16
   [GH-17]: https://github.com/usmu/usmu/issues/17
+  [GH-18]: https://github.com/usmu/usmu/issues/18
+  [GH-21]: https://github.com/usmu/usmu/issues/21

data/lib/usmu/deployment/directory_diff.rb

@@ -58,9 +58,9 @@ module Usmu
       end
 
       def local_files_list
-        Dir[@configuration.destination_path + '/**/{*,.??*}'].map do |f|
-          f[(@configuration.destination_path.length + 1), f.length]
-        end
+        Dir[@configuration.destination_path + '/**/{*,.??*}'].
+            select {|f| not File.directory? f }.
+            map {|f| f[(@configuration.destination_path.length + 1), f.length]}
       end
     end
   end

data/lib/usmu/version.rb

@@ -1,5 +1,5 @@
 
 module Usmu
   # The current version string for the gem
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/deployment/directory_diff_spec.rb

@@ -108,5 +108,14 @@ RSpec.describe Usmu::Deployment::DirectoryDiff do
 
       expect(diff.send :local_files_list).to eq(%w{index.html})
     end
+
+    it 'doesn\'t return directories listed in the output directory' do
+      expect(Dir).to receive(:[]).with('site/**/{*,.??*}').and_return(%w{site/assets site/assets/test.css site/index.html})
+      allow(File).to receive(:directory?).and_return(false)
+      expect(File).to receive(:directory?).with('site/assets').and_return(true)
+      diff = Usmu::Deployment::DirectoryDiff.new(configuration, nil)
+
+      expect(diff.send :local_files_list).to eq(%w{assets/test.css index.html})
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: java
 authors:
 - Matthew Scharley