spiderfw 0.6.23 → 0.6.24

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

@@ -1,263 +1,267 @@
-class AppCommand < CmdParse::Command
+module Spider::CommandLine
 
+    class AppCommand < CmdParse::Command
 
-    def initialize
-        super('app', true, true )
-        @short_desc = _("Manage apps")
-        
-        
-        self.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--proxy [SERVER]", _("Proxy server to use (http://user:pass@host:port)"), "-p"){ |p|
-                ENV['http_proxy'] = p
-            }
-            opt.on("--server [SERVER]", _("App server"), "-s") { |s|
-                @server_url = s
-            }
-        end
-  
-        @installed = true
-        
-        list = CmdParse::Command.new( 'list', false )
-        list.short_desc = _("List installed and available apps")
-        list.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--installed", _("List installed apps (the default)")) { |installed|
-                @remote = false
-            }
-            opt.on("--remote", _("List only remote apps"), "-r"){ |r|
-                @installed = false
-                @remote = true
-            }
-            opt.on("--all", _("List both local and remote apps"), "-a"){ |a|
-                @installed = true
-                @remote = true
-                @all = true
-            }
-            opt.on("--core", _("Include apps that come with spider"), "-c"){ |c|
-                @core = true
-            }
-        end
-        list.set_execution_block do |args|
-            if @installed
-                require 'spiderfw/home'
-                home = Spider::Home.new(Dir.pwd)
-                installed = {}
-                Spider.init_base
-                active = Spider.config.get('apps')
-                Spider.home.apps.each do |app, info|
-                    installed[app] = {
-                        :active => active.include?(app)
-                    }
-                    if spec = info[:spec]
-                        installed[app].merge!({
-                            :version => spec.version
-                        })                        
-                    end
-                end
+
+        def initialize
+            super('app', true, true )
+            @short_desc = _("Manage apps")
+            
+            
+            self.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--proxy [SERVER]", _("Proxy server to use (http://user:pass@host:port)"), "-p"){ |p|
+                    ENV['http_proxy'] = p
+                }
+                opt.on("--server [SERVER]", _("App server"), "-s") { |s|
+                    @server_url = s
+                }
+            end
+      
+            @installed = true
+            
+            list = CmdParse::Command.new( 'list', false )
+            list.short_desc = _("List installed and available apps")
+            list.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--installed", _("List installed apps (the default)")) { |installed|
+                    @remote = false
+                }
+                opt.on("--remote", _("List only remote apps"), "-r"){ |r|
+                    @installed = false
+                    @remote = true
+                }
+                opt.on("--all", _("List both local and remote apps"), "-a"){ |a|
+                    @installed = true
+                    @remote = true
+                    @all = true
+                }
+                opt.on("--core", _("Include apps that come with spider"), "-c"){ |c|
+                    @core = true
+                }
             end
-            if @remote
-                require 'spiderfw/setup/app_server_client'
-                unless @server_url
-                    require 'spiderfw/spider'
+            list.set_execution_block do |args|
+                if @installed
+                    require 'spiderfw/home'
+                    home = Spider::Home.new(Dir.pwd)
+                    installed = {}
                     Spider.init_base
-                    @server_url = Spider.config.get('app_server.url')
+                    active = Spider.config.get('apps')
+                    Spider.home.apps.each do |app, info|
+                        installed[app] = {
+                            :active => active.include?(app)
+                        }
+                        if spec = info[:spec]
+                            installed[app].merge!({
+                                :version => spec.version
+                            })                        
+                        end
+                    end
                 end
-                client = Spider::AppServerClient.new(@server_url)
-                remote = {}
-                client.specs.each do |app|
-                    remote[app.app_id] = {
-                        :version => app.version
-                    }
-                    if installed && installed[app] && installed[app][:version]
-                        v = Gem::Version.new(installed[app][:version])
-                        if v < app.version
-                            installed[app][:available] = app.version
+                if @remote
+                    require 'spiderfw/setup/app_server_client'
+                    unless @server_url
+                        require 'spiderfw/spider'
+                        Spider.init_base
+                        @server_url = Spider.config.get('app_server.url')
+                    end
+                    client = Spider::AppServerClient.new(@server_url)
+                    remote = {}
+                    client.specs.each do |app|
+                        remote[app.app_id] = {
+                            :version => app.version
+                        }
+                        if installed && installed[app] && installed[app][:version]
+                            v = Gem::Version.new(installed[app][:version])
+                            if v < app.version
+                                installed[app][:available] = app.version
+                            end
                         end
                     end
                 end
-            end
-            if @installed
-                puts
-                puts "*** "+_('INSTALLED APPS')+" ***"
-                puts  
-                installed.keys.sort.each do |app|                  
-                    details = installed[app]
-                    str = app
-                    str += " #{details[:version]}" if details[:version]
-                    str += " (#{_('not loaded')})" unless details[:active]
-                    puts str
+                if @installed
+                    puts
+                    puts "*** "+_('INSTALLED APPS')+" ***"
+                    puts  
+                    installed.keys.sort.each do |app|                  
+                        details = installed[app]
+                        str = app
+                        str += " #{details[:version]}" if details[:version]
+                        str += " (#{_('not loaded')})" unless details[:active]
+                        puts str
+                    end
                 end
-            end
-            if @remote
-                puts
-                puts "*** "+_('REMOTE APPS')+" ***"
-                puts
-                remote.keys.sort.each do |app|
-                    details = remote[app]
-                    str = app
-                    str += " #{details[:version]}" if details[:version]
-                    puts str
+                if @remote
+                    puts
+                    puts "*** "+_('REMOTE APPS')+" ***"
+                    puts
+                    remote.keys.sort.each do |app|
+                        details = remote[app]
+                        str = app
+                        str += " #{details[:version]}" if details[:version]
+                        puts str
+                    end
                 end
+                puts
             end
-            puts
-        end
-        self.add_command( list )
-        
-        
-        install = CmdParse::Command.new( 'install', false )
-        install.short_desc = _("Install an app")
-        install.options = CmdParse::OptionParserWrapper.new do |opt|
-            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 
-            }
-            opt.on("--no-gems", _("Don't install ruby gems this app depends on"), "-g"){ |g| @no_gems = true }
-            opt.on("--optional", _("Install optional app dependencies"), "-o"){ |o| @optional = true }
-            opt.on("--no-optional-gems", _("Don't install optional gem dependencies"), "-G"){ |g| 
-                @no_optional_gems = true
-            }
-            opt.on("--ssh-user [USERNAME]", _("SSH user")){ |s| @ssh_user = s }
-            opt.on("--no-activate", _("Don't activate installed apps")){ |s| @no_activate = true }
-            opt.on("--branch [BRANCH]", _("Install app from specific branch"), "-b"){ |b| @branch = b }
-        end
-        install.set_execution_block do |args|
-            $SPIDER_INTERACTIVE = true
-            unless File.exist?('init.rb') && File.directory?('apps')
-                puts _("Please execute this command from the home folder")
-                exit
-            end
-            require 'spiderfw/setup/app_manager'
-            options = {
-                :use_git => @git, :all => @all, :no_deps => @no_deps, :optional => @optional, 
-                :no_gems => @no_gems, :no_optional_gems => @no_optional_gems, :no_activate => @no_activate
-            }
-            options[:url] = @server_url if @server_url
-            options[:branch] = @branch if @branch
-            if @git && !Spider::AppManager.git_available?
-                puts _("git gem not available; install git gem for Git support")
-                exit
-            end
-            apps = args
-            installed = []
-            apps.each do |app|
-                installed << app if Spider::AppManager.installed?(app)
-            end
-            unless installed.empty?
-                puts _("%s already installed") % installed.join(', ')
+            self.add_command( list )
+            
+            
+            install = CmdParse::Command.new( 'install', false )
+            install.short_desc = _("Install an app")
+            install.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--[no-]git", _("Use git for installing apps"), "-g"){ |r| @git = r }
+                opt.on("--no-dependencies", _("Don't install other apps this one depends on"), "-d"){ |d| 
+                    @no_deps = true 
+                }
+                opt.on("--no-gems", _("Don't install ruby gems this app depends on"), "-g"){ |g| @no_gems = true }
+                opt.on("--optional", _("Install optional app dependencies"), "-o"){ |o| @optional = true }
+                opt.on("--no-optional-gems", _("Don't install optional gem dependencies"), "-G"){ |g| 
+                    @no_optional_gems = true
+                }
+                opt.on("--ssh-user [USERNAME]", _("SSH user")){ |s| @ssh_user = s }
+                opt.on("--no-activate", _("Don't activate installed apps")){ |s| @no_activate = true }
+                opt.on("--branch [BRANCH]", _("Install app from specific branch"), "-b"){ |b| @branch = b }
             end
