Fix namespace

Author: root

Diff for: lib/redmine_git_hosting/config/gitolite_hooks.rb

@@ -60,7 +60,7 @@ def check_hooks_install!
 
 
       def update_hook_params!
-        GlobalParams.new.installed?
+        RedmineGitHosting::GitoliteParams::GlobalParams.new.installed?
       end
 
     end

Diff for: lib/redmine_git_hosting/gitolite_params/base_param.rb

@@ -1,28 +1,29 @@
-module RedmineGitHosting::GitoliteParams
+module RedmineGitHosting
+  module GitoliteParams
+    module BaseParam
 
-  module BaseParam
+      private
 
-    private
+        def logger
+          RedmineGitHosting.logger
+        end
 
-    def logger
-      RedmineGitHosting.logger
-    end
 
+        # Return a hash with global config parameters.
+        def get_git_config_params(namespace)
+          RedmineGitHosting::Commands.sudo_get_git_global_params(namespace)
+        end
 
-    # Return a hash with global config parameters.
-    def get_git_config_params(namespace)
-      RedmineGitHosting::Commands.sudo_get_git_global_params(namespace)
-    end
 
+        def set_git_config_param(namespace, key, value)
+          RedmineGitHosting::Commands.sudo_set_git_global_param(namespace, key, value)
+        end
 
-    def set_git_config_param(namespace, key, value)
-      RedmineGitHosting::Commands.sudo_set_git_global_param(namespace, key, value)
-    end
 
+        def unset_git_config_param(key)
+          RedmineGitHosting::Commands.sudo_unset_git_global_param(key)
+        end
 
-    def unset_git_config_param(key)
-      RedmineGitHosting::Commands.sudo_unset_git_global_param(key)
     end
-
   end
 end

Diff for: lib/redmine_git_hosting/gitolite_params/global_params.rb

@@ -1,70 +1,71 @@
-module RedmineGitHosting::GitoliteParams
+module RedmineGitHosting
+  module GitoliteParams
+    class GlobalParams
 
-  class GlobalParams
+      include BaseParam
 
-    include BaseParam
+      attr_reader :gitolite_hooks_url
+      attr_reader :debug_mode
+      attr_reader :async_mode
 
-    attr_reader :gitolite_hooks_url
-    attr_reader :debug_mode
-    attr_reader :async_mode
+      attr_reader :namespace
+      attr_reader :current_params
 
-    attr_reader :namespace
-    attr_reader :current_params
 
+      def initialize
+        # Params to set
+        @gitolite_hooks_url = RedmineGitHosting::Config.gitolite_hooks_url
+        @debug_mode         = RedmineGitHosting::Config.gitolite_hooks_debug.to_s
+        @async_mode         = RedmineGitHosting::Config.gitolite_hooks_are_asynchronous.to_s
 
-    def initialize
-      # Params to set
-      @gitolite_hooks_url = RedmineGitHosting::Config.gitolite_hooks_url
-      @debug_mode         = RedmineGitHosting::Config.gitolite_hooks_debug.to_s
-      @async_mode         = RedmineGitHosting::Config.gitolite_hooks_are_asynchronous.to_s
+        # Namespace where to set params
+        @namespace = RedmineGitHosting::Config.gitolite_hooks_namespace
 
-      # Namespace where to set params
-      @namespace = RedmineGitHosting::Config.gitolite_hooks_namespace
+        # Get current params
+        @current_params = get_git_config_params(@namespace)
 
-      # Get current params
-      @current_params = get_git_config_params(@namespace)
-
-      # Build hash of installed params
-      @installed = {}
-    end
+        # Build hash of installed params
+        @installed = {}
+      end
 
 
-    def installed?
-      gitolite_hooks_url_set?
-      debug_mode_set?
-      async_mode_set?
-      @installed
-    end
+      def installed?
+        gitolite_hooks_url_set?
+        debug_mode_set?
+        async_mode_set?
+        @installed
+      end
 
 
-    private
+      private
 
 
-      def gitolite_hooks_url_set?
-        if current_params['redmineurl'] != gitolite_hooks_url
-          @installed['redmineurl'] = set_git_config_param(namespace, 'redmineurl', gitolite_hooks_url)
-        else
-          @installed['redmineurl'] = true
+        def gitolite_hooks_url_set?
+          if current_params['redmineurl'] != gitolite_hooks_url
+            @installed['redmineurl'] = set_git_config_param(namespace, 'redmineurl', gitolite_hooks_url)
+          else
+            @installed['redmineurl'] = true
+          end
         end
