spiderfw 0.5.15 → 0.5.16

data/apps/master/po/master.pot

@@ -0,0 +1,400 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Spider::Master 0.1\n"
+"POT-Creation-Date: 2010-11-29 12:48+0100\n"
+"PO-Revision-Date: 2010-11-29 12:48+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: controllers/master_controller.rb:50 views/customers.shtml:3 views/index.shtml:2
+#: views/master.layout.shtml:20
+msgid "Customers"
+msgstr ""
+
+#: controllers/master_controller.rb:81
+msgid "No customer"
+msgstr ""
+
+#: controllers/master_controller.rb:83
+msgid "User can't access this customer"
+msgstr ""
+
+#: controllers/master_controller.rb:102
+msgid "User can't list customers"
+msgstr ""
+
+#: models/scout_plugin_instance.rb:21
+msgid "Ok"
+msgstr ""
+
+#: models/scout_plugin_instance.rb:22
+msgid "Error"
+msgstr ""
+
+#: models/scout_plugin_instance.rb:23
+msgid "Alert"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:8
+msgid "Peak trigger"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:9
+msgid "Plateau trigger"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:10
+msgid "Trend trigger"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:15
+msgid "Up"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:16
+msgid "Down"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:17
+msgid "Either"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:22 views/trigger_edit.shtml:76
+msgid "yesterday's average"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:23 views/trigger_edit.shtml:79
+msgid "previous 7-day average"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:24 views/trigger_edit.shtml:82
+msgid "preceding window"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:27
+msgid "normal"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:28
+msgid "fired"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:93 models/scout_plugin_trigger.rb:101
+#: models/scout_plugin_trigger.rb:230
+msgid "%d minutes"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:111
+msgid "Alert me when %s exceeds %s"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:113
+msgid "Alert me when %s goes %s more than %s over the preceding %s (relative to %s), \n                as long as the value is at least %s"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:119
+msgid "Alert me when %s stays above %s for %s or more"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:224
+msgid "%s exceeded %s, increasing to %s at %s"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:232
+msgid "%s went %s more than %s over the preceding %s minutes with respect to %s, and is now %s"
+msgstr ""
+
+#: models/scout_plugin_trigger.rb:241
+msgid "%s exceeded %s, increasing to %s at %s, and is still continuing at %s as of %s"
+msgstr ""
+
+#: views/admin.layout.shtml:5
+msgid "\"Administration\""
+msgstr ""
+
+#: views/customer.shtml:6
+msgid "New customer"
+msgstr ""
+
+#: views/customer.shtml:8 views/servant.shtml:6
+msgid "Edit"
+msgstr ""
+
+#: views/customer.shtml:21 views/index.shtml:3 views/master.layout.shtml:21
+msgid "Servants"
+msgstr ""
+
+#: views/customer.shtml:21 views/customer.shtml:32 views/customers.shtml:3
+#: views/plugin_instance.shtml:33
+msgid "Add"
+msgstr ""
+
+#: views/customer.shtml:32
+msgid "Installations"
+msgstr ""
+
+#: views/installation.shtml:3
+msgid "Back to customer"
+msgstr ""
+
+#: views/installation.shtml:6
+msgid "New installation for %s"
+msgstr ""
+
+#: views/installation.shtml:9 views/plugin_edit.shtml:10
+msgid "Name"
+msgstr ""
+
+#: views/installation.shtml:16
+msgid "Installation \"%s\" for %s"
+msgstr ""
+
+#: views/installation.shtml:18
+msgid "Edit installation"
+msgstr ""
+
+#: views/installation.shtml:20
+msgid "Apps"
+msgstr ""
+
+#: views/installation.shtml:28
+msgid "Save"
+msgstr ""
+
+#: views/installation.shtml:32
+msgid "Targets"
+msgstr ""
+
+#: views/master.layout.shtml:19
+msgid "Home"
+msgstr ""
+
+#: views/plugin_data.shtml:13
+msgid "Compare"
+msgstr ""
+
+#: views/plugin_data.shtml:22
+msgid "Show in same scale"
+msgstr ""
+
+#: views/plugin_edit.shtml:3
+msgid "Edit plugin \"%s\""
+msgstr ""
+
+#: views/plugin_edit.shtml:4
+msgid "Back to plugin details"
+msgstr ""
+
+#: views/plugin_edit.shtml:15
+msgid "Settings"
+msgstr ""
+
+#: views/plugin_edit.shtml:28
+msgid "Advanced options"
+msgstr ""
+
+#: views/plugin_edit.shtml:30
+msgid "Interval"
+msgstr ""
+
+#: views/plugin_edit.shtml:34
+msgid "Timeout"
+msgstr ""
+
+#: views/plugin_edit.shtml:38
+msgid "Update"
+msgstr ""
+
+#: views/plugin_instance.shtml:5
+msgid "Edit settings"
+msgstr ""
+
+#: views/plugin_instance.shtml:8
+msgid "Last report"
+msgstr ""
+
+#: views/plugin_instance.shtml:19
+msgid "Field"
+msgstr ""
+
+#: views/plugin_instance.shtml:20
+msgid "Value"
+msgstr ""
+
+#: views/plugin_instance.shtml:24
+msgid "@labels[key]"
+msgstr ""
+
+#: views/plugin_instance.shtml:33
+msgid "Triggers"
+msgstr ""
+
+#: views/plugin_instance.shtml:38
+msgid "edit"
+msgstr ""
+
+#: views/servant.shtml:14 views/trigger_edit.shtml:8
+msgid "Customer"
+msgstr ""
+
+#: views/servant.shtml:23 views/servants.shtml:4
+msgid "New servant"
+msgstr ""
+
+#: views/servant.shtml:23
+msgid "for customer %s"
+msgstr ""
+
+#: views/servant.shtml:31
+msgid "Sites"
+msgstr ""
+
+#: views/servant.shtml:32
+msgid "New site"
+msgstr ""
+
+#: views/servant.shtml:33
+msgid "Add existing site"
+msgstr ""
+
+#: views/servant.shtml:39 views/servant.shtml:62
+msgid "Remove"
+msgstr ""
+
+#: views/servant.shtml:44
+msgid "Plugins"
+msgstr ""
+
+#: views/servant.shtml:47
+msgid "Add plugin"
+msgstr ""
+
+#: views/servant.shtml:70
+msgid "Servant %s"
+msgstr ""
+
+#: views/servant.shtml:73
+msgid "Last check"
+msgstr ""
+
+#: views/servant.shtml:78
+msgid "Manage resources"
+msgstr ""
+
+#: views/servant.shtml:81
+msgid "Resources"
+msgstr ""
+
+#: views/servant.shtml:94
+msgid "System details"
+msgstr ""
+
+#: views/site_edit.shtml:3
+msgid "Edit Site %s"
+msgstr ""
+
+#: views/site_edit.shtml:4
+msgid "Create new Site for %s"
+msgstr ""
+
+#: views/site_edit.shtml:7
+msgid "Choose site type"
+msgstr ""
+
+#: views/trigger_edit.shtml:3
+msgid "Edit Trigger %s"
+msgstr ""
+
+#: views/trigger_edit.shtml:4
+msgid "New Trigger for plugin %s"
+msgstr ""
+
+#: views/trigger_edit.shtml:12
+msgid "Servant"
+msgstr ""
+
+#: views/trigger_edit.shtml:16
+msgid "Plugin"
+msgstr ""
+
+#: views/trigger_edit.shtml:20 views/trigger_edit.shtml:24
+msgid "Data series"
+msgstr ""
+
+#: views/trigger_edit.shtml:30
+msgid "Trigger type"
+msgstr ""
+
+#: views/trigger_edit.shtml:32
+msgid "peak"
+msgstr ""
+
+#: views/trigger_edit.shtml:33
+msgid "plateau"
+msgstr ""
+
+#: views/trigger_edit.shtml:34
+msgid "trend"
+msgstr ""
+
+#: views/trigger_edit.shtml:42 views/trigger_edit.shtml:52
+msgid "Max Value"
+msgstr ""
+
+#: views/trigger_edit.shtml:48
+msgid "Duration"
+msgstr ""
+
+#: views/trigger_edit.shtml:49
+msgid "minutes"
+msgstr ""
+
+#: views/trigger_edit.shtml:58
+msgid "Trigger"
+msgstr ""
+
+#: views/trigger_edit.shtml:61
+msgid "Alert me to changes going"
+msgstr ""
+
+#: views/trigger_edit.shtml:63
+msgid "up"
+msgstr ""
+
+#: views/trigger_edit.shtml:64
+msgid "down"
+msgstr ""
+
+#: views/trigger_edit.shtml:65
+msgid "up or down"
+msgstr ""
+
+#: views/trigger_edit.shtml:69
+msgid "during the span of"
+msgstr ""
+
+#: views/trigger_edit.shtml:73
+msgid "relative to"
+msgstr ""
+
+#: views/trigger_edit.shtml:89
+msgid "when change is at least"
+msgstr ""
+
+#: views/trigger_edit.shtml:93
+msgid "Minimum Value"
+msgstr ""
+
+#: views/trigger_edit.shtml:98
+msgid "Submit"
+msgstr ""

