ronin 1.0.0.rc1 → 1.0.0.rc2

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

@@ -35,7 +35,7 @@ module Ronin
         #   The resources written by the author.
         #
         def written_by(name)
-          all(:authors => {:name.like => "%#{name}%"})
+          all('authors.name.like' => "%#{name}%")
         end
 
         #
@@ -48,7 +48,7 @@ module Ronin
         #   The resources associated with the organization.
         #
         def written_for(name)
-          all(:authors => {:organization.like => "%#{name}%"})
+          all('authors.organization.like' => "%#{name}%")
         end
       end
     end

data/lib/ronin/model/has_authors/has_authors.rb

@@ -58,7 +58,7 @@ module Ronin
       #          :email => 'anon@example.com',
       #          :organization => 'Anonymous LLC'
       #
-      def author(attributes={})
+      def author(attributes)
         self.authors.new(attributes)
       end
     end

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

@@ -28,20 +28,37 @@ module Ronin
         #
         # Finds all models associated with a given license.
         #
-        # @param [Symbol, String] name
-        #   The name of the license which models are associated with.
+        # @param [License, Symbol, String] license
+        #   The license which models are associated with.
         #
         # @return [Array<Model>]
         #   The models associated with a given license.
         #
-        # @example
+        # @example Query using a predefined {License} resource.
+        #   LicensedModel.licensed_under(License.mit)
+        #   # => [#<Ronin::LicensedModel: ...>, ...]
+        #
+        # @example Query using the name of a predefined {License}.
         #   LicensedModel.licensed_under(:cc_by_nc)
         #   # => [#<Ronin::LicensedModel: ...>, ...]
         #
+        # @example Query using the name of a {License}.
+        #   LicensedModel.licensed_under('GPL-2')
+        #   # => [#<Ronin::LicensedModel: ...>, ...]
+        #
         # @since 1.0.0
         #
-        def licensed_under(name)
-          all(:license => {:name => name.to_s})
+        def licensed_under(license)
+          license = case license
+                    when License
+                      license
+                    when Symbol
+                      License.predefined_resource(license)
+                    else
+                      {:name => license.to_s}
+                    end
+
+          all(:license => license)
         end
       end
     end

data/lib/ronin/{database/migrations/create_tags_table.rb → model/has_unique_name/class_methods.rb}

@@ -17,23 +17,28 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/database/migrations/migrations'
-
 module Ronin
-  module Database
-    module Migrations
-      migration(:create_tags_table) do
-        up do
-          create_table :tags do
-            column :id, Integer, :serial => true
-            column :name, String, :not_null => true
+  module Model
+    module HasUniqueName
+      module ClassMethods
+        #
+        # Searches for models with the unique name.
+        #
+        # @param [String, Symbol, Integer] key
+        #   The unique name or index to search for.
+        #
+        # @return [Model, nil]
+        #   The matching model.
+        #
+        # @since 1.0.0
+        #   
+        def [](key)
+          case key
+          when String, Symbol
+            first(:name => key.to_s)
+          else
+            super(key)
           end
-
-          create_index :tags, :name, :unique => true
-        end
-
-        down do
-          drop_table :tags
         end
       end
     end

data/lib/ronin/model/has_unique_name/has_unique_name.rb

@@ -0,0 +1,72 @@
+#
+# Copyright (c) 2006-2011 Hal Brodigan (postmodern.mod3 at gmail.com)
+#
+# This file is part of Ronin.
+#
+# Ronin is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ronin is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+require 'ronin/model/has_unique_name/class_methods'
+require 'ronin/model/has_name/class_methods'
+
+module Ronin
+  module Model
+    #
+    # Adds a unique `name` property to a model.
+    #
+    module HasUniqueName
+      #
+      # Adds the unique `name` property and {HasName::ClassMethods} to the
+      # model.
+      #
+      # @param [Class] base
+      #   The model.
+      #
+      def self.included(base)
+        base.send :include, Model
+        base.send :extend, HasName::ClassMethods,
+                           HasUniqueName::ClassMethods
+
+        base.module_eval do
+          # The name of the model
+          property :name, String, :required => true, :unique => true
+        end
+      end
+
+      #
+      # Converts the named resource into a String.
+      #
+      # @return [String]
+      #   The name of the resource.
+      #
+      # @since 1.0.0
+      #
+      def to_s
+        self.name.to_s
+      end
+
+      #
+      # Inspects the resource with the unique name.
+      #
+      # @return [String]
+      #   The inspected resource.
+      #
+      # @since 1.0.0
+      #
+      def inspect
+        "#<#{self.class}:#{self.name}>"
+      end
+    end
+  end
+end

