ronin 1.1.0.rc2 → 1.1.0.rc3

data/ChangeLog.md

@@ -4,6 +4,7 @@
 * Require data_paths ~> 0.3.
 * Require ronin-support ~> 0.2.
 * Added `ronin/repositories`, for quickly loading all repositories.
+* Added {Ronin#script}.
 * Added {Ronin::AutoLoad}.
 * Added {Ronin::Arch.arm}.
 * Added {Ronin::Arch.mips}.
@@ -54,6 +55,9 @@
 * Set the length of {Ronin::License.url} to 256.
 * Merged `Ronin::Model::Cacheable` into {Ronin::Script}.
 * Repositories can now cache/load scripts from the `scripts/` directory.
+* Disable {Ronin::UI::Console.short_errors} if the `VERBOSE` environment
+  variable is set.
+* Disable {Ronin::UI::Console.color} if the `STDOUT` is a tty.
 * Set {Ronin::UI::Output.handler} to {Ronin::UI::Output::Terminal::Raw},
   when `STDOUT` is not a tty.
 * {Ronin::UI::CLI::ModelCommand#setup} now automatically calls
@@ -61,6 +65,7 @@
 * Merged `query_method` into {Ronin::UI::CLI::ModelCommand#query}.
 * Allow {Ronin::UI::CLI::ModelCommand.query_option} to map to Model
   properties.
+* Use DataMapper query-paths to improve performance of query-helper methods.
 
 ### 1.0.0 / 2011-03-25
 

data/gemspec.yml

@@ -65,7 +65,7 @@ dependencies:
   thor: ~> 0.14.3
   # Ronin dependencies:
   # ronin-support: ~> 0.2
-  ronin-support: ~> 0.2.0.rc1
+  ronin-support: ~> 0.2.0.rc2
 
 development_dependencies:
   bundler: ~> 1.0.10

data/lib/ronin/campaign.rb

@@ -64,7 +64,7 @@ module Ronin
     # @api public
     #
     def self.targeting(addr)
-      all(:addresses => {:address => addr})
+      all('addresses.address' => addr)
     end
 
     #
@@ -81,7 +81,7 @@ module Ronin
     # @api public
     #
     def self.targeting_orgs(names)
-      all(:organizations => {:name => names})
+      all('organizations.name' => names)
     end
 
     #

data/lib/ronin/email_address.rb

@@ -67,7 +67,7 @@ module Ronin
     # @api public
     #
     def self.with_hosts(names)
-      all(:host_name => {:address => names})
+      all('host_name.address' => names)
     end
 
     #
@@ -84,7 +84,7 @@ module Ronin
     # @api public
     #
     def self.with_ips(ips)
-      all(:ip_addresses => {:address => ips})
+      all('ip_addresses.address' => ips)
     end
 
     #
@@ -101,7 +101,7 @@ module Ronin
     # @api public
     #
     def self.with_users(names)
-      all(:user_name => {:name => names})
+      all('user_name.name' => names)
     end
 
     #

data/lib/ronin/host_name.rb

@@ -68,7 +68,7 @@ module Ronin
     # @api public
     #
     def self.with_ips(ips)
-      all(:ip_addresses => {:address => ips})
+      all('ip_addresses.address' => ips)
     end
 
     #
@@ -85,7 +85,7 @@ module Ronin
     # @api public
     #
     def self.with_ports(numbers)
-      all(:ports => {:number => numbers})
+      all('ports.number' => numbers)
     end
 
     #

data/lib/ronin/ip_address.rb

@@ -117,7 +117,7 @@ module Ronin
     # @api public
     #
     def self.with_macs(macs)
-      all(:mac_addresses => {:address => macs})
+      all('mac_addresses.address' => macs)
     end
 
     #
@@ -134,7 +134,7 @@ module Ronin
     # @api public
     #
     def self.with_hosts(names)
-      all(:host_names => {:address => names})
+      all('host_names.address' => names)
     end
 
     #
@@ -151,7 +151,7 @@ module Ronin
     # @api public
     #
     def self.with_ports(numbers)
-      all(:ports => {:number => numbers})
+      all('ports.number' => numbers)
     end
 
     #

data/lib/ronin/model/has_license/class_methods.rb

@@ -51,16 +51,16 @@ module Ronin
         # @api public
         #
         def licensed_under(license)
-          license = case license
-                    when License
-                      license
-                    when Symbol
-                      License.predefined_resource(license)
-                    else
-                      {:name => license.to_s}
-                    end
+          query = case license
+                  when License
+                    {:license => license}
+                  when Symbol
+                    {:license => License.predefined_resource(license)}
+                  else
+                    {'license.name' => license.to_s}
+                  end
 
-          all(:license => license)
+          all(query)
         end
       end
     end

data/lib/ronin/ronin.rb

@@ -36,4 +36,23 @@ module Ronin
   def self.included(base)
     base.send :extend, ClassMethods
   end
+
+  #
+  # Convenience method for loading Ronin {Script}s.
+  #
+  # @param [String] path
+  #   The path to the file.
+  #
+  # @return [Script]
+  #   The loaded script.
+  #
+  # @see Script.load_from
+  #
+  # @since 1.1.0
+  #
+  # @api public
+  #
+  def script(path)
+    Script.load_from(path)
+  end
 end

data/lib/ronin/script/script.rb

@@ -33,6 +33,15 @@ require 'data_paths/finders'
 require 'parameters'
 
 module Ronin
+  #
+  # {Script} is a high-level module that enables a Class to load
+  # instances from files and cache them into the {Database}.
+  # Classes that include {Script}, may also include Script sub-modules
+  # that define behaviors of the Script Class:
+  #
+  # * {Buildable}
+  # * {Testable}
+  # * {Deployable}
   #
   # @since 1.1.0
   #
@@ -90,11 +99,9 @@ module Ronin
     # @return [Script]
     #   The loaded script.
     #
-    # @see Cacheable.load_from
-    #
     # @since 1.1.0
     #
-    # @api public
+    # @api semipublic
     #
     def Script.load_from(path)
       path = File.expand_path(path)

data/lib/ronin/ui/cli/command.rb

@@ -126,7 +126,6 @@ module Ronin
                               :aliases => '-Q'
 
         class_option :color, :type => :boolean, :default => true
-        class_option :no_color, :type => :boolean, :default => false
 
         #
         # Sets the namespace of a new {Command} class.
@@ -225,15 +224,15 @@ module Ronin
         # @api semipublic
         #
         def setup
-          UI::Output.verbose! if self.options.verbose?
-          UI::Output.quiet! if self.options.quiet?
-          UI::Output.silent! if self.options.silent?
-
-          if self.options.no_color?
-            UI::Output.handler = UI::Output::Terminal::Raw
-          elsif self.options.color?
-            UI::Output.handler = UI::Output::Terminal::Color
-          end
+          Output.verbose! if self.options.verbose?
+          Output.quiet! if self.options.quiet?
+          Output.silent! if self.options.silent?
+
+          Output.handler = if self.options.color?
+                             Output::Terminal::Color
+                           else
+                             Output::Terminal::Raw
+                           end
         end
 
         #

data/lib/ronin/ui/cli/commands/console.rb

@@ -51,8 +51,8 @@ module Ronin
               return
             end
 
-            UI::Console.color = false if options.nocolor?
-            UI::Console.short_errors = false if options.backtrace?
+            UI::Console.color = !(options.color?)
+            UI::Console.short_errors = !(options.backtrace?)
 
             options[:require].each do |path|
               UI::Console.auto_load << path

data/lib/ronin/ui/console.rb

@@ -31,8 +31,8 @@ module Ronin
       # The history file for the Console session
       HISTORY_FILE = File.join(Config::PATH,'console.log')
 
-      @@color = true
-      @@short_errors = true
+      @@color = !(STDOUT.tty?)
+      @@short_errors = !(ENV.has_key?('VERBOSE'))
       @@auto_load = []
       @@setup_blocks = []
 

data/lib/ronin/ui/output/output.rb

@@ -26,7 +26,12 @@ module Ronin
     # Controls {Output} from Ronin.
     #
     module Output
-      @mode = :quiet
+      @mode = if ENV['VERBOSE']
+                :verbose
+              else
+                :quiet
+              end
+
       @handler = if STDOUT.tty?
                    Terminal::Color
                  else

data/lib/ronin/url.rb

@@ -87,7 +87,7 @@ module Ronin
     # @api public
     #
     def self.http
-      all(:scheme => {:name => 'http'})
+      all('scheme.name' => 'http')
     end
 
     #
@@ -101,7 +101,7 @@ module Ronin
     # @api public
     #
     def self.https
-      all(:scheme => {:name => 'https'})
+      all('scheme.name' => 'https')
     end
 
     #
@@ -118,7 +118,7 @@ module Ronin
     # @api public
     #
     def self.hosts(names)
-      all(:host => {:address => names})
+      all('host.address' => names)
     end
 
     #
@@ -135,7 +135,7 @@ module Ronin
     # @api public
     #
     def self.ports(numbers)
-      all(:port => {:number => numbers})
+      all('port.number' => numbers)
     end
 
     #
@@ -186,7 +186,7 @@ module Ronin
     # @api public
     #
     def self.query_param(name)
-      all(:query_params => {:name => name})
+      all('query_params.name' => name)
     end
 
     #
@@ -203,7 +203,7 @@ module Ronin
     # @api public
     #
     def self.query_value(value)
-      all(:query_params => {:value => value})
+      all('query_params.value' => value)
     end
 
     #

data/lib/ronin/version.rb

@@ -19,5 +19,5 @@
 
 module Ronin
   # Ronin version 
-  VERSION = '1.1.0.rc2'
+  VERSION = '1.1.0.rc3'
 end

metadata

@@ -2,7 +2,7 @@
 name: ronin
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors: 
 - Postmodern
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 Z
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-sqlite-adapter
@@ -284,7 +284,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0.rc1
+        version: 0.2.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: *id024