data/apps/messenger/po/it/spider_messenger.po

@@ -3,13 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Messenger 0.1\n"
-"POT-Creation-Date: 2010-03-24 16:27+0100\n"
-"PO-Revision-Date: 2009-06-30 16:44+0200\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-11-29 12:48+0100\n"
+"PO-Revision-Date: 2010-11-29 12:53+0100\n"
+"Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +20,7 @@ msgid "From"
 msgstr "Mittente"
 
 #: models/email.rb:8
+#: models/sms.rb:7
 msgid "To"
 msgstr "Destinatario"
 
@@ -53,25 +53,65 @@ msgid "Attempts"
 msgstr "Tentativi"
 
 #: models/message.rb:10
+msgid "Backend"
+msgstr "Backend"
+
+#: models/message.rb:11
+msgid "Backend id"
+msgstr "Id del backend"
+
+#: models/message.rb:12
 msgid "Last status"
 msgstr "Ultimo stato"
 
-#: models/message.rb:11
+#: models/message.rb:13
 msgid "Sent at"
 msgstr "Inviato il"
 
+#: models/message.rb:15
+msgid "Retry"
+msgstr "Riprova"
+
+#: models/message.rb:16
+msgid "Queued"
+msgstr "In coda"
+
+#: models/message.rb:17
+msgid "Failed"
+msgstr "Fallito"
+
+#: models/message.rb:18
+msgid "Handed to backend"
+msgstr "Passato al backend"
+
+#: models/message.rb:19
+msgid "Sent"
+msgstr "Inviato"
+
+#: models/message.rb:20
+msgid "Delivered"
+msgstr "Consegnato"
+
+#: models/sms.rb:8
+msgid "Text"
+msgstr "Testo"
+
 #: views/index.shtml:2
 msgid "Queues"
 msgstr "Code"
 