data/lib/ronin/model/has_unique_name.rb

@@ -17,54 +17,5 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/model/has_name/class_methods'
-
-module Ronin
-  module Model
-    #
-    # Adds a unique `name` property to a model.
-    #
-    module HasUniqueName
-      #
-      # Adds the unique `name` property and {HasName::ClassMethods} to the
-      # model.
-      #
-      # @param [Class] base
-      #   The model.
-      #
-      def self.included(base)
-        base.send :include, Model
-        base.send :extend, HasName::ClassMethods
-
-        base.module_eval do
-          # The name of the model
-          property :name, String, :required => true, :unique => true
-        end
-      end
-
-      #
-      # Converts the named resource into a String.
-      #
-      # @return [String]
-      #   The name of the resource.
-      #
-      # @since 1.0.0
-      #
-      def to_s
-        self.name.to_s
-      end
-
-      #
-      # Inspects the resource with the unique name.
-      #
-      # @return [String]
-      #   The inspected resource.
-      #
-      # @since 1.0.0
-      #
-      def inspect
-        "#<#{self.class}:#{self.name}>"
-      end
-    end
-  end
-end
+require 'ronin/model/has_unique_name/class_methods'
+require 'ronin/model/has_unique_name/has_unique_name'

data/lib/ronin/model/model.rb

@@ -44,7 +44,7 @@ module Ronin
     #   The class that will be setup as a DataMapper model.
     #
     def self.included(base)
-      unless base.ancestors.include?(DataMapper::Resource)
+      unless base < DataMapper::Resource
         base.send :include, DataMapper::Resource
       end
 

data/lib/ronin/open_port.rb

@@ -17,16 +17,16 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/service_credential'
-require 'ronin/port'
-require 'ronin/service'
-require 'ronin/ip_address'
 require 'ronin/model'
 
 require 'dm-timestamps'
-require 'dm-tags'
 
 module Ronin
+  autoload :ServiceCredential, 'ronin/service_credential'
+  autoload :Port, 'ronin/port'
+  autoload :Service, 'ronin/service'
+  autoload :IPAddress, 'ronin/ip_address'
+
   #
   # Represents a open port at a specified IP address.
   #
@@ -56,9 +56,6 @@ module Ronin
     # Define the created_at timestamp
     timestamps :created_at
 
-    # Tags
-    has_tags_on :tags
-
     #
     # The IP Address of the open port.
     #

data/lib/ronin/organization.rb

@@ -17,15 +17,15 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/address'
 require 'ronin/model'
 require 'ronin/model/has_unique_name'
 require 'ronin/model/has_description'
 
 require 'dm-timestamps'
-require 'dm-tags'
 
 module Ronin
+  autoload :Address, 'ronin/address'
+
   #
   # Represents an Organization which owns {Address}es.
   #
@@ -44,8 +44,5 @@ module Ronin
     # Tracks when the organization was first created
     timestamps :created_at
 
-    # Tags
-    has_tags_on :tags
-
   end
 end

data/lib/ronin/os.rb

@@ -19,11 +19,12 @@
 
 require 'ronin/model'
 require 'ronin/model/has_name'
-require 'ronin/os_guess'
-require 'ronin/ip_address'
 require 'ronin/extensions/meta'
 
 module Ronin
+  autoload :OSGuess, 'ronin/os_guess'
+  autoload :IPAddress, 'ronin/ip_address'
+
   #
   # Represents an Operating System and pre-defines other common ones
   # ({linux}, {freebsd}, {openbsd}, {netbsd}, {osx}, {solaris}, {windows}

data/lib/ronin/os_guess.rb

@@ -17,13 +17,14 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/ip_address'
-require 'ronin/os'
 require 'ronin/model'
 
 require 'dm-timestamps'
 
 module Ronin
+  autoload :IPAddress, 'ronin/ip_address'
+  autoload :OS, 'ronin/os'
+
   #
   # Represents a guess about what {OS} an {IPAddress} might be running.
   #

data/lib/ronin/password.rb

