config_curator 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9af0c4d52d23b706e8e09981116e80082b81c08b
-  data.tar.gz: 317bbb50b2c7154328e2a4f8e79248ee2b03fdff
+  metadata.gz: 5e2b559882994bb8018bbe48134184ae10ff7f77
+  data.tar.gz: 2f9dc98e7e92abed3919cd1254ec1ead0d92a136
 SHA512:
-  metadata.gz: 5d963e3943a58c0f02b675fd2d775965be1d494cbc4c4b249302d100dede6957e2af2ea49d0b943e7e7d632e19076990978fb38dea402d0340f8018aa8028dfd
-  data.tar.gz: d5376c45ac4da4699fe56912ddc059a40356ed63b0fefe4805dda8b147f2ecc454dced7b740d84ec5471c710cbe73630e9cf81dc26b7d63f925342d34c6ca3d5
+  metadata.gz: 743e75e64d381dad366fcd0edbab0c3e9ffa2540492883a6ccf4ada91ab24a5b3519652f0ea0d061aafc63b0d6bdb73ef3af2eeb13c36c081a0c876d75ee711c
+  data.tar.gz: 42344300ff9789b36ac74860167ba3338910a7aabffa8a38b9c3974b23425498302306109c2cd27ac86b9d43e55a32ed41d7e0d59de76df2173c86c924f6ead8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # ChangeLog
 
+## 0.2.4
+
+- Fix issue where wrong host-specific file would be installed.
+- Only display installed messaged if unit was actually installed.
+
 ## 0.2.3
 
 - Fix bug where component would not install

data/lib/config_curator/collection.rb

@@ -137,10 +137,10 @@ module ConfigCurator
     # @param quiet [Boolean] suppress some {#logger} output
     # @return [Boolean] if unit was installed
     def install_unit(unit, type, quiet = false)
-      unit.install
+      success = unit.install
       logger.info do
         "Installed #{type_name(type)}: #{unit.source} ⇨ #{unit.destination_path}"
-      end unless quiet
+      end unless quiet || !success
       return true
 
       rescue Unit::InstallFailed => e

data/lib/config_curator/units/config_file.rb

@@ -64,12 +64,21 @@ module ConfigCurator
 
     # Will look for files with the naming pattern `filename.hostname.ext`.
     # @param path [String] path to the non-host-specific file
+    # rubocop:disable Metrics/MethodLength
     def search_for_host_specific_file(path)
       directory = File.dirname path
+      filename = File.basename path
       extension = File.extname path
-      basename = File.basename path.chomp(extension)
+      basename = filename.chomp(extension)
       if Dir.exist? directory
-        file = Dir.entries(directory).grep(/^#{basename}.#{hostname.downcase}/).first
+        files = Dir.entries(directory)
+
+        file = files.grep(/^#{filename}\.#{hostname.downcase}$/).first
+        return File.join directory, file unless file.nil?
+
+        extension.gsub!(/^\./, '\.')
+        regex = /^#{basename}\.#{hostname.downcase}#{extension}$/
+        file = files.grep(regex).first
         return File.join directory, file unless file.nil?
       end
       nil

data/lib/config_curator/version.rb

@@ -1,5 +1,5 @@
 # Simple and intelligent configuration file management.
 module ConfigCurator
   # Config Curator version.
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_curator
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Evan Boyd Sosenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport