nexoform 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8210b96451615b27d39e2bbafd827b34bbfe262872ada1622df46ca9b70ed143
-  data.tar.gz: '08d53cde72e871f596c3ecff3da95fdfc8ae8e24ab6ec1a26e3c862a5d08f0bd'
+  metadata.gz: 49c30beaa3d694a24e90963ca1385052390875dc38dd480013c77b9129479239
+  data.tar.gz: 289f9685367b3971520c57842e97d80ef107ac0c1e6fd5dbfa1b531ed847d0f1
 SHA512:
-  metadata.gz: b116bdcf03e8520c33b245ababa552a6fe97dd68d12d1513f76870f953ea46f76e6fb47397bb464a313d19c105a86bf12d6b2b7190c11605fb05418a4376271a
-  data.tar.gz: 3d382aad3235762e85fba2ba7a10cab028735ddad098d8fa8856cbc08c6b38bf1facc130991e9c236330d70e5a5d8de7a3e3d77d11909d56283e7be4f8208db8
+  metadata.gz: fc2054ef934dcf381e62ec76ea181b222ff3489aa17feeee7deb37821b955dbfcf5231292532f6f29bb7f7a14f33d5669fa831ffc92f99ced58dddd445a7deac
+  data.tar.gz: 582e5beae666034fb39ec5577fac917cb380330e97b08d2f0adaa8bd50c3a0251d05ceac9266ecf327569cec18349519cd7ceeb1e333773762e24f115dc98f13

data/bin/nexoform

@@ -514,37 +514,38 @@ class NexoformBin < Thor
     generate_files(options, chdir: false)
   end
 
+  def process_dir(options, directory)
+    Dir.chdir(directory) do
+      # Go through and process ERB into output then delete the ERB file
+      Dir.glob('*.erb').each do |f|
+        header = "# This file was generated by nexoform. Changes will be lost\n"
+        content = ERB.new(File.read(f), 0, "%<>").result(binding)
+        File.write(f.gsub(/\.erb$/i, ''), "#{header}#{content}")
+        FileUtils.rm([f])
+      end
+
+      Dir.glob('*')
+        .select{ |f| File.directory?(f) }
+        .each{ |f| process_dir(options, f) } # recursive
+    end
+  end
+
   def generate_files(options, chdir:)
-    print_next_color 'Generating terraform files ' \
-                     'for environment: '
+    print_next_color 'Generating terraform files for environment: '
     puts_next_color env(options)
-    
-    clean_output_dir(options)
-    # find all .*.erb files, run them through erb and output the result
-    process_copy_erb_files(options)
-    # find all .* files (that don't end in erb) and copy them straight through
-    copy_other_files(options)
 
-    set_working_dir(options) if chdir
-  end
+    clean_output_dir(options)
 
-  def copy_other_files(options)
-    Dir.glob('*')
-      .select { |f| !File.directory?(f) }
-      .select { |f| !(f =~ /\.erb$/i) }
-      .each { |f| FileUtils.cp(File.basename(f), output_dir(options)) }
-  end
+    # Copy everything to new directory
+    FileUtils.cp_r(
+      Dir.glob('*').reject{ |f| Nexoform::Config.envs.include?(f) },
+      output_dir(options)
+    )
 
-  def erb_file_to_out_file(f, options)
-    "#{output_dir(options)}/#{f.gsub(/\.erb$/i, '')}"
-  end
+    # Go through and process ERB into output then delete the ERB file
+    process_dir(options, output_dir(options))
 
-  def process_copy_erb_files(options)
-    Dir.glob('*.erb').each do |f|
-      header = "# This file was generated by nexoform. Changes will be lost\n"
-      content = ERB.new(File.read(f), 0, "%<>").result(binding)
-      File.write(erb_file_to_out_file(f, options), "#{header}#{content}")
-    end
+    set_working_dir(options) if chdir
   end
 
   def clean_output_dir(options)
@@ -559,11 +560,20 @@ class NexoformBin < Thor
     "#{Dir.pwd}/#{env(options)}"
   end
 
-  def has_erb_files?
-    Dir.glob('*.erb').count > 0
+  def has_erb_files?(directory = Dir.pwd)
+    #return true if Dir.glob('*.erb').count > 0
+    Dir.chdir(directory) do
+      if Dir.glob('*.erb').count > 0
+        true
+      else
+        Dir.glob('*')
+          .select { |f| File.directory?(f) }
+          .any? { |f| has_erb_files?(f) } # recursive
+      end
+    end
   end
 
-  def set_working_dir(optioons)
+  def set_working_dir(options)
     Dir.chdir(output_dir(options)) if has_erb_files?
   end
 end
@@ -571,10 +581,10 @@ end
 if !ARGV.empty? && %w[-v --version].include?(ARGV.first)
   puts "Nexoform - Version: #{Nexoform.version}"
 else
-  #begin
+  begin
     NexoformBin.start(ARGV)
-  #rescue StandardError => e
-  #  puts "* Encountered an error.  Make sure your config-file isn't messed up".red
-  #  puts "\n* Exception message: #{e.message}".yellow
-  #end
+  rescue StandardError => e
+    puts "* Encountered an error.  Make sure your config-file isn't messed up".red
+    puts "\n* Exception message: #{e.message}".yellow
+  end
 end

data/lib/nexoform/version.rb

@@ -2,10 +2,10 @@
 
 module Nexoform
   def self.version
-    '0.1.0'
+    '0.1.1'
   end
 
   def self.date
-    '2019-07-18'
+    '2019-07-22'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexoform
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ben Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport