Revise circleci orb version.

Author: taqtiqa-mark

.all-contributorsrc.txt

@@ -1,7 +1,7 @@
 ---
 version: 2.1
 orbs:
-  kitchen: sous-chefs/kitchen@2.0.2
+  kitchen: sous-chefs/kitchen@1.0.1
 
 workflows:
   kitchen:

.circleci/config.yml

@@ -140,7 +140,7 @@ Installs jlenv to the system location, by default `/usr/local/jlenv`
 jlenv_system_install 'foo' do
   git_url # URL of the plugin repo you want to checkout
   git_ref # Optional: Git reference to checkout
-  update_rbenv # Optional: Keeps the git repo up to date
+  update_jlenv # Optional: Keeps the git repo up to date
 end
 ```
 

README.md

@@ -1,5 +1,3 @@
-Please refer to
-https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD
 # Testing
 
 Please refer to the [community cookbook documentation](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD).

TESTING.md

@@ -3,8 +3,10 @@
 # Library:: Chef::Jlenv::ShellHelpers
 #
 # Author:: Fletcher Nichol <[email protected]>
+# Author:: Mark Van de Vyver <[email protected]>
 #
 # Copyright:: 2011-2017, Fletcher Nichol
+# Copyright:: 2019, Mark Van de Vyver
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,7 +42,7 @@ def root_path
         end
       end
 
-      def which_rbenv
+      def which_jlenv
         "(#{new_resource.user || 'system'})"
       end
 

libraries/helpers.rb

@@ -3,37 +3,16 @@ module Jlenv
     module PackageDeps
       def install_julia_dependencies
         case ::File.basename(new_resource.version)
-        when /^jjulia-/
-          package jjulia_package_deps
+        when /^special-julia-/
+          # call another package install method
         else
           package_deps.each do |deps|
             package deps
           end
         end
-
         ensure_java_environment if new_resource.version =~ /^jjulia-/
       end
 
-      def ensure_java_environment
-        resource_collection.find(
-          'julia_block[update-java-alternatives]'
-        ).run_action(:create)
-      rescue Chef::Exceptions::ResourceNotFound
-        # have pity on my soul
-        Chef::Log.info 'The java cookbook does not appear to in the run_list.'
-      end
-
-      def jjulia_package_deps
-        case node['platform_family']
-        when 'rhel', 'fedora', 'amazon'
-          %w(make gcc-c++)
-        when 'debian'
-          %w(make g++)
-        when 'freebsd'
-          %w(alsa-lib bash dejavu expat fixesproto fontconfig freetype2 gettext-runtime giflib indexinfo inputproto java-zoneinfo javavmwrapper kbproto libICE libSM libX11 libXau libXdmcp libXext libXfixes libXi libXrender libXt libXtst libfontenc libpthread-stubs libxcb libxml2 mkfontdir mkfontscale openjdk8 recordproto renderproto xextproto xproto)
-        end
-      end
-
       def package_deps
         case node['platform_family']
         when 'mac_os_x'

libraries/package_deps.rb

@@ -42,7 +42,7 @@
 # e.g. "jlenv global" should return the version we set
 
 action :create do
-  jlenv_script "globals #{which_rbenv}" do
+  jlenv_script "globals #{which_jlenv}" do
     code "jlenv global #{new_resource.jlenv_version}"
     user new_resource.user if new_resource.user
     action :run

resources/global.rb

@@ -58,7 +58,7 @@
   command << " #{new_resource.version}"
   command << ' --verbose' if new_resource.verbose
 
-  jlenv_script "#{command} #{which_rbenv}" do
+  jlenv_script "#{command} #{which_jlenv}" do
     code command
     user new_resource.user if new_resource.user
     environment new_resource.environment if new_resource.environment

resources/julia.rb

@@ -27,7 +27,7 @@
 property :user, String
 
 action :run do
-  jlenv_script "jlenv rehash #{which_rbenv}" do
+  jlenv_script "jlenv rehash #{which_jlenv}" do
     code %(jlenv rehash)
     user new_resource.user if new_resource.user
     action :run

resources/rehash.rb

@@ -27,7 +27,7 @@
 property :git_url,       String, default: 'https://github.com/rbenv/rbenv.git'
 property :git_ref,       String, default: 'master'
 property :global_prefix, String, default: '/usr/local/jlenv'
-property :update_rbenv,  [true, false], default: true
+property :update_jlenv,  [true, false], default: true
 
 action :install do
   node.run_state['root_path'] ||= {}
@@ -51,7 +51,7 @@
   git new_resource.global_prefix do
     repository new_resource.git_url
     reference new_resource.git_ref
-    action :checkout if new_resource.update_rbenv == false
+    action :checkout if new_resource.update_jlenv == false
     notifies :run, 'julia_block[Add jlenv to PATH]', :immediately
     notifies :run, 'bash[Initialize system jlenv]', :immediately
   end

resources/system_install.rb

@@ -30,7 +30,7 @@
 property :group,        String, default: lazy { user }
 property :home_dir,     String, default: lazy { ::File.expand_path("~#{user}") }
 property :user_prefix,  String, default: lazy { ::File.join(home_dir, '.jlenv') }
-property :update_rbenv, [true, false], default: true
+property :update_jlenv, [true, false], default: true
 
 action :install do
   package package_prerequisites
@@ -51,7 +51,7 @@
   git new_resource.user_prefix do
     repository new_resource.git_url
     reference new_resource.git_ref
-    action :checkout if new_resource.update_rbenv == false
+    action :checkout if new_resource.update_jlenv == false
     user new_resource.user
     group new_resource.group
     notifies :run, 'julia_block[Add jlenv to PATH]', :immediately