Add friendlier error message

sinatra · Jun 24, 2018 · e0f90cb · e0f90cb
1 parent 357ae91
commit e0f90cb
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 18 deletions.
diff --git a/rack-protection/rack-protection.gemspec b/rack-protection/rack-protection.gemspec
@@ -17,11 +17,21 @@ Gem::Specification.new do |s|
     "Gemfile",
     "rack-protection.gemspec"
   ]
-  s.metadata = {
-    'source_code_uri' => 'https://github.com/sinatra/sinatra/tree/master/rack-protection'
-    'homepage_uri'      => 'http://sinatrarb.com/protection/',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/rack-protection'
-  }
+
+  if s.respond_to?(:metadata)
+    s.metadata = {
+      'source_code_uri'   => 'https://github.com/sinatra/sinatra/tree/master/rack-protection',
+      'homepage_uri'      => 'http://sinatrarb.com/protection/',
+      'documentation_uri' => 'https://www.rubydoc.info/gems/rack-protection'
+    }
+  else
+    raise <<-EOF
+RubyGems 2.0 or newer is required to protect against public gem pushes. You can update your rubygems version by running:
+  gem install rubygems-update
+  update_rubygems:
+  gem update --system
+EOF
+  end
 
   # dependencies
   s.add_dependency "rack"

diff --git a/sinatra-contrib/sinatra-contrib.gemspec b/sinatra-contrib/sinatra-contrib.gemspec
@@ -18,11 +18,21 @@ Gem::Specification.new do |s|
     "ideas.md",
     "sinatra-contrib.gemspec"
   ]
-  s.metadata = {
-    'source_code_uri'   => 'https://github.com/sinatra/sinatra/tree/master/sinatra-contrib'
-    'homepage_uri'      => 'http://sinatrarb.com/contrib/',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/sinatra-contrib'
-  }
+
+  if s.respond_to?(:metadata)
+    s.metadata = {
+      'source_code_uri'   => 'https://github.com/sinatra/sinatra/tree/master/sinatra-contrib',
+      'homepage_uri'      => 'http://sinatrarb.com/contrib/',
+      'documentation_uri' => 'https://www.rubydoc.info/gems/sinatra-contrib'
+    }
+  else
+    raise <<-EOF
+RubyGems 2.0 or newer is required to protect against public gem pushes. You can update your rubygems version by running:
+  gem install rubygems-update
+  update_rubygems:
+  gem update --system
+EOF
+  end
 
   s.required_ruby_version = '>= 2.2.0'
 

diff --git a/sinatra.gemspec b/sinatra.gemspec
@@ -22,14 +22,29 @@ Gem::Specification.new 'sinatra', version do |s|
   s.test_files        = s.files.select { |p| p =~ /^test\/.*_test.rb/ }
   s.extra_rdoc_files  = s.files.select { |p| p =~ /^README/ } << 'LICENSE'
   s.rdoc_options      = %w[--line-numbers --inline-source --title Sinatra --main README.rdoc --encoding=UTF-8]
-  s.metadata = {
-    'source_code_uri'   => 'https://github.com/sinatra/sinatra',
-    'changelog_uri'     => 'https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md',
-    'homepage_uri'      => 'http://sinatrarb.com/',
-    'bug_tracker_uri'   => 'https://github.com/sinatra/sinatra/issues',
-    'mailing_list_uri'  => 'http://groups.google.com/group/sinatrarb',
-    'documentation_uri' => 'https://www.rubydoc.info/gems/sinatra'
-  }
+
+  if s.respond_to?(:metadata)
+    s.metadata = {
+      'source_code_uri'   => 'https://github.com/sinatra/sinatra',
+      'changelog_uri'     => 'https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md',
+      'homepage_uri'      => 'http://sinatrarb.com/',
+      'bug_tracker_uri'   => 'https://github.com/sinatra/sinatra/issues',
+      'mailing_list_uri'  => 'http://groups.google.com/group/sinatrarb',
+      'documentation_uri' => 'https://www.rubydoc.info/gems/sinatra'
+    }
+  else
+    msg = "RubyGems 2.0 or newer is required to protect against public "\
+          "gem pushes. You can update your rubygems version by running:\n\n"\
+          "gem install rubygems-update\n"\
+          "update_rubygems\n"\
+          "gem update --system"
+    raise <<-EOF
+RubyGems 2.0 or newer is required to protect against public gem pushes. You can update your rubygems version by running:
+  gem install rubygems-update
+  update_rubygems:
+  gem update --system
+EOF
+  end
 
   s.required_ruby_version = '>= 2.2.0'