@@ -17,12 +17,13 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/credential'
 require 'ronin/model'
 
 require 'digest'
 
 module Ronin
+  autoload :Credential, 'ronin/credential'
+
   #
   # Represents a password that can be stored in the {Database}.
   #

data/lib/ronin/port.rb

@@ -17,10 +17,11 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/open_port'
 require 'ronin/model'
 
 module Ronin
+  autoload :OpenPort, 'ronin/open_port'
+
   #
   # Represents a TCP or UDP port.
   #

data/lib/ronin/repository.rb

@@ -19,7 +19,6 @@
 
 require 'ronin/exceptions/duplicate_repository'
 require 'ronin/exceptions/repository_not_found'
-require 'ronin/cached_file'
 require 'ronin/model/has_license'
 require 'ronin/model/has_authors'
 require 'ronin/model'
@@ -30,6 +29,8 @@ require 'data_paths'
 require 'yaml'
 
 module Ronin
+  autoload :CachedFile, 'ronin/cached_file'
+
   class Repository
 
     include Model

data/lib/ronin/service.rb

@@ -17,11 +17,12 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/open_port'
 require 'ronin/model'
 require 'ronin/model/has_unique_name'
 
 module Ronin
+  autoload :OpenPort, 'ronin/open_port'
+
   #
   # Represents a TCP/UDP Service that runs on various common ports.
   #

data/lib/ronin/service_credential.rb

@@ -18,9 +18,10 @@
 #
 
 require 'ronin/credential'
-require 'ronin/open_port'
 
 module Ronin
+  autoload :OpenPort, 'ronin/open_port'
+
   #
   # Represents Credentials used to access a TCP/UDP {Service}.
   #

data/lib/ronin/software.rb

@@ -18,9 +18,10 @@
 #
 
 require 'ronin/model'
-require 'ronin/vendor'
 
 module Ronin
+  autoload :Vendor, 'ronin/vendor'
+
   #
   # Represents a Software product.
   #

data/lib/ronin/spec/database.rb

@@ -36,6 +36,10 @@ RSpec.configure do |spec|
       Ronin::Database.setup_log(:stream => STDERR, :level => :debug)
     end
 
+    # setup the database
     Ronin::Database.setup
+
+    # auto-migrate any models defined in the specs
+    DataMapper.finalize.auto_migrate!
   end
 end

data/lib/ronin/target.rb

@@ -17,13 +17,14 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/campaign'
-require 'ronin/address'
 require 'ronin/model'
 
 require 'fileutils'
 
 module Ronin
+  autoload :Campaign, 'ronin/campaign'
+  autoload :Address, 'ronin/address'
+
   #
   # Represents an {Address} targeted by a {Campaign}.
   #

data/lib/ronin/tcp_port.rb

@@ -18,16 +18,18 @@
 #
 
 require 'ronin/port'
-require 'ronin/url'
 
 module Ronin
+  autoload :URL, 'ronin/url'
+
   #
   # Represents a TCP {Port}.
   #
   class TCPPort < Port
 
     # The URLs that use the port
-    has 0..n, :urls, :model => 'URL'
+    has 0..n, :urls, :model => 'URL',
+                     :child_key => [:port_id]
 
     #
     # Creates a new {TCPPort} resource.

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

@@ -25,9 +25,8 @@ module Ronin
   module UI
     #
     # The {CLI} provides an extensible Command Line Interface (CLI)
-    # for Ronin. The {CLI} can load any sub-command using the
-    # {command} method, from the `ronin/ui/cli/commands`
-    # directory.
+    # for Ronin. The {CLI} can load any command using the {command} method,
+    # from the `ronin/ui/cli/commands` directory.
     #
     module CLI
       # Name of the default to run

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

@@ -29,14 +29,13 @@ module Ronin
     module CLI
       #
       # The {Command} class inherits `Thor::Group` to provide a base-class
-      # for defining sub-commands for the {CLI}.
+      # for defining commands for the {CLI}.
       #
       # # Extending
       #
-      # To create a new sub-command one can inherit the {Command} class.
-      # The new sub-command can define multiple `class_options` and
-      # `arguments` which `Thor::Group` will use to parse command-line
-      # arguments.
+      # To create a new command one can inherit the {Command} class.
+      # The new command can define multiple `class_options` and `arguments`
+      # which `Thor::Group` will use to parse command-line arguments.
       #
       #     require 'ronin/ui/cli/command'
       #
