Skip to content

Commit

Permalink
remaining cleanup, cookbook rename
Browse files Browse the repository at this point in the history
  • Loading branch information
thmttch committed Apr 21, 2014
1 parent ed17ef1 commit 3d31352
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platforms:
suites:
- name: default
run_list:
- recipe[chef-continuum-anaconda::default]
- recipe[anaconda::default]
attributes:
anaconda:
flavor: 'x86_64'
Expand Down
2 changes: 1 addition & 1 deletion .ruby-gemset
Original file line number Diff line number Diff line change
@@ -1 +1 @@
chef-continuum-anaconda-tests
chef-anaconda
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# chef-continuum-anaconda cookbook
# anaconda cookbook

Chef cookbook for installing [Continuum Analytic](http://continuum.io/)'s
[Anaconda](https://store.continuum.io/cshop/anaconda/): "completely free Python
Expand Down Expand Up @@ -40,12 +40,12 @@ conda 3.4.1
To use it in a cookbook:

```ruby
include_recipe 'chef-continuum-anaconda::default'j
include_recipe 'anaconda::default'
```

## Usage, recipes, and attributes

This cookbook only has one recipe: `chef-continuum-anaconda::default`. Include
This cookbook only has one recipe: `anaconda::default`. Include
it in your runlist, and it will install the package as well as any necessary
dependencies.

Expand All @@ -59,8 +59,6 @@ The following are user-configurable attributes. Check
individual installs go into `#{install_root}/#{version}`
- `accept_license`: must be explicitly set to the string `yes`; any other
value will reject the license.
- `add_to_shell_path`: edit the owner's shell profile to include anaconda in
`PATH`. This is not recommended as then cannot be managed by this cookbook.
- `owner`: the user who owns the install
- `group`: the group who owns the install

Expand Down
6 changes: 2 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# vi: set ft=ruby :

Vagrant.configure('2') do |config|
config.vm.hostname = 'chef-continuum-anaconda-berkshelf'
config.vm.hostname = 'anaconda-berkshelf'
config.vm.box = 'precise32'
config.vm.box_url = 'http://files.vagrantup.com/precise32.box'
config.vm.network :private_network, ip: '33.33.33.123'
Expand Down Expand Up @@ -39,13 +39,11 @@ Vagrant.configure('2') do |config|
#:version => '1.9.2',
#:flavor => 'x86',
:accept_license => 'yes',
# explicitly set for quickstart convenience only
#:add_to_shell_path => true,
}
}

chef.run_list = [
'recipe[chef-continuum-anaconda::default]',
'recipe[anaconda::default]',
]
end
end
2 changes: 0 additions & 2 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
# specific versions are installed _under_ this directory
default.anaconda.install_root = '/opt/anaconda'
default.anaconda.accept_license = 'no'
# setting this to true is not recommended; if the installation dir changes the path won't change
#default.anaconda.add_to_shell_path = false

default.anaconda.owner = 'vagrant'
default.anaconda.group = 'vagrant'
4 changes: 2 additions & 2 deletions metadata.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name 'chef-continuum-anaconda'
name 'anaconda'
maintainer 'Matt Chu'
maintainer_email '[email protected]'
license 'MIT'
description 'Installs/Configures chef-continuum-anaconda'
description 'Installs/Configures anaconda'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '0.1.0'

Expand Down
3 changes: 1 addition & 2 deletions recipes/default.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Cookbook Name:: chef-continuum-anaconda
# Cookbook Name:: anaconda
# Recipe:: default
#
# Copyright (C) 2014 Matt Chu
Expand Down Expand Up @@ -34,7 +34,6 @@
:flavor => flavor,
:anaconda_install_dir => anaconda_install_dir,
:accept_license => node.anaconda.accept_license,
#:add_to_shell_path => node.anaconda.add_to_shell_path ? 'yes' : 'no',
:add_to_shell_path => 'no',
})
end
Expand Down
2 changes: 1 addition & 1 deletion spec/default_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
end
end

describe 'chef-continuum-anaconda::default' do
describe 'anaconda::default' do
platforms = {
# for whatever reason there's no fauxhai data for 12.10
'ubuntu' => [ '12.04', '13.04', '13.10' ],
Expand Down
9 changes: 5 additions & 4 deletions templates/default/installer_config.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
The questions are:
# In order to continue the installation process, please review the license
# agreement. Please, press ENTER to continue
'',
<<
<< read license here
# Do you approve the license terms? [yes|no]
'yes',
<<
# Anaconda will now be installed into this location:
# /home/blah/anaconda
# - Press ENTER to confirm the location
# - Press CTRL-C to abort the installation
# - Or specify an different location below
anaconda_install_dir,
<<
# Do you wish the installer to prepend the Anaconda install location to PATH in your /home/vagrant/.bashrc ? [yes|no]
add_to_shell_path ? 'yes' : 'no'
<<
%>
<%- case "#{@version}-#{@flavor}" %>
<%- when 'nothing here because no exceptions between different installers' %>
Expand Down

0 comments on commit 3d31352

Please sign in to comment.