modulesync.rb in modulesync-0.8.0

- old
+ new

@@ -5,10 +5,11 @@
 require 'modulesync/git'
 require 'modulesync/hook'
 require 'modulesync/renderer'
 require 'modulesync/settings'
 require 'modulesync/util'
+require 'monkey_patches'
 
 module ModuleSync
   include Constants
 
   def self.config_defaults
@@ -28,11 +29,12 @@
     "#{project_root}/#{puppet_module}/#{file}"
   end
 
   def self.local_files(path)
     if File.exist?(path)
-      local_files = Find.find(path).collect { |file| file unless File.directory?(file) }.compact
+      # only select *.erb files, and strip the extension. This way all the code will only have to handle bare paths, except when reading the actual ERB text
+      local_files = Find.find(path).find_all { |p| p =~ /.erb$/ && !File.directory?(p) }.collect { |p| p.chomp('.erb') }.to_a
     else
       puts "#{path} does not exist. Check that you are working in your module configs directory or that you have passed in the correct directory with -c."
       exit
     end
   end
@@ -46,11 +48,11 @@
     if managed_modules.empty?
       puts "No modules found at #{path}. Check that you specified the right configs directory containing managed_modules.yml."
       exit
     end
     managed_modules.select! { |m| m =~ Regexp.new(filter) } unless filter.nil?
-    managed_modules.select! { |m| m !~ Regexp.new(negative_filter) } unless negative_filter.nil?
+    managed_modules.reject! { |m| m =~ Regexp.new(negative_filter) } unless negative_filter.nil?
     managed_modules
   end
 
   def self.module_name(module_name, default_namespace)
     return [default_namespace, module_name] unless module_name.include?('/')
@@ -86,10 +88,10 @@
     end
   end
 
   def self.manage_module(puppet_module, module_files, module_options, defaults, options)
     puts "Syncing #{puppet_module}"
-    namespace, module_name = self.module_name(puppet_module, options[:namespace])
+    namespace, module_name = module_name(puppet_module, options[:namespace])
     unless options[:offline]
       git_base = options[:git_base]
       git_uri = "#{git_base}#{namespace}"
       Git.pull(git_uri, module_name, options[:branch], options[:project_root], module_options || {})
     end