Skip to content

allow to not install gem. it can be already installed via rvm #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
morr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

allow to not install gem. it can be already installed via rvm #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7a524a
allow to not install gem. it can be already installed via rvm
morr Nov 17, 2015
dca00cf
Fix Symbols as name attribute broken with chef-client 12.5
tucksaun Dec 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
default['backup']['group'] = 'root'

default['backup']['dependencies'] = []
default['backup']['install_gem?'] = true
default['backup']['version'] = '4.0.2'
default['backup']['version_from_git?'] = false
default['backup']['git_repo'] = nil
Expand Down
24 changes: 13 additions & 11 deletions recipes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,19 @@
# limitations under the License.
#

if node['backup']['version_from_git?']
include_recipe 'gem_specific_install'
gem_specific_install "backup" do
repository node['backup']['git_repo']
revision "master"
action :install
end
else
gem_package 'backup' do
version node['backup']['version'] if node['backup']['version']
action :upgrade if node['backup']['upgrade?']
if node['backup']['install_gem?']
if node['backup']['version_from_git?']
include_recipe 'gem_specific_install'
gem_specific_install "backup" do
repository node['backup']['git_repo']
revision "master"
action :install
end
else
gem_package 'backup' do
version node['backup']['version'] if node['backup']['version']
action :upgrade if node['backup']['upgrade?']
end
end
end

Expand Down
2 changes: 1 addition & 1 deletion resources/model.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
actions :create, :delete
default_action :create

attribute :name, :kind_of => Symbol, :name_attribute => true, :required => true
attribute :name, :kind_of => String, :name_attribute => true, :required => true
attribute :description, :kind_of => String

attribute :definition, :kind_of => String
Expand Down