from-scratch 0.5.0 → 0.6.0

data/cookbooks/scratchify/lib/from-scratch.rb

@@ -1,15 +1,26 @@
 require 'securerandom'
 require 'erb'
 require 'fileutils'
+require 'optparse'
+require 'ostruct'
 
-module FromScratch
-  def self.run!
-    app_name, host = ARGV
-    ssh_pub_key = `cat ~/.ssh/id_rsa.pub`.strip
-    postgresql_admin_password = `echo -n '#{SecureRandom.base64(16)}''postgres' | openssl md5 | sed -e 's/.* /md5/'`.strip
-    postgresql_user_password = SecureRandom.base64(16)
+class FromScratch
+  DEFAULTS = { ruby_installer: 'rvm' }
 
-    { node: ['nodes', host], user: ['data_bags/users', 'deploy'] }.each do |from, to|
+  attr_accessor :options
+
+  def initialize
+    @options = OpenStruct.new DEFAULTS
+  end
+
+  def run!
+    parse_options
+    get_host_and_app_name
+    generate_values
+
+    { node: ['nodes', @options.host],
+      user: ['data_bags/users', 'deploy']
+    }.each do |from, to|
       FileUtils.mkdir_p File.expand_path("../../tmp/#{to[0]}", __FILE__)
       File.open(File.expand_path("../../tmp/#{to.join('/')}.json", __FILE__), 'w') do |f|
         f.write ERB.new(File.open(File.expand_path("../../templates/#{from}.json.erb", __FILE__)).read).result(binding)
@@ -17,10 +28,41 @@ module FromScratch
     end
 
     Dir.chdir(File.expand_path('../..', __FILE__)) do
-      system "knife solo bootstrap root@#{host} -c ./.chef/knife.rb"
-      system "knife solo clean root@#{host} -c ./.chef/knife.rb"
+      system "knife solo bootstrap root@#{@options.host} -c ./.chef/knife.rb"
+      system "knife solo clean root@#{@options.host} -c ./.chef/knife.rb"
     end
 
     FileUtils.rm_rf [File.expand_path('../../tmp', __FILE__)]
   end
+
+  def get_host_and_app_name
+    @options.app_name, @options.host = ARGV.select { |x| !(x =~ /^\-/) }
+
+    unless @options.app_name && @options.host
+      raise ArgumentError, 'You should specify APP_NAME and HOST. Use --help for information.'
+    end
+  end
+
+  def parse_options
+    opt_parser = OptionParser.new do |args|
+      args.banner = "Usage: scratchify your_app_name your.host.com [options]"
+
+      args.on '--rbenv', 'Use RBENV instead of RVM' do
+        @options.ruby_installer = 'rbenv'
+      end
+
+      args.on '-h', '--help', 'Prints this help' do
+        puts args
+        exit
+      end
+    end
+
+    opt_parser.parse!
+  end
+
+  def generate_values
+    @options.ssh_pub_key               = `cat ~/.ssh/id_rsa.pub`.strip
+    @options.postgresql_admin_password = `echo -n '#{SecureRandom.base64(16)}''postgres' | openssl md5 | sed -e 's/.* /md5/'`.strip
+    @options.postgresql_user_password  = SecureRandom.base64(16)
+  end
 end

data/cookbooks/scratchify/lib/from-scratch/version.rb

@@ -1,3 +1,3 @@
-module FromScratch
-  VERSION = "0.4.0"
+class FromScratch
+  VERSION = "0.6.0"
 end

data/cookbooks/scratchify/metadata.json

@@ -13,7 +13,8 @@
     "user": ">= 0.0.0",
     "rvm": ">= 0.0.0",
     "postgresql": ">= 0.0.0",
-    "nginx": ">= 0.0.0"
+    "nginx": ">= 0.0.0",
+    "ruby_rbenv": ">= 0.0.0"
   },
   "recommendations": {
   },

data/cookbooks/scratchify/spec/from/scratch_spec.rb

@@ -1,11 +1,68 @@
 require 'spec_helper'
 
-describe From::Scratch do
-  it 'has a version number' do
-    expect(From::Scratch::VERSION).not_to be nil
+describe FromScratch do
+  let(:instance) { described_class.new }
+  let(:app_name) { 'my_app' }
+  let(:host)     { 'host.example.com' }
+
+  describe '::new' do
+    subject { instance }
+
+    its('options.to_h') { are_expected.to eq(described_class::DEFAULTS) }
+  end
+
+  describe '#get_host_and_app_name' do
+    before do
+      stub_const 'ARGV', argv
+    end
+
+    subject { instance.options }
+
+    context 'with app_name and host' do
+      before { instance.get_host_and_app_name }
+      let(:argv) { [app_name, host] }
+
+      its(:app_name) { is_expected.to eq(app_name) }
+      its(:host) { is_expected.to eq(host) }
+    end
+
+    context 'without one of app_name or host' do
+      let(:argv) { [app_name] }
+
+      it 'should raise' do
+        expect do
+          instance.get_host_and_app_name
+        end.to raise_error(ArgumentError)
+      end
+
+      context 'and with --option' do
+        let(:argv) { [app_name, '--option'] }
+
+        it 'should raise' do
+          expect do
+            instance.get_host_and_app_name
+          end.to raise_error(ArgumentError)
+        end
+      end
+    end
   end
 
-  it 'does something useful' do
-    expect(false).to eq(true)
+  describe '#parse_options' do
+    before do
+      stub_const 'ARGV', argv
+      instance.parse_options
+    end
+
+    subject { instance.options }
+
+    context 'with --rbenv' do
+      let(:argv) { [app_name, host, '--rbenv'] }
+
+      its(:ruby_installer) { is_expected.to eq('rbenv') }
+    end
+  end
+
+  it 'has a version number' do
+    expect(FromScratch::VERSION).not_to be nil
   end
 end

data/cookbooks/scratchify/spec/spec_helper.rb

@@ -1,2 +1,9 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'from/scratch'
+require 'rspec/its'
+require 'from-scratch'
+require 'pry'
+
+RSpec.configure do |c|
+  c.filter_run focus: true
+  c.run_all_when_everything_filtered = true
+end

data/cookbooks/scratchify/templates/node.json.erb

@@ -1,8 +1,13 @@
 {
   "run_list": [
     "recipe[user::data_bag]",
+<% if @options.ruby_installer == 'rvm' %>
     "recipe[scratchify::pre_rvm]",
     "recipe[rvm::user]",
+<% elsif @options.ruby_installer == 'rbenv' %>
+    "recipe[ruby_build]",
+    "recipe[ruby_rbenv::user]",
+<% end %>
     "recipe[postgresql::server]",
     "recipe[postgresql::config_pgtune]",
     "recipe[postgresql::setup_users]",
@@ -14,6 +19,7 @@
 
   "users": ["deploy"],
 
+<% if @options.ruby_installer == 'rvm' %>
   "rvm": {
     "user_default_ruby": "2.2.3",
     "user_install_rubies": true,
@@ -27,27 +33,42 @@
     ],
     "gpg": {}
   },
+<% elsif @options.ruby_installer == 'rbenv' %>
+  "rbenv": {
+    "user_installs": [
+      { "user": "deploy",
+        "rubies": [{
+          "name": "2.2.3",
+          "environment": {
+            "RUBY_CONFIGURE_OPTS": "--disable-install-doc"
+          }
+        }],
+        "global": "2.2.3"
+      }
+    ]
+  },
+<% end %>
 
   "postgresql": {
     "version": "9.4",
     "enable_pgdg_yum": true,
     "enable_pgdg_apt": true,
     "password": {
-      "postgres": "<%= postgresql_admin_password %>"
+      "postgres": "<%= @options.postgresql_admin_password %>"
     },
     "users": [
       {
-        "username": "<%= app_name %>",
+        "username": "<%= @options.app_name %>",
         "superuser": false,
         "createdb": false,
         "login": true,
-        "password": "<%= postgresql_user_password %>"
+        "password": "<%= @options.postgresql_user_password %>"
       }
     ],
     "databases": [
       {
-        "name": "<%= app_name %>",
-        "owner": "<%= app_name %>"
+        "name": "<%= @options.app_name %>",
+        "owner": "<%= @options.app_name %>"
       }
     ],
     "pg_hba": [
@@ -72,7 +93,7 @@
   },
 
   "scratchify": {
-    "app_name": "<%= app_name %>"
+    "app_name": "<%= @options.app_name %>"
   },
 
   "nginx": {
@@ -81,6 +102,6 @@
   },
 
   "automatic": {
-    "ipaddress": "<%= host %>"
+    "ipaddress": "<%= @options.host %>"
   }
 }

data/cookbooks/scratchify/templates/user.json.erb

@@ -2,5 +2,5 @@
   "id": "deploy",
   "name": "deploy",
   "groups": ["deploy"],
-  "ssh_keys": ["<%= ssh_pub_key %>"]
+  "ssh_keys": ["<%= @options.ssh_pub_key %>"]
 }

data/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'

data/lib/from-scratch.rb

@@ -1,15 +1,26 @@
 require 'securerandom'
 require 'erb'
 require 'fileutils'
+require 'optparse'
+require 'ostruct'
 
-module FromScratch
-  def self.run!
-    app_name, host = ARGV
-    ssh_pub_key = `cat ~/.ssh/id_rsa.pub`.strip
-    postgresql_admin_password = `echo -n '#{SecureRandom.base64(16)}''postgres' | openssl md5 | sed -e 's/.* /md5/'`.strip
-    postgresql_user_password = SecureRandom.base64(16)
+class FromScratch
+  DEFAULTS = { ruby_installer: 'rvm' }
 
-    { node: ['nodes', host], user: ['data_bags/users', 'deploy'] }.each do |from, to|
+  attr_accessor :options
+
+  def initialize
+    @options = OpenStruct.new DEFAULTS
+  end
+
+  def run!
+    parse_options
+    get_host_and_app_name
+    generate_values
+
+    { node: ['nodes', @options.host],
+      user: ['data_bags/users', 'deploy']
+    }.each do |from, to|
       FileUtils.mkdir_p File.expand_path("../../tmp/#{to[0]}", __FILE__)
       File.open(File.expand_path("../../tmp/#{to.join('/')}.json", __FILE__), 'w') do |f|
         f.write ERB.new(File.open(File.expand_path("../../templates/#{from}.json.erb", __FILE__)).read).result(binding)
@@ -17,10 +28,41 @@ module FromScratch
     end
 
     Dir.chdir(File.expand_path('../..', __FILE__)) do
-      system "knife solo bootstrap root@#{host} -c ./.chef/knife.rb"
-      system "knife solo clean root@#{host} -c ./.chef/knife.rb"
+      system "knife solo bootstrap root@#{@options.host} -c ./.chef/knife.rb"
+      system "knife solo clean root@#{@options.host} -c ./.chef/knife.rb"
     end
 
     FileUtils.rm_rf [File.expand_path('../../tmp', __FILE__)]
   end
+
+  def get_host_and_app_name
+    @options.app_name, @options.host = ARGV.select { |x| !(x =~ /^\-/) }
+
+    unless @options.app_name && @options.host
+      raise ArgumentError, 'You should specify APP_NAME and HOST. Use --help for information.'
+    end
+  end
+
+  def parse_options
+    opt_parser = OptionParser.new do |args|
+      args.banner = "Usage: scratchify your_app_name your.host.com [options]"
+
+      args.on '--rbenv', 'Use RBENV instead of RVM' do
+        @options.ruby_installer = 'rbenv'
+      end
+
+      args.on '-h', '--help', 'Prints this help' do
+        puts args
+        exit
+      end
+    end
+
+    opt_parser.parse!
+  end
+
+  def generate_values
+    @options.ssh_pub_key               = `cat ~/.ssh/id_rsa.pub`.strip
+    @options.postgresql_admin_password = `echo -n '#{SecureRandom.base64(16)}''postgres' | openssl md5 | sed -e 's/.* /md5/'`.strip
+    @options.postgresql_user_password  = SecureRandom.base64(16)
+  end
 end

data/lib/from-scratch/version.rb

@@ -1,3 +1,3 @@
-module FromScratch
-  VERSION = "0.5.0"
+class FromScratch
+  VERSION = "0.6.0"
 end

data/metadata.rb

@@ -17,3 +17,4 @@ depends 'user'
 depends 'rvm'
 depends 'postgresql'
 depends 'nginx'
+depends 'ruby_rbenv'

data/templates/node.json.erb

@@ -1,8 +1,13 @@
 {
   "run_list": [
     "recipe[user::data_bag]",
+<% if @options.ruby_installer == 'rvm' %>
     "recipe[scratchify::pre_rvm]",
     "recipe[rvm::user]",
+<% elsif @options.ruby_installer == 'rbenv' %>
+    "recipe[ruby_build]",
+    "recipe[ruby_rbenv::user]",
+<% end %>
     "recipe[postgresql::server]",
     "recipe[postgresql::config_pgtune]",
     "recipe[postgresql::setup_users]",
@@ -14,6 +19,7 @@
 
   "users": ["deploy"],
 
+<% if @options.ruby_installer == 'rvm' %>
   "rvm": {
     "user_default_ruby": "2.2.3",
     "user_install_rubies": true,
@@ -27,27 +33,42 @@
     ],
     "gpg": {}
   },
+<% elsif @options.ruby_installer == 'rbenv' %>
+  "rbenv": {
+    "user_installs": [
+      { "user": "deploy",
+        "rubies": [{
+          "name": "2.2.3",
+          "environment": {
+            "RUBY_CONFIGURE_OPTS": "--disable-install-doc"
+          }
+        }],
+        "global": "2.2.3"
+      }
+    ]
+  },
+<% end %>
 
   "postgresql": {
     "version": "9.4",
     "enable_pgdg_yum": true,
     "enable_pgdg_apt": true,
     "password": {
-      "postgres": "<%= postgresql_admin_password %>"
+      "postgres": "<%= @options.postgresql_admin_password %>"
     },
     "users": [
       {
-        "username": "<%= app_name %>",
+        "username": "<%= @options.app_name %>",
         "superuser": false,
         "createdb": false,
         "login": true,
-        "password": "<%= postgresql_user_password %>"
+        "password": "<%= @options.postgresql_user_password %>"
       }
     ],
     "databases": [
       {
-        "name": "<%= app_name %>",
-        "owner": "<%= app_name %>"
+        "name": "<%= @options.app_name %>",
+        "owner": "<%= @options.app_name %>"
       }
     ],
     "pg_hba": [
@@ -72,7 +93,7 @@
   },
 
   "scratchify": {
-    "app_name": "<%= app_name %>"
+    "app_name": "<%= @options.app_name %>"
   },
 
   "nginx": {
@@ -81,6 +102,6 @@
   },
 
   "automatic": {
-    "ipaddress": "<%= host %>"
+    "ipaddress": "<%= @options.host %>"
   }
 }