spiderfw 0.6.23 → 0.6.24

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

@@ -1,135 +1,139 @@
-class ModelCommand < CmdParse::Command
+module Spider::CommandLine
 
+    class ModelCommand < CmdParse::Command
 
-    def initialize
-        super( 'model', true, true )
-        @short_desc = _("Manage models")
-        @apps = []
-        @force = false
-        @no_fkc = true
 
-        sync_cmd = CmdParse::Command.new( 'sync', false )
-        sync_cmd.short_desc = _("Sync models")
-        sync_cmd.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--force", _("Force syncing"), "-f"){ |f|
-                @force = true
-            }
-            opt.on("--drop-columns", _("Drop unused columns"), "-d"){ |d| @drop = true}
-            opt.on("--drop-tables [PREFIX]", _("Drop unused tables")){ |dt|
-                dt = true if dt == '*'
-                @drop_tables = dt
-            }
-            opt.on("--update-sequences", _("Update current sequences to max db value"), "-s"){ |s|
-                @update_sequences = true
-            }
-            opt.on("--non-managed", _("Process also non managed models"), "-m"){ |m| @non_managed = true}
-            opt.on("--no-fk-constraints", _("Don't create foreign key constraints"), "-c"){ |c| @no_fkc = true }
-            opt.on("--fk-constraints", _("Create foreign key constraints"), "-C" ){ |c| @no_fkc = false } 
-        end
-        
-        sync_cmd.set_execution_block do |req_models|
-            require 'spiderfw/init'
-            require 'spiderfw/model/mappers/db_mapper'
-            req_models || []
-            unsafe_fields = {}
-            req_models = Spider.apps.values if (req_models.empty?)
-            req_models.each do |model_or_app|
-                models = []
-                mod = model_or_app.is_a?(Module) ? model_or_app : const_get_full(model_or_app)
-                if (mod.is_a?(Module) && mod.include?(Spider::App))
-                    mod.models.each do |m|
-                        unless @non_managed || m < Spider::Model::Managed
-                            unless m < Spider::Model::InlineModel || m.attributes[:sub_model]
-                                Spider.logger.warn("Skipping #{m} because it's non managed (use -m to override)")
+        def initialize
+            super( 'model', true, true )
+            @short_desc = _("Manage models")
+            @apps = []
+            @force = false
+            @no_fkc = true
+
+            sync_cmd = CmdParse::Command.new( 'sync', false )
+            sync_cmd.short_desc = _("Sync models")
+            sync_cmd.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--force", _("Force syncing"), "-f"){ |f|
+                    @force = true
+                }
+                opt.on("--drop-columns", _("Drop unused columns"), "-d"){ |d| @drop = true}
+                opt.on("--drop-tables [PREFIX]", _("Drop unused tables")){ |dt|
+                    dt = true if dt == '*'
+                    @drop_tables = dt
+                }
+                opt.on("--update-sequences", _("Update current sequences to max db value"), "-s"){ |s|
+                    @update_sequences = true
+                }
+                opt.on("--non-managed", _("Process also non managed models"), "-m"){ |m| @non_managed = true}
+                opt.on("--no-fk-constraints", _("Don't create foreign key constraints"), "-c"){ |c| @no_fkc = true }
+                opt.on("--fk-constraints", _("Create foreign key constraints"), "-C" ){ |c| @no_fkc = false } 
+            end
+            
+            sync_cmd.set_execution_block do |req_models|
+                require 'spiderfw/init'
+                require 'spiderfw/model/mappers/db_mapper'
+                req_models || []
+                unsafe_fields = {}
+                req_models = Spider.apps.values if (req_models.empty?)
+                req_models.each do |model_or_app|
+                    models = []
+                    mod = model_or_app.is_a?(Module) ? model_or_app : const_get_full(model_or_app)
+                    if (mod.is_a?(Module) && mod.include?(Spider::App))
+                        mod.models.each do |m|
+                            unless @non_managed || m < Spider::Model::Managed
+                                unless m < Spider::Model::InlineModel || m.attributes[:sub_model]
+                                    Spider.logger.warn("Skipping #{m} because it's non managed (use -m to override)")
+                                end
+                                next
                             end
