Skip to content

Commit 8903063

Browse files
committed
Add further mass Julia refactor.
1 parent c318df3 commit 8903063

File tree

15 files changed

+34
-85
lines changed

15 files changed

+34
-85
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ _Store
2525
.julia-version
2626
.julia-gemset
2727
.rvmrc
28-
Gemfile.lock
28+
Pkgfile.lock
2929
.bundle
3030
*.gem
3131

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ A `jlenv_system_install` or `jlenv_user_install` is required to be set so that j
3636

3737
System wide installations of jlenv are supported by this cookbook, but discouraged by the jlenv maintainer, see [these][https://github.com/rbenv/rbenv/issues/38] [two][https://github.com/rbenv/rbenv/issues/306] issues in the rbenv repository.
3838

39-
## Gem
39+
## Pkg
4040

4141
Used to install a package into the selected jlenv environment.
4242

4343
```julia
4444
jlenv_package 'pkg_name' do
4545
options # Optional: Options to pass to the packagecommand e.g. '--no-rdoc --no-ri'
4646
source # Optional: source URL/location for gem.
47-
timeout # Optional: Gem install timeout
48-
version # Optional: Gem version to install
47+
timeout # Optional: Pkg install timeout
48+
version # Optional: Pkg version to install
4949
response_file # Optional: response file to reconfigure a gem
5050
jlenv_version # Required: Which jlenv version to install the packageto.
5151
user # Which user to install packageto. REQUIRED if you're using jlenv_user_install
@@ -57,7 +57,7 @@ end
5757
Sets the global julia version. The name of the resource is the version to set.
5858

5959
```julia
60-
jlenv_global '2.5.1' do
60+
jlenv_global '1.1.0' do
6161
user # Optional: if passed sets the users global version. Leave unset, to set the system global version
6262
end
6363
```
@@ -82,24 +82,24 @@ If user is passed in, the plugin is installed to the users install of jlenv.
8282

8383
```julia
8484
jlenv_rehash 'rehash' do
85-
user 'vagrant' # Optional: if passed rehashes the user Ruby otherwise rehashes the system jlenv
85+
user 'vagrant' # Optional: if passed rehashes the user Julia otherwise rehashes the system jlenv
8686
end
8787
```
8888

89-
If user is passed in, the user Ruby is rehashed rather than the system Ruby.
89+
If user is passed in, the user Julia is rehashed rather than the system Julia.
9090

91-
## Ruby
91+
## Julia
9292

93-
Installs a given Ruby version to the system or user location.
93+
Installs a given Julia version to the system or user location.
9494

9595
```julia
96-
jlenv_julia '2.5.1' do
96+
jlenv_julia '1.1.0' do
9797
user # Optional, but recommended: If passed, the user to install jlenv to
9898
jlenv_action # Optional: the action to perform, 'install' (default), 'uninstall' etc
9999
end
100100
```
101101

102-
Shorter example `jlenv_julia '2.5.1'`
102+
Shorter example `jlenv_julia '1.1.0'`
103103

104104
## Script
105105

resources/julia.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
install_start = Time.now
3939

40-
Chef::Log.info("Building Ruby #{new_resource.version}, this could take a while...")
40+
Chef::Log.info("Building Julia #{new_resource.version}, this could take a while...")
4141

4242
jlenv_plugin 'julia-build' do
4343
git_url new_resource.julia_build_git_url
File renamed without changes.

test/integration/custom_group_install/controls/default.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
22

3-
global_julia = '2.4.1'
3+
global_julia = '1.0.1'
44

55
control 'Jlenv should be installed' do
66
title 'Jlenv should be installed to the users home directory'
@@ -33,10 +33,10 @@
3333
end
3434
end
3535

36-
control 'Global Ruby' do
36+
control 'Global Julia' do
3737
title 'Jlenv should be installed globally'
3838

39-
desc "Can set global Ruby version to #{global_julia}"
39+
desc "Can set global Julia version to #{global_julia}"
4040
describe bash('sudo -H -u vagrant bash -c "source /etc/profile.d/jlenv.sh && jlenv versions --bare"') do
4141
its('exit_status') { should eq 0 }
4242
its('stdout') { should include(global_julia) }

test/integration/custom_group_install/inspec.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: jlenv
22
title: jlenv profile
3-
maintainer: Sous Chefs
4-
copyright: Webb Agile Solutions Ltd.
3+
maintainer: Taqtiqa LLC
4+
copyright: Taqtiqa LLC
55
license: Apache-2.0
66
summary: Verifies jlenv is installed correctly for a user & group
77
version: 1.0.0

test/integration/gem/controls/gem_install.rb

Lines changed: 0 additions & 42 deletions
This file was deleted.

test/integration/gem/inspec.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

test/integration/global/controls/global_install.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# frozen_string_literal: true
2-
global_julia = '2.4.1'
2+
global_julia = '1.0.1'
33

44
control 'Jlenv should be installed' do
55
title 'Jlenv should be installed globally'
66

7-
desc "Can set global Ruby version to #{global_julia}"
7+
desc "Can set global Julia version to #{global_julia}"
88
describe bash('source /etc/profile.d/jlenv.sh && jlenv versions --bare') do
99
its('exit_status') { should eq 0 }
1010
its('stdout') { should include(global_julia) }

test/integration/global/inspec.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: jlenv
22
title: jlenv profile
3-
maintainer: Sous Chefs
4-
copyright: Webb Agile Solutions Ltd.
3+
maintainer: Taqtiqa LLC
4+
copyright: Taqtiqa LLC
55
license: Apache-2.0
6-
summary: Verifies jlenv correctly sets the global Ruby version
6+
summary: Verifies jlenv correctly sets the global Julia version
77
version: 1.0.0
88
supports:
99
- os-family: linux

0 commit comments

Comments
 (0)