spiderfw 0.6.23 → 0.6.24

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

@@ -1,89 +1,92 @@
-class ConfigCommand < CmdParse::Command
+module Spider::CommandLine
 
+    class ConfigCommand < CmdParse::Command
 
-    def initialize
-        super( 'config', true, true )
-        @short_desc = _("Manage configuration")
-        
-        list = CmdParse::Command.new( 'list', false )
-        list.short_desc = _("List configuration options")
-        list.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--info", _("Show info"), "-i"){ |i|
-                @info = true
-            }
-        end
-        
-        list.set_execution_block do |args|
-            require 'spiderfw/spider'
-            Spider.init_base
-            search = args.first
-            max_len = 0
-            opts = Spider.config.options_list
-            opts.each{ |o| max_len = o.length if o.length > max_len }
-            opts.sort.each{ |o| 
-                next if search && o.index(search) != 0
-                str = o.ljust(max_len + 2)
-                if @info
-                    option = Spider.config.option(o)
-                    str += " #{option[:description]}" if option
-                end
-                puts str
-            }
-        end
-        
-        self.add_command(list)
-        
-        info = CmdParse::Command.new('info', false)
-        info.short_desc = _("Get information about a configuration option")
-        info.set_execution_block do |args|
-            require 'spiderfw/spider'
-            Spider.init_base
-            option = Spider.config.option(args.first)
-            if option && option[:params]
-                print args[0]
-                print ":\n"+option[:description]+"\n" if option[:description] && !option[:description].empty?
-                puts
-                puts "#{( _('Type') +':').ljust(10)} #{option[:params][:type]}" if option[:params][:type]
-                default_str = nil
-                if default = option[:params][:default]
-                    default_str = default.is_a?(Proc) ? _('Dynamic') : default
-                end
-                puts "#{( _('Default') +':').ljust(10)} #{default_str}" if default_str
-                if choices = option[:params][:choices]
-                    choices = choices.call if choices.is_a?(Proc)
-                    puts "#{( _('Choices') +':').ljust(10)} #{choices.join(', ')}" 
+
+        def initialize
+            super( 'config', true, true )
+            @short_desc = _("Manage configuration")
+            
+            list = CmdParse::Command.new( 'list', false )
+            list.short_desc = _("List configuration options")
+            list.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--info", _("Show info"), "-i"){ |i|
+                    @info = true
+                }
+            end
+            
+            list.set_execution_block do |args|
+                require 'spiderfw/spider'
+                Spider.init_base
+                search = args.first
+                max_len = 0
+                opts = Spider.config.options_list
+                opts.each{ |o| max_len = o.length if o.length > max_len }
+                opts.sort.each{ |o| 
+                    next if search && o.index(search) != 0
+                    str = o.ljust(max_len + 2)
+                    if @info
+                        option = Spider.config.option(o)
+                        str += " #{option[:description]}" if option
+                    end
+                    puts str
+                }
+            end
+            
+            self.add_command(list)
+            
+            info = CmdParse::Command.new('info', false)
+            info.short_desc = _("Get information about a configuration option")
+            info.set_execution_block do |args|
+                require 'spiderfw/spider'
+                Spider.init_base
+                option = Spider.config.option(args.first)
+                if option && option[:params]
+                    print args[0]
+                    print ":\n"+option[:description]+"\n" if option[:description] && !option[:description].empty?
+                    puts
+                    puts "#{( _('Type') +':').ljust(10)} #{option[:params][:type]}" if option[:params][:type]
+                    default_str = nil
+                    if default = option[:params][:default]
+                        default_str = default.is_a?(Proc) ? _('Dynamic') : default
+                    end
+                    puts "#{( _('Default') +':').ljust(10)} #{default_str}" if default_str
+                    if choices = option[:params][:choices]
+                        choices = choices.call if choices.is_a?(Proc)
+                        puts "#{( _('Choices') +':').ljust(10)} #{choices.join(', ')}" 
+                    end
+                else
+                    puts _("Configuration option not found")
                 end
-            else
-                puts _("Configuration option not found")
             end
+            
+            self.add_command(info)
+            
+            get = CmdParse::Command.new('get', false)
+            get.short_desc = _("Get the current value of a configuration option")
+            get.set_execution_block do |args|
+                require 'spiderfw/spider'
+                Spider.init_base
+                puts Spider.conf.get(args.first)
+            end
+            
+            self.add_command(get)
+            
+            set = CmdParse::Command.new('set', false)
+            set.short_desc = _("Set the value of a configuration option")
+            set.set_execution_block do |args|
+                require 'spiderfw/spider'
+                require 'lib/spiderfw/config/configuration_editor'
+                Spider.init_base
+                editor = Spider.config.get_editor
+                editor.set(*args)
+                editor.save
+            end
+            
+            self.add_command(set)
+            
         end
         
-        self.add_command(info)
-        
-        get = CmdParse::Command.new('get', false)
-        get.short_desc = _("Get the current value of a configuration option")
-        get.set_execution_block do |args|
-            require 'spiderfw/spider'
-            Spider.init_base
-            puts Spider.conf.get(args.first)
-        end
-        
-        self.add_command(get)
-        
-        set = CmdParse::Command.new('set', false)
-        set.short_desc = _("Set the value of a configuration option")
-        set.set_execution_block do |args|
-            require 'spiderfw/spider'
-            require 'lib/spiderfw/config/configuration_editor'
-            Spider.init_base
-            editor = Spider.config.get_editor
-            editor.set(*args)
-            editor.save
-        end
-        
-        self.add_command(set)
-        
     end
-    
-end
-        
+
+end

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

@@ -1,47 +1,71 @@
-class ConsoleCommand < CmdParse::Command
-
-
-    def initialize
-        super( 'console', false )
-        @short_desc = _("Open a console")
-#        @description = _("")
-        @opts = {}
-        
-        self.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--irb [IRB]", 
-                   _("Use irb instead of ripl (use given executable if supplied)"),
-                   "-i"){ |irb|
-                @opts[:irb] = irb ? irb : 'irb'
-            }
-        end
-        
-        set_execution_block do
-            unless @opts[:irb]
-                begin
-                    require 'rubygems'
-                    require 'ripl'
-                rescue LoadError
-                    @opts[:irb] = 'irb'
-                end
+module Spider::CommandLine
+
+    class ConsoleCommand < CmdParse::Command
+
+
+        def initialize
+            super( 'console', false )
+            @short_desc = _("Open a console")
+    #        @description = _("")
+            @opts = {}
+            
+            self.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--irb [IRB]",  _("Use irb (you can specify the executable to use)"), "-i"){ |irb|
+                    @opts[:irb] = irb ? irb : 'irb'
+                }
+                opt.on('--ripl' ,_("User ripl"), "-r"){ |ripl| @opts[:ripl] = true }
+                opt.on('--pry', _("Use Pry if available (the default)"))
             end
-            if @opts[:irb]
-                ENV['SPIDER_RUNMODE'] = $SPIDER_RUNMODE if ($SPIDER_RUNMODE)
-                ENV['SPIDER_CONFIG_SETS'] = $SPIDER_CONFIG_SETS.join(',') if ($SPIDER_CONFIG_SETS)
-                exec("#{@opts[:irb]} -I #{$SPIDER_LIB} -r spiderfw")
-            else
-                require 'ripl/irb'
-                require 'ripl/multi_line' 
-                
-                Ripl.config[:irb_verbose] = false
-                Ripl::Runner.load_rc(Ripl.config[:riplrc])
-                
-                require 'spiderfw/init'
-                Object.send(:remove_const, :IRB) if Object.const_defined?(:IRB)
-                Ripl.shell.loop
+            
+            set_execution_block do
+                if @opts[:ripl]
+                    begin
+                        require 'rubygems'
+                        require 'ripl'
+                    rescue LoadError
+                        @opts[:irb] = 'irb'
+                    end
+                end
+                unless @opts[:irb]
+                    begin
+                        require 'rubygems'
+                        require 'pry'
+                    rescue LoadError
+                        @opts[:irb] = 'irb'
+                    end
+                end
+                if @opts[:irb]
+                    ENV['SPIDER_RUNMODE'] = $SPIDER_RUNMODE if ($SPIDER_RUNMODE)
+                    ENV['SPIDER_CONFIG_SETS'] = $SPIDER_CONFIG_SETS.join(',') if ($SPIDER_CONFIG_SETS)
+                    exec("#{@opts[:irb]} -I #{$SPIDER_LIB} -r spiderfw")
+                elsif @opts[:ripl]
+                    require 'ripl/irb'
+                    require 'ripl/multi_line' 
+                    
+                    Ripl.config[:irb_verbose] = false
+                    Ripl::Runner.load_rc(Ripl.config[:riplrc])
+                    
+                    require 'spiderfw/init'
+                    Object.send(:remove_const, :IRB) if Object.const_defined?(:IRB)
+                    Ripl.shell.loop
+                else
+                    try_require 'pry-nav'
+                    try_require 'pry-stack_explorer'
+                    require 'spiderfw/init'
+                    Pry.start
+                end
             end
+
+
         end
 
+        def try_require(lib)
+            begin
+               require lib 
+            rescue LoadError => e
+            end
+        end
 
     end
 
-end
+end

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

@@ -1,33 +1,37 @@
 require 'fileutils'
 
-class ContentCommand < CmdParse::Command
+module Spider::CommandLine
 
+    class ContentCommand < CmdParse::Command
 
-    def initialize
-        super( 'content', true, true )
-        @short_desc = _("Manage static content")
-        
-        publish = CmdParse::Command.new( 'publish', false )
-        publish.short_desc = _("Publish apps static content to home public folder")
-        publish.options = CmdParse::OptionParserWrapper.new do |opt|
-        end
-        
-        publish.set_execution_block do |args|
-            require 'spiderfw/init'
-            Spider::StaticContent.publish
-        end
-        
-        self.add_command(publish)
-        
-        compress = CmdParse::Command.new('compress', false)
-        compress.short_desc = _("Compress Javascript files")
-        compress.set_execution_block do |args|
-            require 'spiderfw/init'
-            Spider::ContentUtils.compress(*args)
+
+        def initialize
+            super( 'content', true, true )
+            @short_desc = _("Manage static content")
+            
+            publish = CmdParse::Command.new( 'publish', false )
+            publish.short_desc = _("Publish apps static content to home public folder")
+            publish.options = CmdParse::OptionParserWrapper.new do |opt|
+            end
+            
+            publish.set_execution_block do |args|
+                require 'spiderfw/init'
+                Spider::StaticContent.publish
+            end
+            
+            self.add_command(publish)
+            
+            compress = CmdParse::Command.new('compress', false)
+            compress.short_desc = _("Compress Javascript files")
+            compress.set_execution_block do |args|
+                require 'spiderfw/init'
+                Spider::ContentUtils.compress(*args)
+            end
+            
+            self.add_command(compress)
+            
         end
         
-        self.add_command(compress)
-        
     end
-    
+
 end

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

@@ -1,69 +1,73 @@
 require 'spiderfw/spider'
 require 'spiderfw/create'
 
-class CreateCommand < CmdParse::Command
+module Spider::CommandLine
 
+    class CreateCommand < CmdParse::Command
 
-    def initialize
-        super( 'create', true, true )
-        @short_desc = _("Create a working dir for development or installation")
-#        @description = _("")
 
