ronin 0.2.1 → 0.2.2

data/lib/ronin/formatting/extensions/text/string.rb

@@ -21,7 +21,7 @@
 #++
 #
 
-require 'ronin/chars'
+require 'chars'
 
 class String
 
@@ -31,11 +31,11 @@ class String
   #
   # _options_ may include the following keys:
   # <tt>:included</tt>:: The set of characters that will be formated,
-  #                      defaults to <tt>Ronin::Chars.all</tt>.
+  #                      defaults to <tt>Chars.all</tt>.
   # <tt>:excluded</tt>:: The characters not to format.
   #
   def format_chars(options={},&block)
-    included = (options[:included] || Ronin::Chars.all)
+    included = (options[:included] || Chars.all)
     excluded = (options[:excluded] || [])
 
     targeted = included - excluded
@@ -60,7 +60,7 @@ class String
   #
   # _options_ may include the following keys:
   # <tt>:included</tt>:: The set of characters that will be formated,
-  #                      defaults to <tt>Ronin::Chars.all</tt>.
+  #                      defaults to <tt>Chars.all</tt>.
   # <tt>:excluded</tt>:: The characters not to format.
   #
   def format_bytes(options={},&block)

data/lib/ronin/license.rb

@@ -22,7 +22,6 @@
 #
 
 require 'ronin/model'
-require 'ronin/extensions/string'
 
 require 'dm-predefined'
 
@@ -65,24 +64,55 @@ module Ronin
     # <tt>:url</tt>:: The URL to the license.
     #
     def self.define(name,options={})
-      super(name.to_method_name,options.merge(:name => name))
+      super(name.downcase.gsub(/[\s_\-]+/,'_'),options.merge(:name => name))
     end
 
     # Creative Commons Licenses
-    define 'CC by', :description => 'Creative Commons Attribution v3.0 License', :url => 'http://creativecommons.org/licenses/by/3.0/'
-    define 'CC by-sa', :description => 'Creative Commons Attribution-Share Alike v3.0 License', :url => 'http://creativecommons.org/licenses/by-sa/3.0/'
-    define 'CC by-nd', :description => 'Creative Commons Attribution-No Derivative Works v3.0 License', :url => 'http://creativecommons.org/licenses/by-nd/3.0/'
-    define 'CC by-nc', :description => 'Creative Commons Attribution-Noncommercial v3.0 License', :url => 'http://creativecommons.org/licenses/by-nc/3.0/'
-    define 'CC by-nc-sa', :description => 'Creative Commons Attribution-Noncommercial-Share Alike v3.0 License', :url => 'http://creativecommons.org/licenses/by-nc-sa/3.0/'
-    define 'CC by-nc-nd', :description => 'Creative Commons Attribution-Noncommercial-No Derivative Works v3.0 License', :url => 'http://creativecommons.org/licenses/by-nc-nd/3.0/'
+    define 'CC by',
+           :description => 'Creative Commons Attribution v3.0 License',
+           :url => 'http://creativecommons.org/licenses/by/3.0/'
+
+    define 'CC by-sa',
+           :description => 'Creative Commons Attribution-Share Alike v3.0 License',
+           :url => 'http://creativecommons.org/licenses/by-sa/3.0/'
+
+    define 'CC by-nd',
+           :description => 'Creative Commons Attribution-No Derivative Works v3.0 License',
+           :url => 'http://creativecommons.org/licenses/by-nd/3.0/'
+
+    define 'CC by-nc',
+           :description => 'Creative Commons Attribution-Noncommercial v3.0 License',
+           :url => 'http://creativecommons.org/licenses/by-nc/3.0/'
+
+    define 'CC by-nc-sa',
+           :description => 'Creative Commons Attribution-Noncommercial-Share Alike v3.0 License',
+           :url => 'http://creativecommons.org/licenses/by-nc-sa/3.0/'
+
+    define 'CC by-nc-nd',
+           :description => 'Creative Commons Attribution-Noncommercial-No Derivative Works v3.0 License',
+           :url => 'http://creativecommons.org/licenses/by-nc-nd/3.0/'
+
+    define 'CC0',
+           :description => 'Creative Commons Zero License',
+           :url => 'http://creativecommons.org/licenses/zero/1.0/'
 
     # GNU Public Licenses