@@ -80,24 +79,36 @@ module Ronin
       #
       # # Running
       #
-      # To run the sub-command from Ruby, one can call the `start` class
-      # method with the options and arguments to run the sub-command with.
+      # To run the command from Ruby, one can call the {run} class method
+      # with the options and arguments to run the command with:
       #
-      #     MyCommand.start(
+      #     MyCommand.run(
       #       {:stuff => true, :syntax => 'bla', :includes => ['other']},
       #       ['some/file.txt']
       #     )
       #
-      # To ensure that your sub-command is accessible to the `ronin`
-      # command, make sure that the ruby file the sub-command is defined
-      # within is in the `ronin/ui/cli/commands` directory of a
-      # Ronin library. If the sub-command class is named 'MyCommand'
-      # it's ruby file must also be named 'my_command.rb'.
+      # To run the command from Ruby, with raw command-line options, one
+      # can call the `start` class method:
       #
-      # To run the sub-command using the `ronin` command, simply specify
-      # it's underscored name:
+      #     MyCommand.start([
+      #       '--stuff', 'true', '--syntax', 'bla', '--includes', 'other',
+      #       'some/file.txt'
+      #     ])
       #
-      #     ronin my_command some/file.txt --stuff --syntax bla --includes one two
+      # Note: If `MyCommand.start` is not given any arguments, it will use
+      # `ARGV` instead.
+      #
+      # To ensure that your command is accessible to the `ronin` command,
+      # make sure that the ruby file the command is defined within is in
+      # the `ronin/ui/cli/commands` directory of a Ronin library.
+      # If the command class is named 'MyCommand' it's ruby file must also
+      # be named 'my_command.rb'.
+      #
+      # To run the command using the `ronin` command, simply specify it's
+      # underscored name:
+      #
+      #     ronin my_command some/file.txt --stuff --syntax bla \
+      #       --includes one two
       #
       class Command < Thor::Group
 
@@ -134,6 +145,27 @@ module Ronin
           self.name.split('::').last.underscore
         end
 
+        #
+        # Runs the command.
+        #
+        # @param [Hash{String,Symbol => Object}] options
+        #   Option values for the command.
+        #
+        # @param [Array<String>] arguments
+        #   Additional arguments for the command.
+        #
+        # @return [Command]
+        #   The executed command.
+        #
+        # @since 1.0.0
+        #
+        def self.run(options={},arguments=[])
+          command = self.new(arguments,options)
+          command.invoke_all()
+
+          return command
+        end
+
         #
         # Creates a new Command object.
         #

data/lib/ronin/ui.rb

@@ -18,6 +18,5 @@
 #
 
 require 'ronin/ui/output'
-require 'ronin/ui/hexdump'
 require 'ronin/ui/console'
 require 'ronin/ui/shell'

data/lib/ronin/url.rb

@@ -17,19 +17,19 @@
 # along with Ronin.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-require 'ronin/url_scheme'
-require 'ronin/url_query_param'
-require 'ronin/host_name'
-require 'ronin/tcp_port'
-require 'ronin/web_credential'
 require 'ronin/model'
 
 require 'dm-timestamps'
-require 'dm-tags'
 require 'uri'
 require 'uri/query_params'
 
 module Ronin
+  autoload :URLScheme, 'ronin/url_scheme'
+  autoload :URLQueryParam, 'ronin/url_query_param'
+  autoload :HostName, 'ronin/host_name'
+  autoload :TCPPort, 'ronin/tcp_port'
+  autoload :WebCredential, 'ronin/web_credential'
+
   #
   # Represents URLs that can be stored in the {Database}.
   #
@@ -75,9 +75,6 @@ module Ronin
     # Defines the created_at timestamp
     timestamps :created_at
 
-    # Tags
-    has_tags_on :tags
-
     #
     # Searches for all URLs using HTTP.
     #
@@ -207,7 +204,9 @@ module Ronin
       return super(url) if url.kind_of?(Integer)
 
       # optionally parse the URL
-      url = ::URI.parse(url) unless url.kind_of?(::URI)
+      unless url.kind_of?(::URI)
+        url = ::URI.parse(url.to_s)
+      end
 
       port = if url.port
                {:number => url.port}