kafo 0.2.2 → 0.3.0

data/lib/kafo/params/boolean.rb

@@ -1,20 +1,22 @@
-module Params
-  class Boolean < Param
-    def value=(value)
-      super
-      @value = typecast(@value)
-    end
+module Kafo
+  module Params
+    class Boolean < Param
+      def value=(value)
+        super
+        @value = typecast(@value)
+      end
 
-    private
+      private
 
-    def typecast(value)
-      case value
-        when '0', 'false', 'f', false
-          false
-        when '1', 'true', 't', true
-          true
-        else
-          value
+      def typecast(value)
+        case value
+          when '0', 'false', 'f', false
+            false
+          when '1', 'true', 't', true
+            true
+          else
+            value
+        end
       end
     end
   end

data/lib/kafo/params/integer.rb

@@ -1,14 +1,16 @@
-module Params
-  class Integer < Param
-    def value=(value)
-      super
-      @value = typecast(@value)
-    end
+module Kafo
+  module Params
+    class Integer < Param
+      def value=(value)
+        super
+        @value = typecast(@value)
+      end
 
-    private
+      private
 
-    def typecast(value)
-      value.nil? ? nil : value.to_i
+      def typecast(value)
+        value.nil? ? nil : value.to_i
+      end
     end
   end
 end

data/lib/kafo/params/password.rb

@@ -1,49 +1,55 @@
-module Params
-  # A password paramater is stored encrypted in answer file using AES 256 in CBC mode
-  #
-  # we use a passphrase that is stored in kafo.yaml for encryption
-  # encrypted password is prefixed with $1$ (for historical reasons, no connection to
-  # Modular Crypt Format)
-  class Password < Param
-    def value=(value)
-      super
-      if @value.nil? || @value.empty?
-        @value = password_manager.password
-      end
-      setup_password if @value.is_a?(::String)
-      @value
-    end
+module Kafo
+  module Params
+    # A password paramater is stored encrypted in answer file using AES 256 in CBC mode
+    #
+    # we use a passphrase that is stored in kafo.yaml for encryption
+    # encrypted password is prefixed with $1$ (for historical reasons, no connection to
+    # Modular Crypt Format)
+    class Password < Param
+      def value=(value)
+        super
+        if @value.nil? || @value.empty?
+          @value = password_manager.password
+        end
+        setup_password if @value.is_a?(::String)
+        @value
+      end
 
-    def value
-      @encrypted
-    end
+      def value
+        @encrypted
+      end
 
-    private
+      def condition_value
+        "\"#{value}\""
+      end
 
-    def setup_password
-      encrypted? ? decrypt : encrypt
-    end
+      private
 
-    def encrypted?
-      @value.length > 3 && @value[0..2] == '$1$'
-    end
+      def setup_password
+        encrypted? ? decrypt : encrypt
+      end
 
-    def decrypt
-      @encrypted = @value
-      @value = password_manager.aes_decrypt(@value[3..-1], phrase)
-    end
+      def encrypted?
+        @value.length > 3 && @value[0..2] == '$1$'
+      end
 
-    def encrypt
-      @encrypted = '$1$' + password_manager.aes_encrypt(@value, phrase)
-    end
+      def decrypt
+        @encrypted = @value
+        @value     = password_manager.aes_decrypt(@value[3..-1], phrase)
+      end
 
-    def password_manager
-      @password_manager ||= PasswordManager.new
-    end
+      def encrypt
+        @encrypted = '$1$' + password_manager.aes_encrypt(@value, phrase)
+      end
 
-    def phrase
-      KafoConfigure.config.app[:password]
-    end
+      def password_manager
+        @password_manager ||= PasswordManager.new
+      end
+
+      def phrase
+        KafoConfigure.config.app[:password]
+      end
 
+    end
   end
 end

data/lib/kafo/params/string.rb

@@ -1,3 +1,9 @@
-module Params
-  class String < Param; end
+module Kafo
+  module Params
+    class String < Param
+      def condition_value
+        %{"#{value}"}
+      end
+    end
+  end
 end

data/lib/kafo/password_manager.rb

@@ -4,42 +4,44 @@ require 'digest/sha2'
 require 'openssl'
 require 'base64'
 