-      end
 
 
-      def debug_mode_set?
-        if current_params['debugmode'] != debug_mode
-          @installed['debugmode'] = set_git_config_param(namespace, 'debugmode', debug_mode)
-        else
-          @installed['debugmode'] = true
+        def debug_mode_set?
+          if current_params['debugmode'] != debug_mode
+            @installed['debugmode'] = set_git_config_param(namespace, 'debugmode', debug_mode)
+          else
+            @installed['debugmode'] = true
+          end
         end
-      end
 
 
-      def async_mode_set?
-        if current_params['asyncmode'] != async_mode
-          @installed['asyncmode'] = set_git_config_param(namespace, 'asyncmode', async_mode)
-        else
-          @installed['asyncmode'] = true
+        def async_mode_set?
+          if current_params['asyncmode'] != async_mode
+            @installed['asyncmode'] = set_git_config_param(namespace, 'asyncmode', async_mode)
+          else
+            @installed['asyncmode'] = true
+          end
         end
-      end
 
+    end
   end
 end

Diff for: lib/redmine_git_hosting/gitolite_params/mailer_params.rb

@@ -1,69 +1,70 @@
-module RedmineGitHosting::GitoliteParams
+module RedmineGitHosting
+  module GitoliteParams
+    class MailerParams
 
-  class MailerParams
+      include BaseParam
 
-    include BaseParam
+      attr_reader :namespace
+      attr_reader :current_params
+      attr_reader :current_mailer_params
 
-    attr_reader :namespace
-    attr_reader :current_params
-    attr_reader :current_mailer_params
 
+      def initialize
+        ## Namespace where to set params
+        @namespace = 'multimailhook'
 
-    def initialize
-      ## Namespace where to set params
-      @namespace = 'multimailhook'
+        ## Get current params
+        @current_params        = get_git_config_params(@namespace)
+        @current_mailer_params = get_mailer_params
 
-      ## Get current params
-      @current_params        = get_git_config_params(@namespace)
-      @current_mailer_params = get_mailer_params
-
-      # Build hash of installed params
-      @installed = {}
-    end
+        # Build hash of installed params
+        @installed = {}
+      end
 
 
-    def installed?
-      mailer_params.each do |param|
-        if current_params[param] != current_mailer_params[param]
-          @installed[param] = set_git_config_param(namespace, param, current_mailer_params[param])
-        else
-          @installed[param] = true
+      def installed?
+        mailer_params.each do |param|
+          if current_params[param] != current_mailer_params[param]
+            @installed[param] = set_git_config_param(namespace, param, current_mailer_params[param])
+          else
+            @installed[param] = true
+          end
         end
+        @installed
       end
-      @installed
-    end
 
 
-    private
+      private
 
 
-      def mailer_params
-        %w(mailer environment smtpauth smtpserver smtpport smtpuser smtppass)
-      end
+        def mailer_params
+          %w(mailer environment smtpauth smtpserver smtpport smtpuser smtppass)
+        end
 
 
-      def get_mailer_params
-        params = {}
-        params['environment'] = 'gitolite'
-        params['mailer']      = mailer
-        params['smtpauth']    = smtpauth_enabled?.to_s
-        params['smtpserver']  = ActionMailer::Base.smtp_settings[:address].to_s
-        params['smtpport']    = ActionMailer::Base.smtp_settings[:port].to_s
-        params['smtpuser']    = ActionMailer::Base.smtp_settings[:user_name] || ''
-        params['smtppass']    = ActionMailer::Base.smtp_settings[:password] || ''
-        params
-      end
+        def get_mailer_params
+          params = {}
+          params['environment'] = 'gitolite'
+          params['mailer']      = mailer
+          params['smtpauth']    = smtpauth_enabled?.to_s
+          params['smtpserver']  = ActionMailer::Base.smtp_settings[:address].to_s
+          params['smtpport']    = ActionMailer::Base.smtp_settings[:port].to_s
+          params['smtpuser']    = ActionMailer::Base.smtp_settings[:user_name] || ''
+          params['smtppass']    = ActionMailer::Base.smtp_settings[:password] || ''
+          params
+        end
 
 
-      def mailer
-        ActionMailer::Base.delivery_method == :smtp ? 'smtp' : 'sendmail'
-      end
+        def mailer
+          ActionMailer::Base.delivery_method == :smtp ? 'smtp' : 'sendmail'
+        end
 
 
-      def smtpauth_enabled?
-        auth = ActionMailer::Base.smtp_settings[:authentication]
-        auth != nil && auth != '' && auth != :none
-      end
+        def smtpauth_enabled?
+          auth = ActionMailer::Base.smtp_settings[:authentication]
+          auth != nil && auth != '' && auth != :none
+        end
 
+    end
   end
 end