spiderfw 0.6.9 → 0.6.10

data/CHANGELOG

@@ -1,7 +1,11 @@
+= 0.6.10
+== 2 August, 2011
+* Bugfixes
+
 = 0.6.9
 == 28 July, 2011
 * App installer now uses Git gem instead of Grit for better Windows compatibility
-* Switched from GetText to FastGettext
+* Switched from GetText to FastGettext; text domains are now used for each app
 
 = 0.6.8
 == 26 July, 2011

data/README.rdoc

@@ -0,0 +1,121 @@
+== Welcome to Spider
+
+Spider is a Model-View-Controller application framework, mainly intended for Web applications.
+
+Its main features are:
+
+* A model layer that is easy to use, yet flexible enough to adapt to legacy schemas. 
+  Models are defined in Ruby: schemas are autogenerated, but can be specified manually when needed.
+  
+  Deep loading and deep querying are supported, through a simple pure-Ruby query language: 
+    
+    planets = Planet.find{ |planet| planet.stars.diameter <= 1500000 }
+    p planets[0].atmosphere.type
+
+  No N+1 queries are performed: deep data is loaded in batches, using windows if needed.
+
+  A Unit of Work is available for complex saves. An Identity Mapper mantains
+  the integrity of an object's tree; but it isn't forced globally, so data replication and
+  translation is still possible.
+
+* A view layer based on HTML, with reusable widgets that are easy to extend in both their controller and their view.
+
+  Templates are mostly valid HTML, but implement variable substitution, widget instantiation, conditional and iteration logic.
+
+    <div id="my-view">
+        <h1>Hello, { @my_name }</h1>
+        <core:table model="Music" />
+    </div>
+
+  A view can be extended by another one like
+
+    <tpl:extend src="view.shtml">
+        <tpl:append search="#my-view h1">, and welcome to the show.</tpl:append>
+    </tpl:extend>
+
+  Or, a widget can be customized directly when instantiated:
+
+    <div id="my-view">
+        <core:table model="Music">
+            <tpl:after search="tbody td">
+                <a sp:if="element == :title" href="#listen">Listen</a>
+            </tpl:after>
+        </core:table>
+    </div>
+
+  Views are compiled, so they are fast; so are the _overrides_, which always work on the source template.
+
+  No code blocks are available in the views. This forces clear separation of the logic from the presentation and allows
+  the programmatic manipulation of the templates.
+  Still, full Ruby is available on the "scene" variables, so formatting logic can be applied inline.
+
+* A light controller with flexible redirection, before and after stacks, and an annotation system to expose methods
+  with different content types.
+
+    class MyController < Spider::PageController
+        route 'admin', MyAdminController
+        route /books/(.+)/, :book
+
+        __.html
+        def book(id)
+            @scene.book = Book.new(id)
+            render 'book'
+        end
+
+    end
+
+  Widgets are controllers, too, so they get the same funtionality; still, it's the main controller that manages them,
+  and can easily customize the widgets' behaviour.
+
+* A JavaScript library (jQuery based) that interacts with the backend.
+  Controllers have their corresponding Javascript objects that allow actions on the server; so do widgets
+  instances, which have a direct line with the same instance on the server.
+
+    $W('my_gallery').reload({place: 'Barcelona'});
+
+  Widgets instances can be rendered individually, allowing a zero-work ajax which can be refined later while
+  still preserving the non-javascript functionality.
+
+  Javascript and CSS dependencies are managed by requiring them in controller and widget templates; they are 
+  automatically resolved and compressed when running in production mode.
+
+In addition, Spider provides:
+
+* Thread safety (if you play it safe, of course): Spider runs equally well in a single process mode as in a multiple
+  process mode. A threaded single process can be faster and less resource intensive; multiple threaded or single-threaded
+  processes can be pooled.
+  Thread safety has been a requirement since the beginning of the project.
+
+* CRUD administration but no scaffolding: administration is composed with widgets that can be extended and customized, 
+  ensuring that common functionality can be globally modified when needed.
+
+* Multiple app support: apps are packages which can be distributed and activated as needed. 
+
+* A (writable) YAML-based configuration system with smart defaults and includable sets.
+
+* No pollution: monkey-patching is kept to the minimum. ActiveSupport is definitely not needed, 
+  but is grudgingly accepted if it is loaded.
+
+* Full internazionalization using gettext and CLDR, even for Javascript files.
+
+You can dive in by running
+
+  $ spider create home test
+  $ cd test
+  $ spider create app my_app
+  
+Add 'my_app' to the apps in config/config.yml, run 
+
+  $ spider webserver start
+  
+and point your browser to http://localhost:8080/my_app/
+
+Have fun!
+
+
+  
+ 
+   
+  
+  
+

