[TASK] Some cleanup

.gitignore

@@ -12,4 +12,4 @@ bin/*
 .bundle/*
 .kitchen/
 .kitchen.local.yml
-/.idea/*
\ No newline at end of file
+.idea
\ No newline at end of file

.kitchen.yml

----
-driver:
-  name: vagrant
-
-provisioner:
-  name: chef_solo
-
-platforms:
-  - name: debian-7
-    driver:
-      box: opendo_debian-7-amd64
-      box_url: http://ci.opendo.at:8080/job/Packer-Debian7Amd64/ws/packer_debian-7-amd64-typo3-nginx_virtualbox.box
-      network:
-        - ["private_network", {ip: "172.16.1.3"}]
-
-suites:
-  - name: default
-    run_list:
-      - recipe[apt::default]
-      - recipe[typo3_solr::default]
-    attributes:
-  - name: typo3_solr_2-1_java6
-    run_list:
-      - recipe[apt::default]
-      - recipe[typo3_solr::default]
-      - recipe[fake::typo3_solr_2-1]
-  - name: typo3_solr_2-1_java7
-    run_list:
-      - recipe[apt::default]
-      - recipe[typo3_solr::default]
-      - recipe[fake::typo3_solr_2-1]
-    attributes:
-      java:
-        jdk_version: "7"
-  - name: typo3_solr_3-0_java7
-    run_list:
-      - recipe[apt::default]
-      - recipe[typo3_solr::default]
-      - recipe[fake::typo3_solr_3-0]
-    attributes:
-      java:
-        jdk_version: "7"
\ No newline at end of file

Berksfile

-site :opscode
-metadata
-
-group :integration do
-  cookbook 'apt', '~> 1.10.0'
-  cookbook 'tomcat', '~> 0.11.0'
-  cookbook 'fake', path: 'test/fixtures/cookbooks/fake'
-end
\ No newline at end of file

ChangeLog

-2014-10-28 5aa726a Merge branch 'release/1.2.0' (Jenkins)
-2014-10-28 5a3cde9 [TASK] Generates ChangeLog (Jenkins)
-2014-10-28 be1eadf [TASK] Raises versionnumber (Jenkins)
-2014-10-28 0073ee0 [TASK] Solr Cookbook (pbergsmann)
-2014-10-28 14c1168 Merge branch 'release/1.1.5' (Jenkins)
-2014-10-28 d2c147d Merge branch 'release/1.1.5' into develop (Jenkins)
-2014-10-28 1172979 [TASK] Generates ChangeLog (Jenkins)
-2014-10-28 b0df63b [TASK] Raises versionnumber (Jenkins)
-2014-10-28 0ea0adc [BUGFIX] Solr Cookbook (pbergsmann)
-2014-08-07 fb66fe1 [BUGFIX] Fixes integration-test (pbergsmann)
-2014-08-07 cf9b5b3 [BUGFIX] Conditionally loads stopwords (pbergsmann)
-2014-08-07 7043697 [BUGFIX] Excludes stopwords.txt (pbergsmann)
-2014-08-07 3e44c95 [BUGFIX] Changes resource-path for master (pbergsmann)
-2014-08-07 c4b396e [BUGFIX] Fixes release-branch-check (pbergsmann)
-2014-07-30 1b702c0 Revert "[BUGFIX] Cookbook is broken" (Josef Florian Glatz)
-2014-07-24 c6690ff [BUGFIX] Cookbook is broken (Josef Florian Glatz)
-2014-07-24 5b687bd [TASK] Extends .gitignore (Josef Florian Glatz)
-2014-07-21 8e52a12 [TASK] Raises versionnumber (pbergsmann)
-2014-07-21 2852948 [BUGFIX] Marks codeblock (pbergsmann)
-2014-07-21 953fde2 [TASK] Enhances documentation (pbergsmann)
-2014-07-21 83c551b [FEATURE] Enhances documentation for EXT:solr >= 3.0 (pbergsmann)
-2014-07-21 e07c275 [FEATURE] Adds integration tests (pbergsmann)
-2014-07-21 ecaa001 [FEATURE] Adds compatibility for Solr v4 (pbergsmann)
-2013-11-12 6ce975c Initial commit (pbergsmann)
-2013-01-30 b79bceb [FEATURE] Adds resources/providers removes attributes and default recipe (pbergsmann)
-2013-01-24 16a5d79 removes install bash script (pbergsmann)
-2013-01-24 30c084a First commit (pbergsmann)
\ No newline at end of file

metadata.rb

-name             "typo3_solr"
-maintainer       "Philipp Bergsmann, opendo GmbH"
-maintainer_email "p.bergsmann@opendo.at"
-license          "All rights reserved"
-description      "Installs/Configures TYPO3 EXT:solr"
+name 'typo3_solr'
+maintainer 'sgalinski Internet Services, Philipp Bergsmann, opendo GmbH'
+maintainer_email 'stefan@sgalinski.de'
+license 'All rights reserved'
+description 'Installs/Configures TYPO3 EXT:solr'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version "1.2.0"
+version '1.2.0'
+recipe 'typo3_solr::default', 'Installs/Configures TYPO3 EXT:solr'
+issues_url 'https://gitlab.sgalinski.de/chef-cookbooks/typo3_solr/issues'
+source_url 'https://gitlab.sgalinski.de/chef-cookbooks/typo3_solr'
 
-%w{ tomcat }.each do |cb|
-  depends cb
-end
+depends 'apt'
+depends 'tomcat', '~> 2.3.1'
\ No newline at end of file

recipes/default.rb

@@ -2,20 +2,31 @@
 # Cookbook Name:: typo3_solr
 # Recipe:: default
 #
-# Copyright 2012, Philipp Bergsmann, opendo GmbH
+# Copyright sgalinski Internet Services
 #
-# All rights reserved - Do Not Redistribute
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 
-include_recipe "tomcat"
+include_recipe 'tomcat'
 
 directory node[:typo3_solr][:solr][:solr_home] do
-  owner node[:tomcat][:user]
-  group "root"
-  mode 0770
-  action :create
-end
-
-#execute "chmod" do
-#  command "chmod -R 777 #{node[:typo3_solr][:solr][:solr_home]}"
-#end
\ No newline at end of file
+	owner node[:tomcat][:user]
+	group 'root'
+	mode 0770
+	action :create
+end
\ No newline at end of file

test/fixtures/cookbooks/fake/metadata.rb

-name 'fake'
-version '1.0.0'
-
-depends 'typo3_solr'
\ No newline at end of file

test/fixtures/cookbooks/fake/recipes/typo3_solr_2-1.rb

-typo3_solr_app "c015" do
-  solr '3.5.0'
-  extension '2.1'
-  plugin '1.2.0'
-  languages %w{ german english }
-end
-
-typo3_solr_core "live-MetallbringtsAt-1-0-de_AT" do
-  language 'german'
-  app 'c015'
-  action :add
-  notifies :restart, resources(:service => "tomcat")
-end
\ No newline at end of file

test/fixtures/cookbooks/fake/recipes/typo3_solr_3-0.rb

-typo3_solr_app "c015" do
-  solr '4.7.2'
-  solr '4.8.1'
-  extension '3.0'
-  plugin_access '2.0'
-  plugin_utils '1.1'
-  plugin_lang '3.1'
-  languages %w{ german english }
-end
-
-typo3_solr_core "live-MetallbringtsAt-1-0-de_AT" do
-  language 'german'
-  app 'c015'
-  action :add
-  notifies :restart, resources(:service => "tomcat")
-end

test/integration/default/serverspec/solr_home_spec.rb

-require 'serverspec'
-
-include Serverspec::Helper::Exec
-include Serverspec::Helper::DetectOS
-
-RSpec.configure do |c|
-  c.before :all do
-    c.path = '/sbin:/usr/sbin'
-  end
-end
-
-describe "Solr home-directory" do
-
-  it "creates the directory /srv/solr" do
-    expect(file('/srv/solr')).to be_directory
-  end
-
-end
\ No newline at end of file

test/integration/typo3_solr_2-1/serverspec/solr_spec.rb

-require 'serverspec'
-
-include Serverspec::Helper::Exec
-include Serverspec::Helper::DetectOS
-
-RSpec.configure do |c|
-  c.before :all do
-    c.path = '/sbin:/usr/sbin'
-  end
-end
-
-describe "Solr available" do
-
-  it "should list all available cores" do
-    command('wget -qO- http://127.0.0.1:8080/c015').stdout.should match(/live\-MetallbringtsAt\-1\-0\-de\_AT/)
-  end
-
-  it "should have the typo3 plugin loaded" do
-    command('wget -qO- http://127.0.0.1:8080/c015/live-MetallbringtsAt-1-0-de_AT/admin/registry.jsp').stdout.should match(/org\.typo3\.solr\.search\.AccessFilterQParserPlugin/)
-  end
-
-end
\ No newline at end of file

test/integration/typo3_solr_2-1/serverspec/tomcat_spec.rb

-require 'serverspec'
-
-include Serverspec::Helper::Exec
-include Serverspec::Helper::DetectOS
-
-RSpec.configure do |c|
-  c.before :all do
-    c.path = '/sbin:/usr/sbin'
-  end
-end
-
-describe "Tomcat available" do
-
-  it "should be listening on port 8080" do
-    expect(port(8080)).to be_listening.with('tcp6')
-  end
-
-end
\ No newline at end of file

test/integration/typo3_solr_3-0/serverspec/solr_spec.rb

-require 'serverspec'
-
-include Serverspec::Helper::Exec
-include Serverspec::Helper::DetectOS
-
-RSpec.configure do |c|
-  c.before :all do
-    c.path = '/sbin:/usr/sbin'
-  end
-end
-
-describe "Solr available" do
-
-  it "should list all available cores" do
-    command('wget -qO- http://localhost:8080/c015/admin/cores?action=STATUS').stdout.should match(/live\-MetallbringtsAt\-1\-0\-de\_AT/)
-  end
-
-end
-
-describe "TYPO3-specific libraries are downloaded" do
-
-  it "downloads typo3 acces-plugin" do
-    expect(file('/srv/solr/c015/typo3lib/solr-typo3-access-2.0.jar')).to be_file
-  end
-
-  it "downloads typo3 utils-plugin" do
-    expect(file('/srv/solr/c015/typo3lib/solr-typo3-utils-1.1.jar')).to be_file
-  end
-
-  it "downloads lang-plugin" do
-    expect(file('/srv/solr/c015/typo3lib/commons-lang3-3.1.jar')).to be_file
-  end
-
-end
\ No newline at end of file

test/integration/typo3_solr_3-0/serverspec/tomcat_spec.rb

-require 'serverspec'
-
-include Serverspec::Helper::Exec
-include Serverspec::Helper::DetectOS
-
-RSpec.configure do |c|
-  c.before :all do
-    c.path = '/sbin:/usr/sbin'
-  end
-end
-
-describe "Tomcat available" do
-
-  it "should be listening on port 8080" do
-    expect(port(8080)).to be_listening.with('tcp6')
-  end
-
-end
\ No newline at end of file