erb_asterisk 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcf4a610f1430f15b08437cc1e1bb8b09f31bcbc
-  data.tar.gz: f1f6ee972dfb99dd839b51bc1016e692ab1c3eb3
+  metadata.gz: 6f0fecca0c2117fa73b3d92f12f140d8671025c9
+  data.tar.gz: 327785c07af5c5a5e6e04c74d9c6d8729083a1b5
 SHA512:
-  metadata.gz: b5fe4467d64751959d1951d01a62cc897e61b81f0f51bc1fda1cf379299e07b39ab89bc594a31cf17712046cfdedbce49caa42b665c05429cc7ca5fbb349b3a8
-  data.tar.gz: e75e9c4e19cd4ac6e792b4d5ade0ee0f337e235c6aadc0bb25225fda637cb9bd6b83d35ef761fd4ae8a42ad9a92af843dc15c45f9224458439d47b8cd1872918
+  metadata.gz: 136c2ebd6398372f08ad093f4e5d085cc0c3298468457eae8721ecdaff481ee35126e5cb39ff43503c703be3fcb53be45b37712af73f228da11a2b00b69567f8
+  data.tar.gz: 373e733cee4fde8433bece09e7363c32840fe86ce43e8a21b69f2e1327eea338f40d8a6bd2b876ad96e96f2229569612bc7b3adea624bde516acf759751da4fe

data/lib/erb_asterisk/inclusion.rb

@@ -3,22 +3,20 @@ module ErbAsterisk
     # Declare current config file inclusion to file_name
     # args can has :priority key (larger the number - higher the priority)
     def include_to(file_name, args = {})
-      return unless TOPLEVEL_BINDING.local_variable_defined?(:current_conf_file)
       default_args!(args)
       @exports[file_name] = [] if @exports[file_name].nil?
 
       arr = @exports[file_name]
 
-      current_conf_file = TOPLEVEL_BINDING.local_variable_get(:current_conf_file)
-      unless arr.index { |i| i[:file] == current_conf_file }.nil?
+      unless arr.index { |i| i[:file] == @current_conf_file }.nil?
         log_warn(
-          "Skip #{current_conf_file} duplicate inclusion to #{file_name}")
+          "Skip #{@current_conf_file} duplicate inclusion to #{file_name}")
         return
       end
 
-      log_debug("include_to: #{current_conf_file}, #{file_name}, #{args}", 2)
+      log_debug("include_to: #{@current_conf_file}, #{file_name}, #{args}", 2)
 
-      arr << { file: current_conf_file, priority: args[:priority] }
+      arr << { file: @current_conf_file, priority: args[:priority] }
       "; Included to \"#{file_name}\""
     end
   end

data/lib/erb_asterisk/soft_write.rb

@@ -0,0 +1,17 @@
+require 'digest'
+
+module ErbAsterisk
+  module SoftWrite
+    # Write to file only if something has changed
+    def soft_write(file_name, content)
+      if !File.exist?(file_name) ||
+         Digest::MD5.hexdigest(File.read(file_name)) !=
+         Digest::MD5.hexdigest(content)
+        File.write(file_name, content)
+        return true
+      end
+
+      false
+    end
+  end
+end

data/lib/erb_asterisk/version.rb

@@ -1,3 +1,3 @@
 module ErbAsterisk
-  VERSION = '0.0.14'.freeze
+  VERSION = '0.0.15'.freeze
 end

data/lib/erb_asterisk.rb

@@ -8,6 +8,7 @@ require 'erb_asterisk/yields'
 require 'erb_asterisk/utils'
 require 'erb_asterisk/log'
 require 'erb_asterisk/file_cache'
+require 'erb_asterisk/soft_write'
 
 module ErbAsterisk
   include Render
@@ -16,6 +17,7 @@ module ErbAsterisk
   include Utils
   include Log
   include FileCache
+  include SoftWrite
 
   def execute(opts)
     init_instance(opts)
@@ -70,7 +72,7 @@ module ErbAsterisk
     render_erbs(erbs)
     log_debug('')
 
-    save_erbs(erbs)
+    save_configs(erbs)
     export_includes(root)
   end
 
@@ -94,8 +96,8 @@ module ErbAsterisk
       # Skip on second round all erbs without yield_here method
       next if value[:skip]
 
-      # Declare global variable with current erb file name for include_to method:
-      TOPLEVEL_BINDING.local_variable_set(:current_conf_file, value[:config])
+      # Declare variable with current erb file name for include_to method:
+      @current_conf_file = value[:config]
       log_debug("ERB: #{file}", 1)
 
       @yield_here_occured = false
@@ -104,8 +106,12 @@ module ErbAsterisk
     end
   end
 
-  def save_erbs(erbs)
-    erbs.each { |_, value| File.write(value[:config], value[:content]) }
+  def save_configs(erbs)
+    erbs.each do |_, value|
+      config = value[:config]
+      next unless soft_write(config, value[:content])
+      log_debug("save_configs: #{config}")
+    end
   end
 
   def export_includes(root)
@@ -116,8 +122,9 @@ module ErbAsterisk
         s << "#include \"#{i[:file].sub(root, '')}\"\n"
       end
 
-      File.write("#{root}#{include_file}", result)
-      log_debug("export_includes: #{include_file}")
+      f = "#{root}#{include_file}"
+      next unless soft_write(f, result)
+      log_debug("export_includes: #{f}")
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erb_asterisk
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Artem Baikuzin
@@ -117,6 +117,7 @@ files:
 - lib/erb_asterisk/inclusion.rb
 - lib/erb_asterisk/log.rb
 - lib/erb_asterisk/render.rb
+- lib/erb_asterisk/soft_write.rb
 - lib/erb_asterisk/utils.rb
 - lib/erb_asterisk/version.rb
 - lib/erb_asterisk/yields.rb