-#: views/index.shtml:7 views/queue.shtml:2
+#: views/index.shtml:7
+#: views/queue.shtml:2
 msgid "Sent messages"
 msgstr "Messaggi inviati"
 
-#: views/index.shtml:8 views/queue.shtml:4
+#: views/index.shtml:8
+#: views/queue.shtml:4
 msgid "Queued messages"
 msgstr "Messaggi in coda"
 
-#: views/index.shtml:9 views/queue.shtml:6
+#: views/index.shtml:9
+#: views/queue.shtml:6
 msgid "Failed messages"
 msgstr "Messaggi falliti"
+

data/apps/messenger/po/spider_messenger.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Messenger 0.1\n"
-"POT-Creation-Date: 2010-03-24 16:27+0100\n"
+"POT-Creation-Date: 2010-11-29 12:48+0100\n"
 "PO-Revision-Date: 2009-06-30 16:44+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-#: models/email.rb:8
+#: models/email.rb:8 models/sms.rb:7
 msgid "To"
 msgstr ""
 
@@ -53,13 +53,49 @@ msgid "Attempts"
 msgstr ""
 
 #: models/message.rb:10
-msgid "Last status"
+msgid "Backend"
 msgstr ""
 
 #: models/message.rb:11
+msgid "Backend id"
+msgstr ""
+
+#: models/message.rb:12
+msgid "Last status"
+msgstr ""
+
+#: models/message.rb:13
 msgid "Sent at"
 msgstr ""
 
+#: models/message.rb:15
+msgid "Retry"
+msgstr ""
+
+#: models/message.rb:16
+msgid "Queued"
+msgstr ""
+
+#: models/message.rb:17
+msgid "Failed"
+msgstr ""
+
+#: models/message.rb:18
+msgid "Handed to backend"
+msgstr ""
+
+#: models/message.rb:19
+msgid "Sent"
+msgstr ""
+
+#: models/message.rb:20
+msgid "Delivered"
+msgstr ""
+
+#: models/sms.rb:8
+msgid "Text"
+msgstr ""
+
 #: views/index.shtml:2
 msgid "Queues"
 msgstr ""

data/lib/spiderfw/app.rb

@@ -19,21 +19,22 @@ module Spider
                     
                     def init
                         unless @path
-                          file = caller[1].split(':')[0]
-                          dir = File.expand_path(File.dirname(file))
-                          @path = dir
+                            file = caller[1].split(':')[0]
+                            dir = File.dirname(file)
+                            @path = dir
                         end
