bellboy 0.3.2 → 0.3.3

data/lib/bellboy/uploader.rb

@@ -48,18 +48,18 @@ module Bellboy
 
           # Process every sub-directory (but not current & parent, natch)
           unless dir == '.' || dir == '..'
-            begin
-              bag = conn.data_bag.create(name: dir) unless conn.data_bag.find(dir)
-              if bag.nil?
-                Bellboy.logger.verbose "Skipped creation of data bag #{dir}"
-              else
-                Bellboy.logger.verbose "Created new data bag #{dir}"
-              end
-              manifest = upload_databag_items(conn, File.join(path, dir), dir)
 
+            begin
+              conn.data_bag.create(name: dir)
+            rescue Ridley::Errors::HTTPConflict
+              Bellboy.logger.verbose "Skipped creation of data bag #{dir}"
             rescue Ridley::Errors::RidleyError => ex
               raise ChefConnectionError, ex
-            end
+            else
+              Bellboy.logger.verbose "Created new data bag #{dir}"
+            end 
+
+            manifest = upload_databag_items(conn, File.join(path, dir), dir)
 
             create_manifest_file(cookbook.path, dir, manifest)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bellboy
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors: