itamae-plugin-recipe-rbenv 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 300a2187a4816d13d54082bc055e0b72512d3cfe
-  data.tar.gz: 74f410e7adcf32d54c7d124400662027a32f24ab
+  metadata.gz: 05a841124194fd50571a8c312b0de8571fe2bd78
+  data.tar.gz: f123e55f8fc79f622e9a960068d2357aa46b3a8e
 SHA512:
-  metadata.gz: f86d9ef730911056c433a389a16c16b5a863605a0d89d04b79d11182ffd25f53fa0e265e3ca97e843db7e8f49bd42a59d56d7fca072678ad470ec1fbe1bfff42
-  data.tar.gz: 94dfde9658c27a3823916455a52bd4dce05b60ab420bd502e582e8aa599f5227e2421afb3f631da8bbe4be487696396d51a65bd54a71a04e3d348fd9a7946a1b
+  metadata.gz: caad1d67c8c86edb9846eea263331cf992686925fb853afaf9ced0a1e500335e0c0def26c0b40dace6b4fa99fdb0b8ff702f34b395c2b25f12a501f9d1a03dea
+  data.tar.gz: e64d76ddf34dec4559b02396ee3041a2c945420b1534113735157bd598505e79b475f80fe0936a449144ed00bcafdb68e53f146be28fa8cf80247863ac56bb97

data/CHANGELOG.md

@@ -0,0 +1,83 @@
+## v0.4.0
+### Added
+
+- Support user-local rbenv installation by `rbenv::user`
+- `rbenv_plugin` resource
+
+### Changed
+
+- Unused rbenv plugins are not `git clone`ed by default except ruby-build
+  - You should explicitly set `install: true` if you want
+
+## v0.3.4
+### Added
+
+- Add osx support for dependency installation.
+  *Thanks to @dex1t*
+
+## v0.3.3
+### Added
+
+- Add support for non-git scheme.
+  *Thanks to @katsyoshi*
+
+## v0.3.2
+### Added
+
+- Add support for rbenv-gem-rehash.
+  *Thanks to @dex1t*
+
+## v0.3.1
+### Added
+
+- Add git package installation.
+  *Thanks to @takai*
+
+## v0.3.0
+### Changed
+
+- Change platform finder from `os[:family]` to `node[:platform]`.
+  *Thanks to @muratayusuke*
+- Require itamae ~> v1.2
+
+## v0.2.2
+### Added
+
+- Widen supported platforms for dependency installation.
+  *Thanks to @sue445*
+
+## v0.2.1
+### Added
+
+- Allow installing gems by default using rbenv-default-gems.
+  *Thanks to @sue445*
+
+## v0.2.0
+### Added
+
+- Allow specifying `RBENV_ROOT` by `node[:rbenv][:rbenv_root]`.
+  *Thanks to @sue445*
+
+## v0.1.2
+### Fixed
+
+- Add libffi-devel package depended by Ruby 2.2.
+  *Thanks to @kwappa*
+
+## v0.1.1
+### Fixed
+
+- Prevent error when `node[:'ruby-build']` is nil
+
+## v0.1.0
+### Added
+
+- Support updating ruby-build's revision by `node[:'ruby-build'][:revision]`
+
+## v0.0.1
+### Added
+
+- Clone rbenv and ruby-build by default
+- Support ruby-build
+  - installing multiple rubies using ruby-build
+  - `rbenv global`

data/README.md

@@ -18,9 +18,10 @@ Or install it yourself as:
 
     $ gem install itamae-plugin-recipe-rbenv
 
-## Usage
+# Usage
+## System wide installation
 
-System wide rbenv installation
+Install rbenv to /usr/local/rbenv or some shared path
 
 ### Recipe
 
@@ -48,7 +49,7 @@ rbenv:
   # specify scheme to use in git clone (default: git)
   scheme: https
 
-# revision of sstephenson/ruby-build, optional
+# revision of rbenv/ruby-build, optional
 ruby-build:
   revision: e455975286e44393b1b33037ae1ce40ef2742401
 
@@ -57,11 +58,13 @@ rbenv-default-gems:
     - bundler
     - bcat ~>0.6
     - rails --pre
-  # revision of sstephenson/rbenv-default-gems, optional
+  # revision of rbenv/rbenv-default-gems, optional
   revision: ead67889c91c53ad967f85f5a89d986fdb98f6fb
 
-# revision of sstephenson/rbenv-gem-rehash, optional
+# Specify :install or :revision to install rbenv-gem-rehash
 rbenv-gem-rehash:
+  install: true
+  # or
   revision: 4d7b92de4bdf549df59c3c8feb1890116d2ea985
 ```
 
@@ -75,6 +78,32 @@ export PATH="${RBENV_ROOT}/bin:${PATH}"
 eval "$(rbenv init -)"
 ```
 