-            specs = Spider::AppManager.resolve(apps, options)
-            iapps = specs[:install].map{ |spec| spec.app_id }
-            deps = iapps - apps
-            unless deps.empty?
-                puts _("The following apps will be installed as a dependency: %s") % deps.join(', ')
+            install.set_execution_block do |args|
+                $SPIDER_INTERACTIVE = true
+                unless File.exist?('init.rb') && File.directory?('apps')
+                    puts _("Please execute this command from the home folder")
+                    exit
+                end
+                require 'spiderfw/setup/app_manager'
+                options = {
+                    :use_git => @git, :all => @all, :no_deps => @no_deps, :optional => @optional, 
+                    :no_gems => @no_gems, :no_optional_gems => @no_optional_gems, :no_activate => @no_activate
+                }
+                options[:url] = @server_url if @server_url
+                options[:branch] = @branch if @branch
+                if @git && !Spider::AppManager.git_available?
+                    puts _("git gem not available; install git gem for Git support")
+                    exit
+                end
+                apps = args
+                installed = []
+                apps.each do |app|
+                    installed << app if Spider::AppManager.installed?(app)
+                end
+                unless installed.empty?
+                    puts _("%s already installed") % installed.join(', ')
+                end
+                specs = Spider::AppManager.resolve(apps, options)
+                iapps = specs[:install].map{ |spec| spec.app_id }
+                deps = iapps - apps
+                unless deps.empty?
+                    puts _("The following apps will be installed as a dependency: %s") % deps.join(', ')
+                end
+                unless specs[:update].empty?
+                    puts _("The following apps will be updated as a dependency: %s") % specs[:update].map{ |s| s.app_id }.join(', ')
+                end
+                Spider::AppManager.new(:interactive => true).install(specs, options)
             end
-            unless specs[:update].empty?
-                puts _("The following apps will be updated as a dependency: %s") % specs[:update].map{ |s| s.app_id }.join(', ')
+            self.add_command(install)
+            
+            activate = CmdParse::Command.new('activate', false )
+            activate.short_desc = _("Activate an app")
+            activate.set_execution_block do |args|
+                $SPIDER_INTERACTIVE = true
+                apps = args
+                require 'spiderfw/spider'
+                apps = Spider.get_app_deps(apps)
+                Spider.activate_apps(apps)
             end
-            Spider::AppManager.new(:interactive => true).install(specs, options)
-        end
-        self.add_command(install)
-        
-        activate = CmdParse::Command.new('activate', false )
-        activate.short_desc = _("Activate an app")
-        activate.set_execution_block do |args|
-            $SPIDER_INTERACTIVE = true
-            apps = args
-            require 'spiderfw/spider'
-            apps = Spider.get_app_deps(apps)
-            Spider.activate_apps(apps)
-        end
-        self.add_command(activate)
-        
-        update = CmdParse::Command.new( 'update', false )
-        update.short_desc = _("Update an app")
-        update.options = CmdParse::OptionParserWrapper.new do |opt|
-            opt.on("--all", _("Update all apps"), "-a"){ |a| @all = true }
-            opt.on("--no-git", _("Don't use git for updating apps"), "-g"){ |r| @no_git = true }
-            opt.on("--no-dependencies", _("Don't install/update other apps this one depends on"), "-d"){ |d| 
-                @no_deps = true 
-            }
-            opt.on("--no-gems", _("Don't install ruby gems this app depends on"), "-g"){ |g| @no_gems = true }
-            opt.on("--no-optional", _("Don't install optional app dependencies"), "-D"){ |o| @no_optional = true }
-            opt.on("--no-optional-gems", _("Don't install optional gem dependencies"), "-G"){ |g| 
-                @no_optional_gems = true
-            }
-            opt.on("--no-activate", _("Don't activate installed apps, if any")){ |s| @no_activate = true }
-            opt.on("--refresh", _("Update apps even if the version has not changed"), "-r"){ |r| @refresh = true }
-            opt.on("--no-clear-cache", _("Don't clear cache"), "-C"){ |c| @no_clear_cache = true }
-            opt.on("--no-restart", _("Don't restart the server after the udpate"), "-R"){ |r| @no_restart = true }
-            opt.on("--branch [BRANCH]", _("Install app from specific branch"), "-b"){ |b| @branch = b }
-        end
-        update.set_execution_block do |args|
-            $SPIDER_INTERACTIVE = true
-            unless File.exist?('init.rb') && File.directory?('apps')
-                puts _("Please execute this command from the home folder")
-                exit
+            self.add_command(activate)
+            
+            update = CmdParse::Command.new( 'update', false )
+            update.short_desc = _("Update an app")
+            update.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.on("--all", _("Update all apps"), "-a"){ |a| @all = true }
+                opt.on("--no-git", _("Don't use git for updating apps"), "-g"){ |r| @no_git = true }
+                opt.on("--no-dependencies", _("Don't install/update other apps this one depends on"), "-d"){ |d| 
+                    @no_deps = true 
+                }
+                opt.on("--no-gems", _("Don't install ruby gems this app depends on"), "-g"){ |g| @no_gems = true }
+                opt.on("--no-optional", _("Don't install optional app dependencies"), "-D"){ |o| @no_optional = true }
+                opt.on("--no-optional-gems", _("Don't install optional gem dependencies"), "-G"){ |g| 
+                    @no_optional_gems = true
+                }
+                opt.on("--no-activate", _("Don't activate installed apps, if any")){ |s| @no_activate = true }
+                opt.on("--refresh", _("Update apps even if the version has not changed"), "-r"){ |r| @refresh = true }
+                opt.on("--no-clear-cache", _("Don't clear cache"), "-C"){ |c| @no_clear_cache = true }
+                opt.on("--no-restart", _("Don't restart the server after the udpate"), "-R"){ |r| @no_restart = true }
+                opt.on("--branch [BRANCH]", _("Install app from specific branch"), "-b"){ |b| @branch = b }
             end