data/VERSION

@@ -1 +1 @@
-0.6.9
+0.6.10

data/apps/app_server/lib/app.rb

@@ -13,11 +13,11 @@ module Spider; module AppServer
             @spec.send(name, *args) if @spec.respond_to?(name)
         end
         
-        def to_json
+        def to_json(options=nil)
             @spec.to_json
         end
         
         
     end
     
-end; end
+end; end

data/apps/messenger/messenger.rb

@@ -38,6 +38,7 @@ module Spider
             return false if mutex.locked?
             model = Spider::Messenger.const_get(self.queues[queue][:model])
             lock_file = "#{self.lock_file}_#{queue}"
+            now = DateTime.now
             mutex.synchronize do
                 FileUtils.touch(lock_file)
                 File.open(lock_file, 'r'){ |f| return false unless f.flock File::LOCK_EX | File::LOCK_NB }
@@ -46,7 +47,6 @@ module Spider
                     if tickets
                         list = model.where(:ticket => tickets)
                     else
-                        now = DateTime.now
                         list = model.where{ (sent == nil) & (next_try <= now) }
                     end
                     list.each do |msg|

data/apps/servant/lib/commands_processor.rb

@@ -90,7 +90,7 @@ module Spider; module Servant
             installed = []
             gems.each do |g|
                 v = g['version'] || Gem::Requirement.default
-                unless Gem.available?(g['name'], v)
+                unless Spider.gem_available?(g['name'], v)
                     inst.install g['name'], v
                     installed << g
                 end

data/apps/worker/cmd.rb

@@ -12,7 +12,11 @@ module Spider; module Worker
             status.set_execution_block do
                 pid = Worker.running?
                 if (pid)
-                    puts "Worker running (#{pid})"
+                    str = "Worker running (#{pid})"
+                    if Worker.pid_file && ::File.exists?(Worker.pid_file)
+                        str += " since #{::File::Stat.new(Worker.pid_file).mtime}"
+                    end
+                    puts str
                 else
                     puts "Worker not running"
                 end
@@ -67,4 +71,4 @@ module Spider; module Worker
  
 
 
-end; end
+end; end

data/apps/worker/config/options.rb

@@ -6,5 +6,7 @@ module Spider
     }
     config_option 'worker.detach', :type => Spider::DataTypes::Bool, :default => true
     config_option 'worker.jobs_interval', _("Seconds between each jobs run"), :type => Fixnum, :default => 60
+    config_option 'worker.keep_running', _('Keep the worker running after the main process shuts down'), :type => Spider::Bool,
+    	:default => lambda{ Object.const_defined?(:PhusionPassenger) ? true : false }
     
 end

data/apps/worker/worker.rb

@@ -33,7 +33,7 @@ module Spider
         end
         
         def self.app_shutdown
-            return unless @runner || Spider.conf.get('worker.enable')
+            return unless @runner || (Spider.conf.get('worker.enable') && !Spider.conf.get('worker.keep_running'))
             @mutex.try_lock || return
             Spider::Logger.info("Shutting down worker in #{Process.pid}")
             if @runner

data/lib/spiderfw/app.rb

@@ -365,6 +365,7 @@ END_OF_EVAL
             
             def tsort_each_child(node, &block)
                 return unless node.is_a?(AppSpec)
+                return unless node.load_after
                 node.load_after.map{ |a| @apps_hash[a] }.each(&block)
             end
             

data/lib/spiderfw/cmd/commands/app.rb

@@ -106,7 +106,7 @@ class AppCommand < CmdParse::Command
         install = CmdParse::Command.new( 'install', false )
         install.short_desc = _("Install an app")
         install.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--no-git", _("Don't use git for installing apps"), "-g"){ |r| @no_git = true }
+            opt.on("--git", _("Use git for installing apps"), "-g"){ |r| @git = true }
             opt.on("--no-dependencies", _("Don't install other apps this one depends on"), "-d"){ |d| 
                 @no_deps = true 
             }
@@ -125,7 +125,7 @@ class AppCommand < CmdParse::Command
             end
             require 'spiderfw/setup/app_manager'
             options = {
-                :no_git => @no_git, :all => @all, :no_deps => @no_deps, :no_optional => @no_optional, 
+                :git => @git, :all => @all, :no_deps => @no_deps, :no_optional => @no_optional, 
                 :no_gems => @no_gems, :no_optional_gems => @no_optional_gems, :no_activate => @no_activate
             }
             options[:url] = @server_url if @server_url

data/lib/spiderfw/cmd/commands/create.rb

@@ -24,7 +24,7 @@ class CreateCommand < CmdParse::Command
             @path ||= Dir.pwd+'/apps'
             names.each do |name|
                 Spider::Create.app(name, @path, @module_name)
-                puts "Created app #{name} at #{@path}/#{name}" if ($verbose)
+                Spider.output "Created app #{name} at #{@path}/#{name}" if ($verbose)
             end
         end
         self.add_command(app, false)

data/lib/spiderfw/controller/mixins/visual.rb

@@ -305,10 +305,12 @@ module Spider; module ControllerMixins
             end
             @rendering_error = true
             @scene.__is_error_page = true
-            if Spider.const_defined?(:Messenger) && Spider.conf.get('errors.send_email') && Spider.conf.get('site.tech_admin.email')
-                begin
-                    send_error_email(exc)
-                rescue => exc2
+            unless exc.is_a?(Spider::Controller::NotFound)
+                if Spider.const_defined?(:Messenger) && Spider.conf.get('errors.send_email') && Spider.conf.get('site.tech_admin.email')
+                    begin
+                        send_error_email(exc)
+                    rescue => exc2
+                    end
                 end
             end
             render_error "#{error_page}", :layout => layout

data/lib/spiderfw/create.rb

@@ -44,11 +44,12 @@ module Spider
                     repo.add('.gitignore')
                     repo.commit(_("Created repository"))
                 rescue => exc
-                    puts "Unable to init Git repo, please init manually"
+                    Spider.output exc.message, :ERROR
+                    Spider.output "Unable to init Git repo, please init manually", :ERROR
                 end
                 Dir.chdir(cwd)
             rescue LoadError
-                puts "git gem not installed, cannot init repo"
+                Spider.output _("git gem not installed, cannot init repo"), :NOTICE
             end
         end
         

data/lib/spiderfw/i18n/gettext.rb

@@ -3,6 +3,7 @@ require 'locale'
 include FastGettext::Translation
 FastGettext.add_text_domain('spider', :path => File.join($SPIDER_PATH, 'data', 'locale'))
 FastGettext.text_domain = 'spider'
+FastGettext.default_text_domain = 'spider'
 l = Locale.current[0].to_s
 l = $1 if l =~ /(\w\w)_+/
 FastGettext.locale = l

data/lib/spiderfw/model/element.rb

@@ -149,7 +149,7 @@ module Spider; module Model
             prev_text_domain = nil
             if @definer_model && @definer_model != Spider::Model::Managed
                 prev_text_domain = FastGettext.text_domain
-                FastGettext.text_domain = @definer_model.app.short_name
+                FastGettext.text_domain = @definer_model.app.short_name if FastGettext.translation_repositories.key?(@definer_model.app.short_name)
             end
             l = self.attributes[:label] ? _(self.attributes[:label]) : Inflector.underscore_to_upcasefirst(@name.to_s)
             if prev_text_domain

data/lib/spiderfw/requires.rb

@@ -24,6 +24,7 @@ require 'spiderfw/utils/ordered_hash'
 require 'spiderfw/utils/memory'
 require 'spiderfw/utils/secure_random'
 require 'spiderfw/utils/http_client'
+require 'spiderfw/utils/gems'
 require 'spiderfw/config/configuration'
 require 'spiderfw/config/configurable'
 require 'spiderfw/model/model'

data/lib/spiderfw/setup/app_manager.rb

@@ -32,20 +32,20 @@ module Spider
             return if apps.empty?
             require 'spiderfw/setup/app_server_client'
             use_git = false
-            unless options[:no_git]
+            if options[:git]
                 begin
                     require 'git'
                     use_git = true
                 rescue => exc
-                    puts exc.message
-                    puts "git gem not available; install git gem for Git support"
+                    Spider.output exc.message, :ERROR
+                    Spider.output "git gem not available; install git gem for Git support", :ERROR
                 end
             end
             
             existent = []
             apps.each do |app|
                 if File.exist?("apps/#{app}")
-                    puts _("%s already exists, skipping") % app
+                    Spider.output _("%s already exists, skipping") % app
                     existent << app
                 end
             end
@@ -65,8 +65,8 @@ module Spider
             end
             deps = specs.map{ |s| s.app_id }
             unless (deps - apps).empty?
-                puts _("The following apps will be installed as a dependency:")
-                puts (deps - apps).inspect
+                Spider.output _("The following apps will be installed as a dependency:")
+                Spider.output((deps - apps).inspect)
             end
             i_options = {
                 :use_git => use_git, 
@@ -96,7 +96,7 @@ module Spider
                     require 'git'
                     use_git = true
                 rescue
-                    puts "git gem not available; install git gem for Git support"
+                    Spider.output "git gem not available; install git gem for Git support"
                 end
             end
             if options[:all]
@@ -105,10 +105,9 @@ module Spider
                 apps = home.list_apps
             end
             if apps.empty?
-                puts _("No app to update")
+                Spider.output _("No app to update")
                 exit
             end
-            require 'spiderfw/setup/app_manager'
             specs = []
             client = Spider::AppServerClient.new(url)
             if options[:no_deps]
@@ -118,8 +117,8 @@ module Spider
             end
             deps = specs.map{ |s| s.app_id }
             unless (deps - apps).empty?
-                puts _("The following apps will be updated as a dependency:")
-                puts (deps - apps).inspect
+                Spider.output _("The following apps will be updated as a dependency:")
+                Spider.output((deps - apps).inspect)
             end
             Spider::AppManager.update(specs, Dir.pwd, {
                 :use_git => use_git, 
@@ -129,7 +128,6 @@ module Spider
         end
 
         def self.install(specs, home_path, options)
-            options[:use_git] = true unless options[:use_git] == false
             options[:home_path] = home_path
             specs = [specs] if specs && !specs.is_a?(Array)
             specs ||= []
@@ -147,16 +145,17 @@ module Spider
         def self.git_install(spec, home_path, options={})
             require 'git'
             if ::File.exist?("apps/#{spec.id}")
-                puts _("%s already installed, skipping") % spec.id
+                Spider.output _("%s already installed, skipping") % spec.id
                 return
             end
             repo = Git.open(home_path)
-            puts _("Fetching %s from %s") % [spec.app_id, spec.git_repo]
+            Spider.output _("Fetching %s from %s") % [spec.app_id, spec.git_repo]
             repo_url = spec.git_repo
             if options[:ssh_user] && repo_url =~ /ssh:\/\/([^@]+@)?(.+)/
                 repo_url = "ssh://#{options[:ssh_user]}@#{$2}"
             end
             
+            ENV['GIT_WORK_TREE'] = nil
             Dir.chdir(home_path) do
                 `git submodule add #{repo_url} apps/#{spec.id}`
                 `git submodule init`
@@ -171,7 +170,7 @@ module Spider
             client = AppServerClient.new(spec.app_server)
             print _("Fetching %s from server... ") % spec.app_id
             tmp_path = client.fetch_app(spec.app_id)
-            puts _("Fetched.")
+            Spider.output _("Fetched.")
             dest = File.join(home_path, "apps/#{spec.app_id}")
             FileUtils.mkdir_p(dest)
             open tmp_path, Gem.binary_mode do |io|
@@ -188,7 +187,15 @@ module Spider
                     end
                 end
             end
-
+            if File.directory?(File.join(home_path, '.git'))
+                begin
+                    require 'git'
+                    repo = Git.open(home_path)
+                    repo.add("apps/#{spec.id}")
+                    repo.commit(_("Added app %s") % spec.id)
+                rescue
+                end
+            end
         end
         
         def self.pre_setup(specs, options={})
@@ -196,11 +203,25 @@ module Spider
             require 'rubygems/command.rb'
             require 'rubygems/dependency_installer.rb'
             unless options[:no_gems]
-                unless Gem.available?('bundler')
-                    puts _("Installing bundler gem")
-                    inst = Gem::DependencyInstaller.new
-                    inst.install 'bundler'
+               gems = specs.map{ |s| s.gems }
+               # unless options[:no_optional_gems]
+               #     gems += specs.map{ |s| s.gems_optional }
+               # end
+               gems = gems.flatten.uniq
+               gems.reject!{ |g| Spider.gem_available?(g) }
+               unless gems.empty?
+                   Spider.output _("Installing the following needed gems:")
+                   Spider.output gems.inspect
+                   inst = Gem::DependencyInstaller.new
+                    gems.each do |g|
+                        inst.install g
+                    end
                 end
+                # unless Spider.gem_available?('bundler')
+                #     puts _("Installing bundler gem")
+                #     inst = Gem::DependencyInstaller.new
+                #     inst.install 'bundler'
+                # end
             end
         end
         
@@ -213,12 +234,16 @@ module Spider
         end
         
         def self.update(specs, home_path, options)
-            options[:use_git] = true unless options[:use_git] == false
             specs = [specs] unless specs.is_a?(Array)
             pre_setup(specs, options)
             pre_update(specs, options)
             specs.each do |spec|
+                use_git = false
                 if spec.git_repo && options[:use_git]
+                    app_path = File.join(home_path, "apps/#{spec.id}")
+                    use_git = true if File.directory?(File.join(app_path, '.git'))
+                end
+                if use_git
                     git_update(spec, home_path, options)
                 else
                     pack_update(spec, home_path, options)
@@ -231,7 +256,7 @@ module Spider
             home_repo = Git.open(home_path)
             app_path = File.join(home_path, "apps/#{spec.id}")
             app_repo = Git.open(app_path)
-            puts _("Updating %s from %s") % [spec.app_id, spec.git_repo]
+            Spider.output _("Updating %s from %s") % [spec.app_id, spec.git_repo]
             Dir.chdir(app_path) do
                 app_repo.branch('master').checkout
             end
@@ -240,7 +265,7 @@ module Spider
                 `git --git-dir='#{app_path}/.git' pull origin master`
             end
             if response =~ /Aborting/
-                puts err
+                Spider.output err, :ERROR
                 return
             end
             Dir.chdir(app_path) do
@@ -265,12 +290,11 @@ module Spider
                 pack_install(spec, home_path)
                 FileUtils.rmdir(tmp_app_path)
             rescue
-                puts _("Update of %s failed" % spec.id)
+                Spider.output _("Update of %s failed") % spec.id, :ERROR
                 FileUtils.mv(tmp_app_path, app_path)
             end
         end
         
-        
 
     end
 

data/lib/spiderfw/setup/spider_setup_wizard.rb

@@ -227,7 +227,7 @@ module Spider
             require 'rubygems'
             require 'rubygems/command.rb'
             require 'rubygems/dependency_installer.rb'
-            unless Gem.available?('mysql') || Gem.available?('ruby-mysql')
+            unless Spider.gem_available?('mysql') || Spider.gem_available?('ruby-mysql')
                 if ask? _("Mysql gem is not available. Install?")
                     ok = false
                     while !ok

data/lib/spiderfw/spider.rb

@@ -85,7 +85,6 @@ module Spider
         def init_apps
             @apps.each do |name, mod|
                 if File.directory?(File.join(mod.path, 'po'))
-                    Spider.logger.debug("Adding text domain #{mod.short_name}")
                     FastGettext.add_text_domain(mod.short_name, :path => File.join(mod.path, 'data', 'locale'))
                 end
             end
@@ -119,6 +118,7 @@ module Spider
             load_configuration File.join(@root, 'config')
             Locale.default = Spider.conf.get('i18n.default_locale')
             setup_env
+            @logger = Spider::Logger
             @init_base_done = true
         end
         
@@ -179,9 +179,9 @@ module Spider
                 @fssm_thread = Thread.new do
                     monitor.run
                 end
-                Spider.logger.debug("Monitoring restart.txt") if Spider.logger
+                Spider.output("Monitoring restart.txt")
             else
-                Spider.logger.debug("FSSM not installed, unable to monitor restart.txt") if Spider.logger
+                Spider.output("FSSM not installed, unable to monitor restart.txt")
             end
             trap('TERM'){ Spider.main_process_shutdown; exit }
             trap('INT'){ Spider.main_process_shutdown; exit }
@@ -274,8 +274,7 @@ module Spider
         
         # Closes any open loggers, and opens new ones based on configured settings.
         def start_loggers(force=false)
-            return if @logger && !force
-            @logger ||= Spider::Logger
+            return if @logger_started && !force
             @logger.close_all
             @logger.open(STDERR, Spider.conf.get('log.console')) if Spider.conf.get('log.console')
             begin
@@ -300,6 +299,7 @@ module Spider
             end
             $LOG = @logger
             Object.const_set(:LOGGER, @logger)
+            @logger_started = true
         end
         
         def start_loggers!
@@ -482,13 +482,9 @@ module Spider
                     begin
                         @configuration.load_yaml(File.join(path, f))
                     rescue ConfigurationException => exc
-                        if (exc.type == :yaml)
+                        if exc.type == :yaml
                             err = "Configuration file #{path+f} is not valid YAML"
-                            if @logger
-                                @logger.error(err)
-                            else
-                                puts err
-                            end
+                            Spider.output(err, :ERROR)
                         else
                             raise
                         end
@@ -772,12 +768,8 @@ module Spider
                 end
             rescue LoadError, RuntimeError => exc
                 msg = _('Unable to start debugger. Ensure ruby-debug is installed (or set debugger.start to false).')
-                if Spider.logger
-                    Spider.logger.warn(exc.message)
-                    Spider.logger.warn(msg) 
-                else
-                    puts msg
-                end
+                Spider.output(exc.message)
+                Spider.output(msg)
             end
         end
         
@@ -807,6 +799,15 @@ module Spider
             end
         end
         
+        def output(str, level=:INFO)
+            if @logger_started
+                @logger.log(level, str)
+            else
+                str = "#{level}: #{str}" if level == :ERROR
+                puts str
+            end
+        end
+        
     end
     
 end

data/lib/spiderfw/utils/gems.rb

@@ -0,0 +1,12 @@
+module Spider
+   
+    # TODO: remove when old RubyGems versions are not a problem anymore
+    def self.gem_available?(name, *requirements)
+        if Gem::Specification.respond_to?(:find_by_name)
+            Gem::Specification.find_by_name(name, *requirements)
+        else
+            Gem.available?(name, requirements.first)
+        end
+    end 
+
+end

data/lib/spiderfw/utils/logger.rb

@@ -68,6 +68,10 @@ module Spider
                 return false                
             end
             
+            def log(*args, &proc)
+                send_to_loggers(:add, *args, &proc)
+            end
+            
             def debug(*args, &proc)
                 send_to_loggers(:debug, *args, &proc)
             end
@@ -131,6 +135,10 @@ module Spider
 
         end
         
+        def log(*args, &proc)
+            Spider::Logger.add(*args, &proc)
+        end
+        
         def debug(*args, &proc)
             Spider::Logger.debug(*args, &proc)
         end

data/spider.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
   s.authors  = ["Ivan Pirlik"]
   s.files = [
-      'README',
+      'README.rdoc',
       'VERSION',
       'CHANGELOG',
       'Rakefile',
@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
       + Dir.glob('lib/**/*.rb') \
       + Dir.glob('views/**/*')
 #  s.test_files = []
-#  s.rdoc_options = ["--main", "README.txt"]
-#  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
+#  s.rdoc_options = ["--main", "README.rdoc"]
+#  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc"]
   s.executables = ['spider']
   s.default_executable = 'spider'
   s.add_dependency("cmdparse", ["> 2.0.0"])

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spiderfw
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 6
-  - 9
-  version: 0.6.9
+  - 10
+  version: 0.6.10
 platform: ruby
 authors: 
 - Ivan Pirlik
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-28 00:00:00 +02:00
+date: 2011-08-02 00:00:00 +02:00
 default_executable: spider
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cmdparse
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -38,11 +35,9 @@ dependencies:
   name: fast_gettext
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 5
@@ -54,11 +49,9 @@ dependencies:
   name: hpricot
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 0
         - 8
@@ -69,11 +62,9 @@ dependencies:
   name: json_pure
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 1
@@ -84,11 +75,9 @@ dependencies:
   name: uuidtools
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 2
         - 1
@@ -99,11 +88,9 @@ dependencies:
   name: rufus-scheduler
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -114,11 +101,9 @@ dependencies:
   name: mime-types
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -129,11 +114,9 @@ dependencies:
   name: locale
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 0
@@ -144,11 +127,9 @@ dependencies:
   name: builder
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 2
         - 1
@@ -159,11 +140,9 @@ dependencies:
   name: macaddr
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -175,11 +154,9 @@ dependencies:
   name: bundler
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -189,11 +166,9 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 7
@@ -205,11 +180,9 @@ dependencies:
   name: ruby-debug
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 61
         segments: 
         - 0
         - 9
@@ -226,7 +199,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README
+- README.rdoc
 - VERSION
 - CHANGELOG
 - Rakefile
@@ -1174,6 +1147,7 @@ files:
 - lib/spiderfw/utils/annotations.rb
 - lib/spiderfw/utils/events/event_source.rb
 - lib/spiderfw/utils/fork.rb
+- lib/spiderfw/utils/gems.rb
 - lib/spiderfw/utils/hash_comparison.rb
 - lib/spiderfw/utils/http_client.rb
 - lib/spiderfw/utils/inflector.rb
@@ -1226,27 +1200,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - "Optional dependencies: ripl, ripl-irb, ripl-multi_line, json, openssl, sqlite3, webrick, mongrel, ruby-oci8 >2.0, mysql, yui-compressor, home_run, cldr"
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A (web) framework

data/README

@@ -1,4 +0,0 @@
-== Welcome to Spider
-
-Spider is a MVC application framework.
-You can start looking at the Spider::Model::BaseModel documentation.