-
-
Notifications
You must be signed in to change notification settings - Fork 130
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #187 from petems/refactor_highline_import
Refactor highline import
- Loading branch information
Showing
15 changed files
with
256 additions
and
203 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| require 'hiera/backend/eyaml/logginghelper' | ||
|
|
||
| class Hiera | ||
| module Backend | ||
| module Eyaml | ||
| class EditHelper | ||
|
|
||
| def self.find_editor | ||
| editor = ENV['EDITOR'] | ||
| editor ||= %w{ /usr/bin/sensible-editor /usr/bin/editor /usr/bin/vim /usr/bin/vi }.collect {|e| e if FileTest.executable? e}.compact.first | ||
| raise StandardError, "Editor not found. Please set your EDITOR env variable" if editor.nil? | ||
| if editor.index(' ') | ||
| editor = editor.dup if editor.frozen? # values from ENV are frozen | ||
| editor.gsub!(/([^\\]|^)~/, '\1' + ENV['HOME']) # replace ~ with home unless escaped | ||
| editor.gsub!(/(^|[^\\])"/, '\1') # remove unescaped quotes during processing | ||
| editor.gsub!(/\\ /, ' ') # unescape spaces since we quote paths | ||
| pieces = editor.split(' ') | ||
| paths = pieces.each_with_index.map {|_,x| pieces[0..x].join(' ')}.reverse # get possible paths, starting with longest | ||
| extensions = (ENV['PATHEXT'] || '').split(';') # handle Windows executables | ||
| pathdirs = ENV['PATH'].split(File::PATH_SEPARATOR) | ||
| paths += pathdirs.collect { |dir| paths.collect { |path| File.expand_path(path, dir) } }.flatten | ||
| editorfile = paths.select { |path| | ||
| FileTest.file?(path) || ! extensions.select {|ext| FileTest.file?(path + ext) }.empty? | ||
| }.first | ||
| raise StandardError, "Editor not found. Please set your EDITOR env variable" if editorfile.nil? | ||
| raw_command = paths[(paths.index editorfile) % pieces.size] | ||
| editor = "\"#{editorfile}\"#{editor[raw_command.size()..-1]}" | ||
| end | ||
| editor | ||
| end | ||
|
|
||
| def self.secure_file_delete args | ||
| file = File.open(args[:file], 'r+') | ||
| num_bytes = args[:num_bytes] | ||
| [0xff, 0x55, 0xaa, 0x00].each do |byte| | ||
| file.seek(0, IO::SEEK_SET) | ||
| num_bytes.times { file.print(byte.chr) } | ||
| file.fsync | ||
| end | ||
| file.close | ||
| File.delete args[:file] | ||
| end | ||
|
|
||
| def self.write_tempfile data_to_write | ||
| file = Tempfile.open(['eyaml_edit', '.yaml']) | ||
| path = file.path | ||
| file.close! | ||
|
|
||
| file = File.open(path, "w") | ||
| file.chmod(0600) | ||
| if ENV['OS'] == 'Windows_NT' | ||
| # Windows doesn't support chmod | ||
| icacls = 'C:\Windows\system32\icacls.exe' | ||
| if File.executable? icacls | ||
| current_user = `C:\\Windows\\system32\\whoami.exe`.chomp | ||
| # Use ACLs to restrict access to the current user only | ||
| command = %Q{#{icacls} "#{file.path}" /grant:r "#{current_user}":f /inheritance:r} | ||
| system "#{command} >NUL 2>&1" | ||
| end | ||
| end | ||
| file.puts data_to_write | ||
| file.close | ||
|
|
||
| LoggingHelper::debug "Wrote temporary file: #{path}" | ||
|
|
||
| path | ||
| end | ||
|
|
||
| end | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| require 'tempfile' | ||
| require 'fileutils' | ||
|
|
||
| class Hiera | ||
| module Backend | ||
| module Eyaml | ||
| class EncryptHelper | ||
|
|
||
| def self.write_important_file args | ||
| require 'hiera/backend/eyaml/highlinehelper' | ||
| filename = args[ :filename ] | ||
| content = args[ :content ] | ||
| mode = args[ :mode ] | ||
| if File.file? "#{filename}" | ||
| raise StandardError, "User aborted" unless HighlineHelper::confirm? "Are you sure you want to overwrite \"#{filename}\"?" | ||
| end | ||
| open( "#{filename}", "w" ) do |io| | ||
| io.write(content) | ||
| end | ||
| File.chmod( mode, filename ) unless mode.nil? | ||
| end | ||
|
|
||
| def self.ensure_key_dir_exists key_file | ||
| key_dir = File.dirname key_file | ||
|
|
||
| unless File.directory? key_dir | ||
| begin | ||
| FileUtils.mkdir_p key_dir | ||
| LoggingHelper::info "Created key directory: #{key_dir}" | ||
| rescue | ||
| raise StandardError, "Cannot create key directory: #{key_dir}" | ||
| end | ||
| end | ||
|
|
||
| end | ||
|
|
||
| end | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| require 'highline/import' | ||
|
|
||
| class Hiera | ||
| module Backend | ||
| module Eyaml | ||
| class HighlineHelper | ||
|
|
||
| def self.read_password | ||
| ask("Enter password: ") {|q| q.echo = "*" } | ||
| end | ||
|
|
||
| def self.confirm? message | ||
| result = ask("#{message} (y/N): ") | ||
| if result.downcase == "y" or result.downcase == "yes" | ||
| true | ||
| else | ||
| false | ||
| end | ||
| end | ||
|
|
||
| end | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| require 'tempfile' | ||
| require 'fileutils' | ||
|
|
||
| class Hiera | ||
| module Backend | ||
| module Eyaml | ||
| class LoggingHelper | ||
|
|
||
| def self.structure_message messageinfo | ||
| message = {:from => "hiera-eyaml-core"} | ||
| case messageinfo.class.to_s | ||
| when 'Hash' | ||
| message.merge!(messageinfo) | ||
| else | ||
| message.merge!({:msg => messageinfo.to_s}) | ||
| end | ||
| message[:prefix] = "[#{message[:from]}]" | ||
| message[:spacer] = " #{' ' * message[:from].length} " | ||
| formatted_output = message[:msg].split("\n").each_with_index.map do |line, index| | ||
| if index == 0 | ||
| "#{message[:prefix]} #{line}" | ||
| else | ||
| "#{message[:spacer]} #{line}" | ||
| end | ||
| end | ||
| formatted_output.join "\n" | ||
| end | ||
|
|
||
| def self.warn messageinfo | ||
| self.print_message({ :message => self.structure_message( messageinfo ), :hiera_loglevel => :warn, :cli_color => :red }) | ||
| end | ||
|
|
||
| def self.info messageinfo | ||
| self.print_message({ :message => self.structure_message( messageinfo ), :hiera_loglevel => :debug, :cli_color => :white, :threshold => 0 }) | ||
| end | ||
|
|
||
| def self.debug messageinfo | ||
| self.print_message({ :message => self.structure_message( messageinfo ), :hiera_loglevel => :debug, :cli_color => :green, :threshold => 1 }) | ||
| end | ||
|
|
||
| def self.trace messageinfo | ||
| self.print_message({ :message => self.structure_message( messageinfo ), :hiera_loglevel => :debug, :cli_color => :blue, :threshold => 2 }) | ||
| end | ||
|
|
||
| def self.print_message( args ) | ||
| message = args[:message] ||= "" | ||
| hiera_loglevel = args[:hiera_loglevel] ||= :debug | ||
| cli_color = args[:cli_color] ||= :blue | ||
| threshold = args[:threshold] | ||
|
|
||
| if self.hiera? | ||
| Hiera.send(hiera_loglevel, message) if threshold.nil? or Eyaml.verbosity_level > threshold | ||
| else | ||
| STDERR.puts self.colorize( message, cli_color ) if threshold.nil? or Eyaml.verbosity_level > threshold | ||
| end | ||
| end | ||
|
|
||
| def self.colorize message, color | ||
| suffix = "\e[0m" | ||
| prefix = case color | ||
| when :red | ||
| "\e[31m" | ||
| when :green | ||
| "\e[32m" | ||
| when :blue | ||
| "\e[34m" | ||
| else #:white | ||
| "\e[0m" | ||
| end | ||
| "#{prefix}#{message}#{suffix}" | ||
| end | ||
|
|
||
| def self.hiera? | ||
| "hiera".eql? Eyaml::Options[:source] | ||
| end | ||
|
|
||
| end | ||
| end | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.