new resource: 'conda_package', with tests

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.3.0
+
+## 0.2.1
+
+Fix incorrect checksums for Anaconda 2.0.1
+
 ## 0.2.0
 
 Feature improvments:

README.md

@@ -55,9 +55,8 @@ include_recipe 'anaconda::default'
 
 ## Usage, recipes, and attributes
 
-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.
+The main recipe is `anaconda::default`. Include it in your runlist, and it will
+install the package as well as any necessary dependencies.
 
 The following are user-configurable attributes. Check
 [attributes/default.rb](attributes/default.rb) for default values.
@@ -72,6 +71,10 @@ The following are user-configurable attributes. Check
   - `owner`: the user who owns the install
   - `group`: the group who owns the install
 
+### `recipe[anaconda::shell-conveniences]`
+
+Include this to have a 
+
 ## Tests
 
 Run the full test suite:

Vagrantfile

@@ -43,7 +43,9 @@ Vagrant.configure('2') do |config|
     }
 
     chef.run_list = [
-      'recipe[anaconda::default]',
+      #'recipe[anaconda::default]',
+      #'recipe[anaconda::shell-conveniences]',
+      'recipe[anaconda::package_tests]',
     ]
   end
 end

attributes/default.rb

@@ -18,6 +18,8 @@
 # specific versions are installed _under_ this directory
 default.anaconda.install_root = '/opt/anaconda'
 default.anaconda.accept_license = 'no'
+default.anaconda.install_logfile = ''
 
 default.anaconda.owner = 'vagrant'
 default.anaconda.group = 'vagrant'
+default.anaconda.home = "/home/#{node.anaconda.owner}"

libraries/matchers.rb

@@ -1,5 +1,15 @@
 if defined?(ChefSpec)
+
   def run_bash(resource_name)
     ChefSpec::Matchers::ResourceMatcher.new('bash', :run, resource_name)
   end
+
+  def install_conda_package(resource_name)
+    ChefSpec::Matchers::ResourceMatcher.new('anaconda_package', :install, resource_name)
+  end
+
+  def remove_conda_package(resource_name)
+    ChefSpec::Matchers::ResourceMatcher.new('anaconda_package', :remove, resource_name)
+  end
+
 end

providers/package.rb

@@ -0,0 +1,84 @@
+def whyrun_supported?
+  true
+end
+
+def cmd_conda
+  "#{node.anaconda.install_root}/#{node.anaconda.version}/bin/conda"
+end
+
+def is_installed?(package_name)
+  `"#{cmd_conda}" list`.include?(package_name)
+end
+
+def log_opts(node)
+  if node.anaconda.install_log
+    "2>&1 >#{node.anaconda.install_log}"
+  else
+    ''
+  end
+end
+
+action :install do
+  r = new_resource
+  name = r.name
+  package_name = r.package_name || name
+
+  Chef::Log.info "installing conda package: #{package_name}"
+
+  cmd_opts = [
+    # --yes: automated install (don't ask)
+    "--yes",
+
+    r.env_name ? "--name #{r.env_name}" : '',
+    r.env_path_prefix ? "--name #{r.env_path_prefix}" : '',
+
+    r.channel ? "--channel #{r.channel}" : '',
+    r.override_channels ? '--override-channels' : '',
+
+    r.no_pin ? '--no-pin' : '',
+
+    r.force_install ? '--force' : '',
+
+    r.revision ? "--revision #{r.revision}" : '',
+    r.file ? "--file #{r.file}" : '',
+    r.unknown ? '--unknown' : '',
+    r.no_deps ? '--no_deps' : '',
+    r.mkdir ? '--mkdir' : '',
+    r.use_index_cache ? '--use-index-cache' : '',
+    r.use_local ? '--use-local' : '',
+    r.alt_hint ? '--alt-hint' : '',
+  ].join(" ")
+
+  execute "conda_package_install_#{package_name}" do
+    command "#{cmd_conda} install #{package_name} #{cmd_opts} #{log_opts(node)}"
+    only_if { !is_installed?(package_name) || r.force_install }
+  end
+end
+
+action :remove do
+  r = new_resource
+  name = r.name
+  package_name = r.package_name || name
+
+  Chef::Log.info "removing conda package: #{package_name}"
+
+  cmd_opts = [
+    # --yes: automated install (don't ask)
+    "--yes",
+
+    r.env_name ? "--name #{r.env_name}" : '',
+    r.env_path_prefix ? "--name #{r.env_path_prefix}" : '',
+
+    r.channel ? "--channel #{r.channel}" : '',
+    r.override_channels ? '--override-channels' : '',
+
+    r.no_pin ? '--no-pin' : '',
+
+    r.all ? '--all' : '',
+    r.features ? '--features' : '',
+  ].join(' ')
+
+  execute "conda_package_remove_#{package_name}" do
+    command "#{cmd_conda} remove #{package_name} #{cmd_opts} #{log_opts(node)}"
+  end
+end

recipes/package_tests.rb

@@ -0,0 +1,20 @@
+#
+# Cookbook Name:: anaconda
+# Recipe:: package_tests
+#
+# Copyright (C) 2014 Matt Chu
+#
+# All rights reserved - Do Not Redistribute
+#
+
+log 'do NOT include this in your runlist! for testing only.' do
+  level :error
+end
+
+anaconda_package 'astroid' do
+  action :install
+end
+
+anaconda_package 'astroid' do
+  action :remove
+end

recipes/shell-conveniences.rb

@@ -0,0 +1,17 @@
+#
+# Cookbook Name:: anaconda
+# Recipe:: shell-conveniences
+#
+# Copyright (C) 2014 Matt Chu
+#
+# All rights reserved - Do Not Redistribute
+#
+
+template "#{node.anaconda.home}/source-me.sh" do
+  source 'source-me.sh.erb'
+  variables({
+    :install_root => node.anaconda.install_root,
+    :version => node.anaconda.version,
+  })
+end
+

resources/package.rb

@@ -0,0 +1,34 @@
+actions :install, :remove
+default_action :install
+
+attribute :name, :kind_of => String, :name_attribute => true
+
+# attributes for both install and remove
+
+attribute :package_name, :kind_of => String
+
+attribute :env_name, :kind_of => String
+attribute :env_path_prefix, :kind_of => String
+
+attribute :channel, :kind_of => String
+attribute :override_channels, :kind_of => [ TrueClass, FalseClass ]
+
+attribute :no_pin, :kind_of => [ TrueClass, FalseClass ]
+
+# attributes for install only
+
+attribute :force_install, :kind_of => [ TrueClass, FalseClass ]
+
+attribute :revision, :kind_of => String
+attribute :file, :kind_of => String
+attribute :unknown, :kind_of => [ TrueClass, FalseClass ]
+attribute :no_deps, :kind_of => [ TrueClass, FalseClass ]
+attribute :mkdir, :kind_of => [ TrueClass, FalseClass ]
+attribute :use_index_cache, :kind_of => [ TrueClass, FalseClass ]
+attribute :use_local, :kind_of => [ TrueClass, FalseClass ]
+attribute :alt_hint, :kind_of => [ TrueClass, FalseClass ]
+
+# attributes for remove only
+
+attribute :all, :kind_of => [ TrueClass, FalseClass ]
+attribute :features, :kind_of => [ TrueClass, FalseClass ]

spec/default_spec.rb

@@ -26,6 +26,19 @@
       expect(chef_run).to render_file(installer_config_path).with_content(/.*\n.*\n.*\n.*/)
     end
 
+    it 'exposes the conda_package resource' do
+      chef_run.converge('recipe[anaconda::package_tests]')
+
+      expect(chef_run).to install_conda_package('astroid')
+      expect(chef_run).to remove_conda_package('astroid')
+    end
+
+    it 'provides a convenience shell script' do
+      chef_run.converge('recipe[anaconda::shell-conveniences]')
+
+      expect(chef_run).to create_template("#{chef_run.node.anaconda.home}/source-me.sh")
+    end
+
   end
 end
 

spec/spec_helper.rb

@@ -1,3 +1,8 @@
+# https://github.com/sethvargo/chefspec#reporting
+require 'chefspec'
+ChefSpec::Coverage.start! do
+end
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only

templates/default/source-me.sh.erb

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+export PATH=<%= @install_root %>/<%= @version %>/bin:${PATH}

test/integration/default/serverspec/default_spec.rb

@@ -11,8 +11,8 @@
 
 describe 'general tests' do
 
-  it 'installs conda' do
-    command('/opt/anaconda/1.9.2/bin/conda --version').should return_stdout 'conda 3.4.1'
+  it 'installs conda 2.0.1' do
+    command('/opt/anaconda/2.0.1/bin/conda --version').should return_stdout 'conda 3.5.5'
   end
 
 end