from-scratch 0.5.0 → 0.6.0

data/cookbooks/ruby_rbenv/recipes/user.rb

@@ -0,0 +1,76 @@
+#
+# Cookbook Name:: ruby_rbenv
+# Recipe:: user
+#
+# Copyright 2010, 2011 Fletcher Nichol
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe 'ruby_rbenv::user_install'
+
+Array(node['rbenv']['user_installs']).each do |rbenv_user|
+  plugins   = rbenv_user['plugins'] || node['rbenv']['user_plugins']
+  rubies    = rbenv_user['rubies'] || node['rbenv']['user_rubies']
+  gem_hash  = rbenv_user['gems'] || node['rbenv']['user_gems']
+
+  plugins.each do |plugin|
+    rbenv_plugin plugin['name'] do
+      git_url plugin['git_url']
+      git_ref plugin['git_ref'] if plugin['git_ref']
+      user rbenv_user['user']
+      root_path rbenv_user['root_path'] if rbenv_user['root_path']
+    end
+  end
+
+  rubies.each do |rubie|
+    if rubie.is_a?(Hash)
+      rbenv_ruby "#{rubie['name']} (#{rbenv_user['user']})" do
+        definition rubie['name']
+        user rbenv_user['user']
+        root_path rbenv_user['root_path'] if rbenv_user['root_path']
+        environment rubie['environment'] if rubie['environment']
+        patch_url rubie['patch_url'] if rubie['patch_url']
+        patch_file rubie['patch_file'] if rubie['patch_file']
+      end
+    else
+      rbenv_ruby "#{rubie} (#{rbenv_user['user']})" do
+        definition rubie
+        user rbenv_user['user']
+        root_path rbenv_user['root_path'] if rbenv_user['root_path']
+      end
+    end
+  end
+
+  rbenv_global "#{rbenv_user['global']} (#{rbenv_user['user']})" do
+    rbenv_version rbenv_user['global']
+    user rbenv_user['user']
+    root_path rbenv_user['root_path'] if rbenv_user['root_path']
+    only_if { rbenv_user['global'] }
+  end
+
+  gem_hash.each_pair do |rubie, gems|
+    Array(gems).each do |gem|
+      rbenv_gem "#{gem['name']} (#{rbenv_user['user']})" do
+        package_name gem['name']
+        user rbenv_user['user']
+        root_path rbenv_user['root_path'] if rbenv_user['root_path']
+        rbenv_version rubie
+
+        %w(version action options source).each do |attr|
+          send(attr, gem[attr]) if gem[attr]
+        end
+      end
+    end
+  end
+end

data/cookbooks/ruby_rbenv/recipes/user_install.rb

@@ -0,0 +1,48 @@
+#
+# Cookbook Name:: ruby_rbenv
+# Recipe:: user_install
+#
+# Copyright 2011, Fletcher Nichol
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe 'ruby_rbenv'
+
+install_rbenv_pkg_prereqs
+
+template '/etc/profile.d/rbenv.sh' do
+  source 'rbenv.sh.erb'
+  owner 'root'
+  mode '0755'
+  only_if { node['rbenv']['create_profiled'] }
+end
+
+Array(node['rbenv']['user_installs']).each do |rb_user|
+  upgrade_strategy  = build_upgrade_strategy(rb_user['upgrade'])
+  git_url           = rb_user['git_url'] || node['rbenv']['git_url']
+  git_ref           = rb_user['git_ref'] || node['rbenv']['git_ref']
+  home_dir          = rb_user['home'] || ::File.join(
+    node['rbenv']['user_home_root'], rb_user['user'])
+  rbenv_prefix      = rb_user['root_path'] || ::File.join(home_dir, '.rbenv')
+  rbenv_plugins     = rb_user['plugins'] || []
+
+  install_or_upgrade_rbenv rbenv_prefix: rbenv_prefix,
+                           home_dir: home_dir,
+                           git_url: git_url,
+                           git_ref: git_ref,
+                           upgrade_strategy: upgrade_strategy,
+                           user: rb_user['user'],
+                           group: rb_user['group'],
+                           rbenv_plugins: rbenv_plugins
+end

data/cookbooks/ruby_rbenv/resources/gem.rb

@@ -0,0 +1,44 @@
+#
+# Cookbook Name:: ruby_rbenv
+# Resource:: gem
+#
+# Author:: Fletcher Nichol <fnichol@nichol.ca>
+#
+# Copyright 2011, Fletcher Nichol
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+actions :install, :upgrade, :remove, :purge
+default_action :install
+
+provides :rbenv_gem
+
+attribute :package_name,  kind_of: String, name_attribute: true
+attribute :rbenv_version, kind_of: String, default: 'global'
+attribute :version,       kind_of: String
+attribute :response_file, kind_of: String
+attribute :source,        kind_of: String
+attribute :options,       kind_of: [String, Hash]
+attribute :gem_binary,    kind_of: String
+attribute :user,          kind_of: String
+attribute :root_path,     kind_of: String
+attribute :clear_sources, kind_of: [TrueClass, FalseClass]
+attribute :timeout,       kind_of: Integer, default: 300
+
+include Chef::Rbenv::Mixin::ResourceString
+
+def initialize(*args)
+  super
+  @provider = Chef::Provider::Package::RbenvRubygems
+end

data/cookbooks/ruby_rbenv/resources/global.rb

@@ -0,0 +1,33 @@
+#
+# Cookbook Name:: ruby_rbenv
+# Resource:: global
+#
+# Author:: Fletcher Nichol <fnichol@nichol.ca>
+#
+# Copyright 2011, Fletcher Nichol
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+actions :create
+default_action :create
+
+provides :rbenv_global
+
+attribute :rbenv_version, kind_of: String, name_attribute: true
+attribute :user,          kind_of: String
+attribute :root_path,     kind_of: String
+
+def to_s
+  "#{super} (#{@user || 'system'})"
+end

data/cookbooks/ruby_rbenv/resources/plugin.rb

@@ -0,0 +1,15 @@
+actions :install
+
+default_action :install
+
+provides :rbenv_plugin
+
+attribute :name,      kind_of: String, name_attribute: true
+attribute :git_url,   kind_of: String
+attribute :git_ref,   kind_of: String
+attribute :user,      kind_of: String
+attribute :root_path, kind_of: String
+
+def to_s
+  "#{super} (#{@user || 'system'})"
+end

data/cookbooks/ruby_rbenv/resources/rehash.rb

@@ -0,0 +1,29 @@
+#
+# Cookbook Name:: ruby_rbenv
+# Resource:: rehash
+#
+# Author:: Fletcher Nichol <fnichol@nichol.ca>
+#
+# Copyright 2011, Fletcher Nichol
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+actions :run
+default_action :run
+
+provides :rbenv_rehash
+
+attribute :name,      kind_of: String, name_attribute: true
+attribute :user,      kind_of: String
+attribute :root_path, kind_of: String

data/cookbooks/ruby_rbenv/resources/ruby.rb

@@ -0,0 +1,43 @@
+#
+# Cookbook Name:: ruby_rbenv
+# Resource:: ruby
+#
+# Author:: Fletcher Nichol <fnichol@nichol.ca>
+#
+# Copyright 2011, Fletcher Nichol
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+actions :install, :reinstall
+default_action :install
+
+provides :rbenv_ruby
+
+attribute :definition, kind_of: String, name_attribute: true
+attribute :definition_file,	kind_of: String
+attribute :root_path,   kind_of: String
+attribute :user,        kind_of: String
+attribute :environment, kind_of: Hash
+attribute :patch_url,   kind_of: String
+attribute :patch_file,  kind_of: String
+attribute :rbenv_action, kind_of: String, default: 'install'
+
+def initialize(*args)
+  super
+  @rbenv_version = @definition
+end
+
+def to_s
+  "#{super} (#{@user || 'system'})"
+end

data/cookbooks/ruby_rbenv/resources/script.rb

@@ -0,0 +1,39 @@
+#
+# Cookbook Name:: ruby_rbenv
+# Resource:: script
+#
+# Author:: Fletcher Nichol <fnichol@nichol.ca>
+#
+# Copyright 2011, Fletcher Nichol
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+actions :run
+default_action :run
+
+provides :rbenv_script
+
+attribute :name,          kind_of: String, name_attribute: true
+attribute :rbenv_version, kind_of: String
+attribute :root_path,     kind_of: String
+attribute :code,          kind_of: String
+attribute :creates,       kind_of: String
+attribute :cwd,           kind_of: String
+attribute :environment,   kind_of: Hash
+attribute :group,         kind_of: String
+attribute :path,          kind_of: Array
+attribute :returns,       kind_of: Array, default: [0]
+attribute :timeout,       kind_of: Integer
+attribute :user,          kind_of: String
+attribute :umask,         kind_of: [String, Integer]

data/cookbooks/ruby_rbenv/templates/default/rbenv.sh.erb

