update repo

.rubocop.yml

@@ -8,9 +8,6 @@ LineLength:
 AbcSize:
   Max: 75
 
-AbcSize:
-    Max: 50
-
 FileName:
   Enabled: false
 

bin/metrics-solr-graphite.rb

@@ -42,7 +42,7 @@ class SolrGraphite < Sensu::Plugin::Metric::CLI::Graphite
          long: '--scheme SCHEME',
          default: "#{Socket.gethostname}.solr"
 
-  def run
+  def run # rubocop:disable all
     cores = []
     if config[:core]
       cores = [config[:core]]

bin/metrics-solr-v1.4graphite.rb

@@ -43,7 +43,7 @@ def outputstats(section, queryindex, statpage, metrics, label)
     end
   end
 
-  def run
+  def run # rubocop:disable all
     # Capture initial stats page XML data. Sol4 1.4 takes a while to load stats page, the timeout accomidates that.
     doc = Nokogiri::XML(open("http://#{config[:host]}:#{config[:port]}/solr/admin/stats.jsp", read_timeout: 300))
 

bin/metrics-solr4-graphite.rb

@@ -47,7 +47,7 @@ def get_url_json(url)
     warning "RestClient exception: #{e.class} -> #{e.message}"
   end
 
-  def run
+  def run #rubocop:disable all
     graphite_path = config[:scheme]
 
     # Process core stats

sensu-plugins-solr.gemspec

@@ -13,33 +13,35 @@ pvt_key = '~/.ssh/gem-private_key.pem'
 
 Gem::Specification.new do |s|
   s.authors                = ['Sensu-Plugins and contributors']
-  s.name                   = 'sensu-plugins-solr'
-  s.version                = SensuPluginsSolr::VERSION
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-  s.authors                = ['Yieldbot, Inc. and contributors']
-=======
-  s.authors                = ['Sensu Plugins and contributors']
->>>>>>> update repo
->>>>>>> update repo
+  s.cert_chain             = ['certs/sensu-plugins.pem']
+  s.date                   = Date.today.to_s
+  s.description            = 'Sensu plugins for working with solr'
   s.email                  = '<[email protected]>'
+  s.executables            = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.files                  = Dir.glob('{bin,lib}/**/*') + %w(LICENSE README.md CHANGELOG.md)
   s.homepage               = 'https://github.com/sensu-plugins/sensu-plugins-solr'
-  s.summary                = ''
-  s.description            = ''
   s.license                = 'MIT'
-  s.date                   = Date.today.to_s
-  s.files                  = Dir.glob('{bin,lib}/**/*') + %w(LICENSE README.md CHANGELOG.md)
-  s.executables            = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files             = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths          = ['lib']
-  s.cert_chain             = ['certs/sensu-plugins.pem']
-  s.signing_key            = File.expand_path(pvt_key) if $PROGRAM_NAME =~ /gem\z/
+  s.metadata               = { 'maintainer'         => '',
+                               'development_status' => 'active',
+                               'production_status'  => 'unstable - testing recommended',
+                               'release_draft'      => 'false',
+                               'release_prerelease' => 'false'
+  }
+  s.name                   = 'sensu-plugins-solr'
   s.platform               = Gem::Platform::RUBY
   s.post_install_message   = 'You can use the embedded Ruby by setting EMBEDDED_RUBY=true in /etc/default/sensu'
+  s.require_paths          = ['lib']
   s.required_ruby_version  = '>= 1.9.3'
+  s.signing_key            = File.expand_path(pvt_key) if $PROGRAM_NAME =~ /gem\z/
+  s.summary                = 'Sensu plugins for working with solr'
+  s.test_files             = s.files.grep(%r{^(test|spec|features)/})
+  s.version                = SensuPluginsSolr::Version::VER_STRING
 
-  s.add_runtime_dependency 'sensu-plugin', '1.1.0'
+  s.add_runtime_dependency 'sensu-plugin',      '1.1.0'
+  s.add_runtime_dependency 'crack',             '0.4.2'
+  s.add_runtime_dependency 'json',              '1.8.2'
+  s.add_runtime_dependency 'rest-client',       '1.8.0'
+  s.add_runtime_dependency 'nokogiri',          '1.6.6.2'
 
   s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
   s.add_development_dependency 'rubocop',                   '~> 0.30'