vt 0.8.0 → 0.8.1

data/CHANGE_LOG.md

@@ -0,0 +1,7 @@
+## 0.8.1
+- Bug fixing on the formate command
+- Bring in code from the colorize ruby gem
+
+## 0.8.0
+- First Draft
+- There are some bugs

data/lib/vt/format_command.rb

@@ -1,8 +1,11 @@
 require 'json'
+
 module Vt
   class FormatCommand
     attr_reader :raw_contract, :colored_contract, :compressed_contract
 
+    CIPHER_TEXT_COLOR = :yellow
+
     def initialize(c)
       @raw_contract = c
     end
@@ -16,9 +19,12 @@ module Vt
 
     private
 
-
     def contract
-      JSON.parse(raw_contract)
+      JSON.parse(pretty_generated_contract)
+    end
+
+    def pretty_generated_contract
+      JSON.pretty_generate JSON.parse(raw_contract)
     end
 
     def color_vault_contents(c)
@@ -42,7 +48,7 @@ module Vt
     end
 
     def colored_vault_contents(v)
-      contract['vaults'][v]['contents'].yellow
+      contract['vaults'][v]['contents'].colorize(CIPHER_TEXT_COLOR)
     end
 
     def compressed_vault_contents(v)
@@ -50,22 +56,186 @@ module Vt
     end
 
   end
-  end
+end
 
 class String
-  def yellow
-    colorize(33)
-  end
 
-  def colorize(color_code)
-    "\e[#{color_code}m#{self}\e[0m"
-  end
+  CIPHER_TEXT_CHAR_LENGTH = 60
+  CIPHER_TEXT_CHAR_INDENT = 18
+
 
   def compressed
-    gsub(/(.{60})(?=.)/, '\1 \2').gsub(' ',"\n").gsub("\n","\n #{blank_spaces(18)}")
+    gsub(/(.{#{CIPHER_TEXT_CHAR_LENGTH}})(?=.)/, '\1 \2').gsub(' ',"\n").gsub("\n","\n #{blank_spaces(CIPHER_TEXT_CHAR_INDENT)}")
   end
 
   def blank_spaces(number)
     x = ''; number.times{x = x + ' '}; x;
   end
 end
+
+# Colorize String class extension.
+# This code is from https://github.com/fazibear/colorize
+class String
+
+  #
+  # Colors Hash
+  #
+  COLORS = {
+    :black          => 0,
+    :red            => 1,
+    :green          => 2,
+    :yellow         => 3,
+    :blue           => 4,
+    :magenta        => 5,
+    :cyan           => 6,
+    :white          => 7,
+    :default        => 9,
+
+    :light_black    => 60,
+    :light_red      => 61,
+    :light_green    => 62,
+    :light_yellow   => 63,
+    :light_blue     => 64,
+    :light_magenta  => 65,
+    :light_cyan     => 66,
+    :light_white    => 67
+  }
+
+  #
+  # Modes Hash
+  #
+  MODES = {
+    :default        => 0, # Turn off all attributes
+    :bold           => 1, # Set bold mode
+    :underline      => 4, # Set underline mode
+    :blink          => 5, # Set blink mode
+    :swap           => 7, # Exchange foreground and background colors
+    :hide           => 8  # Hide text (foreground color would be the same as background)
+  }
+
+  REGEXP_PATTERN = /\033\[([0-9]+);([0-9]+);([0-9]+)m(.+?)\033\[0m|([^\033]+)/m
+  COLOR_OFFSET = 30
+  BACKGROUND_OFFSET = 40
+  
+  public
+
+  #
+  # Change color of string
+  #
+  # Examples:
+  #
+  #   puts "This is blue".colorize(:blue)
+  #   puts "This is light blue".colorize(:light_blue)
+  #   puts "This is also blue".colorize(:color => :blue)
+  #   puts "This is light blue with red background".colorize(:color => :light_blue, :background => :red)
+  #   puts "This is light blue with red background".colorize(:light_blue ).colorize( :background => :red)
+  #   puts "This is blue text on red".blue.on_red
+  #   puts "This is red on blue".colorize(:red).on_blue
+  #   puts "This is red on blue and underline".colorize(:red).on_blue.underline
+  #   puts "This is blue text on red".blue.on_red.blink
+  #   puts "This is uncolorized".blue.on_red.uncolorize
+  #
+  def colorize(params)
+    begin
+      require 'Win32/Console/ANSI' if RUBY_PLATFORM =~ /win32/
+    rescue LoadError
+      raise 'You must gem install win32console to use colorize on Windows'
+    end
+    
+    self.scan(REGEXP_PATTERN).inject("") do |str, match|
+      match[0] ||= MODES[:default]
+      match[1] ||= COLORS[:default] + COLOR_OFFSET
+      match[2] ||= COLORS[:default] + BACKGROUND_OFFSET
+      match[3] ||= match[4]
+
+      if (params.instance_of?(Hash))
+        match[0] = MODES[params[:mode]] if params[:mode] && MODES[params[:mode]]
+        match[1] = COLORS[params[:color]] + COLOR_OFFSET if params[:color] && COLORS[params[:color]]
+        match[2] = COLORS[params[:background]] + BACKGROUND_OFFSET if params[:background] && COLORS[params[:background]]
+      elsif (params.instance_of?(Symbol))
+        match[1] = COLORS[params] + COLOR_OFFSET if params && COLORS[params]
+      end
+
+      str << "\033[#{match[0]};#{match[1]};#{match[2]}m#{match[3]}\033[0m"
+    end
+  end
+
+  #
+  # Return uncolorized string
+  #
+  def uncolorize
+    self.scan(REGEXP_PATTERN).inject("") do |str, match|
+      str << (match[3] || match[4])
+    end
+  end
+
+  #
+  # Return true if string is colorized
+  #
+  def colorized?
+    self.scan(REGEXP_PATTERN).reject do |match|
+      match.last
+    end.any?
+  end
+
+  #
+  # Make some color and on_color methods
+  #
+  COLORS.each_key do |key|
+    next if key == :default
+
+    define_method key do
+      self.colorize(:color => key)
+    end
+
+    define_method "on_#{key}" do
+      self.colorize(:background => key)
+    end
+  end
+
+  #
+  # Methods for modes
+  #
+  MODES.each_key do |key|
+    next if key == :default
+
+    define_method key do
+      self.colorize(:mode => key)
+    end
+  end
+
+  class << self
+
+    #
+    # Return array of available modes used by colorize method
+    #
+    def modes
+      MODES.keys
+    end
+
+    #
+    # Return array of available colors used by colorize method
+    #
+    def colors
+      COLORS.keys
+    end
+
+    #
+    # Display color matrix with color names
+    #
+    def color_matrix(txt = '[X]')
+      size = String.colors.length
+      String.colors.each do |color|
+        String.colors.each do |back|
+          print txt.colorize(:color => color, :background => back)
+        end
+        puts " < #{color}"
+      end
+      String.colors.reverse.each_with_index do |back, index|
+        puts "#{"|".rjust(txt.length)*(size-index)} < #{back}"
+      end
+      ''
+    end
+
+  end
+end

data/lib/vt/version.rb

@@ -1,3 +1,3 @@
 module Vt
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/fixtures/test_with_env_vars.json

@@ -2,11 +2,17 @@
   "header": {},
   "vaults": {
     "test_vault":{
-      "description":"A Simple Message",
-      "fill_with": "EXTERNAL_INPUT['VAULT_MESSAGE']",
+      "fill_with": "RANDOM_NUMBER",
       "lock_with": "UNLOCKED",
       "unlock_with": "UNLOCKED",
       "contents": ""
-      }
+    },
+    "second_vault":{
+      "description":"A Simple Message",
+      "fill_with": "EXTERNAL_INPUT['VAULT_MESSAGE']",
+      "lock_with": "KEY['test_vault']",
+      "unlock_with": "KEY['test_vault']",
+      "contents": ""
+    }
   }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vt
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vault-tree
@@ -69,8 +69,8 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .ruby-version
+- CHANGE_LOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile