itamae-plugin-recipe-rtn_rbenv 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa4583dde9dc934b2554a177935bd02c6e81ef38
-  data.tar.gz: cb925ce3e789c05a3a60ba148f95f1f0c806fdb5
+  metadata.gz: 235e6a5f2c5eae574d3d7a972faa70e45655500a
+  data.tar.gz: 8c313976c8fbeafbeeb6d8bc5c14292a0d99ef6e
 SHA512:
-  metadata.gz: 766f509bfb25475476e88b135387a70ca51b80c0f1dbd7b8a50c68b0f00b6b1ee3bf8f13a9591290f5be9c2e31651afe4c56d8cf0209b4c2e83526ea8800a9fd
-  data.tar.gz: 3bda76b006981ae7da8ed240f7848b76abef535b638cf1b8945ac211163164f6c2bff49d12874f845d0b5fe21151f993d27173a6bd445ae69af7925ab410f2ff
+  metadata.gz: 1ce7ee2e210087587c230657c168f6d5b5a1ab9874bc4c6a68173b54043575a18e58a93dd9a267b1d9463a552e5da2c3e39e8ecc51527b66e811db9d61aaa5f8
+  data.tar.gz: 514e2f3624458ed6a58540c27f3dc66cf98ceb0b9ec0e1caf354f97284a186582f3a2c176178cf46f3d1309ebd384e87690660a57a88d2def00661bf5e3199e8

data/README.md

@@ -38,7 +38,8 @@ include_recipe 'rtn_rbenv::system'
         "user": "vagrant",
         "versions": {
             "2.1.3": [
-                "bundler": {
+                {
+                    "name": "bundler",
                     "version": "1.7.3",
                     "force": true
                 },

data/Rakefile

@@ -11,15 +11,18 @@ namespace :spec do
     next unless File.directory?(dir)
     targets << File.basename(dir)
   end
+  platforms = %w[sl6 ubuntu1404]
 
   task :all     => targets
   task :default => :all
 
   targets.each do |target|
-    desc "Run serverspec tests to #{target}"
-    RSpec::Core::RakeTask.new(target.to_sym) do |t|
-      ENV['TARGET_HOST'] = target
-      t.pattern = "spec/#{target}/*_spec.rb"
+    platforms.each do |platform|
+      desc "Run serverspec tests to #{target} in #{platform}"
+      RSpec::Core::RakeTask.new(target.to_sym) do |t|
+        ENV['TARGET_HOST'] = "#{platform}_#{target}"
+        t.pattern = "spec/#{target}/*_spec.rb"
+      end
     end
   end
 end

data/Vagrantfile

@@ -4,13 +4,26 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "sl6"
-  config.vm.box_url = 'http://files.rutan.info/box/scientific-6-5-x64-virtualbox.box'
 
-  config.vm.define :user do |c|
+  config.vm.define :sl6_user do |c|
+    c.vm.box = "sl6"
+    c.vm.box_url = 'http://files.rutan.info/box/scientific-6-5-x64-virtualbox.box'
     c.vm.network :private_network, ip: '192.168.33.11'
   end
-  config.vm.define :system do |c|
+  config.vm.define :sl6_system do |c|
+    c.vm.box = "sl6"
+    c.vm.box_url = 'http://files.rutan.info/box/scientific-6-5-x64-virtualbox.box'
     c.vm.network :private_network, ip: '192.168.33.12'
   end
+
+  config.vm.define :ubuntu1404_user do |c|
+    c.vm.box = "ubuntu1404"
+    c.vm.box_url = 'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box'
+    c.vm.network :private_network, ip: '192.168.33.21'
+  end
+  config.vm.define :ubuntu1404_system do |c|
+    c.vm.box = "ubuntu1404"
+    c.vm.box_url = 'https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box'
+    c.vm.network :private_network, ip: '192.168.33.22'
+  end
 end

data/lib/itamae/plugin/recipe/rtn_rbenv/common.rb

@@ -8,9 +8,9 @@ packages << 'git'
 
 case os[:family]
 when %r(debian|ubuntu)
-  packages << 'zlib-dev'
-  packages << 'openssl-dev'
-  packages << 'readline-dev'
+  packages << 'zlib1g-dev'
+  packages << 'libssl-dev'
+  packages << 'libreadline6-dev'
 when %r(redhat|fedora)
   packages << 'zlib-devel'
   packages << 'openssl-devel'

data/lib/itamae/plugin/recipe/rtn_rbenv/resource.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+RBENV_DEFAULT_PROFILE_PATH = '/etc/profile.d/rbenv.sh'
+
+# install rbenv and ruby_build
+# @param name [String] install directory
+# @param user [String] install user name
+# @param profile_path [String] bash_profile path
+define :rbenv_install, user: nil, profile_path: RBENV_DEFAULT_PROFILE_PATH do
+  params = self.params
+
+  git "#{params[:name]}" do
+    repository 'https://github.com/sstephenson/rbenv.git'
+    user params[:user] if params[:user]
+  end
+
+  git "#{params[:name]}/plugins/ruby_build" do
+    repository 'https://github.com/sstephenson/ruby-build.git'
+    user params[:user] if params[:user]
+  end
+
+  setting = <<"EOS"
+export RBENV_ROOT=#{params[:name]}
+export PATH="$RBENV_ROOT/bin:$RBENV_ROOT/shims:$PATH"
+eval "$(rbenv init -)"
+EOS
+
+  execute 'add rbenv settings' do
+    command "echo '#{setting}' >> #{params[:profile_path]}"
+    user params[:user] if params[:user]
+    not_if "test `touch #{params[:profile_path]} && cat #{params[:profile_path]} | grep 'rbenv' -c` != 0"
+  end
+end
+
+# install ruby with rbenv
+# @param name [String] ruby version
+# @param user [String] install user name
+# @param profile_path [String] bash_profile path
+define :ruby_install, user: nil, profile_path: RBENV_DEFAULT_PROFILE_PATH do
+  params = self.params
+
+  execute "ruby install #{params[:name]}" do
+    command ". #{params[:profile_path]} && rbenv install #{params[:name]}"
+    user params[:user] if params[:user]
+    not_if "test `. #{params[:profile_path]} && rbenv versions  | grep '#{params[:name]}' -c` != 0"
+  end
+end
+
+# install rubygems with rbenv
+# @param name [String] gem name
+# @param version [String] gem version
+# @param ruby_version [String] use ruby version
+# @param user [String] install user name
+# @param profile_path [String] bash_profile path
+define :gem_install, version: nil, ruby_version: nil, force: nil, user: nil, profile_path: RBENV_DEFAULT_PROFILE_PATH do
+  params = self.params
+
+  execute "gem install #{params[:name]}" do
+    command ". #{params[:profile_path]} && rbenv shell #{params[:ruby_version]} && gem install #{params[:name]} #{params[:version] ? "-v #{params[:version]}" : ''} #{params[:force] ? '--force' : ''}"
+    user params[:user] if params[:user]
+  end
+end

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

@@ -1,52 +1,34 @@
 # encoding: utf-8
+include_recipe './resource.rb'
 include_recipe 'rtn_rbenv::common'
 
 # load setting
 RBENV_ROOT = '/usr/local/rbenv'
 RBENV_PROFILE_PATH = '/etc/profile.d/rbenv.sh'
 
-RBENV_BASH_SETTING = <<"EOS"
-export RBENV_ROOT=#{RBENV_ROOT}
-export PATH="$RBENV_ROOT/bin:$RBENV_ROOT/shims:$PATH"
-eval "$(rbenv init -)"
-EOS
-
-# define
-def ruby_install(version)
-  execute "ruby install #{version}" do
-    command "source #{RBENV_PROFILE_PATH} && rbenv install #{version}"
-    not_if "test `source #{RBENV_PROFILE_PATH} && rbenv versions  | grep '#{version}' -c` != 0"
-  end
-end
-
-def gem_install(ruby_version, name, options = {})
-  execute "gem install #{name}" do
-    command "source #{RBENV_PROFILE_PATH} && rbenv shell #{ruby_version} && gem install #{name} #{options[:version] ? "-v #{options[:version]}" : ''} #{options[:force] ? '--force' : ''}"
-  end
-end
-
 # install rbenv and ruby_build
-git "#{RBENV_ROOT}" do
-  repository 'https://github.com/sstephenson/rbenv.git'
-end
-
-git "#{RBENV_ROOT}/plugins/ruby_build" do
-  repository 'https://github.com/sstephenson/ruby-build.git'
-end
-
-execute 'add rbenv settings to /etc/profile.d/rbenv.sh' do
-  command "echo '#{RBENV_BASH_SETTING}' >> #{RBENV_PROFILE_PATH}"
-  not_if "test `touch #{RBENV_PROFILE_PATH} && cat #{RBENV_PROFILE_PATH} | grep 'rbenv' -c` != 0"
+rbenv_install RBENV_ROOT do
+  profile_path RBENV_PROFILE_PATH
 end
 
 # install Ruby and Gems
 (node['rtn_rbenv']['versions'] || {}).each do |ruby_version, gems|
-  ruby_install ruby_version
+  ruby_install ruby_version do
+    profile_path RBENV_PROFILE_PATH
+  end
   gems.each do |gem|
     if gem.kind_of?(Hash)
-      gem_install ruby_version, gem['name'], :version => gem['version'], :force => gem['force']
+      gem_install gem['name'] do
+        self.ruby_version ruby_version
+        version gem['version'] if gem['version']
+        force gem['force'] if gem['force']
+        profile_path RBENV_PROFILE_PATH
+      end
     else
-      gem_install ruby_version, gem
+      gem_install gem do
+        self.ruby_version ruby_version
+        profile_path RBENV_PROFILE_PATH
+      end
     end
   end
 end
@@ -54,6 +36,6 @@ end
 # set global
 if node['rtn_rbenv']['global']
   execute "rbenv global #{node['rtn_rbenv']['global']}" do
-    command "source #{RBENV_PROFILE_PATH} && rbenv global #{node['rtn_rbenv']['global']}"
+    command ". #{RBENV_PROFILE_PATH} && rbenv global #{node['rtn_rbenv']['global']}"
   end
 end

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

@@ -1,4 +1,5 @@
 # encoding: utf-8
+include_recipe './resource.rb'
 include_recipe 'rtn_rbenv::common'
 
 # load setting
@@ -7,53 +8,33 @@ RBENV_USER_HOME = "/home/#{RBENV_USER}"
 RBENV_ROOT = "#{RBENV_USER_HOME}/.rbenv"
 RBENV_PROFILE_PATH = "#{RBENV_USER_HOME}/.bash_profile"
 
-RBENV_BASH_SETTING = <<"EOS"
-export RBENV_ROOT=#{RBENV_ROOT}
-export PATH="$RBENV_ROOT/bin:$RBENV_ROOT/shims:$PATH"
-eval "$(rbenv init -)"
-EOS
-
-# define
-def ruby_install(version)
-  execute "ruby install #{version}" do
-    command "source #{RBENV_PROFILE_PATH} && rbenv install #{version}"
-    user RBENV_USER
-    not_if "test `source #{RBENV_PROFILE_PATH} && rbenv versions  | grep '#{version}' -c` != 0"
-  end
-end
-
-def gem_install(ruby_version, name, options = {})
-  execute "gem install #{name}" do
-    command "source #{RBENV_PROFILE_PATH} && rbenv shell #{ruby_version} && gem install #{name} #{options[:version] ? "-v #{options[:version]}" : ''} #{options[:force] ? '--force' : ''}"
-    user RBENV_USER
-  end
-end
-
 # install rbenv and ruby_build
-git "#{RBENV_ROOT}" do
-  repository 'https://github.com/sstephenson/rbenv.git'
+rbenv_install RBENV_ROOT do
   user RBENV_USER
-end
-
-git "#{RBENV_ROOT}/plugins/ruby_build" do
-  repository 'https://github.com/sstephenson/ruby-build.git'
-  user RBENV_USER
-end
-
-execute 'add rbenv settings to .bash_profile' do
-  command "echo '#{RBENV_BASH_SETTING}' >> #{RBENV_PROFILE_PATH}"
-  user RBENV_USER
-  not_if "test `touch #{RBENV_PROFILE_PATH} && cat #{RBENV_PROFILE_PATH} | grep 'rbenv' -c` != 0"
+  profile_path RBENV_PROFILE_PATH
 end
 
 # install Ruby and Gems
 (node['rtn_rbenv']['versions'] || {}).each do |ruby_version, gems|
-  ruby_install ruby_version
+  ruby_install ruby_version do
+    user RBENV_USER
+    profile_path RBENV_PROFILE_PATH
+  end
   gems.each do |gem|
     if gem.kind_of?(Hash)
-      gem_install ruby_version, gem['name'], :version => gem['version'], :force => gem['force']
+      gem_install gem['name'] do
+        self.ruby_version ruby_version
+        version gem['version'] if gem['version']
+        force gem['force'] if gem['force']
+        user RBENV_USER
+        profile_path RBENV_PROFILE_PATH
+      end
     else
-      gem_install ruby_version, gem
+      gem_install gem do
+        self.ruby_version ruby_version
+        user RBENV_USER
+        profile_path RBENV_PROFILE_PATH
+      end
     end
   end
 end
@@ -61,7 +42,7 @@ end
 # set global
 if node['rtn_rbenv']['global']
   execute "rbenv global #{node['rtn_rbenv']['global']}" do
-    command "source #{RBENV_PROFILE_PATH} && rbenv global #{node['rtn_rbenv']['global']}"
+    command ". #{RBENV_PROFILE_PATH} && rbenv global #{node['rtn_rbenv']['global']}"
     user RBENV_USER
   end
 end

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

@@ -2,7 +2,7 @@ module Itamae
   module Plugin
     module Recipe
       module RtnRbenv
-        VERSION = "0.0.1"
+        VERSION = "0.0.2"
       end
     end
   end

data/spec/spec_helper.rb

@@ -16,9 +16,10 @@ else
 end
 
 host = ENV['TARGET_HOST']
+target = host.split('_')[1]
 
 `vagrant up #{host}`
-system("bundle exec itamae ssh -h #{host} --vagrant '#{File.expand_path("../#{host}/role.rb", __FILE__)}' -j '#{File.expand_path("../#{host}/node.json", __FILE__)}'")
+system("bundle exec itamae ssh -h #{host} --vagrant '#{File.expand_path("../#{target}/role.rb", __FILE__)}' -j '#{File.expand_path("../#{target}/node.json", __FILE__)}'")
 
 config = Tempfile.new('', Dir.tmpdir)
 `vagrant ssh-config #{host} > #{config.path}`

data/spec/system/node.json

@@ -1,10 +1,10 @@
 {
   "rtn_rbenv": {
     "versions": {
-      "2.1.3": [
+      "2.1.4": [
         "sinatra"
       ],
-      "2.1.0": [
+      "2.1.3": [
         {
           "name": "rake",
           "version": "10.2.0",
@@ -12,6 +12,6 @@
         }
       ]
     },
-    "global": "2.1.0"
+    "global": "2.1.3"
   }
 }

data/spec/system/rbenv_spec.rb

@@ -1,28 +1,28 @@
 require 'spec_helper'
 
-describe command('which rbenv') do
+describe command('. /etc/profile && which rbenv') do
   let(:disable_sudo) { true }
   its(:stdout) { should match '/usr/local/rbenv/bin/rbenv' }
 end
 
-%w[2.1.3 2.1.0].each do |ruby_version|
-  describe command("source /etc/profile && rbenv versions | grep '#{ruby_version}'") do
+%w[2.1.4 2.1.3].each do |ruby_version|
+  describe command(". /etc/profile && rbenv versions | grep '#{ruby_version}'") do
     let(:disable_sudo) { true }
     its(:stdout) { should match /#{Regexp.escape(ruby_version)}/ }
   end
 end
 
-describe command("source /etc/profile && rbenv shell 2.1.3 && gem list") do
+describe command(". /etc/profile && rbenv shell 2.1.4 && gem list") do
   let(:disable_sudo) { true }
   its(:stdout) { should match /sinatra/ }
 end
 
-describe command("source /etc/profile && rbenv shell 2.1.0 && gem list | grep 'rake'") do
+describe command(". /etc/profile && rbenv shell 2.1.3 && gem list | grep 'rake'") do
   let(:disable_sudo) { true }
   its(:stdout) { should match /10\.2\.0/ }
 end
 
-describe command("source /etc/profile && ruby -v") do
+describe command(". /etc/profile && ruby -v") do
   let(:disable_sudo) { true }
-  its(:stdout) { should match /2\.1\.0/ }
+  its(:stdout) { should match /2\.1\.3/ }
 end

data/spec/user/node.json

@@ -2,10 +2,10 @@
   "rtn_rbenv": {
     "user": "vagrant",
     "versions": {
-      "2.1.3": [
+      "2.1.4": [
         "sinatra"
       ],
-      "2.1.0": [
+      "2.1.3": [
         {
           "name": "rake",
           "version": "10.2.0",
@@ -13,6 +13,6 @@
         }
       ]
     },
-    "global": "2.1.3"
+    "global": "2.1.4"
   }
 }

data/spec/user/rbenv_spec.rb

@@ -1,29 +1,29 @@
 require 'spec_helper'
 
-describe command('source /home/vagrant/.bash_profile; which rbenv') do
+describe command('. /home/vagrant/.bash_profile; which rbenv') do
   let(:disable_sudo) { true }
   its(:stdout) { should match '/home/vagrant/.rbenv/bin/rbenv' }
 end
 
-%w[2.1.3 2.1.0].each do |ruby_version|
-  describe command("source /home/vagrant/.bash_profile; rbenv versions | grep '#{ruby_version}'") do
+%w[2.1.4 2.1.3].each do |ruby_version|
+  describe command(". /home/vagrant/.bash_profile; rbenv versions | grep '#{ruby_version}'") do
     let(:disable_sudo) { true }
     its(:stdout) { should match /#{Regexp.escape(ruby_version)}/ }
   end
 end
 
-describe command("source /home/vagrant/.bash_profile; rbenv shell 2.1.3; gem list | grep 'sinatra'") do
+describe command(". /home/vagrant/.bash_profile; rbenv shell 2.1.4; gem list | grep 'sinatra'") do
   let(:disable_sudo) { true }
   its(:stdout) { should match /sinatra/ }
 end
 
-describe command("source /home/vagrant/.bash_profile; rbenv shell 2.1.0; gem list | grep 'rake'") do
+describe command(". /home/vagrant/.bash_profile; rbenv shell 2.1.3; gem list | grep 'rake'") do
   let(:disable_sudo) { true }
   its(:stdout) { should match /10\.2\.0/ }
 end
 
-describe command("source /home/vagrant/.bash_profile; ruby -v") do
+describe command(". /home/vagrant/.bash_profile; ruby -v") do
   let(:disable_sudo) { true }
-  its(:stdout) { should match /2\.1\.3/ }
+  its(:stdout) { should match /2\.1\.4/ }
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae-plugin-recipe-rtn_rbenv
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ru/MuckRu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-11 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itamae
@@ -82,6 +82,7 @@ files:
 - itamae-plugin-recipe-rtn_rbenv.gemspec
 - lib/itamae/plugin/recipe/rtn_rbenv.rb
 - lib/itamae/plugin/recipe/rtn_rbenv/common.rb
+- lib/itamae/plugin/recipe/rtn_rbenv/resource.rb
 - lib/itamae/plugin/recipe/rtn_rbenv/system.rb
 - lib/itamae/plugin/recipe/rtn_rbenv/user.rb
 - lib/itamae/plugin/recipe/rtn_rbenv/version.rb