Browse Source

Corrected with rubocop cop 'Style/SignalException'.

Thorsten Eckel 9 years ago
parent
commit
c2af4fdd30

+ 0 - 5
.rubocop.yml

@@ -173,11 +173,6 @@ Style/Documentation:
   Description: 'Document classes and non-namespace modules.'
   Enabled: false
 
-Style/SignalException:
-  Description: 'Checks for proper usage of fail and raise.'
-  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#fail-method'
-  Enabled: false
-
 Metrics/AbcSize:
   Description: >-
                  A calculated magnitude based on number of assignments,

+ 1 - 1
app/controllers/getting_started_controller.rb

@@ -831,7 +831,7 @@ curl http://localhost/api/v1/getting_started -v -u #{login}:#{password}
 
     # validate params
     if !params[:adapter]
-      raise 'need :adapter param'
+      fail 'need :adapter param'
     end
 
     # connection test

+ 1 - 1
app/controllers/tickets_controller.rb

@@ -350,7 +350,7 @@ class TicketsController < ApplicationController
   def stats
 
     if !params[:user_id] && !params[:organization_id]
-      raise 'Need user_id or organization_id as param'
+      fail 'Need user_id or organization_id as param'
     end
 
     # permissin check

+ 1 - 1
app/models/activity_stream.rb

@@ -34,7 +34,7 @@ add a new activity entry for an object
     if data[:role]
       role = Role.lookup( name: data[:role] )
       if !role
-        raise "No such Role #{data[:role]}"
+        fail "No such Role #{data[:role]}"
       end
       role_id = role.id
     end

+ 3 - 3
app/models/application_model.rb

@@ -70,7 +70,7 @@ returns
   def self.param_cleanup(params, newObject = false)
 
     if params.nil?
-      raise "No params for #{self}!"
+      fail "No params for #{self}!"
     end
 
     # ignore id for new objects
@@ -340,7 +340,7 @@ returns
       }
       return
     else
-      raise 'Need name, id or login for lookup()'
+      fail 'Need name, id or login for lookup()'
     end
   end
 
@@ -435,7 +435,7 @@ returns
       record.save
       return record
     else
-      raise 'Need name, login or locale for create_or_update()'
+      fail 'Need name, login or locale for create_or_update()'
     end
   end
 

+ 1 - 1
app/models/locale.rb

@@ -13,7 +13,7 @@ class Locale < ApplicationModel
       }
     )
 
-    raise "Can't load locales from #{url}: #{result.error}" if !result.success?
+    fail "Can't load locales from #{url}: #{result.error}" if !result.success?
 
     ActiveRecord::Base.transaction do
       result.data.each {|locale|

+ 1 - 1
app/models/observer/ticket/article/fillup_from_email.rb

@@ -33,7 +33,7 @@ class Observer::Ticket::Article::FillupFromEmail < ActiveRecord::Observer
     # set sender
     email_address = ticket.group.email_address
     if !email_address
-      raise "No email address found for group '#{ticket.group.name}'"
+      fail "No email address found for group '#{ticket.group.name}'"
     end
     system_sender = "#{email_address.realname} <#{email_address.email}>"
     if Setting.get('ticket_define_email_from') == 'AgentNameSystemAddressName'

+ 1 - 1
app/models/observer/ticket/notification.rb

@@ -100,7 +100,7 @@ class Observer::Ticket::Notification < ActiveRecord::Observer
           end
         end
       else
-        raise "unknown object for notification #{event[:name]}"
+        fail "unknown object for notification #{event[:name]}"
       end
     }
     list_objects

+ 1 - 1
app/models/observer/ticket/notification/background_job.rb

@@ -97,7 +97,7 @@ class Observer::Ticket::Notification::BackgroundJob
       elsif @p[:type] == 'update'
         template = self.template_update(user, ticket, article, changes)
       else
-        raise "unknown type for notification #{@p[:type]}"
+        fail "unknown type for notification #{@p[:type]}"
       end
 
       # prepare subject & body

+ 9 - 9
app/models/package.rb

@@ -85,7 +85,7 @@ class Package < ApplicationModel
       package = entry.sub( %r{^.*/(.+?)\.szpm$}, '\1')
     end
     if package == false
-      raise "Can't link package, '#{package_base_dir}' is no package source directory!"
+      fail "Can't link package, '#{package_base_dir}' is no package source directory!"
     end
     logger.debug package.inspect
     package
@@ -154,7 +154,7 @@ class Package < ApplicationModel
       if File.file?( entry.to_s ) && ( File.file?( dest.to_s ) && !File.symlink?( dest.to_s ) )
         backup_file = dest.to_s + '.link_backup'
         if File.exist?( backup_file )
-          raise "Can't link #{entry} -> #{dest}, destination and .link_backup already exists!"
+          fail "Can't link #{entry} -> #{dest}, destination and .link_backup already exists!"
         else
           logger.info "Create backup file of #{dest} -> #{backup_file}."
           File.rename( dest.to_s, backup_file )
@@ -199,10 +199,10 @@ class Package < ApplicationModel
     if package_db
       if !data[:reinstall]
         if Gem::Version.new( package_db.version ) == Gem::Version.new( meta[:version] )
-          raise "Package '#{meta[:name]}-#{meta[:version]}' already installed!"
+          fail "Package '#{meta[:name]}-#{meta[:version]}' already installed!"
         end
         if Gem::Version.new( package_db.version ) > Gem::Version.new( meta[:version] )
-          raise "Newer version (#{package_db.version}) of package '#{meta[:name]}-#{meta[:version]}' already installed!"
+          fail "Newer version (#{package_db.version}) of package '#{meta[:name]}-#{meta[:version]}' already installed!"
         end
       end
 
@@ -255,7 +255,7 @@ class Package < ApplicationModel
   def self.reinstall(package_name)
     package = Package.find_by( name: package_name )
     if !package
-      raise "No such package '#{package_name}'"
+      fail "No such package '#{package_name}'"
     end
 
     file = self._get_bin( package.name, package.version )
@@ -345,7 +345,7 @@ class Package < ApplicationModel
       version: version,
     )
     if !package
-      raise "No such package '#{name}' version '#{version}'"
+      fail "No such package '#{name}' version '#{version}'"
     end
     list = Store.list(
       object: 'Package',
@@ -354,10 +354,10 @@ class Package < ApplicationModel
 
     # find file
     if !list || !list.first
-      raise "No such file in storage list #{name} #{version}"
+      fail "No such file in storage list #{name} #{version}"
     end
     if !list.first.content
-      raise "No such file in storage #{name} #{version}"
+      fail "No such file in storage #{name} #{version}"
     end
     list.first.content
   end
@@ -470,7 +470,7 @@ class Package < ApplicationModel
           name    = $2
         end
         if !version || !name
-          raise "Invalid package migration '#{migration}'"
+          fail "Invalid package migration '#{migration}'"
         end
 
         # down

Some files were not shown because too many files changed in this diff