-                            next
+                            models << m
+                        end
+                    elsif (mod.subclass_of?(Spider::Model::BaseModel))
+                        if @non_managed || mod < Spider::Model::Managed
+                            models << mod
+                        else
+                            Spider.logger.warn("Skipping #{mod} because it's non managed (use -m to override)")
                         end
-                        models << m
+                        
                     end
-                elsif (mod.subclass_of?(Spider::Model::BaseModel))
-                    if @non_managed || mod < Spider::Model::Managed
-                        models << mod
-                    else
-                        Spider.logger.warn("Skipping #{mod} because it's non managed (use -m to override)")
+                    models.each do |model|
+                        begin
+                            Spider::Model.sync_schema(model, @force, 
+                            :drop_fields => @drop, :update_sequences => @update_sequences, :no_foreign_key_constraints => @no_fkc)
+                        rescue Spider::Model::Mappers::SchemaSyncUnsafeConversion => exc
+                            unsafe_fields[model] = exc.fields
+                        end 
                     end
-                    
-                end
-                models.each do |model|
-                    begin
-                        Spider::Model.sync_schema(model, @force, 
-                        :drop_fields => @drop, :update_sequences => @update_sequences, :no_foreign_key_constraints => @no_fkc)
-                    rescue Spider::Model::Mappers::SchemaSyncUnsafeConversion => exc
-                        unsafe_fields[model] = exc.fields
-                    end 
-                end
-                if (@drop_tables)
-                    begin
-                        Spider::Model.sync_schema(mod, false, :no_sync => true, :drop_tables => @drop_tables)
-                    rescue Spider::Model::Mappers::SchemaSyncUnsafeConversion => exc
-                        puts _("The following tables are about to be dropped: \n%s") % exc.fields.join(', ')
-                        puts _("Continue? yes/NO: ")
-                        r = STDIN.gets.chomp.downcase
-                        yes_chr = _("yes")[0].chr
-                        no_chr = _("no")[0].chr
-                        if (r == _("yes") || (yes_chr != no_chr && r == yes_chr)) 
-                            Spider::Model.sync_schema(mod, true, :no_sync => true, :drop_tables => @drop_tables)
+                    if (@drop_tables)
+                        begin
+                            Spider::Model.sync_schema(mod, false, :no_sync => true, :drop_tables => @drop_tables)
+                        rescue Spider::Model::Mappers::SchemaSyncUnsafeConversion => exc
+                            puts _("The following tables are about to be dropped: \n%s") % exc.fields.join(', ')
+                            puts _("Continue? yes/NO: ")
+                            r = STDIN.gets.chomp.downcase
+                            yes_chr = _("yes")[0].chr
+                            no_chr = _("no")[0].chr
+                            if (r == _("yes") || (yes_chr != no_chr && r == yes_chr)) 
+                                Spider::Model.sync_schema(mod, true, :no_sync => true, :drop_tables => @drop_tables)
+                            end
                         end
+                            
+                            
                     end
-                        
-                        
+                end
+                unless unsafe_fields.empty?
+                    puts _("Unable to modify the following fields:")
+                    puts unsafe_fields.inspect
+                    puts _("(use -f to force)")
                 end
             end
-            unless unsafe_fields.empty?
-                puts _("Unable to modify the following fields:")
-                puts unsafe_fields.inspect
-                puts _("(use -f to force)")
+            self.add_command(sync_cmd)
+            
+            dump_cmd = CmdParse::Command.new( 'dump', false )
+            dump_cmd.short_desc = _("Dump models")
+            dump_cmd.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--force", _("Overwrite existing files"), "-f"){ |f|
+                    @force = true
+                }
+                opt.on("--path [PATH]", _("Specify dump path"), "-p"){ |p|
+                    @dump_path = p
+                }
             end
-        end
-        self.add_command(sync_cmd)
-        
-        dump_cmd = CmdParse::Command.new( 'dump', false )
-        dump_cmd.short_desc = _("Dump models")
-        dump_cmd.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--force", _("Overwrite existing files"), "-f"){ |f|
-                @force = true
-            }
-            opt.on("--path [PATH]", _("Specify dump path"), "-p"){ |p|
-                @dump_path = p
-            }
-        end
-        dump_cmd.set_execution_block do |req_models|
-            require 'spiderfw/init'
-            req_models || []
-            req_models.each do |model_or_app|
-                models = []
-                mod = model_or_app.is_a?(Module) ? model_or_app : const_get_full(model_or_app)
-                if (mod.is_a?(Module) && mod.include?(Spider::App))
-                    mod.models.each do |m|
-                        models << m
-                    end
-                elsif (mod.subclass_of?(Spider::Model::BaseModel))
-                    models << mod if @non_managed || mod < Spider::Model::Managed
-                end
-                Spider.logger.warn("Nothing to do") if models.empty?
-                models.each do |model|
-                    dest = @dump_path || model.app.models_path
-                    FileUtils.mkdir_p(dest)
-                    file_name = "#{model.short_name}.rb"
-                    path = "#{dest}/#{file_name}"
-                    if (File.exist?(path) && !@force)
-                        Spider.logger.warn("File #{path} exists, skipping #{model}")
-                        next
+            dump_cmd.set_execution_block do |req_models|
+                require 'spiderfw/init'
+                req_models || []
+                req_models.each do |model_or_app|
+                    models = []
+                    mod = model_or_app.is_a?(Module) ? model_or_app : const_get_full(model_or_app)
+                    if (mod.is_a?(Module) && mod.include?(Spider::App))
+                        mod.models.each do |m|
+                            models << m
+                        end
+                    elsif (mod.subclass_of?(Spider::Model::BaseModel))
+                        models << mod if @non_managed || mod < Spider::Model::Managed
                     end
-                    code = model.to_code
-                    File.open(path, "w") do |f|
-                        f << code
+                    Spider.logger.warn("Nothing to do") if models.empty?
+                    models.each do |model|
+                        dest = @dump_path || model.app.models_path
+                        FileUtils.mkdir_p(dest)
+                        file_name = "#{model.short_name}.rb"
+                        path = "#{dest}/#{file_name}"
+                        if (File.exist?(path) && !@force)
+                            Spider.logger.warn("File #{path} exists, skipping #{model}")
+                            next
+                        end
+                        code = model.to_code
+                        File.open(path, "w") do |f|
+                            f << code
+                        end
                     end
                 end
             end
-        end
-        self.add_command(dump_cmd)
+            self.add_command(dump_cmd)
 
 
+        end
+
     end
 
 end

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

@@ -1,61 +1,65 @@
-class SetupCommand < CmdParse::Command
-
-
-    def initialize
-        super( 'setup', false, true )
-        @short_desc = _("Setup an application")
-#        @description = _("")
-        @apps = []
-        
-        self.options = CmdParse::OptionParserWrapper.new do |opt|
-            # TODO
-            opt.on("--from [VERSION]", _("Assume a specific version is installed"), "-f"){ |from|
-                @from = Gem::Version.new(from)
-            }
-            opt.on("--to [VERSION]", _("Setup to a specific version"), "-t"){ |to|
-                @to = Gem::Version.new(to)
-            }
-            opt.on("--version [VERSION]", _("Only run the setup script for the given version"), "-v"){ |v|
-                @version = Gem::Version.new(v)
-            }
-            opt.on("--all", _("Setup all active apps")){ |all|
-                @all = true
-            }
-            opt.on("--no-cleanup", _("Don't cleanup"), "-C"){ |no_cleanup| @no_cleanup = true }
-        end
+module Spider::CommandLine
 
-        set_execution_block do |apps|
-            $SPIDER_INTERACTIVE = true
-            require 'spiderfw/spider'
-            Spider.init_base
-            apps = Spider.apps.keys if @all
-            if (apps.length > 1) && (@to || @from || @version)
-                raise "Can't use --from, --to or --version with multiple apps"
-            end
-            if apps.length == 0
-                require 'lib/spiderfw/setup/spider_setup_wizard'
-                wizard = Spider::SpiderSetupWizard.new
-                wizard.implementation(Spider::ConsoleWizard)
-                wizard.run
-                
-            end
-            tasks = []
-            apps.each do |name|
-                require 'spiderfw/setup/app_manager'
-                tasks += Spider::AppManager.new(:interactive => true).setup(name, @from, @to)
+    class SetupCommand < CmdParse::Command
+
+
+        def initialize
+            super( 'setup', false, true )
+            @short_desc = _("Setup an application")
+    #        @description = _("")
+            @apps = []
+            
+            self.options = CmdParse::OptionParserWrapper.new do |opt|
+                # TODO
+                opt.on("--from [VERSION]", _("Assume a specific version is installed"), "-f"){ |from|
+                    @from = Gem::Version.new(from)
+                }
+                opt.on("--to [VERSION]", _("Setup to a specific version"), "-t"){ |to|
+                    @to = Gem::Version.new(to)
+                }
+                opt.on("--version [VERSION]", _("Only run the setup script for the given version"), "-v"){ |v|
+                    @version = Gem::Version.new(v)
+                }
+                opt.on("--all", _("Setup all active apps")){ |all|
+                    @all = true
+                }
+                opt.on("--no-cleanup", _("Don't cleanup"), "-C"){ |no_cleanup| @no_cleanup = true }
             end
-            unless @no_cleanup
-                tasks.each do |t|
-                    begin
-                        t.do_cleanup
-                    rescue => exc
-                        Spider.logger.error(exc)
+
+            set_execution_block do |apps|
+                $SPIDER_INTERACTIVE = true
+                require 'spiderfw/spider'
+                Spider.init_base
+                apps = Spider.apps.keys if @all
+                if (apps.length > 1) && (@to || @from || @version)
+                    raise "Can't use --from, --to or --version with multiple apps"
+                end
+                if apps.length == 0
+                    require 'lib/spiderfw/setup/spider_setup_wizard'
+                    wizard = Spider::SpiderSetupWizard.new
+                    wizard.implementation(Spider::ConsoleWizard)
+                    wizard.run
+                    
+                end
+                tasks = []
+                apps.each do |name|
+                    require 'spiderfw/setup/app_manager'
+                    tasks += Spider::AppManager.new(:interactive => true).setup(name, @from, @to)
+                end
+                unless @no_cleanup
+                    tasks.each do |t|
+                        begin
+                            t.do_cleanup
+                        rescue => exc
+                            Spider.logger.error(exc)
+                        end
                     end
                 end
             end
-        end
 
 
+        end
+
     end
 
 end

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

@@ -1,72 +1,76 @@
-class TestCommand < CmdParse::Command
+module Spider::CommandLine
 
+    class TestCommand < CmdParse::Command
 
-    def initialize
-        super( 'test', true, true )
-        @short_desc = _("Manage tests")
-#        @description = _("")
-        @apps = []
 
-        run_cmd = CmdParse::Command.new( 'run', false )
-        run_cmd.short_desc = _("Run tests")
-        # run.options = CmdParse::OptionParserWrapper.new do |opt|
-        #     opt.on("--app", 
-        #            _("Run tests only for an app"),
-        #            "-a"){ |app|
-        #         @apps << app
-        #     }
-        # end
-        run_cmd.set_execution_block do |apps|
-            require 'test/unit/collector/dir'
-            require 'test/unit'
-            apps = Spider.apps.keys if (!apps || apps.length < 1)
-            collector = Test::Unit::Collector::Dir.new()
-            apps.each do |name|
-                next unless File.exist?(Spider.apps[name].test_path)
-                collector.collect(Spider.apps[name].test_path)
+        def initialize
+            super( 'test', true, true )
+            @short_desc = _("Manage tests")
+    #        @description = _("")
+            @apps = []
+
+            run_cmd = CmdParse::Command.new( 'run', false )
+            run_cmd.short_desc = _("Run tests")
+            # run.options = CmdParse::OptionParserWrapper.new do |opt|
+            #     opt.on("--app", 
+            #            _("Run tests only for an app"),
+            #            "-a"){ |app|
+            #         @apps << app
+            #     }
+            # end
+            run_cmd.set_execution_block do |apps|
+                require 'test/unit/collector/dir'
+                require 'test/unit'
+                apps = Spider.apps.keys if (!apps || apps.length < 1)
+                collector = Test::Unit::Collector::Dir.new()
+                apps.each do |name|
+                    next unless File.exist?(Spider.apps[name].test_path)
+                    collector.collect(Spider.apps[name].test_path)
+                end
             end
