ronin 0.2.0 → 0.2.1

data/lib/ronin/ui/command_line/commands/uninstall.rb

@@ -27,47 +27,45 @@ require 'ronin/platform/overlay'
 module Ronin
   module UI
     module CommandLine
-      class UninstallCommand < Command
+      module Commands
+        class Uninstall < Command
 
-        command :uninstall
-
-        def initialize
-          @cache = nil
-          @verbose = false
-
-          super
-        end
+          def defaults
+            @cache = nil
+            @verbose = false
+          end
 
-        def define_options(opts)
-          opts.usage = 'NAME [NAME ...] [options]'
+          def define_options(opts)
+            opts.usage = 'NAME [NAME ...] [options]'
 
-          opts.options do
-            opts.on('-C','--cache DIR','Specify an alternate overlay cache') do |dir|
-              @cache = dir
-            end
+            opts.options do
+              opts.on('-C','--cache DIR','Specify an alternate overlay cache') do |dir|
+                @cache = dir
+              end
 
-            opts.on('-v','--verbose','Enable verbose output') do
-              @verbose = true
+              opts.on('-v','--verbose','Enable verbose output') do
+                @verbose = true
+              end
             end
-          end
 
-          opts.arguments(
-            'NAME' => 'The overlay to uninstall'
-          )
+            opts.arguments(
+              'NAME' => 'The overlay to uninstall'
+            )
 
-          opts.summary('Uninstall the specified repositories')
-        end
+            opts.summary('Uninstall the specified repositories')
+          end
 
-        def arguments(*args)
-          Platform.load_overlays(@cache) if @cache
+          def arguments(*args)
+            Platform.load_overlays(@cache) if @cache
 
-          args.each do |name|
-            Platform.uninstall(name) do |overlay|
-              puts "Uninstalling #{overlay.name.dump} ..."
+            args.each do |name|
+              Platform.uninstall(name) do |overlay|
+                puts "Uninstalling #{overlay.name.dump} ..."
+              end
             end
           end
-        end
 
+        end
       end
     end
   end

data/lib/ronin/ui/command_line/commands/update.rb

@@ -27,47 +27,45 @@ require 'ronin/platform/overlay'
 module Ronin
   module UI
     module CommandLine
-      class UpdateCommand < Command
+      module Commands
+        class Update < Command
 
-        command :update, :up
-
-        def initialize
-          @cache = nil
-          @verbose = false
-
-          super
-        end
+          def defaults
+            @cache = nil
+            @verbose = false
+          end
 
-        def define_options(opts)
-          opts.usage = '[NAME ...] [options]'
+          def define_options(opts)
+            opts.usage = '[NAME ...] [options]'
 
-          opts.options do
-            opts.on('-C','--cache DIR','Specify an alternate overlay cache') do |dir|
-              @cache = dir
-            end
+            opts.options do
+              opts.on('-C','--cache DIR','Specify an alternate overlay cache') do |dir|
+                @cache = dir
+              end
 
-            opts.on('-v','--verbose','Enable verbose output') do
-              @verbose = true
+              opts.on('-v','--verbose','Enable verbose output') do
+                @verbose = true
+              end
             end
-          end
 
-          opts.arguments(
-            'NAME' => 'The overlay to update'
-          )
+            opts.arguments(
+              'NAME' => 'The overlay to update'
+            )
 
-          opts.summary('Updates all or the specified repositories')
-        end
+            opts.summary('Updates all or the specified repositories')
+          end
 
-        def arguments(*args)
-          Platform.load_overlays(@cache) if @cache
+          def arguments(*args)
+            Platform.load_overlays(@cache) if @cache
 
-          if args.empty?
-            Platform.overlays.each_overlay { |overlay| overlay.update }
-          else
-            args.each { |name| Platform.overlays.update(name) }
+            if args.empty?
+              Platform.overlays.each_overlay { |overlay| overlay.update }
+            else
+              args.each { |name| Platform.overlays.update(name) }
+            end
           end
-        end
 
+        end
       end
     end
   end

data/lib/ronin/ui/command_line/options.rb

@@ -39,18 +39,6 @@ module Ronin
           super(&block)
         end
 