+## Installation for a user
+
+Install rbenv to `~#{node[:rbenv][:user]}/.rbenv`
+
+### Recipe
+
+```ruby
+# your recipe
+include_recipe "rbenv::user"
+```
+
+### Node
+
+Use this with `itamae -y node.yml`
+
+```yaml
+# node.yml
+rbenv:
+  user: k0kubun
+  global:
+    2.2.0
+  versions:
+    - 2.2.0
+    - 2.1.5
+```
+
 ## License
 
 MIT License

data/lib/itamae/plugin/recipe/rbenv.rb

@@ -1,17 +1 @@
-DEFAULT_RBENV_ROOT = "/usr/local/rbenv"
-
-def rbenv_root
-  if node[:rbenv] && node[:rbenv][:rbenv_root]
-    node[:rbenv][:rbenv_root]
-  else
-    DEFAULT_RBENV_ROOT
-  end
-end
-
-def rbenv_init
-  <<-EOS
-    export RBENV_ROOT=#{rbenv_root}
-    export PATH="#{rbenv_root}/bin:${PATH}"
-    eval "$(rbenv init --no-rehash -)"
-  EOS
-end
+require "itamae/plugin/recipe/rbenv/version"

data/lib/itamae/plugin/recipe/rbenv/dependency.rb

@@ -0,0 +1,36 @@
+# cf) https://github.com/rbenv/ruby-build/wiki#suggested-build-environment
+case node[:platform]
+when 'debian', 'ubuntu'
+  package 'autoconf'
+  package 'bison'
+  package 'build-essential'
+  package 'libffi-dev'
+  package 'libgdbm-dev'
+  package 'libgdbm3'
+  package 'libncurses5-dev'
+  package 'libreadline6-dev'
+  package 'libssl-dev'
+  package 'libyaml-dev'
+  package 'zlib1g-dev'
+when 'redhat', 'fedora'
+  # redhat is including CentOS
+  package 'gcc'
+  package 'gdbm-devel'
+  package 'libffi-devel'
+  package 'libyaml-devel'
+  package 'ncurses-devel'
+  package 'openssl-devel'
+  package 'readline-devel'
+  package 'zlib-devel'
+when 'osx', 'darwin'
+  package 'libffi'
+  package 'libyaml'
+  package 'openssl'
+else
+  # for backward compatibility (<= v0.2.1)
+  package 'libffi-devel'
+  package 'openssl-devel'
+  package 'readline-devel'
+end
+
+package 'git'

data/lib/itamae/plugin/recipe/rbenv/install.rb

@@ -0,0 +1,57 @@
+# This recipe requires `rbenv_root` is defined.
+
+include_recipe 'rbenv::dependency'
+
+scheme     = node[:rbenv][:scheme]
+rbenv_root = node[:rbenv][:rbenv_root]
+
+git rbenv_root do
+  repository "#{scheme}://github.com/rbenv/rbenv.git"
+end
+
+directory File.join(rbenv_root, 'plugins')
+
+define :rbenv_plugin do
+  name = params[:name]
+
+  if node[name] && (node[name][:install] || node[name][:revision])
+    git "#{rbenv_root}/plugins/#{name}" do
+      repository "#{scheme}://github.com/rbenv/#{name}.git"
+      revision node[name][:revision] if node[name][:revision]
+    end
+  end
+end
+
+if node[:'rbenv-default-gems'] && node[:'rbenv-default-gems'][:'default-gems']
+  node[:'rbenv-default-gems'][:install] = true
+  file "#{rbenv_root}/default-gems" do
+    content node[:'rbenv-default-gems'][:'default-gems'].join("\n") + "\n"
+    mode    '664'
+  end
+end
+
+rbenv_plugin 'ruby-build'
+rbenv_plugin 'rbenv-gem-rehash'
+rbenv_plugin 'rbenv-default-gems'
+
+rbenv_init = <<-EOS
+  export RBENV_ROOT=#{rbenv_root}
+  export PATH="#{rbenv_root}/bin:${PATH}"
+  eval "$(rbenv init --no-rehash -)"
+EOS
+
+node[:rbenv][:versions].each do |version|
+  execute "rbenv install #{version}" do
+    command "#{rbenv_init} rbenv install #{version}"
+    not_if  "#{rbenv_init} rbenv versions | grep #{version}"
+  end
+end
+
+if node[:rbenv][:global]
+  node[:rbenv][:global].tap do |version|
+    execute "rbenv global #{version}" do
+      command "#{rbenv_init} rbenv global #{version}"
+      not_if  "#{rbenv_init} rbenv version | grep #{version}"
+    end
+  end
+end

data/lib/itamae/plugin/recipe/rbenv/system.rb

