itamae-plugin-recipe-anyenv 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc3b2a1bba61bde074722321d9ca8f4937e108eb
-  data.tar.gz: 7d88b2ec3a381e8379bccefab6830eaccd34c329
+  metadata.gz: 558700ae936f294120b68c59e71f5f4be14bb7cc
+  data.tar.gz: 0a9a9915c9e27459353a801b6e40c9584edb1f40
 SHA512:
-  metadata.gz: d28feda7ac103716333fc3de0094a08e7b64b29e4ae282a68549228a729db6fb1cdcb9cc34b8869ffece04901fe5bcbfaf04bbacf0f79fc68df928591ee6a43d
-  data.tar.gz: cd6d9437ced0ac328f6c053d9a6e121814398713636c682b20ff26b578a9a247903a1994ff3153d2156a6ae6f01ee7502fa0d261ffbc3647843811e1e1648ea4
+  metadata.gz: f4ab5ba6b37be5d254fad601b018bfcd6ea7f0f429bed6c1c8073b964e30bff49788d7bef897d308681f6bde7ecb7b8ae26b3feb20832e5440236e072f1c25db
+  data.tar.gz: 0543020a986d7af6159a7ce58152cb568c866d0fdad0d59061747abd6ee09023530788b5162f3637f39225d8338c943da80494cba44bf2b2275348c09fbc4fe5

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

@@ -1,7 +1,24 @@
-DEFAULT_RBENV_ROOT = "/usr/local/anyenv".freeze
+DEFAULT_RBENV_ROOT = '/usr/local/anyenv'.freeze
+
+def run(attributes, username = nil)
+  init(username)
+
+  clone_anyenv
+  clone_anyenv_update
+
+  install_envs(attributes)
+end
+
+private
+
+def init(username)
+  @username = username
+  @anyenv_root_path = anyenv_root(username)
+  @init_cmd = anyenv_init(@anyenv_root_path)
+end
 
 def scheme
-  scheme ||= node[:anyenv][:scheme] || "git"
+  @scheme ||= node[:anyenv][:scheme] || 'git'
 end
 
 def anyenv_root(username)
@@ -21,7 +38,7 @@ def anyenv_user_root(username)
     return node[:anyenv][:users][username][:anyenv_root]
   end
   case node[:platform]
-  when "darwin"
+  when 'darwin'
     "/Users/#{username}/.anyenv"
   else
     "/home/#{username}/.anyenv"
@@ -29,50 +46,65 @@ def anyenv_user_root(username)
 end
 
 def anyenv_init(root_path)
-  init_str =  %[export ANYENV_ROOT="#{root_path}"; ]
-  init_str << %[export PATH="#{root_path}/bin:${PATH}"; ]
-  init_str << %[eval "$(anyenv init -)"; ]
-  init_str
+  init_str =  %(export ANYENV_ROOT="#{root_path}"; )
+  init_str << %(export PATH="#{root_path}/bin:${PATH}"; )
+  init_str << %(eval "$(anyenv init -)"; )
 end
 
-def run(attributes, username = nil)
-  root_path = anyenv_root(username)
-  init_cmd = anyenv_init(root_path)
-
-  git root_path do
-    user username if username
-    repository "#{scheme}://github.com/riywo/anyenv.git"
+def clone_repository(install_path, repo_path)
+  git install_path do
+    user @username if @username
+    repository repo_path if repo_path
+    not_if "test -d #{install_path}"
   end
+end
 
-  git "#{root_path}/plugins/anyenv-update" do
-    user username
-    repository "#{scheme}://github.com/znz/anyenv-update.git"
-  end
+def clone_anyenv
+  repo_path = "#{scheme}://github.com/riywo/anyenv.git"
+  clone_repository(@anyenv_root_path, repo_path)
+end
 
-  attributes[:install_versions].keys.each do |env|
-    execute "install #{env}" do
-      user username if username
-      command "#{init_cmd} anyenv install #{env}"
-      not_if "#{init_cmd} type #{env}"
-    end
-  end
+def clone_anyenv_update
+  install_path = "#{@anyenv_root_path}/plugins/anyenv-update"
+  repo_path = "#{scheme}://github.com/znz/anyenv-update.git"
+  clone_repository(install_path, repo_path)
+end
+
+def install_envs(attributes)
+  attributes[:install_versions].each do |envs|
+    envs.each do |env, vers|
+      install_env(env)
 
-  attributes[:install_versions].each do |env, vers|
-    vers.each do |ver|
-      execute "#{env} install #{ver}" do
-        user username if username
-        command "#{init_cmd} #{env} install #{ver}"
-        not_if "#{init_cmd} #{env} versions | grep #{ver}"
+      vers.each do |ver|
+        install_env_version(env, ver)
       end
+
+      global_version(env, vers.first)
     end
   end
+end
 
-  attributes[:install_versions].each do |env, vers|
-    execute "#{env} global #{vers.first}" do
-      user username if username
-      command "#{init_cmd} #{env} global #{vers.first}; " \
-              "#{init_cmd} #{env} rehash"
-      not_if "#{init_cmd} #{env} global | grep #{vers.first}"
-    end
+def install_env(envname)
+  execute "install #{envname}" do
+    user @username if @username
+    command "#{@init_cmd} anyenv install #{envname}"
+    not_if "#{@init_cmd} type #{envname}"
+  end
+end
+
+def install_env_version(envname, version)
+  execute "#{envname} install #{version}" do
+    user @username if @username
+    command "#{@init_cmd} #{envname} install #{version}"
+    not_if "#{@init_cmd} #{envname} versions | grep #{version}"
+  end
+end
+
+def global_version(envname, version)
+  execute "#{envname} global #{version}" do
+    user @username if @username
+    command "#{@init_cmd} #{envname} global #{version}; " \
+      "#{@init_cmd} #{envname} rehash"
+    not_if "#{@init_cmd} #{envname} global | grep #{version}"
   end
 end

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

@@ -1,5 +1,5 @@
 require 'itamae/plugin/recipe/anyenv'
 
-package "git"
+package 'git'
 
 run(node[:anyenv])

data/lib/itamae/plugin/recipe/anyenv/users.rb

@@ -1,6 +1,6 @@
 require 'itamae/plugin/recipe/anyenv'
 
-package "git"
+package 'git'
 
 node[:anyenv][:users].each do |username, user_attributes|
   attributes = node[:anyenv].merge(user_attributes)

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

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module Anyenv
-        VERSION = "0.3.0"
+        VERSION = '0.3.1'.freeze
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-anyenv
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Surume
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae