salted-rails 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDdiZWRhMWZmOGIzZmI4OTdjZmI3YTE2MjIzOGNmZGJkNzRiMzI3NQ==
+  data.tar.gz: !binary |-
+    NTMyYjkxMzI0NjkwOGJjZWU0NmMxMzFjN2I1ZGJmZmI4ZTQwZDE0ZA==
+SHA512:
+  metadata.gz: !binary |-
+    ZTQzYTRhN2ExMDc4OWE0ZDc5N2U1MGI1N2Q1YjVjY2UzNjQxOTNlODIwYzg2
+    ZjQ3YjU0OTNkNDBkNjI3MTUxN2YxOWUzZGY5YTc4MDY5OGI3YTM0MmRmYmI0
+    YmY2NjdkMmE3YzAyYjFhNzM2ZDJlZWIzZjY3ZjQ1YzVkNDUxMTM=
+  data.tar.gz: !binary |-
+    MzUxODRhMDBiMGQ1NWQyYjJiMDJjNmIxNTE4ZGNlYWM4ZDUwMmE2MTA0N2U5
+    NzRkM2I5ZjE5NzQzMDFjYzdlYmIyOTgzNzIwZjFkYTJkYjJjYTBkMjJmNzY4
+    MDMxNzc1ODI2NmRkNWJjNjlkY2RkNGFmMTJkZDE2YWQ5Y2EzZGM=

data/.gitignore

@@ -1,6 +1,3 @@
-# OS-specific
-.DS_Store
-
 # Vagrant stuff
 acceptance_config.yml
 boxes/*
@@ -15,27 +12,13 @@ tags
 /Gemfile.lock
 test/tmp/
 
+/bin
+
 # Documentation
 _site/*
 .yardoc/
 doc/
 
-# Python
-*.pyc
-
-# Rubinius
-*.rbc
-
-# IDE junk
-.idea/*
-*.iml
-
-# Ruby Managers
-.rbenv
-.ruby-gemset
-.ruby-version
-.rvmrc
-
 # Website: docs
 website/docs/.sass-cache
 website/docs/build
@@ -50,7 +33,5 @@ website/www/Rakefile
 /salt/railsapp/files
 /pillar/application.sls
 
-# Temp files
-,*
-*~
-
+# See: https://gist.github.com/ianheggie/9327010
+# for Global git ignore for OS/IDE/temp/backup files

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+notifications:
+  email:
+    on_success: change
+    on_failure: always
+
+before_install:
+  - gem update --system $RUBYGEMS_VERSION
+  - gem --version
+  - gem install bundler
+  - bundle --version
+
+bundler_args: "--binstubs"
+
+script: bin/rspec
+
+rvm: 
+  - 1.9.3
+

data/README.md

@@ -20,10 +20,7 @@ This configures vagrant in the way that I personally like:
 * forward post 3000, 80, 443
 * Include fix vbguest fix for upgrading virtualbox additions with ubunutu cloud
 
-I am thinking of doing the following in the future:
-* Configuring up vim with a standard set of plugins
-* Expand it for use with capistrano (for deployment to staging and production servers), including hardening up the server for security
-* Expand it to construct continuous testing / delivery servers
+**I am currently investigating ansible and alternative approaches, so this project is currently on hold**
 
 ## Installation
 
@@ -31,8 +28,8 @@ I am thinking of doing the following in the future:
 
 Download init.sh script and run:
 
-  $ wget https://raw.github.com/ianheggie/salted-rails/master/init.sh
-  $ sh init.sh
+    $ wget https://raw.github.com/ianheggie/salted-rails/master/init.sh
+    $ sh init.sh
 
 This will:
 

data/Rakefile

@@ -1 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/init.sh

@@ -3,37 +3,41 @@
 msg='OK: Vagrant has been setup: ready for vagrant up [--provider=digital_ocean]'
 
 if which VirtualBox; then
-  echo Found Virtualbox
+  echo Found VirtualBox
+  VirtualBox --help | line
 else
-  echo ACTION REQUIRED: Please install Virtualbox 4.2.18 or later from https://www.virtualbox.org/wiki/Downloads
+  echo 'ACTION REQUIRED: Please install VirtualBox 4.2.18 or later from https://www.virtualbox.org/wiki/Downloads'
   msg='(PLEASE RERUN SCRIPT AFTERWARDS)'
 fi
 
 if which vagrant; then
-  echo Found vagrant
-  echo Checking vagrant plugins are installed ...
+  echo 'Found vagrant:'
+  vagrant -v
+  echo 'Checking vagrant plugins are installed ...'
 
   vagrant plugin list > /tmp/t$$
   for plugin in deep_merge vagrant-digitalocean vagrant-vbguest salted-rails
   do
     if grep $plugin < /tmp/t$$; then
+      echo Updating plugin $plugin
       vagrant plugin update $plugin
     else
+      echo Installing plugin $plugin
       vagrant plugin install $plugin
     fi
   done
 
 else
-  echo ACTION REQUIRED: Please install vagrant 1.3.3 (1.3.4 has a bug) from http://www.vagrantup.com/
+  echo 'ACTION REQUIRED: Please install vagrant 1.3.3 (1.3.4 has a bug) from http://www.vagrantup.com/'
   msg='(PLEASE RERUN SCRIPT AFTERWARDS)'
 fi
 
 if [ ! -f Vagrantfile ]; then
   if [ -f Vagrantfile.example ]; then
     if [ -f Vagrantfile ]; then
-      echo Found Vagrantfile '(previously copied from example)'
+      echo 'Found Vagrantfile (previously copied from example)'
     else
-      echo Copying Vagrantfile.example to Vagrantfile '(so you can customize it)'
+      echo 'Copying Vagrantfile.example to Vagrantfile (so you can customize it)'
       cp Vagrantfile.example Vagrantfile
     fi
   else
@@ -42,16 +46,18 @@ if [ ! -f Vagrantfile ]; then
   fi
 fi
 
-mkdir -p $HOME/.vagrant.d
+mkdir -p "$HOME/.vagrant.d"
 
-if [ -f "$HOME/.vagrant.d/Vagrantfile" ]; then
-  echo Found global Vagrantfile
+global_Vagrantfile="$HOME/.vagrant.d/Vagrantfile"
+if [ -f "$global_Vagrantfile" ]; then
+  echo Found global Vagrantfile: $global_Vagrantfile
 else
-  echo "About to set up ~/.vagrant.d/Vagrantfile"
+  echo "About to set up $global_Vagrantfile"
   echo -n "Enter your digital ocean client key (defaul none): "
   read client_id
   echo -n "Enter your digital ocean API key (defaul none): "
   read api_key
+  if [ -n "$client_id" -a -n "$api_key" ] ; then
   echo "
 Vagrant.configure('2') do |config|
   config.vm.provider :digital_ocean do |provider|
@@ -59,7 +65,8 @@ Vagrant.configure('2') do |config|
     provider.api_key = '$api_key'
   end
 end
-" > $HOME/.vagrant.d/Vagrantfile
+" > $global_Vagrantfile
+  fi
 fi
 echo
 echo "$msg"

data/lib/salted-rails/config.rb

@@ -53,7 +53,12 @@ module SaltedRails
       @private_key_path = nil
       @mirror = nil
       @memory = nil
-      @ports = [ 80, 443, 880, 3000 ]
+
+      # app in production mode: 80, 443
+      # admin: 880
+      # app in dev mode: 3000
+      # gem server: 8808
+      @ports = [ 80, 443, 880, 3000, 8808 ]
       @mapped_ports = { }
       @sync_vagrant = nil
       @box = nil
@@ -165,7 +170,7 @@ module SaltedRails
       @versions['mysql'] ||= '5.5' if @roles.include?('mysql')
       @versions['teamcity'] ||= '8.0.4' if @roles.include?('teamcity')
       @versions['rubymine'] ||= '5.4.3' if @roles.include?('rubymine')
-      @roles << 'gui' if @roles.include?('rubymine') and not @roles.include?('gui')
+      @roles << 'gui' if @roles.include?('rubymine') and not gui?
 
       %w{ ruby php java }.each do |lang|
         version = File.open(@project_root + ".#{lang}-version", 'r') do |f_in|

data/lib/salted-rails/vagrant_helper.rb

@@ -27,7 +27,7 @@ module SaltedRails
         @config.machines.each do |machine_config|
           machine_config.logger.info "Configuring machine #{machine_config.machine}, hostname: #{machine_config.hostname}"
           vagrant_config.vm.define(machine_config.machine.to_sym) do |vagrant_vm_config|
-            configure_gui(vagrant_vm_config) if @config.gui?
+            configure_gui(vagrant_vm_config) if machine_config.gui?
             configure_hostname(vagrant_vm_config, machine_config)
             configure_ports(vagrant_vm_config, port_offset, machine_config)
             configure_memory(vagrant_vm_config, machine_config.memory, machine_config)

data/lib/salted-rails/version.rb

@@ -1,3 +1,3 @@
 module SaltedRails
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/salt/bin/provision

@@ -13,28 +13,32 @@ runit()
 	0)
 		echo "Running all states ..."
 		sudo salt-call saltutil.sync_all
-		sudo salt-call state.highstate 
+		sudo salt-call --retcode-passthrough state.highstate 
+		ret=$?
+		echo "exit status: $ret"
 		;;
 	*)
 		for file; do
 			echo "Running $file ..."
-			sudo salt-call state.sls "$file"
+			sudo salt-call --retcode-passthrough state.sls "$file"
+			ret=$?
+			echo "exit status: $ret"
 		done
 		;;
 	esac
 }
 case "$1" in
 run)
+        ret=
 	shift
         if $no_check; then
                 # Color is used when there is no checking (piped output)
                 runit "$@"
-                exit
+                exit $ret
         fi
         runit "$@" 2>&1 | tee /tmp/t$$
         echo
         echo Checking results log:
-        ret=
         if egrep '^\[ERROR *\]' /tmp/t$$; then
                 echo ERROR: `egrep '^\[ERROR *\]' /tmp/t$$ | wc -l` ERRORS FOUND IN LOG
                 ret=1

data/salted-rails.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "log4r"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec", '~> 2.14'
 end

data/spec/bin/install_other_plugins

@@ -0,0 +1,4 @@
+#!/bin/bash
+#
+# Installs other plugins that we use for testing
+

data/spec/bin/install_this_plugin

@@ -0,0 +1,5 @@
+#!/bin/bash
+#
+# Installs this plugin into vagrant
+
+

data/spec/bin/install_vagrant

@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+# Installs vagrant if it is missing
+
+if which vagrant && vagrant -v ; then
+  echo 'found vagrant!'
+else
+  wget https://dl.bintray.com/mitchellh/vagrant/vagrant_1.4.3_x86_64.deb
+  sudo dpkg -i vagrant_1.4.3_x86_64.deb
+fi

data/spec/examples/project_with_Gemfile/Gemfile

@@ -0,0 +1 @@
+gem 'mysql'

data/spec/integration/init_sh_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'init.sh' do
+  context 'when run', :slow => true do
+
+    before(:all) do
+      @output = `sh init.sh < /dev/null`
+      @exit_status = $?
+    end
+
+    it 'should not exit with an error' do
+      expect(@exit_status).to be == 0
+    end
+
+    it "should create ~/.vagrant.d directory" do
+      expect(File.directory?("#{ENV['HOME']}/.vagrant.d")).to be == true 
+    end
+
+    context "output" do
+      subject { @output }
+
+      it { should =~ /VirtualBox/ }
+
+      if system 'which vagrant > /dev/null'
+        it { should =~ /Found vagrant/ }
+        it { should =~ /Vagrant\s*\d+\.\d+\.\d+/ }
+        # should mention plugins
+        %w{deep_merge vagrant-digitalocean vagrant-vbguest salted-rails}.each do |plugin|
+          it { should =~ /plugin #{plugin}/ }
+        end
+      else
+        it { should =~ /Please install vagrant/ }
+      end
+
+      if system 'which VirtualBox > /dev/null'
+        it { should =~ /Found VirtualBox/ }
+        it { should =~ /VirtualBox\D+\d+\.\d+\.\d+/ }
+      else
+        it { should =~ /Please install VirtualBox/ }
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,21 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.expect_with :rspec do |c|
+    # disable the `should` syntax...
+    c.syntax = :expect
+  end
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

data/spec/unit/config_spec.rb

@@ -0,0 +1,77 @@
+#require 'rspec'
+require 'spec_helper'
+
+require 'salted-rails/config'
+
+describe 'SaltedRails::Config' do
+
+  context '.new with empty project' do
+    subject { SaltedRails::Config.new(File.expand_path('../examples/empty_project', File.dirname(__FILE__))) }
+
+    context 'attributes' do
+      %w{ admin_password box ca_path copy_from_home databases domain files forward_agent gems hostname
+         logger machine machines mapped_ports memory mirror packages ports private_key_path project_root
+         region roles salt_root staging_password sync_vagrant versions }.each do |attr|
+          it { should respond_to(attr) }
+          it { should respond_to("#{attr}=") }
+      end
+    end
+
+    context '#sanitize_dns_name' do
+      it 'should lowercase names' do
+        expect(subject.sanitize_dns_name('FRED')).to be == 'fred'
+      end
+      
+      it 'should replace one or more illegal chars with hyphen' do
+        expect(subject.sanitize_dns_name('apple\'s')).to be == 'apple-s'
+        expect(subject.sanitize_dns_name('what!_*&fruit')).to be == 'what-fruit'
+      end
+        
+      it 'should not leave hyphens on the end' do
+        expect(subject.sanitize_dns_name('one-')).to be == 'one'
+        expect(subject.sanitize_dns_name('no!!!!')).to be == 'no'
+      end
+    end
+
+    describe '.machines' do
+      it { expect(subject.machines).to be == [ ] }
+    end
+
+    describe '.machine' do
+      it { expect(subject.machine).to be == 'default' }
+    end
+
+    describe '.roles' do
+      it { expect(subject.roles).to be == %w{ app web db } }
+    end
+
+    describe '.ports' do
+      it { expect(subject.ports).to be == [ 80, 443, 880, 3000, 8808 ] }
+    end
+
+    describe '.files' do
+      it { expect(subject.files).to be == [ ] }
+    end
+
+    describe '.gems' do
+      it { expect(subject.gems).to be == { } }
+    end
+
+   end
+
+  context '.new with project having Gemfile' do
+    subject { SaltedRails::Config.new(File.expand_path('../examples/project_with_Gemfile', File.dirname(__FILE__))) }
+
+    describe '.files' do
+      it { expect(subject.files).to be == %w{ Gemfile } }
+    end
+
+    describe '.gems' do
+      it { expect(subject.gems).to be == { 'mysql' => true } }
+    end
+
+    describe '.roles' do
+      it { expect(subject.roles).to be == %w{ app web db mysql } }
+    end
+  end
+end

data/spec/unit/salted_rails_spec.rb

@@ -0,0 +1,13 @@
+require 'rspec'
+require 'spec_helper'
+
+require 'salted-rails'
+
+describe 'SaltedRails' do
+
+  context "::VESION" do
+    subject { SaltedRails::VERSION }
+    it { should =~ /^\d+\.\d+\.\d+/ }
+  end
+
+end

metadata

@@ -1,20 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: salted-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Ian Heggie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,11 +48,24 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
 description: Provision rails using salt to vagrant or capistrano controlled systems
 email:
 - ian@heggie.biz
@@ -51,6 +74,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -190,31 +215,48 @@ files:
 - salt/www/nginx/srv/www/admin/robots.txt
 - salt/www/users.sls
 - salted-rails.gemspec
+- spec/bin/install_other_plugins
+- spec/bin/install_this_plugin
+- spec/bin/install_vagrant
+- spec/examples/empty_project/.gitkeep
+- spec/examples/project_with_Gemfile/Gemfile
+- spec/integration/init_sh_spec.rb
+- spec/spec_helper.rb
+- spec/unit/config_spec.rb
+- spec/unit/salted_rails_spec.rb
 homepage: https://github.com/ianheggie/salted-rails
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provision rails using salt to vagrant or capistrano controlled systems. Uses
   details from .ruby-version, config/database.yml, Gemfile and Gemfile.lock to configure
   system
-test_files: []
+test_files:
+- spec/bin/install_other_plugins
+- spec/bin/install_this_plugin
+- spec/bin/install_vagrant
+- spec/examples/empty_project/.gitkeep
+- spec/examples/project_with_Gemfile/Gemfile
+- spec/integration/init_sh_spec.rb
+- spec/spec_helper.rb
+- spec/unit/config_spec.rb
+- spec/unit/salted_rails_spec.rb