bitwiseCalc 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd231233410a0cbaf9895e9af65a59a324fd93ef
-  data.tar.gz: 8f53ece11b4d2f48e03b1b0ea60137bc5cf8d210
+  metadata.gz: b89270a2ed28dddd5d4545572fb64dd23666ede6
+  data.tar.gz: 0eabb7b70a17b952e5382f3eb837c1b5e8290990
 SHA512:
-  metadata.gz: e1fe010d775788ee75fb03cd817a044d3fe1cd03a30ee6e9d8a08f310a403c883c126274e099aead4de766633fd0ed068b5d0862376fb3b1a890a1d944d71b38
-  data.tar.gz: 8741f577deb99e3e43afb90eb4a9a837e4714f69c477b1a93e96848bd18a62f045c8fe874aa529c7b83bc143a7370b5f98f5edc8c74bb7367579c06b661d841d
+  metadata.gz: dbc0dc7b9bbea0baf005afa70ada2505d64bb8c1d355dc218664f65f84c66d7d4a87f779bca75ea925cc99d2880790d49aa7cd94e1c9616662a7b44834b7cc4b
+  data.tar.gz: 618c5e820839fb3005c50cc80ea2b4a1a23b764c87118d9a888d0d95f72014ae7eaa3eaeee2c38f449cbb5367472ee9e44d0ff81aab6894b520fd39be3226fc4

data/lib/bitwiseCalc

@@ -4,9 +4,17 @@
 # @Email:  vargash1@wit.edu
 # @Date:   2015-02-23 10:23:20
 # @Last Modified by:   vargash1
-# @Last Modified time: 2015-06-30 12:22:35
+# @Last Modified time: 2015-09-13 13:42:24
 require 'colorize'
 class BoolCalc
+    def initialize()
+        @x = nil ; @y = nil
+        @ans = nil; @operation = nil
+        # flags
+        @no_color = false
+        @ops = ['NOT','SHR','SHL','AND','OR','XOR','RAD','ROL','ROR','MUL','DIV','ADD','SUB','MOD','POW']
+         
+    end
     def print_all_radix(num)
         print "Base 10:\t".yellow; print "#{num.to_s(10)}\n"
         print "Base 16:\t".yellow; print "#{num.to_s(16)}\n"
@@ -15,75 +23,82 @@ class BoolCalc
         print_nice_binary(num)
     end
     def execute()
-        print "\t---------------------------------------\n".green
-        print_all_radix(@x)
-        if (@y != nil)
-            puts "\t---------------------------------------\n".green
-            print_all_radix(@y)
-        end
         case 
         when(@operation == 'RAD')
             return
         when (@operation == 'AND')
-            final_result = @x & @y
+            @ans = @x & @y
         when (@operation == 'OR')
-            final_result = @x | @y
+            @ans = @x | @y
         when (@operation == 'XOR')
-            final_result = @x ^ @y 
+            @ans = @x ^ @y 
         when (@operation == 'NOT')
-            final_result = ~@x
+            @ans = ~@x
         when (@operation == 'SHR')
-            final_result = @x >> @y
+            @ans = @x >> @y
         when (@operation == 'SHL')
-            final_result = @x << @y
+            @ans = @x << @y
         when (@operation == 'ROL')
             int_to_binary_arr()
             rol()
-            final_result = (@bit64_array_x.join).to_i(2)
+            @ans = (@bit64_array_x.join).to_i(2)
         when(@operation == 'ROR')
             int_to_binary_arr()
             ror()
-            final_result = (@bit64_array_x.join).to_i(2)
+            @ans = (@bit64_array_x.join).to_i(2)
         when(@operation == 'MUL')
-            final_result = @x * @y
+            @ans = @x * @y
         when(@operation == 'ADD')
-            final_result = @x + @y
+            @ans = @x + @y
         when(@operation == 'DIV')
-            final_result = @x / @y
+            @ans = @x / @y
         when(@operation == 'SUB')
-            final_result = @x - @y
+            @ans = @x - @y
         when(@operation == 'MOD')
-            final_result = @x % @y
+            @ans = @x % @y
         when(@operation == 'POW')
-            final_result = @x ** @y
+            @ans = @x ** @y
         end