-            require 'spiderfw/setup/app_manager'
-            options = {
-                :no_git => @no_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,
-                :clear_cache => !@no_clear_cache, :restart => !@no_restart
-            }
-            options[:url] = @server_url if @server_url
-            options[:branch] = @branch if @branch
-            apps = args
-            options[:refresh] = apps if @refresh
-            apps.each do |app|
-                unless Spider::AppManager.installed?(app)
-                    puts _("App %s is not installed") % app
+            update.set_execution_block do |args|
+                $SPIDER_INTERACTIVE = true
+                unless File.exist?('init.rb') && File.directory?('apps')
+                    puts _("Please execute this command from the home folder")
                     exit
                 end
+                require 'spiderfw/setup/app_manager'
+                options = {
+                    :no_git => @no_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,
+                    :clear_cache => !@no_clear_cache, :restart => !@no_restart
+                }
+                options[:url] = @server_url if @server_url
+                options[:branch] = @branch if @branch
+                apps = args
+                options[:refresh] = apps if @refresh
+                apps.each do |app|
+                    unless Spider::AppManager.installed?(app)
+                        puts _("App %s is not installed") % app
+                        exit
+                    end
+                end
+                specs = Spider::AppManager.resolve(apps, options)
+                unless specs[:install].empty?
+                    puts _("The following apps will be installed as a dependency: %s") % specs[:install].map{ |s| s.app_id }.join(', ')
+                end
+                uapps = specs[:update].map{ |spec| spec.app_id }
+                udeps = uapps - apps
+                unless udeps.empty?
+                    puts _("The following apps will be updated as a dependency: %s") % udeps.join(', ')
+                end
+                noupdate = apps - uapps
+                unless noupdate.empty?
+                    puts _("Already up-to-date: %s") % noupdate.join(', ')
+                end
+                Spider::AppManager.new(:interactive => true).install(specs, options)
             end
-            specs = Spider::AppManager.resolve(apps, options)
-            unless specs[:install].empty?
-                puts _("The following apps will be installed as a dependency: %s") % specs[:install].map{ |s| s.app_id }.join(', ')
-            end
-            uapps = specs[:update].map{ |spec| spec.app_id }
-            udeps = uapps - apps
-            unless udeps.empty?
-                puts _("The following apps will be updated as a dependency: %s") % udeps.join(', ')
-            end
-            noupdate = apps - uapps
-            unless noupdate.empty?
-                puts _("Already up-to-date: %s") % noupdate.join(', ')
+            self.add_command(update)
+            
+            setup = CmdParse::Command.new( 'setup', false )
+            setup.short_desc = _("Setup an app")
+            setup.options = CmdParse::OptionParserWrapper.new do |opt|
+                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
-            Spider::AppManager.new(:interactive => true).install(specs, options)
-        end
-        self.add_command(update)
-        
-        setup = CmdParse::Command.new( 'setup', false )
-        setup.short_desc = _("Setup an app")
-        setup.options = CmdParse::OptionParserWrapper.new do |opt|
-            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
-        
-        setup.set_execution_block do |args|
-            $SPIDER_INTERACTIVE = true
-            require 'spiderfw/setup/app_manager'
-            tasks = Spider::AppManager.new(:interactive => true).setup(name)
-            unless @no_cleanup
-                tasks.each do |t|
-                    begin
-                        t.do_cleanup
-                    rescue => exc
-                        Spider.logger.error(exc)
+            
+            setup.set_execution_block do |args|
+                $SPIDER_INTERACTIVE = true
+                require 'spiderfw/setup/app_manager'
+                tasks = Spider::AppManager.new(:interactive => true).setup(name)
+                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