-    define 'GPL-2', :description => 'GNU Public License v2.0', :url => 'http://www.gnu.org/licenses/gpl-2.0.txt'
-    define 'GPL-3', :description => 'GNU Public License v3.0', :url => 'http://www.gnu.org/licenses/gpl-3.0.txt'
-    define 'LGPL-3', :description => 'GNU Lesser General Public License v3.0', :url => 'http://www.gnu.org/licenses/lgpl-3.0.txt'
+    define 'GPL-2',
+           :description => 'GNU Public License v2.0',
+           :url => 'http://www.gnu.org/licenses/gpl-2.0.txt'
+
+    define 'GPL-3',
+           :description => 'GNU Public License v3.0',
+           :url => 'http://www.gnu.org/licenses/gpl-3.0.txt'
+
+    define 'LGPL-3',
+           :description => 'GNU Lesser General Public License v3.0',
+           :url => 'http://www.gnu.org/licenses/lgpl-3.0.txt'
 
     # The MIT Licence
-    define 'MIT', :description => 'The MIT Licence', :url => 'http://www.opensource.org/licenses/mit-license.php'
+    define 'MIT',
+           :description => 'The MIT Licence',
+           :url => 'http://www.opensource.org/licenses/mit-license.php'
 
   end
 end

data/lib/ronin/os.rb

@@ -23,7 +23,8 @@
 
 require 'ronin/model'
 require 'ronin/extensions/meta'
-require 'ronin/extensions/string'
+
+require 'extlib'
 
 module Ronin
   class OS
@@ -63,7 +64,7 @@ module Ronin
     #
     def OS.define(name)
       name = name.to_s
-      method_name = name.to_method_name
+      method_name = name.snake_case
 
       meta_def(method_name) do
         OS.new(:name => name)

data/lib/ronin/platform/extension.rb

@@ -24,6 +24,7 @@
 require 'ronin/platform/exceptions/extension_not_found'
 require 'ronin/platform/extension_cache'
 require 'ronin/platform/platform'
+require 'ronin/static/finders'
 
 require 'contextify'
 
@@ -32,6 +33,7 @@ module Ronin
     class Extension
 
       include Contextify
+      include Static::Finders
 
       contextify :ronin_extension
 
@@ -41,6 +43,9 @@ module Ronin
       # Extension lib/ directory
       LIB_DIR = 'lib'
 
+      # Extension static/ directory
+      STATIC_DIR = 'static'
+
       # Name of extension
       attr_reader :name
 
@@ -242,150 +247,15 @@ module Ronin
         return self
       end
 
-      #
-      # Find the specified _path_ from within all similar extensions.
-      # If a _block_ is given, it will be passed the full path if found.
-      #
-      #   ext.find_paths('data/test')
-      #   # => [...]
-      #
-      #   ext.find_paths('data/test') do |path|
-      #     puts Dir[File.join(path,'*')]
-      #   end
-      #
-      def find_paths(path,&block)
-        matched_paths = []
-
-        @paths.each do |ext_path|
-          full_path = File.expand_path(File.join(ext_path,path))
-
-          if File.exists?(full_path)
-            block.call(full_path) if block
-            matched_paths << full_path
-          end
-        end
-
-        return matched_paths
-      end
-
-      #
-      # Find the specified _path_ from within the first similar extensions.
-      # If a _block_ is given, it will be passed the full path if found.
-      #
-      #   ext.find_path('data/test')
-      #
-      #   ext.find_path('data/test') do |path|
-      #     puts Dir[File.join(path,'*')]
-      #   end
-      #
-      def find_path(path,&block)
-        find_paths(path) do |full_path|
-          block.call(full_path) if block
-          return full_path
-        end
-
-        return nil
-      end
-
-      #
-      # Find the specified file _path_ from within the first similar extensions.
-      # If a _block_ is given, it will be passed the full file path if
-      # found.
-      #
-      #   ext.find_file('data/test/file.xml')
-      #
-      #   ext.find_file('data/test/file.xml') do |file|
-      #     Nokogiri::XML(open(file))
-      #     ...
-      #   end
-      #
-      def find_file(path,&block)
-        find_paths(path) do |full_path|
-          if File.file?(full_path)
-            block.call(full_path) if block
-            return full_path
-          end
-        end
-      end
+      def static_paths(path,&block)
+        @paths.each do |dir|
+          static_dir = File.join(dir,STATIC_DIR)
+          next unless File.directory?(static_dir)
 
-      #
-      # Find the specified directory _path_ from within the first similar
-      # extensions. If a _block_ is given, it will be passed the full
-      # directory path if found.
-      #
-      #   ext.find_directory('data/test')
-      #
-      #   ext.find_directory('data/test') do |dir|
-      #     puts Dir[File.join(dir,'*')]
-      #   end
-      #
-      def find_dir(path,&block)
-        find_paths(path) do |full_path|
-          if File.directory?(full_path)
-            block.call(full_path) if block
-            return full_path
-          end
-        end
-      end
-
-      #
-      # Find the paths that match the given pattern from within all similar
-      # extensions. If a _block_ is given, it will be passed each matching
-      # full path.
-      #
-      #   ext.glob_paths('data/*') # => [...]
-      #
-      #   ext.glob_paths('data/*') do |path|
-      #     puts path
-      #   end
-      #
-      def glob_paths(pattern,&block)
-        full_paths = @paths.inject([]) do |paths,ext_path|
-          paths + Dir[File.join(ext_path,pattern)]
-        end
-
-        full_paths.each(&block) if block
-        return full_paths
-      end
-
-      #
-      # Find the file paths that match the given pattern from within all
-      # similar extensions. If a _block_ is given, it will be passed each
-      # matching full file path.
-      #
-      #   ext.glob_files('data/*.xml') # => [...]
-      #
-      #   ext.glob_files('data/*.xml') do |file|
-      #     puts file
-      #   end
-      #
-      def glob_files(pattern,&block)
-        full_paths = glob_paths(pattern).select do |path|
-          File.file?(path)
-        end
-
-        full_paths.each(&block) if block
-        return full_paths
-      end
-
-      #
-      # Find the directory paths that match the given pattern from within
-      # all similar extensions. If a _block_ is given, it will be passed
-      # each matching full directory path.
-      #
-      #   ext.glob_dirs('builds/*') # => [...]
-      #
-      #   ext.glob_dirs('builds/*') do |dir|
-      #     puts dir
-      #   end
-      #
-      def glob_dirs(pattern,&block)
-        full_paths = glob_paths(pattern).select do |path|
-          File.directory?(path)
+          block.call(File.join(static_dir,path))
         end
 
-        full_paths.each(&block) if block
-        return full_paths
+        super(path,&block)
       end
 
       #

data/lib/ronin/platform/extension_cache.rb

@@ -85,6 +85,17 @@ module Ronin
         end
       end
 
+      #
+      # Reloads the extensions within the extension cache.
+      #
+      def reload!
+        each do |name,ext|
+          ext.teardown!
+
+          self[name] = load_extension(name)
+        end
+      end
+
     end
   end
 end

data/lib/ronin/platform/overlay.rb

@@ -24,23 +24,32 @@
 require 'ronin/platform/exceptions/extension_not_found'
 require 'ronin/platform/maintainer'
 require 'ronin/platform/extension'
+require 'ronin/static/static'
 
 require 'repertoire'
 require 'nokogiri'
 
 module Ronin
   module Platform
-    class Overlay < Repertoire::Repository
+    class Overlay
+
+      include Repertoire
 
       # Overlay metadata XML file name
       METADATA_FILE = 'ronin.xml'
 
-      # Overlay lib directory
+      # Overlay lib/ directory
       LIB_DIR = 'lib'
 
+      # Overlay static/ directory
+      STATIC_DIR = 'static'
+
       # Overlay objects directory
       OBJECTS_DIR = 'objects'
 
+      # Reserved directories
+      RESERVED_DIRS = [LIB_DIR, STATIC_DIR, OBJECTS_DIR]
+
       # Local path to the overlay
       attr_reader :path
 
@@ -71,20 +80,26 @@ module Ronin
       # Description
       attr_reader :description
 
+      # The static directory
+      attr_reader :static_dir
+
       # The objects directory
       attr_reader :objects_dir
 
+      # Repository of the overlay
+      attr_reader :repository
+
       #
-      # Creates a new Overlay object with the specified _path_, _media_type_
+      # Creates a new Overlay object with the specified _path_, _media_
       # and _uri_.
       #
-      def initialize(path,media_type=nil,uri=nil,&block)
+      def initialize(path,media=nil,uri=nil,&block)
         @path = File.expand_path(path)
         @name = File.basename(@path)
+        @static_dir = File.join(@path,STATIC_DIR)
         @objects_dir = File.join(@path,OBJECTS_DIR)
         @uri = uri
-
-        super(@path,Repertoire::Media.types[media_type])
+        @repository = Repository.new(@path,Media.types[media])
 
         initialize_metadata(&block)
       end
@@ -92,22 +107,18 @@ module Ronin
       #
       # Media type of the overlay.
       #
-      def media_type
-        if @media
-          return @media.name
-        else
-          return nil
-        end
+      def media
+        @repository.media_name
       end
 
       #
       # Returns the paths of all extensions within the overlay.
       #
       def extension_paths
-        directories.reject do |dir|
+        @repository.directories.reject do |dir|
           name = File.basename(dir)
 
-          (name == OBJECTS_DIR) || (name == LIB_DIR)
+          RESERVED_DIRS.include?(name)
         end
       end
 
@@ -154,10 +165,13 @@ module Ronin
       # <tt>$LOAD_PATH</tt>.
       #
       def activate!
+        # add the lib/ directories
         lib_dirs.each do |path|
           $LOAD_PATH << path unless $LOAD_PATH.include?(path)
         end
 
+        # add the static/ directory
+        Static.directory(@static_dir) if File.directory?(@static_dir)
         return true
       end
 
@@ -166,8 +180,9 @@ module Ronin
       # <tt>$LOAD_PATH</tt>.
       #
       def deactive!
-        paths = lib_dirs
+        Static.static_dirs.reject! { |dir| dir == @static_dir }
 
+        paths = lib_dirs
         $LOAD_PATH.reject! { |path| paths.include?(path) }
         return true
       end
@@ -177,11 +192,11 @@ module Ronin
       # is given it will be called after the overlay has been updated.
       #
       def update(&block)
-        if media_type
-          Repertoire.update(:media => media_type, :path => @path, :uri => @uri)
+        if @repository.update(@uri)
+          initialize_metadata(&block)
         end
 
-        return initialize_metadata(&block)
+        return self
       end
 
       #
@@ -190,7 +205,7 @@ module Ronin
       # has been uninstalled.
       #
       def uninstall(&block)
-        Repertoire.delete(@path)
+        @repository.delete
 
         block.call(self) if block
         return self
@@ -228,11 +243,25 @@ module Ronin
           doc = Nokogiri::XML(open(metadata_path))
           overlay = doc.at('/ronin-overlay')
 
-          @title = overlay.at('title').inner_text.strip
-          @license = overlay.at('license').inner_text.strip
-          @source = overlay.at('source').inner_text.strip
-          @source_view = overlay.at('source-view').inner_text.strip
-          @website = overlay.at('website').inner_text.strip
+          if (title_tag = overlay.at('title'))
+            @title = title_tag.inner_text.strip
+          end
+
+          if (license_tag = overlay.at('license'))
+            @license = license_tag.inner_text.strip
+          end
+
+          if (source_tag = overlay.at('source'))
+            @source = source_tag.inner_text.strip
+          end
+
+          if (source_view_tag = @source_view = overlay.at('source-view'))
+            @source_view = source_view_tag.inner_text.strip
+          end
+
+          if (website_tag = @website = overlay.at('website'))
+            @website = website_tag.inner_text.strip
+          end
 
           overlay.search('maintainers/maintainer').each do |maintainer|
             if (name = maintainer.at('name'))
@@ -246,7 +275,9 @@ module Ronin
             @maintainers << Maintainer.new(name,email)
           end
 
-          @description = overlay.search('description').inner_text.strip
+          if (description_tag = overlay.at('description'))
+            @description = description_tag.inner_text.strip
+          end
         end
 
         block.call(self) if block