-        end
-        self.add_command(run_cmd)
-        
-        self_cmd = CmdParse::Command.new('self', false)
-        self_cmd.short_desc = _("Run framework tests")
-        self_cmd.set_execution_block do
-            require 'test/unit/collector/dir'
-            require 'test/unit'
-            $SPIDER_RUNMODE = 'test'
-            require 'spiderfw/init'
-            test_env = "#{$SPIDER_PATH}/test"
-#            Dir.cwd(test_env)
-            $:.push(test_env)
-            apps = Spider.find_apps_in_folder("#{test_env}/apps")
-            Spider.apps.clear
+            self.add_command(run_cmd)
+            
+            self_cmd = CmdParse::Command.new('self', false)
+            self_cmd.short_desc = _("Run framework tests")
+            self_cmd.set_execution_block do
+                require 'test/unit/collector/dir'
+                require 'test/unit'
+                $SPIDER_RUNMODE = 'test'
+                require 'spiderfw/init'
+                test_env = "#{$SPIDER_PATH}/test"
+    #            Dir.cwd(test_env)
+                $:.push(test_env)
+                apps = Spider.find_apps_in_folder("#{test_env}/apps")
+                Spider.apps.clear
 
-            apps.each{ |app| Spider.load_app_at_path app }
+                apps.each{ |app| Spider.load_app_at_path app }
 
-            Spider._test_setup
-            collector = Test::Unit::Collector::Dir.new()
-            collector.collect("#{test_env}/tests")
-            Spider._test_teardown
-        end
-        self.add_command(self_cmd)
+                Spider._test_setup
+                collector = Test::Unit::Collector::Dir.new()
+                collector.collect("#{test_env}/tests")
+                Spider._test_teardown
+            end
+            self.add_command(self_cmd)
 
-        issue = CmdParse::Command.new('issue', false)
-        issue.short_desc = _("Test for an issue")
-        issue.set_execution_block do |args|
-            id = args.first
-            require 'spiderfw/spider'
-            require 'spiderfw/test'
-            
-            test_path = File.join($SPIDER_PATH, 'test', 'issues')
-            issue_no = id.rjust(5, "0")
-            Dir.glob(File.join(test_path, "#{issue_no}-*")).each do |f|
-                require f
+            issue = CmdParse::Command.new('issue', false)
+            issue.short_desc = _("Test for an issue")
+            issue.set_execution_block do |args|
+                id = args.first
+                require 'spiderfw/spider'
+                require 'spiderfw/test'
+                
+                test_path = File.join($SPIDER_PATH, 'test', 'issues')
+                issue_no = id.rjust(5, "0")
+                Dir.glob(File.join(test_path, "#{issue_no}-*")).each do |f|
+                    require f
+                end
+                
             end
-            
-        end
-        self.add_command(issue)
+            self.add_command(issue)
 
 
+        end
+
     end
 
 end

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

@@ -1,63 +1,68 @@
 require 'spiderfw/http/http'
 
-class WebServerCommand < CmdParse::Command
+module Spider::CommandLine
 
+    class WebServerCommand < CmdParse::Command
 
-    def initialize
-        super( 'webserver', true, true )
-        @short_desc = _("Manage internal webserver")
-#        @description = _("")
-        
-        servers = {
-            'webrick' => :WEBrick,
-            'mongrel' => :Mongrel,
-            'thin' => :Thin
-        }
 
-        # start
-        start = CmdParse::Command.new( 'start', false )
-        start.short_desc = "Start web server"
-        start.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--port N", _("The port the webserver should listen on"), "-p") { |port|
-                @port = port
-            }
-            opt.on("--server name", _("Which webserver to use; the choices are 'webrick', 'mongrel' and 'thin'"), "-s"){ |server_name|
-                raise CmdParse::InvalidArgumentError, _("The webserver %s is not supported") % server_name unless servers[server_name]
-                @server_name = server_name
-            }
-            opt.on("--daemonize [daemon_name]", _("Detach server process"), "-d"){ |daemon_name| @daemonize = daemon_name || true }
-            opt.on("--cgi", _("Serve each request spawning a CGI subprocess. Useful in developement."), "-c"){
-                @cgi = true
-            }
-            opt.on("--ssl [PORT]", _("Listen to SSL requests"), "-S"){ |port|
-                @ssl = port || 443
+        def initialize
+            super( 'webserver', true, true )
+            @short_desc = _("Manage internal webserver")
+    #        @description = _("")
+            
+            servers = {
+                'webrick' => :WEBrick,
+                'mongrel' => :Mongrel,
+                'thin' => :Thin
             }
-            opt.on("--cert CERT", _("SSL certificate")){ |cert| @ssl_cert = cert }
-            opt.on("--key key", _("SSL private key")){ |key| @ssl_key = key }
-        end
-        start.set_execution_block do |args|
-            require 'spiderfw/spider'
-            raise "Can't use cgi mode with SSL" if @ssl && @cgi
-            if @ssl && @server_name != 'webrick'
-                puts _("Note: Using WEBrick as a webserver, since SSL was requested")
-                @server_name = 'webrick'
+
+            # start
+            start = CmdParse::Command.new( 'start', false )
+            start.short_desc = "Start web server"
+            start.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--port N", _("The port the webserver should listen on"), "-p") { |port|
+                    @port = port
+                }
+                opt.on("--server name", _("Which webserver to use; the choices are 'webrick', 'mongrel' and 'thin'"), "-s"){ |server_name|
+                    raise CmdParse::InvalidArgumentError, _("The webserver %s is not supported") % server_name unless servers[server_name]
+                    @server_name = server_name
+                }
+                opt.on("--daemonize [daemon_name]", _("Detach server process"), "-d"){ |daemon_name| @daemonize = daemon_name || true }
+                opt.on("--cgi", _("Serve each request spawning a CGI subprocess. Useful in developement."), "-c"){
+                    @cgi = true
+                }
+                opt.on("--ssl [PORT]", _("Listen to SSL requests"), "-S"){ |port|
+                    @ssl = port || 443
+                }
+                opt.on("--cert CERT", _("SSL certificate")){ |cert| @ssl_cert = cert }
+                opt.on("--key key", _("SSL private key")){ |key| @ssl_key = key }
             end
-            options = {
-                :verbose => $verbose,
-                :ssl => @ssl,
-                :ssl_cert => @ssl_cert,
-                :ssl_key => @ssl_key,
-                :cgi => @cgi,
-                :daemonize => @daemonize
-            }
-            Spider::HTTP::Server.start(@server_name, @port, options)
-            
-            
-        end
-        self.add_command( start )
+            start.set_execution_block do |args|
+                require 'spiderfw/spider'
+                raise "Can't use cgi mode with SSL" if @ssl && @cgi
+                if @ssl && @server_name != 'webrick'
+                    puts _("Note: Using WEBrick as a webserver, since SSL was requested")
+                    @server_name = 'webrick'
+                end
+                options = {
+                    :port => @port,
+                    :verbose => $verbose,
+                    :ssl => @ssl,
+                    :ssl_cert => @ssl_cert,
+                    :ssl_key => @ssl_key,
+                    :cgi => @cgi,
+                    :daemonize => @daemonize
+                }
+                Spider::HTTP::Server.start(@server_name, options)
+                
+                
+            end
+            self.add_command( start )
+
+            # stop
 
-        # stop
 
+        end
 
     end