-        app = CmdParse::Command.new( 'app', false )
-        app.short_desc = _("Create a new application")
-        app.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--path", 
-                   _("The path where to create the app (defaults to the app folder under the current path)"),
-                   "-p"){ |path|
-                @path = path
-            }
-            opt.on("--module", _("The module name; by default, the app name will be camelized"), "-m"){ |module_name|
-                @module_name = module_name
-            }
-        end
-        app.set_execution_block do |names|
-            @path ||= Dir.pwd+'/apps'
-            names.each do |name|
-                Spider::Create.app(name, @path, @module_name)
-                Spider.output "Created app #{name} at #{@path}/#{name}" if ($verbose)
+        def initialize
+            super( 'create', true, true )
+            @short_desc = _("Create a working dir for development or installation")
+    #        @description = _("")
+
+            app = CmdParse::Command.new( 'app', false )
+            app.short_desc = _("Create a new application")
+            app.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--path", 
+                       _("The path where to create the app (defaults to the app folder under the current path)"),
+                       "-p"){ |path|
+                    @path = path
+                }
+                opt.on("--module", _("The module name; by default, the app name will be camelized"), "-m"){ |module_name|
+                    @module_name = module_name
+                }
             end
-        end
-        self.add_command(app, false)
-        
-        install = CmdParse::Command.new('home', false)
-        install.short_desc = _("Create an installation")
-        install.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--path [PATH]", 
-                   _("The path where to create the installation (defaults to the path)"),
-                   "-p"){ |path|
-                @path = path
-            }
-            opt.on("--no-wizard", _("Don't launch wizard"), "-W"){ |w| @no_wizard = true }
-            opt.on("--non-interactive", _("Non interactive"), "-i"){ |i|
-                @no_wizard = true
-            }
-        end
-        install.set_execution_block do |installs|
-            @path ||= Dir.pwd
-            installs.each do |inst|
-                Spider::Create.home(inst, @path)
-                unless @no_wizard
-                    Dir.chdir(inst) do 
-                        $SPIDER_RUN_PATH = Dir.pwd
-                        $:.push($SPIDER_RUN_PATH)
-                        require 'spiderfw/init'
-                        require 'lib/spiderfw/setup/spider_setup_wizard'
-                        wizard = Spider::SpiderSetupWizard.new
-                        wizard.first_run = true
-                        wizard.implementation(Spider::ConsoleWizard)
-                        wizard.run
+            app.set_execution_block do |names|
+                @path ||= Dir.pwd+'/apps'
+                names.each do |name|
+                    Spider::Create.app(name, @path, @module_name)
+                    Spider.output "Created app #{name} at #{@path}/#{name}" if ($verbose)
+                end
+            end
+            self.add_command(app, false)
+            
+            install = CmdParse::Command.new('home', false)
+            install.short_desc = _("Create an installation")
+            install.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--path [PATH]", 
+                       _("The path where to create the installation (defaults to the path)"),
+                       "-p"){ |path|
+                    @path = path
+                }
+                opt.on("--no-wizard", _("Don't launch wizard"), "-W"){ |w| @no_wizard = true }
+                opt.on("--non-interactive", _("Non interactive"), "-i"){ |i|
+                    @no_wizard = true
+                }
+            end
+            install.set_execution_block do |installs|
+                @path ||= Dir.pwd
+                installs.each do |inst|
+                    Spider::Create.home(inst, @path)
+                    unless @no_wizard
+                        Dir.chdir(inst) do 
+                            $SPIDER_RUN_PATH = Dir.pwd
+                            $:.push($SPIDER_RUN_PATH)
+                            require 'spiderfw/init'
+                            require 'lib/spiderfw/setup/spider_setup_wizard'
+                            wizard = Spider::SpiderSetupWizard.new
+                            wizard.first_run = true
+                            wizard.implementation(Spider::ConsoleWizard)
+                            wizard.run
+                        end
                     end
                 end
             end
-        end
-        self.add_command(install, false)
+            self.add_command(install, false)
 
 
+        end
+
     end
 
 end