-                        @short_name ||= Inflector.underscore(self.name).gsub('/', '_')
-                        @dotted_name = Inflector.underscore(self.name).gsub('/', '.')
-                        @pub_path ||= @path+'/public'
-                        @test_path ||= @path+'/test'
-                        @setup_path ||= @path+'/setup'
-                        @models_path ||= @path+'/models'
-                        @widgets_path ||= @path+'/widgets'
-                        @views_path ||= @path+'/views'
-                        @tags_path ||= @path+'/tags'
+                        @path = File.expand_path(@path)
+                        @short_name ||= Inflector.underscore(self.name).gsub(File::SEPARATOR, '_')
+                        @dotted_name = Inflector.underscore(self.name).gsub(File::SEPARATOR, '.')
+                        @pub_path ||= File.join(@path, 'public')
+                        @test_path ||= File.join(@path, 'test')
+                        @setup_path ||= File.join(@path, 'setup')
+                        @models_path ||= File.join(@path, 'models')
+                        @widgets_path ||= File.join(@path, 'widgets')
+                        @views_path ||= File.join(@path, '/views')
+                        @tags_path ||= File.join(@path, 'tags')
                         @version = Gem::Version.new(@version.to_s) if @version && !@version.is_a?(Gem::Version)
-                        spec_path = "#{@path}/#{@short_name}.appspec"
+                        spec_path = File.join(@path, "#{@short_name}.appspec")
                         load_spec(spec_path) if File.exists?(spec_path)
                         @route_url ||= Inflector.underscore(self.name)
                         @label ||= @short_name.split('_').each{ |p| p[0] = p[0].chr.upcase }.join(' ')
@@ -174,7 +175,7 @@ module Spider
                             next if entry[0].chr == '.'
                             next unless File.extname(entry) == '.erb'
                             name = File.basename(entry, '.erb')
-                            klass = Spider::Tag.new_class(@tags_path+'/'+entry)
+                            klass = Spider::Tag.new_class(File.join(@tags_path, entry))
                             const_set(Spider::Inflector.camelize(name).to_sym, klass)
                             #Spider::Logger.debug("REGISTERED TAG #{name}, #{klass}")
                             register_tag(name, klass)
@@ -192,7 +193,7 @@ module Spider
                     end
                     
                     def installed_version_path
-                         "#{Spider.paths[:var]}/apps/#{self.name}/installed_version"
+                        File.join(Spider.paths[:var], 'apps', self.name, 'installed_version')
                     end
                     
                     def installed_version

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

@@ -155,5 +155,65 @@ class AppCommand < CmdParse::Command
         end
         self.add_command(install)
         
+        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 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
+            }
+        end
+        update.set_execution_block do |args|
+            unless File.exist?('init.rb') && File.directory?('apps')
+                puts _("Please execute this command from the home folder")
+                exit
+            end
+            require 'spiderfw/setup/app_server_client'
+            use_git = false
+            unless @no_git
+                begin
+                    require 'grit'
+                    use_git = true
+                rescue
+                    puts "Grit not available; install Grit for Git support"
+                end
+            end
+            apps = args
+            if @all
+                require 'spiderfw/home'
+                home = Spider::Home.new(Dir.pwd)
+                apps = home.list_apps
+            end
+            if apps.empty?
+                puts _("No app to update")
+                exit
+            end
+            require 'spiderfw/setup/app_manager'
+            specs = []
+            client = Spider::AppServerClient.new(@server_url)
+            if @no_deps
+                specs = client.get_specs(apps)
+            else
+                specs = client.get_deps(apps, :no_optional => @no_optional)
+            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
+            end
+            Spider::AppManager.update(specs, Dir.pwd, {
+                :use_git => use_git, 
+                :no_gems => @no_gems,
+                :no_optional_gems => @no_optional_gems
+            })
+        end
+        self.add_command(update)
+        
     end
 end

data/lib/spiderfw/controller/controller.rb

@@ -301,13 +301,17 @@ module Spider
 #            obj.dispatch_path = @dispatch_path + route.path
             return obj
         end
+        
+        def controller_action?(method)
+            self.class.controller_action?(method)
+        end
                 
         def set_action(action)
             @executed_method = nil
             @executed_method_arguments = nil
             if !can_dispatch?(:execute, action)
                 method, additional_arguments = get_action_method(action)
-                if (method && self.class.controller_action?(method))
+                if (method && controller_action?(method))
                     @executed_method = method.to_sym
                     @executed_method_arguments = additional_arguments || []
                 end