Merge pull request #522 from till/t/rabbitmq

T/rabbitmq

.rubocop.yml

@@ -10,6 +10,8 @@ AllCops:
     - 'opsworks_nodejs/**/*'
     - 'vagrant-test/**/*'
     - 'test/**/*'
+    - 'erlang/**/*'
+    - 'rabbitmq/**/*'
     - 'Rakefile'
     - 'fc_sandbox/**/*'
 

.travis.yml

@@ -3,11 +3,8 @@ rvm:
   - 1.9.3
 
 script:
-  - find . -type f -name "*.rb" -exec ruby -c {} > /dev/null \;
-  - rake rubocop
-  - rake test
-  - rake spec
-  - rake foodcritic
+  - make cs
+  - make test
 
 after_success:
   - tar cfz easybib-cookbooks.tar.gz * --exclude=easybib-cookbooks.tar.gz

Makefile

@@ -0,0 +1,10 @@
+rake=bundle exec rake
+
+cs:
+	$(rake) rubocop
+	$(rake) foodcritic
+
+test:
+	find . -type f -name "*.rb" -exec ruby -c {} > /dev/null \;
+	$(rake) test
+	$(rake) spec

VERSIONS.md

@@ -1,13 +1,15 @@
  Package | External Version | Comment
 ------------ | ------------- | -------------
 apt| [2.5.3](https://github.com/opscode-cookbooks/apt/tree/v2.5.3) | added apt::easybib, apt::mirror.rb, apt::ppa, apt::proxy, apt::repair.rb, apt::updater.rb
-build-essential| [2.0.2](https://github.com/opscode-cookbooks/build-essential/tree/v2.0.2) | 
-chef_handler| [1.1.6](https://github.com/opscode-cookbooks/chef_handler/tree/v1.1.6) | 
-chef_handler_sns| [1.0.0](https://github.com/onddo/chef_handler_sns-cookbook/tree/1.0.0) | 
+build-essential| [2.0.2](https://github.com/opscode-cookbooks/build-essential/tree/v2.0.2) |
+chef_handler| [1.1.6](https://github.com/opscode-cookbooks/chef_handler/tree/v1.1.6) |
+chef_handler_sns| [1.0.0](https://github.com/onddo/chef_handler_sns-cookbook/tree/1.0.0) |
 cron| [1.3.12](https://github.com/opscode-cookbooks/cron/tree/v1.3.12) |  - We are using 1.3.0, with a backported libraries/matchers.rb from 1.3.12
+erlang | [1.5.6](https://github.com/opscode-cookbooks/erlang/commit/2af91e4650c1411fbf8e44626b1a548f777926c4) | ignored in our cs/test setup
 fail2ban | 2.2.1 | removed yum dependencies, adapted to our rubocop scheme, changed attributes/default.rb
-ohai| 2.0.1 | 
+ohai| 2.0.1 |
+rabbitmq | [3.4.0](https://github.com/jjasghar/rabbitmq/commit/b71c0a068419ad10324e8d13b517fafbf373c0c3) | removed yum, ignored in our cs/test setup
 xml| [1.2.4](https://github.com/opscode-cookbooks/xml/tree/v1.2.4) |
-python | [master](https://github.com/poise/python/commit/56424ab64b06f584c13dba2dbb1cc5369faf20f4) | 
+python | [master](https://github.com/poise/python/commit/56424ab64b06f584c13dba2dbb1cc5369faf20f4) |
 
 

apt/metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email  'till@php.net'
 license           'Apache 2.0'
 description       'Configures apt and apt services'
-version           '0.10.0'
+version           '2.5.3'
 recipe            'apt', 'Runs apt-get update during compile phase and sets up preseed directories'
 recipe            'apt::proxy', 'Set up an APT proxy'
 recipe            'apt::ppa', 'Setup the tools needed to initialize PPAs'

easybib/metadata.rb

@@ -50,6 +50,7 @@
 depends 'postfix'
 depends 'redis'
 depends 'rsyslogd'
+depends 'service'
 depends 'snooze'
 depends 'hhvm-fcgi'
 depends 'statsd'

easybib/recipes/role-gearmand.rb

@@ -1,3 +1,3 @@
-include_recipe 'easybib::setup'
-include_recipe 'loggly::setup'
-include_recipe 'gearmand'
+Chef::Log.info('This is deprecated, please update to service::role-gearmand')
+
+include_recipe 'service::role-gearmand'

erlang/.gitignore

@@ -0,0 +1,14 @@
+.vagrant
+Berksfile.lock
+Gemfile.lock
+*~
+*#
+.#*
+\#*#
+.*.sw[a-z]
+*.un~
+.bundle
+.cache
+.kitchen
+bin
+.kitchen.local.yml

erlang/.kitchen.yml

@@ -0,0 +1,79 @@
+---
+driver_plugin: vagrant
+driver_plugin: digitalocean
+driver_config:
+  digitalocean_client_id: <%= ENV['DIGITAL_OCEAN_CLIENT_ID'] %>
+  digitalocean_api_key: <%= ENV['DIGITAL_OCEAN_API_KEY'] %>
+  aws_access_key_id: <%= ENV['AWS_ACCESS_KEY_ID'] %> 
+  aws_secret_access_key: <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
+  aws_ssh_key_id: <%= ENV['AWS_KEYPAIR_NAME'] %>
+  ssh_key: <%= ENV['AWS_PRIVATE_KEY_PATH'] %>
+  rackspace_username: <%= ENV['RACKSPACE_USERNAME'] %>
+  rackspace_api_key: <%= ENV['RACKSPACE_API_KEY'] %>
+  require_chef_omnibus: latest
+
+platforms:
+- name: centos-5.8
+  driver_plugin: digitalocean
+  driver_config:
+    image_id: 1601
+    flavor_id: 63
+    region_id: 1
+    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+
+- name: centos-6.4
+  driver_plugin: digitalocean
+  driver_config:
+    image_id: 562354
+    flavor_id: 63
+    region_id: 1
+    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+
+- name: amazon-2013.09
+  driver_plugin: ec2
+  driver_config:
+    image_id: ami-3be4bc52
+    username: ec2-user
+
+- name: ubuntu-10.04
+  driver_plugin: digitalocean
+  driver_config:
+    image_id: 14097
+    flavor_id: 63
+    region_id: 1
+    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+    run_list:
+      - recipe[apt::default]
+
+- name: ubuntu-12.04
+  driver_plugin: digitalocean
+  driver_config:
+    image_id: 1505447
+    flavor_id: 63
+    region_id: 1
+    ssh_key_ids: <%= ENV['DIGITAL_OCEAN_SSH_KEY_IDS'] %>
+    run_list:
+      - recipe[apt::default]
+
+suites:
+- name: default
+  run_list:
+  - 'recipe[erlang]'
+  attributes: {}
+
+- name: gui_tools
+  run_list:
+  - 'recipe[erlang]'
+  attributes: { erlang: { gui_tools: true } }
+  excludes: ['centos-5.8', 'centos-6.4', 'amazon-2013.09']
+
+- name: esl
+  run_list:
+  - 'recipe[erlang::esl]'
+  attributes: {}
+  excludes: ['centos-5.8']
+
+- name: source
+  run_list:
+  - 'recipe[erlang::source]'
+  attributes: {}

erlang/.rubocop.yml

@@ -0,0 +1,8 @@
+Encoding:
+  Enabled: false
+
+LineLength:
+  Max: 200
+
+HashSyntax:
+  EnforcedStyle: hash_rockets

erlang/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+bundler_args: --without development integration
+rvm:
+  - 1.9.3
+  - 2.0.0
+before_install:
+  - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
+before_script:
+  - bundle exec berks install
+script:
+#  - bundle exec foodcritic -f any . --tags ~FC005
+  - bundle exec rubocop
+#  - bundle exec rspec --color --format progress

erlang/Berksfile

@@ -0,0 +1,11 @@
+site :opscode
+
+metadata
+
+group :integration do
+  cookbook 'apt'
+  cookbook 'minitest-handler'
+  cookbook 'yum', '~> 3.0'
+  cookbook 'yum-epel'
+  cookbook 'yum-repoforge'
+end

erlang/CHANGELOG.md

@@ -0,0 +1,76 @@
+erlang Cookbook CHANGELOG
+=========================
+This file is used to list changes made in each version of the erlang cookbook.
+
+v1.5.6 (2014-07-29)
+-------------------
+#16 - Allow for systems with that do not have lsb installed
+
+v1.5.4 (2014-04-30)
+-------------------
+- [COOK-4610] - New APT repository for ESL
+
+
+v1.5.2 (2014-03-18)
+-------------------
+- [COOK-4296] Add an attribute for passing CFLAGS prior to compilation
+
+
+v1.5.0 (2014-02-25)
+-------------------
+[COOK-4296] - Add custom build flags when building from source
+
+
+v1.4.2
+------
+COOK-4155, use a version in version conditional
+
+v1.4.0
+------
+Porting to use cookbook yum ~> 3.0
+Moving tests from minitest to bats
+Fixing style against rubocop
+
+
+v1.3.6
+------
+fixing metadata version error. locking to 3.0
+
+
+v1.3.4
+------
+Locking yum dependency to '< 3'
+
+
+v1.3.2
+------
+### New Feature
+- **[COOK-2915](https://tickets.opscode.com/browse/COOK-2915)** - Debian codename override
+
+v1.3.0
+------
+- Add support for Test Kitchen 1.0
+
+### Bug
+- [COOK-2595]: erlang cookbook now incorrectly depends on apt <= 1.7.0
+- [COOK-2894]: erlang::esl uses nil attribute
+
+### Improvement
+- [COOK-2509]: Add support for installing Erlang/OTP from Erlang Solutions' repositories
+
+v1.2.0
+------
+- [COOK-2287] - Add support for installing Erlang from source
+
+v1.1.2
+------
+- [COOK-1215] - Support Amazon Linux in erlang cookbook
+- [COOK-1884] - Erlang Readme does not reflect cookbook requirements
+
+v1.1.0
+------
+- [COOK-1782] - Add test kitchen support
+
+v1.0.0
+------
+- [COOK-905] - Fix installation on RHEL/CentOS 6+