-class PasswordManager
-  # generate a random password of lenght n
-  #
-  # on ruby >= 1.9 we use builtin method urlsafe_base64, on olders we use our own
-  # implementation (inspired by urlsafe_base64)
-  #
-  # the result may contain A-Z, a-z, 0-9, “-” and “_”. “=”
-  def password(n = 32)
-    return SecureRandom.urlsafe_base64(n) if SecureRandom.respond_to?(:urlsafe_base64)
+module Kafo
+  class PasswordManager
+    # generate a random password of lenght n
+    #
+    # on ruby >= 1.9 we use builtin method urlsafe_base64, on olders we use our own
+    # implementation (inspired by urlsafe_base64)
+    #
+    # the result may contain A-Z, a-z, 0-9, “-” and “_”. “=”
+    def password(n = 32)
+      return SecureRandom.urlsafe_base64(n) if SecureRandom.respond_to?(:urlsafe_base64)
 
-    s = [SecureRandom.random_bytes(n)].pack("m*")
-    s.delete!("\n")
-    s.tr!("+/", "-_")
-    s.delete!("=")
-    s
-  end
+      s = [SecureRandom.random_bytes(n)].pack("m*")
+      s.delete!("\n")
+      s.tr!("+/", "-_")
+      s.delete!("=")
+      s
+    end
 
-  def aes_encrypt(text, passphrase)
-    cipher = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
-    cipher.encrypt
-    cipher.key = Digest::SHA2.hexdigest(passphrase)
-    cipher.iv = Digest::SHA2.hexdigest(passphrase + passphrase)
+    def aes_encrypt(text, passphrase)
+      cipher = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
+      cipher.encrypt
+      cipher.key = Digest::SHA2.hexdigest(passphrase)
+      cipher.iv  = Digest::SHA2.hexdigest(passphrase + passphrase)
 
-    encrypted = cipher.update(text)
-    encrypted << cipher.final
-    Base64.encode64(encrypted)
-  end
+      encrypted = cipher.update(text)
+      encrypted << cipher.final
+      Base64.encode64(encrypted)
+    end
 
-  def aes_decrypt(text, passphrase)
-    cipher = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
-    cipher.decrypt
-    cipher.key = Digest::SHA2.hexdigest(passphrase)
-    cipher.iv = Digest::SHA2.hexdigest(passphrase + passphrase)
+    def aes_decrypt(text, passphrase)
+      cipher = OpenSSL::Cipher::Cipher.new("aes-256-cbc")
+      cipher.decrypt
+      cipher.key = Digest::SHA2.hexdigest(passphrase)
+      cipher.iv  = Digest::SHA2.hexdigest(passphrase + passphrase)
 
-    decrypted = cipher.update(Base64.decode64(text))
-    decrypted << cipher.final
-    decrypted
+      decrypted = cipher.update(Base64.decode64(text))
+      decrypted << cipher.final
+      decrypted
+    end
   end
 end

data/lib/kafo/progress_bar.rb

@@ -1,71 +1,74 @@
+# encoding: UTF-8
 require 'powerbar'
 require 'ansi/code'
 
+module Kafo
 # Progress bar base class
 #
 # To define new progress bar you can inherit from this class and implement
 # #finite_template and #infinite_template methods. Also you may find useful to
 # change more methods like #done_message or #print_error
-class ProgressBar
-  def initialize
-    @lines                                    = 0
-    @all_lines                                = 0
-    @total                                    = :unknown
-    @bar                                      = PowerBar.new
-    @bar.settings.tty.infinite.template.main  = infinite_template
-    @bar.settings.tty.finite.template.main    = finite_template
-    @bar.settings.tty.finite.template.padchar = ' '
-    @bar.settings.tty.finite.template.barchar = '.'
-    @bar.settings.tty.finite.output           = Proc.new { |s| $stderr.print s }
-  end
+  class ProgressBar
+    def initialize
+      @lines                                    = 0
+      @all_lines                                = 0
+      @total                                    = :unknown
+      @bar                                      = PowerBar.new
+      @bar.settings.tty.infinite.template.main  = infinite_template
+      @bar.settings.tty.finite.template.main    = finite_template
+      @bar.settings.tty.finite.template.padchar = ' '
+      @bar.settings.tty.finite.template.barchar = '.'
+      @bar.settings.tty.finite.output           = Proc.new { |s| $stderr.print s }
+    end
 
-  def update(line)
-    @total     = $1.to_i if line =~ /\w*START (\d+)/
-    @lines     += 1 if line.include?('RESOURCE') && @lines < @total - 1
-    @all_lines += 1
+    def update(line)
+      @total     = $1.to_i if line =~ /\w*START (\d+)/
+      @lines     += 1 if line.include?('RESOURCE') && @lines < @total - 1
+      @all_lines += 1
 
-    # we print every 20th line during installation preparing otherwise we update every line
-    if @all_lines % 20 == 0 || @total != :unknown
-      @bar.show({ :msg   => format(line),
-                  :done  => @lines,
-                  :total => @total })
+      # we print every 20th line during installation preparing otherwise we update every line
+      if @all_lines % 20 == 0 || @total != :unknown
+        @bar.show({ :msg   => format(line),
+                    :done  => @lines,
+                    :total => @total })
+      end
     end
-  end
 
-  def close
-    @bar.show({ :msg   => done_message,
-                :done  => @total == :unknown ? @bar.done + 1 : @total,
-                :total => @total }, true)
-    @bar.close
-  end
+    def close
+      @bar.show({ :msg   => done_message,
+                  :done  => @total == :unknown ? @bar.done + 1 : @total,
+                  :total => @total }, true)
+      @bar.close
+    end
 
-  def print(line)
-    @bar.print line
-  end
+    def print(line)
+      @bar.print line
+    end
 
-  def print_error(line)
-    print line
-  end
+    def print_error(line)
+      print line
+    end
 
-  private
+    private
 
-  def done_message
-    text = 'Done'
-    text + (' ' * (50 - text.length))
-  end
+    def done_message
+      text = 'Done'
+      text + (' ' * (50 - text.length))
+    end
 
-  def format(line)
-    (line.tr("\r\n", '') + (' ' * 50))[0..49]
-  end
+    def format(line)
+      (line.tr("\r\n", '') + (' ' * 50))[0..49]
+    end
 
-  def finite_template
-    'Installing... [${<percent>%}]'
-  end
+    def finite_template
+      'Installing... [${<percent>%}]'
+    end
 
-  def infinite_template
-    'Installing...'
-  end
+    def infinite_template
+      'Installing...'
+    end
 
+  end
 end
 
 require 'kafo/progress_bars/colored'

data/lib/kafo/progress_bars/black_white.rb

@@ -1,15 +1,17 @@
-module ProgressBars
-  class BlackWhite < ProgressBar
+module Kafo
+  module ProgressBars
+    class BlackWhite < ProgressBar
 
-    private
+      private
 
-    def finite_template
-      'Installing'.ljust(22) + ' ${<msg>} [${<percent>%}] [${<bar>}]'
-    end
+      def finite_template
+        'Installing'.ljust(22) + ' ${<msg>} [${<percent>%}] [${<bar>}]'
+      end
 
-    def infinite_template
-      'Preparing installation ${<msg>}'
-    end
+      def infinite_template
+        'Preparing installation ${<msg>}'
+      end
 
+    end
   end
 end

data/lib/kafo/progress_bars/colored.rb

@@ -1,26 +1,28 @@
-module ProgressBars
-  class Colored < ProgressBar
+module Kafo
+  module ProgressBars
+    class Colored < ProgressBar
 
-    def print_error(line)
-      print ANSI::Code.red { line }
-    end
+      def print_error(line)
+        print ANSI::Code.red { line }
+      end
 
-    private
+      private
 
-    def done_message
-      ANSI::Code.green { super }
-    end
+      def done_message
+        ANSI::Code.green { super }
+      end
 
-    def finite_template
-      'Installing'.ljust(22) +
-          ANSI::Code.yellow { ' ${<msg>}' } +
-          ANSI::Code.green { ' [${<percent>%}]' } +
-          ' [${<bar>}]'
-    end
+      def finite_template
+        'Installing'.ljust(22) +
+            ANSI::Code.yellow { ' ${<msg>}' } +
+            ANSI::Code.green { ' [${<percent>%}]' } +
+            ' [${<bar>}]'
+      end
 
-    def infinite_template
-      'Preparing installation' + ANSI::Code.yellow { ' ${<msg>}' }
-    end
+      def infinite_template
+        'Preparing installation' + ANSI::Code.yellow { ' ${<msg>}' }
+      end
 
+    end
   end
 end