-        #
-        # Creates a new Options object for a Command with the specified
-        # _program_ name and the given command _name_. If a _block_ is
-        # given, it will be passed the newly created Options object.
-        #
-        def Options.command(program,name=nil,&block)
-          program = program.to_s
-          program << " #{name}" if name
-
-          return Options.new(program,&block)
-        end
-
         #
         # Sets the example usage for the options to the specified _example_.
         #

data/lib/ronin/ui/command_line/param_parser.rb

@@ -27,25 +27,38 @@ module Ronin
   module UI
     module CommandLine
       module ParamParser
-        # Hash of format patterns and their parsers
-        FORMATS = {
-          /^[0-9]+$/ => lambda { |value| value.to_i },
-          /^0x[0-9a-fA-F]+$/ => lambda { |value| value.hex },
-          /^[a-zA-Z][a-zA-Z0-9]*:\/\// => lambda { |value| URI(value) },
-          'true' => lambda { |value| true },
-          'false' => lambda { |value| false }
-        }
-
         # The params Hash
         attr_reader :params
 
         #
-        # Creates an empty +params+ Hash.
+        # The Array of parameter patterns and their parsers.
         #
-        def initialize
-          @params = {}
+        def ParamParser.formats
+          @@ronin_param_formats ||= []
         end
 
+        #
+        # Itereates over each parameter pattern and parser, passing them to the
+        # specified _block_.
+        #
+        def ParamParser.each_format(&block)
+          ParamParser.formats.each do |format|
+            block.call(format[:pattern],format[:parser])
+          end
+        end
+
+        #
+        # Adds a new parameter _pattern_ using the specified _block_ as the parser.
+        #
+        def ParamParser.recognize(pattern,&block)
+          ParamParser.formats.unshift({
+            :pattern => pattern,
+            :parser => block
+          })
+        end
+
+        protected
+
         #
         # Parses the specified _name_and_value_ string of the form
         # "name=value" and extracts both the _name_ and the _value_, saving
@@ -57,7 +70,7 @@ module Ronin
           name, value = name_and_value.split('=',2)
 
           if value
-            FORMATS.each do |pattern,parser|
+            ParamParser.each_format do |pattern,parser|
               if value.match(pattern)
                 value = parser.call(value)
                 break
@@ -65,8 +78,15 @@ module Ronin
             end
           end
 
-          @params[name.to_sym] = value
+          return {name.to_sym => value}
         end
+
+        ParamParser.recognize(/^[a-zA-Z][a-zA-Z0-9]*:\/\//) { |value| URI(value) }
+        ParamParser.recognize('false') { |value| false }
+        ParamParser.recognize('true') { |value| true }
+        ParamParser.recognize(/^0x[0-9a-fA-F]+$/) { |value| value.hex }
+        ParamParser.recognize(/^[0-9]+$/) { |value| value.to_i }
+
       end
     end
   end

data/lib/ronin/ui/console.rb

@@ -88,6 +88,7 @@ module Ronin
         # configure the irb workspace
         irb.context.main.instance_eval do
           require 'ronin/environment'
+          require 'ronin/platform'
 
           Ronin::UI::Console.auto_load.each do |path|
             require path

data/lib/ronin/ui/diagnostics.rb

@@ -21,32 +21,18 @@
 #++
 #
 
+require 'ronin/ui/verbose'
+
 module Ronin
   module UI
     module Diagnostics
-      def Diagnostics.enable!
-        @@ronin_diagnostics = true
-      end
-
-      def Diagnostics.enabled?
-        (@@ronin_diagnostics ||= false) == true
-      end
-
-      def Diagnostics.disable!
-        @@ronin_diagnostics = false
-      end
-
-      def Diagnostics.disabled?
-        (@@ronin_diagnostics ||= false) == false
-      end
-
       protected
 
       #
       # Prints the given _messages_ as info diagnostics.
       #
       def print_info(*messages)
-        if Diagnostics.enabled?
+        if Verbose.enabled?
           STDERR.puts(*(messages.map { |mesg| "[-] #{mesg}" }))
         end
       end
@@ -55,7 +41,7 @@ module Ronin
       # Prints the given _messages_ as warning diagnostics.
       #
       def print_warning(*messages)
-        if Diagnostics.enabled?
+        if Verbose.enabled?
           STDERR.puts(*(messages.map { |mesg| "[*] #{mesg}" }))
         end
       end
@@ -64,7 +50,7 @@ module Ronin
       # Prints the given _messages_ as error diagnostics.
       #
       def print_error(*messages)
-        if Diagnostics.enabled?
+        if Verbose.enabled?
           STDERR.puts(*(messages.map { |mesg| "[!] #{mesg}" }))
         end
       end

data/lib/ronin/ui/{command_line/commands.rb → verbose.rb}

@@ -21,16 +21,24 @@
 #++
 #
 
-require 'ronin/ui/command_line/commands/overlay'
-require 'ronin/ui/command_line/commands/extension'
-require 'ronin/ui/command_line/commands/add'
-require 'ronin/ui/command_line/commands/install'
-require 'ronin/ui/command_line/commands/list'
-require 'ronin/ui/command_line/commands/update'
-require 'ronin/ui/command_line/commands/uninstall'
-require 'ronin/ui/command_line/commands/remove'
-require 'ronin/ui/command_line/commands/help'
+module Ronin
+  module UI
+    module Verbose
+      def Verbose.enable!
+        @@ronin_verbose = true
+      end
 
-require 'reverse_require'
+      def Verbose.enabled?
+        (@@ronin_verbose ||= false) == true
+      end
 
-require_for 'ronin', 'ronin/ui/command_line/commands'
+      def Verbose.disable!
+        @@ronin_verbose = false
+      end
+
+      def Verbose.disabled?
+        (@@ronin_verbose ||= false) == false
+      end
+    end
+  end
+end

data/lib/ronin/version.rb

@@ -23,5 +23,5 @@
 
 module Ronin
   # Ronin version 
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/arch_spec.rb

@@ -4,55 +4,55 @@ require 'helpers/database'
 
 describe Arch do
   it "should require a name, endian and address_length attributes" do
-    @arch = Arch.new
-    @arch.should_not be_valid
+    arch = Arch.new
+    arch.should_not be_valid
     
-    @arch.name = 'future'
-    @arch.should_not be_valid
+    arch.name = 'future'
+    arch.should_not be_valid
    
-    @arch.endian = 'little'
-    @arch.should_not be_valid
+    arch.endian = 'little'
+    arch.should_not be_valid
 
-    @arch.address_length = 4
-    @arch.should be_valid
+    arch.address_length = 4
+    arch.should be_valid
   end
 
   it "should require a unique name" do
-    @first_arch = Arch.create(:name => 'cats',
+    first_arch = Arch.create(:name => 'cats',
                               :endian => 'little',
                               :address_length => 4)
-    @first_arch.should be_valid
+    first_arch.should be_valid
 
-    @second_arch = Arch.new(:name => 'cats',
+    second_arch = Arch.new(:name => 'cats',
                             :endian => 'big',
                             :address_length => 4)
-    @second_arch.should_not be_valid
+    second_arch.should_not be_valid
   end
 
   it "should require either 'little' or 'big' for the endian attribute" do
-    @arch = Arch.new(:name => 'test',
+    arch = Arch.new(:name => 'test',
                      :endian => 'lol',
                      :address_length => 4)
-    @arch.should_not be_valid
+    arch.should_not be_valid
 
-    @arch.endian = 'little'
-    @arch.should be_valid
+    arch.endian = 'little'
+    arch.should be_valid
 
-    @arch.endian = 'big'
-    @arch.should be_valid
+    arch.endian = 'big'
+    arch.should be_valid
   end
 
   it "should require a numeric valid for the address_length attribute" do
-    @arch = Arch.new(:name => 'test2',
+    arch = Arch.new(:name => 'test2',
                      :endian => 'big',
                      :address_length => 'x')
-    @arch.should_not be_valid
+    arch.should_not be_valid
 
-    @arch.address_length = '4'
-    @arch.should be_valid
+    arch.address_length = '4'
+    arch.should be_valid
 
-    @arch.address_length = 4
-    @arch.should be_valid
+    arch.address_length = 4
+    arch.should be_valid
   end
 
   it "should provide built-in archs" do

data/spec/chars/chars_spec.rb

@@ -12,7 +12,7 @@ describe Chars do
     @uppercase_alpha_string = Chars.uppercase_alpha.random_string(10)
     @lowercase_alpha_string = Chars.lowercase_alpha.random_string(10)
     @alpha_string = Chars.alpha.random_string(10)
-    @alpha_numeric = Chars.alpha_numeric.random_string(10)
+    @alpha_numeric_string = Chars.alpha_numeric.random_string(10)
     @space_string = Chars.space.random_string(10)
     @punctuation_string = Chars.punctuation.random_string(10)
     @symbols_string = Chars.symbols.random_string(10)
@@ -22,50 +22,86 @@ describe Chars do
   end
 
   it "should provide a numeric CharSet" do
-    (@numeric_string =~ /[0-9]{10}/).should_not be_nil
+    @numeric_string.length.should == 10
+    @numeric_string.each_byte do |b|
+      Chars::NUMERIC.include?(b).should == true
+    end
   end
 
   it "should provide an octal CharSet" do
-    (@octal_string =~ /[0-7]{10}/).should_not be_nil
+    @octal_string.length.should == 10
+    @octal_string.each_byte do |b|
+      Chars::OCTAL.include?(b).should == true
+    end
   end
 
   it "should provide an upper-case hexadecimal CharSet" do
-    (@uppercase_hex_string =~ /[0-9A-F]{10}/).should_not be_nil
+    @uppercase_hex_string.length.should == 10
+    @uppercase_hex_string.each_byte do |b|
+      Chars::UPPERCASE_HEXADECIMAL.include?(b).should == true
+    end
   end
 
   it "should provide a lower-case hexadecimal CharSet" do
-    (@lowercase_hex_string =~ /[0-9a-f]{10}/).should_not be_nil
+    @lowercase_hex_string.length.should == 10
+    @lowercase_hex_string.each_byte do |b|
+      Chars::LOWERCASE_HEXADECIMAL.include?(b).should == true
+    end
   end
 
   it "should provide a hexadecimal CharSet" do
-    (@hex_string =~ /[0-9A-Fa-f]{10}/).should_not be_nil
+    @hex_string.length.should == 10
+    @hex_string.each_byte do |b|
+      Chars::HEXADECIMAL.include?(b).should == true
+    end
   end
 
   it "should provide an upper-case alpha CharSet" do
-    (@uppercase_alpha_string =~ /[A-Z]{10}/).should_not be_nil
+    @uppercase_alpha_string.length.should == 10
+    @uppercase_alpha_string.each_byte do |b|
+      Chars::UPPERCASE_ALPHA.include?(b).should == true
+    end
   end
 
   it "should provide a lower-case alpha CharSet" do
-    (@lowercase_alpha_string =~ /[a-z]{10}/).should_not be_nil
+    @lowercase_alpha_string.length.should == 10
+    @lowercase_alpha_string.each_byte do |b|
+      Chars::LOWERCASE_ALPHA.include?(b).should == true
+    end
   end
 
   it "should provide an alpha CharSet" do
-    (@alpha_string =~ /[A-Za-z]{10}/).should_not be_nil
+    @alpha_string.length.should == 10
+    @alpha_string.each_byte do |b|
+      Chars::ALPHA.include?(b).should == true
+    end
   end
 
   it "should provide an alpha-numeric CharSet" do
-    (@alpha_numeric_string =~ /[A-Za-z0-9]{10}/).should_not be_nil
+    @alpha_numeric_string.length.should == 10
+    @alpha_numeric_string.each_byte do |b|
+      Chars::ALPHA_NUMERIC.include?(b).should == true
+    end
   end
 
   it "should provide a space CharSet" do
-    (@space_string =~ /[ \f\n\r\t\v]{10}/).should_not be_nil
+    @space_string.length.should == 10
+    @space_string.each_byte do |b|
+      Chars::SPACE.include?(b).should == true
+    end
   end
 
   it "should provide a punctuation CharSet" do
-    (@punctuation_string =~ /[ \'\"\`\,\;\:\~\-\(\)\[\]\{\}\.\?\!]{10}/).should_not be_nil
+    @punctuation_string.length.should == 10
+    @punctuation_string.each_byte do |b|
+      Chars::PUNCTUATION.include?(b).should == true
+    end
   end
 
   it "should provide a symbols CharSet" do
-    (@symbols_string =~ /[\@\#\$\%\^\&\*\_\+\=\|\\\<\>\/]/).should_not be_nil
+    @symbols_string.length.should == 10
+    @symbols_string.each_byte do |b|
+      Chars::SYMBOLS.include?(b).should == true
+    end
   end
 end