unveiler 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67d455f8d288e57cb4eb0dbb6517033e8c05d4bf
-  data.tar.gz: e86d30fce804d99f582559f7989f03d776eb840b
+  metadata.gz: 3a0a0cd10d2fb7c824ca8f8fe7e1c0faacb6a3e4
+  data.tar.gz: e348cd099894106a3335fa21940adb4ef269fab4
 SHA512:
-  metadata.gz: 65bfd2f634fa3990e5743af2c2f085a79cde6ece4e646ccb83e0c7d237b65edb1a1516f1a373d0b94a631056cc43f4f85a560598d80dbfeb98e6bbf4eebea917
-  data.tar.gz: 2f1a39d376ce923e8a3af84cb2ae3a3100c6e429ae70a9ad20551bbe6798331946955aa93dfefa4c9157b0a6480327b8f507ed08d8ddef82e13af747f4bbad44
+  metadata.gz: 94d770ff5573c8f2fbbe7d6f343f500fd7d96ed1661513ee581d05af1b210b7b22a897dfb5650c841416d3f4900183edff1c250813362ce2672dde87d30a35df
+  data.tar.gz: 0fd8072c8a75354e13621fc7123f7dca7f458389fa3d2c574d6559a0c91890f1003dbc65b3f795d4c36723b0c60c8f5e385b6e419873015f6267de97ab8e256c

data/bin/unveiler

@@ -6,15 +6,25 @@ require 'unveiler'
 #
 # +input+::  File to be encoded
 # +output+:: File to write encoded data to
-# +data+::   Data to be encoded
-def encode(input, output, data)
+# +type+::   Specifies whether the data is a file name or a string
+# +value+::  File name or string data
+def encode(input, output, type, value)
+  puts 'Starting encoding! This may take some time...'
+  start_time = Time.now
+
+  data = value if type == 'string'
+  data = read_file(value) if type == 'file'
+
   begin
     target = read_file(input)
     data = Unveiler.encode(target, data)
     write_file(output, data)
   rescue
-    puts $!
+    puts $!.message
   end
+
+  time_elapsed = (Time.now - start_time).round(3)
+  puts "Encoding completed in #{time_elapsed} seconds!"
 end
 
 # Decodes the provided input file and saves the decoded data to the output
@@ -23,6 +33,9 @@ end
 # +input+::  File to be decoded
 # +output+:: File to write decoded data to
 def decode(input, output)
+  puts 'Starting decoding! This may take some time...'
+  start_time = Time.now
+
   begin
     target = read_file(input)
     data = Unveiler.decode(target)
@@ -30,6 +43,9 @@ def decode(input, output)
   rescue
     puts $!.message
   end
+
+  time_elapsed = (Time.now - start_time).round(3)
+  puts "Decoding completed in #{time_elapsed} seconds!"
 end
 
 # Reads data from the specified file.
@@ -48,20 +64,55 @@ end
 
 # Prints unveiler usage examples.
 def usage
-  puts 'Usage:'
-  puts 'unveiler encode [input_file] [output_file] [data]'
-  puts 'unveiler decode [input_file] [output_file]'
+  puts "Usage Guide:"
+  puts "Short\tLong\t\tDescription"
+  puts "-e\t--encode\tEncodes the specified input file"
+  puts "-d\t--decode\tDecodes the specified input file"
+  puts "-i\t--input\t\tFile to read from"
+  puts "-o\t--output\tFile to write to"
+  puts "-s\t--string\tSpecify a string of data (following, in quotes)"
+  puts "-f\t--file\t\tSpecify a file to load data from"
+  exit
 end
 
 # Parses ARGV to ensure the correct parameters are given.
 def parse_argv
-  if ARGV.first == 'encode'
-    ARGV.length == 4 ? encode(ARGV[1], ARGV[2], ARGV[3]) : usage
-  elsif ARGV.first == 'decode'
-    ARGV.length == 3 ? decode(ARGV[1], ARGV[2]) : usage
-  else
+  command = ''
+  data_type = ''
+  data_value = ''
+  input_file = ''
+  output_file = ''
+
+  begin
+    ARGV.length.times do |i|
+      if ARGV[i] == '-e' || ARGV[i] == '--encode'
+        command = 'encode'
+      elsif ARGV[i] == '-d' || ARGV[i] == '--decode'
+        command = 'decode'
+      elsif ARGV[i] == '-i' || ARGV[i] == '--input'
+        input_file = ARGV[i + 1]
+      elsif ARGV[i] == '-o' || ARGV[i] == '--output'
+        output_file = ARGV[i + 1]
+      elsif ARGV[i] == '-s' || ARGV[i] == '--string'
+        data_type = 'string'
+        data_value = ARGV[i + 1]
+      elsif ARGV[i] == '-f' || ARGV[i] == '--file'
+        data_type = 'file'
+        data_value = ARGV[i + 1]
+      end
+    end
+  rescue
     usage
   end
+
+  usage if command == '' || input_file == '' || output_file == ''
+  usage if command == 'encode' && (data_type == '' || data_value == '')
+
+  if command == 'encode'
+    encode(input_file, output_file, data_type, data_value)
+  elsif command == 'decode'
+    decode(input_file, output_file)
+  end
 end
 
 ARGV.empty? ? usage : parse_argv

data/lib/unveiler.rb

@@ -88,6 +88,7 @@ class Unveiler
   #
   # +bytes+:: Array of bytes to be processed
   def self.process_bytes(bytes)
+    eof = '010001010100111101000110' # binary "EOF"
     bits = ''
 
     8.times do |index|
@@ -96,20 +97,16 @@ class Unveiler
         bits += byte[7 - index]
 
         # Check whether a full byte has been read
-        if bits.length % 8 == 0
-          # Convert bits to array of bytes
-          data = bits.scan(/.{8}/)
+        if bits.length % 8 == 0 && bits.length >= 24
+          if bits[-24..-1] == eof
+            # Convert bits to array of bytes
+            data = bits.scan(/.{8}/)
 
-          if data.length >= 3
             # Convert bytes to a UTF-8 string
             data.map!{|b| byte = b.to_i(2)}
             data = data.pack('C*').force_encoding('utf-8')
-            len = data.length
 
-            if data[-3,3] == 'EOF'
-              # Return the UTF-8 string, excluding 'EOF'
-              return data[0..len - 3]
-            end
+            return data[0..data.length - 3]
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unveiler
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Brendan Goodenough