kondate 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a431b57f1b6c036f09520ef851e7fd4b41a5329e
-  data.tar.gz: cb3ccc508f8f9ab2d7ef47e34291d4997578c5f6
+  metadata.gz: d31589ca629f60bafbae2b69c18b2624727f61bf
+  data.tar.gz: bf1aab50985881df2d3992a52450f5c7b1bbd2c7
 SHA512:
-  metadata.gz: f6cf11acfe6ac73c2d53271a1c669a128c567e2d6a679ea931ab29e8f79c4aae713a3c48c3fb11686de7fe96d0cf09d167246f5d9c5a935a0cbc547ff8395abd
-  data.tar.gz: a1eeb1a1059e97cbc7150055c52414b70a9ffec2e70d957fb57eb3bc48a551957bf2ea7dc44afc1eeb580c535172525feb9c2eee8dfaa4d5a65e8a2781001b55
+  metadata.gz: ede72933e1fe30fa55497986daaaa849e8e0afc1c67ae78ebc267595b441fb02f129b874752303eac3d490f66cabc6ce9ee366f8294ac4968326ce1fda82adb8
+  data.tar.gz: 7c0ae9c00177ec96fb7fe967d56d90106163b29ede13caf2b8af9ece4726df90eac0a02f933ce662661afc097533a0c6571bd74f91399958edb5697db3573adb

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.3 (2016-12-02)
+
+Fixes:
+
+* Fixe nil error
+
 # 0.4.2 (2016-12-01)
 
 Enhancements:

data/lib/kondate/cli.rb

@@ -134,7 +134,7 @@ module Kondate
       env = {}
       env['RUBYOPT'] = "-I #{Config.plugin_dir} -r bundler/setup -r ext/itamae/kondate"
       property_files.each do |role, property_file|
-        next if property_file.nil?
+        next if property_file.empty?
         command = "bundle exec itamae ssh"
         command << " -h #{host}"
 
@@ -166,7 +166,7 @@ module Kondate
       env['TARGET_VAGRANT'] = '1' if @options[:vagrant]
       env['RUBYOPT'] = "-I #{Config.plugin_dir} -r bundler/setup -r ext/serverspec/kondate"
       property_files.each do |role, property_file|
-        next if property_file.nil?
+        next if property_file.empty?
         spec_files = property_file.load['attributes'].keys.map {|recipe|
           secret_spec_file = File.join(Config.secret_middleware_recipes_serverspec_dir, "#{recipe}_spec.rb")
           spec_file = File.join(Config.middleware_recipes_serverspec_dir, "#{recipe}_spec.rb")
@@ -187,7 +187,7 @@ module Kondate
     end
 
     def proceed?(property_files)
-      if property_files.values.compact.empty?
+      if property_files.values.compact.reject(&:empty?).empty?
         $stderr.puts "Nothing to run"
         false
       elsif @options[:confirm]
@@ -216,11 +216,11 @@ module Kondate
         end
         $stdout.print ", sources: #{property_file.source_files}"
 
-        if property_file
+        if property_file.empty?
+          $stdout.puts " (no attribute, skipped)"
+        else
           $stdout.puts
           $stdout.puts property_file.read
-        else
-          $stdout.puts " (no attribute, skipped)"
         end
       end
     end
@@ -238,11 +238,7 @@ module Kondate
 
       property_files = {}
       roles.each do |role|
-        if property_file = builder.install(role, @options[:recipe])
-          property_files[role] = property_file
-        else
-          property_files[role] = nil
-        end
+        property_files[role] = builder.install(role, @options[:recipe])
       end
 
       property_files

data/lib/kondate/property_builder.rb

@@ -135,7 +135,7 @@ module Kondate
       end
 
       if property['attributes'].empty?
-        nil
+        PropertyFile.new(nil, files)
       else
         fp = Tempfile.create("kondate_")
         YAML.dump(property.to_h, fp)

data/lib/kondate/property_file.rb

@@ -17,6 +17,10 @@ module Kondate
       YAML.load_file(path)
     end
 
+    def empty?
+      @path.nil?
+    end
+
     private
 
     def mask_secrets(str)

data/lib/kondate/version.rb

@@ -1,3 +1,3 @@
 module Kondate
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kondate
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - sonots