@@ -1,89 +1,12 @@
-# cf) https://github.com/sstephenson/ruby-build/wiki#suggested-build-environment
-case node[:platform]
-when "debian", "ubuntu"
-  package "autoconf"
-  package "bison"
-  package "build-essential"
-  package "libssl-dev"
-  package "libyaml-dev"
-  package "libreadline6-dev"
-  package "zlib1g-dev"
-  package "libncurses5-dev"
-  package "libffi-dev"
-  package "libgdbm3"
-  package "libgdbm-dev"
-  package "libffi-dev"
-when "redhat", "fedora"
-  # redhat is including CentOS
-  package "gcc"
-  package "openssl-devel"
-  package "libyaml-devel"
-  package "libffi-devel"
-  package "readline-devel"
-  package "zlib-devel"
-  package "gdbm-devel"
-  package "ncurses-devel"
-  package "libffi-devel"
-when "osx"
-  package "openssl"
-  package "libyaml"
-  package "libffi"
-else
-  # for backward compatibility (<= v0.2.1)
-  package "libffi-devel"
-  package "openssl-devel"
-  package "readline-devel"
-end
-
-package "git"
-
-scheme = "git"
-scheme = node[:rbenv][:scheme] if node[:rbenv][:scheme]
-
-require "itamae/plugin/recipe/rbenv"
-
-git rbenv_root do
-  repository "#{scheme}://github.com/sstephenson/rbenv.git"
-end
-
-git "#{rbenv_root}/plugins/ruby-build" do
-  repository "#{scheme}://github.com/sstephenson/ruby-build.git"
-  if node[:'ruby-build'] && node[:'ruby-build'][:revision]
-    revision node[:'ruby-build'][:revision]
-  end
-end
-
-git "#{rbenv_root}/plugins/rbenv-gem-rehash" do
-  repository "#{scheme}://github.com/sstephenson/rbenv-gem-rehash.git"
-  if node[:'rbenv-gem-rehash'] && node[:'rbenv-gem-rehash'][:revision]
-    revision node[:'rbenv-gem-rehash'][:revision]
-  end
-end
-
-git "#{rbenv_root}/plugins/rbenv-default-gems" do
-  repository "#{scheme}://github.com/sstephenson/rbenv-default-gems.git"
-  if node[:'rbenv-default-gems'] && node[:'rbenv-default-gems'][:revision]
-    revision node[:'rbenv-default-gems'][:revision]
-  end
-end
-
-if node[:'rbenv-default-gems'] && node[:'rbenv-default-gems'][:'default-gems']
-  file "#{rbenv_root}/default-gems" do
-    content node[:'rbenv-default-gems'][:'default-gems'].join("\n") + "\n"
-    mode    "664"
-  end
-end
-
-node[:rbenv][:versions].each do |version|
-  execute "rbenv install #{version}" do
-    command "#{rbenv_init} rbenv install #{version}"
-    not_if  "#{rbenv_init} rbenv versions | grep #{version}"
-  end
-end
-
-node[:rbenv][:global].tap do |version|
-  execute "rbenv global #{version}" do
-    command "#{rbenv_init} rbenv global #{version}"
-    not_if  "#{rbenv_init} rbenv version | grep #{version}"
-  end
-end
+node.reverse_merge!(
+  rbenv: {
+    rbenv_root: '/usr/local/rbenv',
+    scheme:     'git',
+    versions:   [],
+  },
+  :'ruby-build' => {
+    install: true,
+  }
+)
+
+include_recipe 'rbenv::install'

data/lib/itamae/plugin/recipe/rbenv/user.rb

@@ -0,0 +1,22 @@
+node.reverse_merge!(
+  rbenv: {
+    scheme:   'git',
+    user:     ENV['USER'],
+    versions: [],
+  },
+  :'ruby-build' => {
+    install: true,
+  }
+)
+
+unless node[:rbenv][:rbenv_root]
+  case node[:platform]
+  when 'osx', 'darwin'
+    user_dir = '/Users'
+  else
+    user_dir = '/home'
+  end
+  node[:rbenv][:rbenv_root] = File.join(user_dir, node[:rbenv][:user], '.rbenv')
+end
+
+include_recipe 'rbenv::install'

data/lib/itamae/plugin/recipe/rbenv/version.rb

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module Rbenv
-        VERSION = "0.3.4"
+        VERSION = "0.4.0"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-rbenv
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -67,7 +68,10 @@ files:
 - itamae-plugin-recipe-rbenv.gemspec
 - lib/itamae-plugin-recipe-rbenv.rb
 - lib/itamae/plugin/recipe/rbenv.rb
+- lib/itamae/plugin/recipe/rbenv/dependency.rb
+- lib/itamae/plugin/recipe/rbenv/install.rb
 - lib/itamae/plugin/recipe/rbenv/system.rb
+- lib/itamae/plugin/recipe/rbenv/user.rb
 - lib/itamae/plugin/recipe/rbenv/version.rb
 homepage: https://github.com/k0kubun/itamae-plugin-recipe-rbenv
 licenses:
@@ -89,9 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Itamae plugin to install ruby with rbenv
 test_files: []
-has_rdoc: