Fixes for Redmine 3.x: regexp fix and observer removal

s-andy · s-andy · commit 166f03b0d2e1 · 2014-12-14T22:09:25.000Z
git-svn-id: http://svn.s-andy.com/scm-creator@141 ea6535c2-5f70-4292-bc30-dee2014a1bba
diff --git a/app/models/repository/github.rb b/app/models/repository/github.rb
@@ -1,7 +1,7 @@
 require_dependency File.expand_path('../../../../lib/adapters/github_adapter', __FILE__)
 
 class Repository::Github < Repository::Git
-    validates_format_of :url, :with => %r{^(https://github\.com/|git@github\.com:)[a-z0-9\-_]+/[a-z0-9\-_]+\.git$}i, :allow_blank => true
+    validates_format_of :url, :with => %r{\A(https://github\.com/|git@github\.com:)[a-z0-9\-_]+/[a-z0-9\-_]+\.git\z}i, :allow_blank => true
 
     before_save :set_local_url
     before_save :register_hook
@@ -79,7 +79,7 @@ def extra_boolean_attribute(name)
 
     def set_local_url
         if new_record? && url.present? && root_url.blank? && GithubCreator.options && GithubCreator.options['path']
-            path = url.sub(%r{^.*[@/]github.com[:/]}, '')
+            path = url.sub(%r{\A.*[@/]github.com[:/]}, '')
             if Redmine::Platform.mswin?
                 self.root_url = "#{GithubCreator.options['path']}\\#{path.gsub(%r{/}, '\\')}"
             else
diff --git a/app/models/repository_observer.rb b/app/models/repository_observer.rb
diff --git a/init.rb b/init.rb
@@ -15,12 +15,8 @@
 require_dependency 'scm_config'
 require_dependency 'scm_hook'
 
-require_dependency File.expand_path(File.join(File.dirname(__FILE__), 'app/models/repository_observer'))
-
 Rails.logger.info 'Starting SCM Creator Plugin for Redmine'
 
-ActiveRecord::Base.observers << RepositoryObserver
-
 Redmine::Scm::Base.add('Github')
 
 Rails.configuration.to_prepare do
@@ -41,5 +37,5 @@
     author_url  'http://www.andriylesyuk.com/'
     description 'Allows creating Subversion, Git, Mercurial, Bazaar and Github repositories within Redmine.'
     url         'http://projects.andriylesyuk.com/projects/scm-creator'
-    version     '0.5.0b'
+    version     '0.5.1'
 end
diff --git a/lib/adapters/github_adapter.rb b/lib/adapters/github_adapter.rb
@@ -27,10 +27,10 @@ def fetch
 
                 def url_with_credentials
                     if @login.present? && @password.present?
-                        if url =~ %r{^https://}
-                            url.sub(%r{^https://}, "https://#{@login}:#{@password}@")
+                        if url =~ %r{\Ahttps://}
+                            url.sub(%r{\Ahttps://}, "https://#{@login}:#{@password}@")
                         else
-                            url.sub(%r{^git@}, "#{@login}:#{@password}@")
+                            url.sub(%r{\Agit@}, "#{@login}:#{@password}@")
                         end
                     else
                         url
diff --git a/lib/creator/bazaar_creator.rb b/lib/creator/bazaar_creator.rb
@@ -18,7 +18,7 @@ def enabled?
             false
         end
 
-        def external_url(repository, regexp = %r{^(?:sftp|bzr(?:\+[a-z]+)?)://})
+        def external_url(repository, regexp = %r{\A(?:sftp|bzr(?:\+[a-z]+)?)://})
             super
         end
 
diff --git a/lib/creator/git_creator.rb b/lib/creator/git_creator.rb
@@ -18,9 +18,9 @@ def enabled?
             false
         end
 
-        def external_url(repository, regexp = %r{^(?:https?|git|ssh)://})
+        def external_url(repository, regexp = %r{\A(?:https?|git|ssh)://})
             url = super
-            if url.present? && repository.root_url =~ %r{\.git$}
+            if url.present? && repository.root_url =~ %r{\.git\z}
                 url + '.git'
             else
                 url
@@ -48,7 +48,7 @@ def existing_path(identifier, repository = nil)
 
         def repository_name(path)
             base = Redmine::Platform.mswin? ? options['path'].gsub(%r{\\}, "/") : options['path']
-            matches = Regexp.new("^#{Regexp.escape(base)}/([^/]+?)(\\.git)?/?$").match(path)
+            matches = Regexp.new("\A#{Regexp.escape(base)}/([^/]+?)(\\.git)?/?\z").match(path)
             matches ? matches[1] : nil
         end
 
diff --git a/lib/creator/github_creator.rb b/lib/creator/github_creator.rb
@@ -30,7 +30,7 @@ def local?
         def sanitize(attributes)
             if attributes.has_key?('url')
                 url = attributes['url']
-                if url !~ %r{^(https://github\.com|git@github\.com)}
+                if url !~ %r{\A(https://github\.com|git@github\.com)}
                     if url.start_with?(':')
                         url = 'git@github.com' + url
                     elsif url.start_with?('/')
@@ -41,7 +41,7 @@ def sanitize(attributes)
                         url = 'https://github.com/user/' + url
                     end
                 end
-                if url !~ %r{\.git$}
+                if url !~ %r{\.git\z}
                     url << '.git' unless url.end_with?('/')
                 end
                 attributes['url'] = url unless attributes['url'] == url
@@ -51,8 +51,8 @@ def sanitize(attributes)
 
         # path should be the actual URL at this stage
         def access_url(path, repository = nil)
-            if path !~ %r{^(https://github\.com/|git@github\.com:)} &&
-               repository.url =~ %r{^(https://github\.com/|git@github\.com:)}
+            if path !~ %r{\A(https://github\.com/|git@github\.com:)} &&
+               repository.url =~ %r{\A(https://github\.com/|git@github\.com:)}
                 repository.url
             else
                 path
@@ -65,7 +65,7 @@ def access_root_url(path, repository = nil)
         end
 
         # let Redmine use the repository URL
-        def external_url(repository, regexp = %r{^(?:https?://|git@)})
+        def external_url(repository, regexp = %r{\A(?:https?://|git@)})
             repository.url
         end
 
@@ -79,7 +79,7 @@ def existing_path(identifier, repository = nil)
         end
 
         def repository_name(path)
-            matches = %r{^(?:.*/)?([^/]+?)(\\.git)?/?$}.match(path)
+            matches = %r{\A(?:.*/)?([^/]+?)(\\.git)?/?\z}.match(path)
             matches ? matches[1] : nil
         end
 
@@ -96,7 +96,7 @@ def create_repository(path, repository = nil)
             response = client.create(repository_name(path), create_options)
             if response.is_a?(Sawyer::Resource) && response.key?(:clone_url)
                 repository.merge_extra_info('extra_created_with_scm' => 1)
-                if repository && repository.url =~ %r{^git@} && repository.login.blank? && response.key?(:ssh_url)
+                if repository && repository.url =~ %r{\Agit@} && repository.login.blank? && response.key?(:ssh_url)
                     response[:ssh_url]
                 else
                     response[:clone_url]
@@ -121,7 +121,7 @@ def register_hook(repository, login = nil, password = nil)
             else
                 registrar = client
             end
-            github_repository = Octokit::Repository.from_url(repository.url.sub(%r{\.git$}, ''))
+            github_repository = Octokit::Repository.from_url(repository.url.sub(%r{\.git\z}, ''))
             response = client.create_hook(github_repository, 'redmine', {
                 :address                             => "#{Setting.protocol}://#{Setting.host_name}",
                 :project                             => repository.project.identifier,
diff --git a/lib/creator/mercurial_creator.rb b/lib/creator/mercurial_creator.rb
@@ -18,7 +18,7 @@ def enabled?
             false
         end
 
-        def external_url(repository, regexp = %r{^(?:https?|ssh)://})
+        def external_url(repository, regexp = %r{\A(?:https?|ssh)://})
             super
         end
 
diff --git a/lib/creator/scm_creator.rb b/lib/creator/scm_creator.rb
@@ -19,7 +19,7 @@ def interface(repository)
 
         # returns config id used in scm.yml and ScmConfig
         def scm_id
-            if self.name =~ %r{^(.+)Creator$}
+            if self.name =~ %r{\A(.+)Creator\z}
                 $1.downcase
             else
                 nil
@@ -75,7 +75,7 @@ def path(identifier)
         end
 
         # returns url which can be used to access the repository externally
-        def external_url(repository, regexp = %r{^https?://})
+        def external_url(repository, regexp = %r{\Ahttps?://})
             if options['url'] && name = repository_name(repository.root_url)
                 if options['url'] =~ regexp
                     url = "#{options['url']}/#{name}"
@@ -104,13 +104,13 @@ def existing_path(identifier, repository = nil)
         # extracts repository name from path
         def repository_name(path)
             base = Redmine::Platform.mswin? ? options['path'].gsub(%r{\\}, "/") : options['path']
-            matches = Regexp.new("^#{Regexp.escape(base)}/([^/]+)/?$").match(path)
+            matches = Regexp.new("\A#{Regexp.escape(base)}/([^/]+)/?\z").match(path)
             matches ? matches[1] : nil
         end
 
         # compares repository names (was created for multiple repositories support)
         def belongs_to_project?(name, identifier)
-            name =~ %r{^#{Regexp.escape(identifier)}(\..+)?$}
+            name =~ %r{\A#{Regexp.escape(identifier)}(\..+)?\z}
         end
 
         # returns format of repository path which is displayed in the form as a default value
diff --git a/lib/creator/subversion_creator.rb b/lib/creator/subversion_creator.rb
@@ -34,13 +34,13 @@ def access_root_url(path, repository = nil)
             'file://' + (Redmine::Platform.mswin? ? '/' + path.gsub(%r{\\}, "/") : path)
         end
 
-        def external_url(repository, regexp = %r{^(?:file|https?|svn(?:\+[a-z]+)?)://})
+        def external_url(repository, regexp = %r{\A(?:file|https?|svn(?:\+[a-z]+)?)://})
             super
         end
 
         def repository_name(path)
             base = Redmine::Platform.mswin? ? '/' + options['path'].gsub(%r{\\}, "/") : options['path']
-            matches = Regexp.new("^file://#{Regexp.escape(base)}/([^/]+)/?$").match(path)
+            matches = Regexp.new("\Afile://#{Regexp.escape(base)}/([^/]+)/?\z").match(path)
             matches ? matches[1] : nil
         end
 
diff --git a/lib/scm_repositories_controller_patch.rb b/lib/scm_repositories_controller_patch.rb
@@ -61,7 +61,7 @@ def create_with_scm
                     attributes = {}
                     extra_attrs = {}
                     params[:repository].each do |name, value|
-                        if name =~ %r{^extra_}
+                        if name =~ %r{\Aextra_}
                             extra_attrs[name] = value
                         else
                             attributes[name] = value
@@ -97,7 +97,7 @@ def create_with_scm
                         if ScmConfig['only_creator'] && request.post? && @repository.errors.empty? && !@repository.created_with_scm
                             @repository.errors.add(:base, :scm_only_creator)
                         elsif !ScmConfig['allow_add_local'] && request.post? && @repository.errors.empty? && !@repository.created_with_scm &&
-                            attributes['url'] =~ %r{^(file://|([a-z]:)?\.*[\\/])}i
+                            attributes['url'] =~ %r{\A(file://|([a-z]:)?\.*[\\/])}i
                             @repository.errors.add(:base, :scm_local_repositories_denied)
                         end
 
@@ -139,7 +139,7 @@ def update_with_scm
             #        p       = {}
             #        p_extra = {}
             #        p1.each do |k, v|
-            #            if k =~ /^extra_/
+            #            if k =~ /\Aextra_/
             #                p_extra[k] = v
             #            else
             #                p[k] = v
@@ -176,7 +176,7 @@ def edit_with_scm
                         attrs = {}
                         extra = {}
                         attributes.each do |name, value|
-                            if name =~ %r{^extra_}
+                            if name =~ %r{\Aextra_}
                                 extra[name] = value
                             else
                                 attrs[name] = value
@@ -194,7 +194,7 @@ def edit_with_scm
                         if ScmConfig['only_creator'] && @repository.errors.empty? && !@repository.created_with_scm
                             @repository.errors.add(:base, :scm_only_creator)
                         elsif !ScmConfig['allow_add_local'] && @repository.errors.empty? && !@repository.created_with_scm &&
-                            attrs['url'] =~ %r{^(file://|([a-z]:)?\.*[\\/])}i
+                            attrs['url'] =~ %r{\A(file://|([a-z]:)?\.*[\\/])}i
                             @repository.errors.add(:base, :scm_local_repositories_denied)
                         end
 
diff --git a/lib/scm_repositories_helper_patch.rb b/lib/scm_repositories_helper_patch.rb
@@ -183,7 +183,7 @@ def git_field_tags_with_add(form, repository)
                     path = GitCreator.access_root_url(GitCreator.default_path(@project.identifier), repository)
                     if GitCreator.repository_exists?(@project.identifier) && @project.respond_to?(:repositories)
                         offset = @project.repositories.select{ |r| r.created_with_scm }.size.to_s
-                        if path.sub!(%r{\.git$}, '.' + offset + '.git').nil?
+                        if path.sub!(%r{\.git\z}, '.' + offset + '.git').nil?
                             path << '.' + offset
                         end
                     end
diff --git a/lib/scm_repository_patch.rb b/lib/scm_repository_patch.rb
@@ -0,0 +1,35 @@
+require_dependency 'repository'
+
+module ScmRepositoryPatch
+
+    def self.included(base)
+        base.send(:include, InstanceMethods)
+        base.class_eval do
+            unloadable
+
+            before_destroy :remove_repository_files
+        end
+    end
+
+    module InstanceMethods
+
+        def remove_repository_files
+            if created_with_scm
+                interface = SCMCreator.interface(self)
+                if interface
+                    name = interface.repository_name(root_url)
+                    if name
+                        path = interface.existing_path(name, self)
+                        if path
+                            interface.execute(ScmConfig['pre_delete'], path, project) if ScmConfig['pre_delete']
+                            interface.delete_repository(path)
+                            interface.execute(ScmConfig['post_delete'], path, project) if ScmConfig['post_delete']
+                        end
+                    end
+                end
+            end
+        end
+
+    end
+
+end
