from-scratch 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3665e16b338521516687e86af0988408a6caed1
-  data.tar.gz: c3141e1f2fc858d5a06461938465d07cce9da1e7
+  metadata.gz: b239eb34db5ddc59624f2554877ca0700cf26755
+  data.tar.gz: 9bfe5e376edffa38b642d1de50c2035998b1f913
 SHA512:
-  metadata.gz: 8b4689995e6a4d6453356727e22fc167e533459170e6096b611cbbfaa8a268b18d9f89801ef6c3acdbc930e4e6750855aaf2e5094e4aea0c5dd7ee5786ecaed0
-  data.tar.gz: 13b9438685118f017ad6c24986b77d8008d03e7e033c227b6ead2adff75be620a0ec43caade74758452cf010ef5b3b13fb5d05d7c98105422c3e2111a9c395aa
+  metadata.gz: 267c755543821efdb6466a64f1780e151ccb384d5058a602033579c23fcd4dd47c4bb2cf8f20f87b6f418f7d8a2995e259a32361e06f295ad9d9acb001d73b71
+  data.tar.gz: e1e0c001d1102f2fbecb3189c5299e4a30a916458acc5432bd3ea7c76ccd63f7562e44d16dd91318627f0de93cca32374bb2274415d036cd664fa8878bc22582

data/README.md

@@ -13,7 +13,7 @@ And everything is done. Then add following to your `config/deploy.rb` or `config
 
 ```ruby
 server 'your.host.com', user: 'deploy', roles: %w(app db web)
-set :deploy_to, "/home/deploy/your_app_name"
+set :deploy_to, "/home/deploy/#{fetch(:application)}"
 ```
 
 ## Supports
@@ -28,11 +28,15 @@ Ruby installers:
   - RVM (default)
   - rbenv: `scratchify your_app_name your.host.com --rbenv`
 
+Setting specific ruby version:
+
+    $ scratchify your_app_name your.host.com --ruby jruby-1.7.19
+
 ## It's a kind of magic!
 
 Not actully. Just preconfigured [Chef](https://www.chef.io/). Here are the things done with the command:
 
-  - Install user-wide RVM with latest MRI (2.2.3)
+  - Install user-wide RVM with latest MRI (2.2.4)
   - 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

data/chefignore

@@ -100,3 +100,4 @@ Gemfile.lock
 Rakefile
 lib/*
 bin/*
+*.gem

data/cookbooks/scratchify/README.md

@@ -13,7 +13,7 @@ And everything is done. Then add following to your `config/deploy.rb` or `config
 
 ```ruby
 server 'your.host.com', user: 'deploy', roles: %w(app db web)
-set :deploy_to, "/home/deploy/your_app_name"
+set :deploy_to, "/home/deploy/#{fetch(:application)}"
 ```
 
 ## Supports
@@ -28,11 +28,15 @@ Ruby installers:
   - RVM (default)
   - rbenv: `scratchify your_app_name your.host.com --rbenv`
 
+Setting specific ruby version:
+
+    $ scratchify your_app_name your.host.com --ruby jruby-1.7.19
+
 ## It's a kind of magic!
 
 Not actully. Just preconfigured [Chef](https://www.chef.io/). Here are the things done with the command:
 
-  - Install user-wide RVM with latest MRI (2.2.3)
+  - Install user-wide RVM with latest MRI (2.2.4)
   - 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

data/cookbooks/scratchify/chefignore

@@ -100,3 +100,4 @@ Gemfile.lock
 Rakefile
 lib/*
 bin/*
+*.gem

data/cookbooks/scratchify/from-scratch.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = %w(scratchify)
   spec.require_paths = %w(lib)
 
-  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_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', "~> 1.2"
+  spec.add_development_dependency 'pry',       "~> 0.10"
 
   spec.add_dependency 'knife-solo'
   spec.add_dependency 'knife-solo_data_bag'

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

@@ -21,7 +21,7 @@
 
 <% if @options.ruby_installer == 'rvm' %>
   "rvm": {
-    "user_default_ruby": "2.2.3",
+    "user_default_ruby": "<%= @options.ruby_version %>",
     "user_install_rubies": true,
     "installs": {
       "deploy": true
@@ -38,12 +38,12 @@
     "user_installs": [
       { "user": "deploy",
         "rubies": [{
-          "name": "2.2.3",
+          "name": "<%= @options.ruby_version %>",
           "environment": {
             "RUBY_CONFIGURE_OPTS": "--disable-install-doc"
           }
         }],
-        "global": "2.2.3"
+        "global": "<%= @options.ruby_version %>"
       }
     ]
   },

data/from-scratch.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |spec|
   spec.executables   = %w(scratchify)
   spec.require_paths = %w(lib)
 
-  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_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', "~> 1.2"
+  spec.add_development_dependency 'pry',       "~> 0.10"
 
   spec.add_dependency 'knife-solo'
   spec.add_dependency 'knife-solo_data_bag'

data/lib/from-scratch.rb

@@ -5,7 +5,7 @@ require 'optparse'
 require 'ostruct'
 
 class FromScratch
-  DEFAULTS = { ruby_installer: 'rvm' }
+  DEFAULTS = { ruby_installer: 'rvm', ruby_version: '2.2.4' }
 
   attr_accessor :options
 
@@ -51,6 +51,10 @@ class FromScratch
         @options.ruby_installer = 'rbenv'
       end
 
+      args.on '--ruby [VERSION]', "Choose specific ruby version instead of latest MRI" do |ruby_version|
+        @options.ruby_version = ruby_version
+      end
+
       args.on '-h', '--help', 'Prints this help' do
         puts args
         exit

data/lib/from-scratch/version.rb

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

data/templates/node.json.erb

@@ -21,7 +21,7 @@
 
 <% if @options.ruby_installer == 'rvm' %>
   "rvm": {
-    "user_default_ruby": "2.2.3",
+    "user_default_ruby": "<%= @options.ruby_version %>",
     "user_install_rubies": true,
     "installs": {
       "deploy": true
@@ -38,12 +38,12 @@
     "user_installs": [
       { "user": "deploy",
         "rubies": [{
-          "name": "2.2.3",
+          "name": "<%= @options.ruby_version %>",
           "environment": {
             "RUBY_CONFIGURE_OPTS": "--disable-install-doc"
           }
         }],
-        "global": "2.2.3"
+        "global": "<%= @options.ruby_version %>"
       }
     ]
   },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: from-scratch
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Andrew Shaydurov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -575,23 +575,17 @@ files:
 - cookbooks/rvm/test/unit/libraries/provider_rvm_installation_spec.rb
 - cookbooks/rvm/test/unit/libraries/resource_rvm_installation_spec.rb
 - cookbooks/rvm/test/unit/spec_helper.rb
-- cookbooks/scratchify/.chef/knife.rb
 - cookbooks/scratchify/Berksfile
 - cookbooks/scratchify/Berksfile.lock
 - cookbooks/scratchify/LICENSE.txt
 - cookbooks/scratchify/README.md
 - cookbooks/scratchify/Thorfile
-- cookbooks/scratchify/bin/scratchify
 - cookbooks/scratchify/chefignore
 - cookbooks/scratchify/from-scratch.gemspec
-- cookbooks/scratchify/lib/from-scratch.rb
-- cookbooks/scratchify/lib/from-scratch/version.rb
 - cookbooks/scratchify/metadata.json
 - cookbooks/scratchify/recipes/default.rb
 - cookbooks/scratchify/recipes/nginx_site.rb
 - cookbooks/scratchify/recipes/pre_rvm.rb
-- cookbooks/scratchify/spec/from/scratch_spec.rb
-- cookbooks/scratchify/spec/spec_helper.rb
 - cookbooks/scratchify/templates/database.yml.erb
 - cookbooks/scratchify/templates/nginx.erb
 - cookbooks/scratchify/templates/node.json.erb

data/cookbooks/scratchify/.chef/knife.rb

@@ -1,6 +0,0 @@
-cookbook_path    "cookbooks"
-node_path        "tmp/nodes"
-data_bag_path    "tmp/data_bags"
-
-knife[:berkshelf_path] = "cookbooks"
-Chef::Config[:ssl_verify_mode] = :verify_peer if defined? ::Chef

data/cookbooks/scratchify/bin/scratchify

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "from-scratch"
-
-FromScratch.new.run!

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

@@ -1,68 +0,0 @@
-require 'securerandom'
-require 'erb'
-require 'fileutils'
-require 'optparse'
-require 'ostruct'
-
-class FromScratch
-  DEFAULTS = { ruby_installer: 'rvm' }
-
-  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)
-      end
-    end
-
-    Dir.chdir(File.expand_path('../..', __FILE__)) do
-      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 +0,0 @@
-class FromScratch
-  VERSION = "0.6.0"
-end

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

@@ -1,68 +0,0 @@
-require 'spec_helper'
-
-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
-
-  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,9 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-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