@@ -0,0 +1,15 @@
+# Generated by Chef for <%= node['fqdn'] %>
+# Local modifications will be overridden
+
+# prefer a user rbenv over a system wide install
+if [ -s "${HOME}/.rbenv/bin" ]; then
+  rbenv_root="${HOME}/.rbenv"
+elif [ -s "<%= node['rbenv']['root_path'] %>" ]; then
+  rbenv_root="<%= node['rbenv']['root_path'] %>"
+  export RBENV_ROOT="$rbenv_root"
+fi
+
+if [ -n "$rbenv_root" ]; then
+  export PATH="${rbenv_root}/bin:$PATH"
+  eval "$(rbenv init -)"
+fi

data/cookbooks/scratchify/Berksfile

@@ -9,10 +9,4 @@ cookbook 'user'
 cookbook 'rvm', github: 'martinisoft/chef-rvm'
 cookbook 'postgresql', github: 'sandrew/postgresql', branch: 'develop'
 cookbook 'nginx'
-
-# cookbook 'dpkg_packages', git: "https://gitlab.acid.cl/acidlabs/chef-dpkg-packages.git"
-# cookbook 'nginx',         git: "https://gitlab.acid.cl/acidlabs/chef-nginx.git"
-# cookbook 'postgresql',    git: "https://github.com/phlipper/chef-postgresql.git"
-# cookbook 'rvm'
-# cookbook 'ssh-hardening'
-# cookbook 'sudo'
+cookbook 'ruby_rbenv'

data/cookbooks/scratchify/Berksfile.lock

@@ -4,6 +4,7 @@ DEPENDENCIES
     git: git://github.com/sandrew/postgresql.git
     revision: a1f3ce3e2e22515bc175011a3e3faa0af98dd8db
     branch: develop
+  ruby_rbenv
   rvm
     git: git://github.com/martinisoft/chef-rvm.git
     revision: 08ec265f277e112a5a2e4b201bd32ddfe1bb968c
@@ -36,6 +37,10 @@ GRAPH
     build-essential (>= 0.0.0)
     openssl (~> 4.0)
   rsyslog (2.2.0)
+  ruby_build (0.8.0)
+  ruby_rbenv (1.0.1)
+    java (> 1.4.0)
+    ruby_build (>= 0.0.0)
   runit (1.7.4)
     packagecloud (>= 0.0.0)
   rvm (0.10.1)
@@ -44,6 +49,7 @@ GRAPH
   scratchify (0.1.0)
     nginx (>= 0.0.0)
     postgresql (>= 0.0.0)
+    ruby_rbenv (>= 0.0.0)
     rvm (>= 0.0.0)
     user (>= 0.0.0)
   user (0.4.2)

data/cookbooks/scratchify/README.md

@@ -23,11 +23,16 @@ OS:
   - APT-based Linux (Ubuntu, Debian)
   - YUM-based Linux (RedHat, CentOS)
 
+Ruby installers:
+
+  - RVM (default)
+  - rbenv: `scratchify your_app_name your.host.com --rbenv`
+
 ## It's a kind of magic!
 
 Not actully. Just preconfigured [Chef](https://www.chef.io/). Here are the things done with the command:
 
-  - Install system-wide RVM with latest MRI (2.2.3)
+  - Install user-wide RVM with latest MRI (2.2.3)
   - Install PostgreSQL, create database with user, pg_tune a little
   - Add _deploy_ non-admin user to system specially for your app, upload your SSH pub key to it
   - Install nginx and replace it's default site config with one prepared for rails app
@@ -46,11 +51,11 @@ Both `postgres` and `your_app_name` DB users get (different) randomly generated
 
 ## Development
 
-TODO
+Feel free to create bug-reports and feature-requests here on [Issues page](https://github.com/sandrew/from-scratch/issues)
 
 ## Contributing
 
-TODO
+All help is highly appreciated. I'll be thankful for recipes fixes and advices as well as new features implementations. Just fork and pull-request when you have some proposals.
 
 ## License
 

data/cookbooks/scratchify/bin/scratchify

@@ -3,4 +3,4 @@
 require "bundler/setup"
 require "from-scratch"
 
-FromScratch.run!
+FromScratch.new.run!

data/cookbooks/scratchify/from-scratch.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency 'rspec', "~> 3.3"
+  spec.add_development_dependency 'rspec-its'
   spec.add_development_dependency 'pry', "~> 0.10"
 
   spec.add_dependency 'knife-solo'