4 changes: 3 additions & 1 deletion CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2.3.1 - Ben Ford
* Fix for #87
2.3.0 - Zack Smith
* Fold in #78, #75 and #73
2.2.7 - Zack Smith
Expand All @@ -14,7 +16,7 @@
* Remove PID file creation from webhook
2.1.2 - Garrett Honeycutt & Zack Smith
* Fix quoting issue created by #24 with booleans with #54
* Intial commit of fucntional tested github authenticated webhook
* Intial commit of functionally tested github authenticated webhook
2.1.1 - Zack Smith
* Add SSL and auth support to webhook
2.1.0 - Zack Smith
Expand Down
15 changes: 15 additions & 0 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Copyright (C) 2012 Puppet Labs Inc

Puppet Labs can be contacted at: info@puppetlabs.com

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
2 changes: 1 addition & 1 deletion Modulefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name 'zack-r10k'
version '2.3.0'
version '2.3.1'
source 'https://github.com/acidprime/r10k'
author 'zack'
license 'Apache License, Version 2.0'
Expand Down
6 changes: 5 additions & 1 deletion files/webhook
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,11 @@ class Server < Sinatra::Base
IO.popen($config['prefix_command'], mode='r+') do |io|
io.write payload.to_s
io.close_write
result = io.readlines.first.chomp
begin
result = io.readlines.first.chomp
rescue
result = ''
end
end
end #end run_prefix_command

Expand Down
2 changes: 1 addition & 1 deletion manifests/mcollective.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
File {
ensure => present,
owner => 'root',
group => 'root',
group => '0',
mode => '0644',
}
# Install the agent and its ddl file
Expand Down
2 changes: 1 addition & 1 deletion manifests/mcollective/application.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
File {
ensure => present,
owner => 'root',
group => 'root',
group => '0',
mode => '0644',
}
# Install the agent and its ddl file
Expand Down
4 changes: 2 additions & 2 deletions manifests/params.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
class r10k::params
{
$package_name = ''
$version = '1.3.2'
$version = '1.3.4'
$manage_modulepath = false
$manage_ruby_dependency = 'declare'
$install_options = ''
$install_options = undef
$sources = undef

# r10k configuration
Expand Down
6 changes: 3 additions & 3 deletions spec/classes/install/gem_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
:manage_ruby_dependency => 'include',
:version => '1.1.0',
}}
it { should contain_class("ruby").with('rubygems_update' => true)}
it { should contain_class("ruby").with('rubygems_update' => false)}
it { should contain_class("ruby::dev") }
end
context 'when manage_ruby_dependency is set to "ignore"' do
Expand Down Expand Up @@ -65,7 +65,7 @@
:manage_ruby_dependency => 'include',
:version => '1.1.0',
}}
it { should contain_class("ruby").with('rubygems_update' => true)}
it { should contain_class("ruby").with('rubygems_update' => false)}
it { should contain_class("ruby::dev") }
end
context 'when manage_ruby_dependency is set to "ignore"' do
Expand Down Expand Up @@ -104,7 +104,7 @@
:manage_ruby_dependency => 'include',
:version => '0.0.9',
}}
it { should contain_class("ruby").with('rubygems_update' => true)}
it { should contain_class("ruby").with('rubygems_update' => false)}
it { should contain_class("ruby::dev") }
end
context 'when manage_ruby_dependency is set to "ignore"' do
Expand Down
8 changes: 4 additions & 4 deletions spec/classes/mcollective/application_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/application/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644',
'source' => 'puppet:///modules/r10k/application/r10k.rb'
)
}
it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/agent/r10k.ddl").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644',
'source' => 'puppet:///modules/r10k/agent/r10k.ddl'
)
Expand All @@ -40,15 +40,15 @@
it { should contain_file("/usr/libexec/mcollective/mcollective/application/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644',
'source' => 'puppet:///modules/r10k/application/r10k.rb'
)
}
it { should contain_file("/usr/libexec/mcollective/mcollective/agent/r10k.ddl").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644',
'source' => 'puppet:///modules/r10k/agent/r10k.ddl'
)
Expand Down
18 changes: 9 additions & 9 deletions spec/classes/mcollective_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/application/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}
it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/agent/r10k.ddl").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}

it { should contain_file("/opt/puppet/libexec/mcollective/mcollective/agent/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}
Expand All @@ -47,22 +47,22 @@
it { should contain_file("/usr/libexec/mcollective/mcollective/application/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}
it { should contain_file("/usr/libexec/mcollective/mcollective/agent/r10k.ddl").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}

it { should contain_file("/usr/libexec/mcollective/mcollective/agent/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}
Expand All @@ -82,23 +82,23 @@
it { should contain_file("/usr/share/mcollective/plugins/mcollective/application/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}

it { should contain_file("/usr/share/mcollective/plugins/mcollective/agent/r10k.ddl").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}

it { should contain_file("/usr/share/mcollective/plugins/mcollective/agent/r10k.rb").with(
'ensure' => 'present',
'owner' => 'root',
'group' => 'root',
'group' => '0',
'mode' => '0644'
)
}
Expand Down