Praise be to rubocop

Qureshi2131 · Dec 5, 2018 · 7302b6d · 7302b6d
1 parent 1940d6c
commit 7302b6d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/dependabot-core.gemspec b/dependabot-core.gemspec
@@ -18,19 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_path = "lib"
   spec.files        = ["CHANGELOG.md", "LICENSE", "README.md"]
 
-  if File.exist?(".gitignore")
-    ignores = File.readlines(".gitignore").grep(/\S+/).map(&:chomp)
-    if File.directory?("lib") && File.directory?("helpers")
-      Find.find("lib", "helpers") do |path|
-        if ignores.any? { |i| File.fnmatch(i, "/" + path, File::FNM_DOTMATCH) }
-          Find.prune
-        else
-          spec.files << path unless File.directory?(path)
-        end
-      end
-    end
-  end
-
   spec.required_ruby_version = ">= 2.5.0"
   spec.required_rubygems_version = ">= 2.7.3"
 
@@ -54,4 +41,18 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.60.0"
   spec.add_development_dependency "vcr", "~> 4.0.0"
   spec.add_development_dependency "webmock", "~> 3.4.0"
+
+  next unless File.exist?(".gitignore")
+
+  ignores = File.readlines(".gitignore").grep(/\S+/).map(&:chomp)
+
+  next unless File.directory?("lib") && File.directory?("helpers")
+
+  Find.find("lib", "helpers") do |path|
+    if ignores.any? { |i| File.fnmatch(i, "/" + path, File::FNM_DOTMATCH) }
+      Find.prune
+    else
+      spec.files << path unless File.directory?(path)
+    end
+  end
 end
diff --git a/terraform/dependabot-terraform.gemspec b/terraform/dependabot-terraform.gemspec
@@ -18,19 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_path = "lib"
   spec.files        = []
 
-  if File.exist?("../.gitignore")
-    ignores = File.readlines("../.gitignore").grep(/\S+/).map(&:chomp)
-    if File.directory?("lib")
-      Find.find("lib") do |path|
-        if ignores.any? { |i| File.fnmatch(i, "/" + path, File::FNM_DOTMATCH) }
-          Find.prune
-        else
-          spec.files << path unless File.directory?(path)
-        end
-      end
-    end
-  end
-
   spec.required_ruby_version = ">= 2.5.0"
   spec.required_rubygems_version = ">= 2.7.3"
 
@@ -44,4 +31,18 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop", "~> 0.60.0"
   spec.add_development_dependency "vcr", "~> 4.0.0"
   spec.add_development_dependency "webmock", "~> 3.4.0"
+
+  next unless File.exist?("../.gitignore")
+
+  ignores = File.readlines("../.gitignore").grep(/\S+/).map(&:chomp)
+
+  next unless File.directory?("lib")
+
+  Find.find("lib") do |path|
+    if ignores.any? { |i| File.fnmatch(i, "/" + path, File::FNM_DOTMATCH) }
+      Find.prune
+    else
+      spec.files << path unless File.directory?(path)
+    end
+  end
 end
diff --git a/terraform/lib/dependabot/terraform/requirement.rb b/terraform/lib/dependabot/terraform/requirement.rb
@@ -8,9 +8,7 @@ module Dependabot
   module Terraform
     class Requirement < Gem::Requirement
       def self.parse(obj)
-        if obj.is_a?(Gem::Version)
-          return ["=", Version.new(obj.to_s)]
-        end
+        return ["=", Version.new(obj.to_s)] if obj.is_a?(Gem::Version)
 
         unless (matches = PATTERN.match(obj.to_s))
           msg = "Illformed requirement [#{obj.inspect}]"