From 03cc10fa8a569b872d79660611d72de5cd1ba327 Mon Sep 17 00:00:00 2001 From: Matt Jones Date: Fri, 22 May 2015 09:44:00 -0400 Subject: [PATCH] update repos --- README.md | 37 +---------- Vagrantfile | 114 --------------------------------- sensu-plugins-hardware.gemspec | 51 ++++++++------- 3 files changed, 31 insertions(+), 171 deletions(-) delete mode 100644 Vagrantfile diff --git a/README.md b/README.md index 3e77b18..4134d32 100644 --- a/README.md +++ b/README.md @@ -16,39 +16,6 @@ ## Installation -Add the public key (if you haven’t already) as a trusted certificate +[Installation and Setup](https://github.com/sensu-plugins/documentation/blob/master/user_docs/installation_instructions.md) -``` -gem cert --add <(curl -Ls https://raw.githubusercontent.com/sensu-plugins/sensu-plugins.github.io/master/certs/sensu-plugins.pem) -gem install sensu-plugins-hardware -P MediumSecurity -``` - -You can also download the key from /certs/ within each repository. - -#### Rubygems - -`gem install sensu-plugins-hardware` - -#### Bundler - -Add *sensu-plugins-disk-checks* to your Gemfile and run `bundle install` or `bundle update` - -#### Chef - -Using the Sensu **sensu_gem** LWRP -``` -sensu_gem 'sensu-plugins-hardware' do - options('--prerelease') - version '0.0.1' -end -``` - -Using the Chef **gem_package** resource -``` -gem_package 'sensu-plugins-hardware' do - options('--prerelease') - version '0.0.1' -end -``` - -## Notes +## Notes \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index fa91c8e..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,114 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - -require 'json' - -VAGRANTFILE_API_VERSION = '2' - -# Read in the configuration file for the vagrant environment -config_file = JSON.parse(File.read('../GIR/config/vagrant_config.json')) -vagrant_config = config_file['config'] - -Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - # Standard configurtaion details - config.vm.box_download_checksum = true - config.vm.box_download_checksum_type = 'md5' - config.vm.hostname = 'sensu-plugins-dev' - - # None of the boxes have the chef-client installed, - # this will install the latest version for provisioning - config.omnibus.chef_version = :latest - - # Local Berkself configuration - # This is used only if you add recipes to the boxes below. - # All dependencies and such for the roles is done with a Berksfile - # in GIR - config.berkshelf.enabled = true - - # Box definitions - # The roles and boxes can be found in the above configuration file - # in GIR. If you want to change them you can do so below but any - # lasting changes should be made against GIR unless they are repo specific - config.vm.define 'cent5' do |cent5| - cent5.vm.box = vagrant_config['cent5']['box'] - cent5.vm.provision 'chef_zero' do |chef| - chef.roles_path = vagrant_config['cent5']['role_path'] - vagrant_config['cent5']['role'].each do |r| - chef.add_role(r) - end - # chef.add_recipe 'apache2' - end - end - - config.vm.define 'cent6' do |cent6| - cent6.vm.box = vagrant_config['cent6']['box'] - cent6.vm.provision 'chef_zero' do |chef| - chef.roles_path = vagrant_config['cent6']['role_path'] - vagrant_config['cent6']['role'].each do |r| - chef.add_role(r) - end - # chef.add_recipe 'apache2' - end - end - - config.vm.define 'cent7' do |cent7| - cent7.vm.box = vagrant_config['cent7']['box'] - cent7.vm.provision 'chef_zero' do |chef| - chef.roles_path = vagrant_config['cent7']['role_path'] - vagrant_config['cent7']['role'].each do |r| - chef.add_role(r) - end - # chef.add_recipe 'apache2' - end - end - - config.vm.define 'ubuntu14' do |ubuntu14| - ubuntu14.vm.box = vagrant_config['ubuntu14']['box'] - ubuntu14.vm.provision 'chef_zero' do |chef| - chef.roles_path = vagrant_config['ubuntu14']['role_path'] - vagrant_config['ubuntu14']['role'].each do |r| - chef.add_role(r) - end - end - end - - # The bsd boxes have to be configured differently and require some - # tough love. Shared folders are not available and using NFS will - # likely error due to filename length. You can patch it and use - # NFS if you really want but that is not supported or reccomended - # at this time - # - # This means that when making changes to GIR you will need to do a reload - # or possibly a halt/up on the machine to pull in the latest roles and recipes - config.vm.define 'freebsd92' do |bsd9| - bsd9.vm.guest = :freebsd - # The below line is needed for < freebsd9x only - bsd9.ssh.shell = '/bin/sh' - bsd9.vm.box = vagrant_config['bsd9']['box'] - - # Use rsync as a shared folder - bsd9.vm.synced_folder '.', '/vagrant', type: 'rsync' - bsd9.vm.provision 'chef_zero' do |chef| - chef.synced_folder_type = 'rsync' - chef.roles_path = vagrant_config['bsd9']['role_path'] - vagrant_config['bsd9']['role'].each do |r| - chef.add_role(r) - end - end - end - - config.vm.define 'freebsd10' do |bsd10| - bsd10.vm.guest = :freebsd - bsd10.vm.box = vagrant_config['bsd10']['box'] - - # Use rsync as a shared folder - bsd10.vm.synced_folder '.', '/vagrant', type: 'rsync' - bsd10.vm.provision 'chef_zero' do |chef| - chef.synced_folder_type = 'rsync' - chef.roles_path = vagrant_config['bsd10']['role_path'] - vagrant_config['bsd10']['role'].each do |r| - chef.add_role(r) - end - end - end -end diff --git a/sensu-plugins-hardware.gemspec b/sensu-plugins-hardware.gemspec index b19a95c..bb11f6e 100644 --- a/sensu-plugins-hardware.gemspec +++ b/sensu-plugins-hardware.gemspec @@ -12,34 +12,41 @@ end pvt_key = '~/.ssh/gem-private_key.pem' Gem::Specification.new do |s| - s.name = 'sensu-plugins-hardware' - s.version = SensuPluginsHardware::VERSION - s.authors = ['Sensu Plugins and contributors'] + s.authors = ['Sensu-Plugins and contributors'] + s.cert_chain = ['certs/sensu-plugins.pem'] + s.date = Date.today.to_s + s.description = 'Sensu plugins for physical hardware' s.email = '' + 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-hardware' - 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-hardware' 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 physical hardware' + s.test_files = s.files.grep(%r{^(test|spec|features)/}) + s.version = SensuPluginsHardware::Version::VER_STRING - s.add_runtime_dependency 'sensu-plugin' + s.add_runtime_dependency 'sensu-plugin', '1.1.0' - 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' + s.add_development_dependency 'codeclimate-test-reporter', '~> 0.4' + 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' end +