-        puts "\n\t-------------#{@operation} Result-----------------".green
-        print_all_radix(final_result)   
     end
-    def check_for_errors()
-        if (@operation == nil)
-            abort ("ERROR, Expected Operation".red)
+    def print_results()
+        print "\t---------------------------------------\n".green
+        print_all_radix(@x)
+        if (@y != nil)
+            puts "\t---------------------------------------\n".green
+            print_all_radix(@y)
         end
-        #not operation is unary
-        #rad can be either unary or binary
-        #following logic avoids running a binary operation when user entered
-        #only one number
-        operation_restriction = (@operation != "NOT" && @operation != "RAD")
-        if ((operation_restriction && (@y == nil || @y == 0)) || (@x == nil || @x == 0))
+        # rad simply outputs num(s) in multiple radixes
+        if (@operation != "RAD")
+            puts "\n\t-------------#{@operation} Result-----------------".green
+            print_all_radix(@ans)
+        end    
+    end
+    def check_for_errors()
+        # no operation specified
+        abort ("ERROR, Expected Operation".red) if (@operation.nil?)
+        
+        # div by zero
+        if ((@operation == "DIV" || @operation == "MOD") && (@y == 0))
+            abort("ERROR, Divide by 0 for Operation:\t#{@operation}".red)
+        end 
+
+        # all other operations require binary input 
+        restriction = (@operation != "NOT" && @operation != "RAD")
+        if restriction && ((@y == nil ) && (@x == nil)) 
             abort("ERROR, Missing Numbers for Operation:\t#{@operation}".red)
         end
     end   
-    def parse_args()
-        ops = ['NOT','SHR','SHL','AND','OR','XOR','RAD','ROL','ROR','MUL','DIV','ADD','SUB','MOD','POW']
-        if (ARGV.length == 0 || (ARGV[0].upcase) == "-H")
-            print_help()
-            exit
-        end
-        ARGV.each do |a|
+    def parse_args(arr = nil)
+        #exit if no args passed; parse flags only if needed
+        usage() if ARGV.empty? 
+        parse_flags if (!is_number(ARGV[0]))
+        
+        arr = ARGV if arr.nil?
+        arr.each do |a|
             case 
             #if ARGV[a] is letters only,check if its a valid operation
             when (a == a[/[a-zA-Z]*/])
-                ops.each do |ops_elem|
+                @ops.each do |ops_elem|
                     if (a.upcase == ops_elem)
                         @operation = ops_elem
                     end
@@ -107,22 +122,36 @@ class BoolCalc
             end
         end
     end
+    def parse_flags()
+        flags = ARGV[0]
+        flags.split("").each do |f|
+            usage() if f == "H" 
+            @no_color = true if f.upcase == "N"
+        end
+        String.disable_colorization = true if (@no_color)
+    end
     def is_number(num)
         is_num = ((num.to_f.to_s == num.to_s) || (num.to_i.to_s == num.to_s))
         return is_num
     end
-    def print_help()
+    def usage()
         puts """
-        Usage(any of the following are acceptable):
-        \tbitwiseCalc <num> <operation>
-        \tbitwiseCalc <num> <num> <operation>
-        \tbitwiseCalc <num> <operation> <num>\n
+        Usage
+            bitwiseCalc [num] [operation]
+            bitwiseCalc [num] [num] [operation]
+            bitwiseCalc [num] [operation] [num]
+        Flags 
+            -n
+                disables colorized output(enabled by default)
+            -h
+                outputs usage and exits
         
         Passing <num> in a radix other than base10:
-        <base_2_num>  = 0b[0-1]
-        <base_8_num>  = 0[0-7]
-        <base_16_num> = 0x[0-9a-f]
+            <base_2_num>  = 0b[0-1]
+            <base_8_num>  = 0[0-7]
+            <base_16_num> = 0x[0-9a-f]
         
+        Operations
             NOT x
                 Displays ~x 
             x y RAD 
@@ -231,5 +260,6 @@ def main()
     runtime.parse_args()
     runtime.check_for_errors()
     runtime.execute()
+    runtime.print_results()
 end
 main()  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitwiseCalc
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Hector Vargas
 autorequire: 
 bindir: lib
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: BitWise Calculator