deploy

.rubocop.yml

@@ -8,9 +8,6 @@ LineLength:
 AbcSize:
   Max: 75
 
-AbcSize:
-    Max: 50
-
 FileName:
   Enabled: false
 
@@ -27,11 +24,7 @@ IfUnlessModifier:
   Enabled: false
 
 RegexpLiteral:
-<<<<<<< HEAD
   Enabled: false
 
 Style/Documentation:
   Enabled: false
-=======
-    Enabled: false
->>>>>>> update repo

CHANGELOG.md

@@ -5,11 +5,8 @@ This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachang
 
 ## Unreleased][unreleased]
 
-<<<<<<< HEAD
-=======
-## 0.0.1 - 2015-04-30
+## [0.0.1] - 2015-06-04
 
 ### Added
 - initial release
 
->>>>>>> update repo

lib/sensu-plugins-sensu.rb

@@ -1,15 +1 @@
-
 require 'sensu-plugins-sensu/version'
-
-# Load the defaults
-
-#
-# Default class
-#
-module SensuPluginsSensu
-  class << self
-  end
-
-  class << self
-  end
-end

lib/sensu-plugins-sensu/version.rb

@@ -1,6 +1,3 @@
-require 'json'
-
-# encoding: utf-8
 module SensuPluginsSensu
   # This defines the version of the gem
   module Version
@@ -9,20 +6,5 @@ module Version
     PATCH = 1
 
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
-
-    NAME   = 'sensu-plugins-sensu'
-    BANNER = "#{NAME} v%s"
-
-    module_function
-
-    def version
-      format(BANNER, VER_STRING)
-    end
-
-    def json_version
-      {
-        'version' => VER_STRING
-      }.to_json
-    end
   end
 end

sensu-plugins-sensu.gemspec

@@ -12,22 +12,15 @@ end
 pvt_key = '~/.ssh/gem-private_key.pem'
 
 Gem::Specification.new do |s|
-<<<<<<< HEAD
   s.authors                = ['Sensu-Plugins and contributors']
   s.cert_chain             = ['certs/sensu-plugins.pem']
   s.date                   = Date.today.to_s
-  s.description            = 'Sensu plugins for Sensu server'
-=======
-  s.name                   = 'sensu-plugins-sensu'
-  s.version                = SensuPluginsSensu::VERSION
-  s.authors                = ['Sensu Plugins and contributors']
->>>>>>> update repo
+  s.description            = 'Sensu sensu plugins'
   s.email                  = '<sensu-users@googlegroups.com>'
-  s.executables            = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.executables            = Dir.glob('bin/**/*.rb').map { |file| File.basename(file) }
   s.files                  = Dir.glob('{bin,lib}/**/*') + %w(LICENSE README.md CHANGELOG.md)
   s.homepage               = 'https://github.com/sensu-plugins/sensu-plugins-sensu'
   s.license                = 'MIT'
-<<<<<<< HEAD
   s.metadata               = { 'maintainer'         => 'sensu-plugin',
                                'development_status' => 'active',
                                'production_status'  => 'unstable - testing recommended',
@@ -40,45 +33,22 @@ Gem::Specification.new do |s|
   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 Sensu server'
+  s.summary                = 'Sensu plugins for sensu'
   s.test_files             = s.files.grep(%r{^(test|spec|features)/})
   s.version                = SensuPluginsSensu::Version::VER_STRING
 
-  s.add_runtime_dependency 'sensu-plugin', '1.1.0'
-  s.add_runtime_dependency 'rest-client', '~> 1.8.0'
-  s.add_runtime_dependency 'english', '0.6.3'
+  s.add_runtime_dependency 'sensu-plugin',      '1.1.0'
+  s.add_runtime_dependency 'rest-client',       '1.8.0'
+  s.add_runtime_dependency 'json',              '1.8.3'
+  s.add_runtime_dependency 'english',           '0.6.3'
 
+  s.add_development_dependency 'bundler',                   '~> 1.7'
   s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4'
+  s.add_development_dependency 'github-markup',             '~> 1.3'
+  s.add_development_dependency 'pry',                       '~> 0.10'
   s.add_development_dependency 'rubocop',                   '0.30'
   s.add_development_dependency 'rspec',                     '~> 3.1'
-  s.add_development_dependency 'bundler',                   '~> 1.7'
   s.add_development_dependency 'rake',                      '~> 10.0'
-  s.add_development_dependency 'github-markup',             '~> 1.3'
   s.add_development_dependency 'redcarpet',                 '~> 3.2'
   s.add_development_dependency 'yard',                      '~> 0.8'
-  s.add_development_dependency 'pry',                       '~> 0.10'
-=======
-  s.date                   = Date.today.to_s
-  s.files                  = Dir.glob('{bin,lib}/**/*') + %w(LICENSE README.md CHANGELOG.md)
-  s.executables            = Dir.glob('bin/**/*').map { |file| File.basename(file) }
-  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.platform               = Gem::Platform::RUBY
-  s.post_install_message   = 'You can use the embedded Ruby by setting EMBEDDED_RUBY=true in /etc/default/sensu'
-  s.required_ruby_version  = '>= 1.9.3'
-
-  s.add_runtime_dependency 'sensu-plugin'
-
-  s.add_development_dependency 'codeclimate-test-reporter'
-  s.add_development_dependency 'rubocop', '~> 0.17.0'
-  s.add_development_dependency 'rspec', '~> 3.1'
-  s.add_development_dependency 'bundler', '~> 1.7'
-  s.add_development_dependency 'rake', '~> 10.0'
-  s.add_development_dependency 'github-markup'
-  s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'pry'
->>>>>>> update repo
 end