branchable_cdn_assets 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1681d174d7e3443b945cfba8e3400c7c5a48b891
-  data.tar.gz: cd0d194648f0ed2b631610597c4ca742bea4be60
+  metadata.gz: ab78d952715ccd097239e67bccdd4e0e1a6c7635
+  data.tar.gz: f7a994bd5aee7df2ada620b1641e769946abfb8e
 SHA512:
-  metadata.gz: 3f8c6164de81843f7f769971df63a3d373afa79fb547e33295725cb77550dd41b93c79bda3c790cea54e64660862824b5f05af891f82b1402c3a142951a4c0f6
-  data.tar.gz: b364e24a139bdabe12c2ab47cc19f032d80412b6a9bce473b7e1fc89997a35413b308c5ba21f79fa163eb6b3d360af66afede0a25c9ce333c67fe0fc528405dc
+  metadata.gz: 1f80a5a192ced43ab482fa31e870e7baf429e6e5f33a6e71be4419c0dc4b5de7bcb26105d6a5b47c04056b1324b4ca08ad7ddef6204868ef6ebef39283d30c68
+  data.tar.gz: 8765796e5a26a58cd1519e0a707889d26d9ea26dea1448cfc53f46e1cc7e394f089a6e106487fd9210da50a3af9d0447f7e698dcfabcb83e7bf5eac9b5ff1a3d

data/lib/branchable_cdn_assets/file_manager.rb

@@ -121,9 +121,19 @@ module BranchableCDNAssets
       end
 
       def empty_directories
-        Dir[ File.join( Dir.pwd, root, '**/*' ) ].select do |d|
-          File.directory?(d) && (Dir.entries(d) - ['.','..']).empty?
+        directories = Dir[ File.join( Dir.pwd, root, '**/*' ) ].select do |d|
+          File.directory?(d)
         end
+
+        empty_directories = directories.select do |d|
+          # a directory is empty if it only includes other empty directories
+          (( Dir.entries(d) - ['.','..'] ).map { |entry| File.join(d, entry) } - directories ).empty?
+        end
+
+        # reversing to ensure that nested directories are listed first
+        # so on removal we don't try and remove upper directories *then*
+        # the nested directories that aren't there anymore
+        empty_directories.sort_by { |i| i.length }.reverse
       end
 
       # @return [Array] the pushed files (only those updated on remote)

data/lib/branchable_cdn_assets/version.rb

@@ -1,3 +1,3 @@
 module BranchableCDNAssets
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/lib/branchable_cdn_assets/file_manager_spec.rb

@@ -224,6 +224,10 @@ describe BranchableCDNAssets::FileManager do
     end
 
     context "when confirm removal" do
+      after :each do
+        `rm -rf cdn`
+      end
+
       it "removes files that are local and on remote" do
         expect( BranchableCDNAssets::Shell ).to receive(:run_local).with("rm cdn/filename_one")
         release_stdin 'y' do
@@ -233,10 +237,19 @@ describe BranchableCDNAssets::FileManager do
 
       it "removes empty directories" do
         files = described_class.new(@config)
-        expect( files ).to receive(:remove_empty_directories)
+        allow( Dir).to receive(:[]).with( "#{Dir.pwd}/cdn/**/*" ).and_call_original
+
+        `mkdir -p cdn/empty_dir`
+        `mkdir -p cdn/dir/empty_dir`
+        `mkdir -p cdn/foo`
+        `touch cdn/bar`
+        `touch cdn/foo/baz`
+
         release_stdin 'y' do
           files.prune!
         end
+
+        expect( HereOrThere::Local.new.run("ls cdn").stdout ).to eq "bar\nfoo\n"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: branchable_cdn_assets
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Steven Sloan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake