cachivache 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d395340edc5efa34f8cafead802c3ff0726da99
-  data.tar.gz: 2c1cb76ae62c0fa558cad5072e64d68fc762cfce
+  metadata.gz: 3057e44a88c0f053f9d6a60541f0acf8a45f9278
+  data.tar.gz: 26bfabc484bffff7e437b221cb4e82981959e6a9
 SHA512:
-  metadata.gz: 7d48d5f20a32d6e2a6759fb005670199096d7b30fdbbb6ce6e475a2bd8800a8b1209857daa816e20075f8942a7be7a43f14fb386de5b2c73b5d38e825d889763
-  data.tar.gz: 92eb614e6831df563bf4a5099dbd0814e570438b34d4d5580eeb9ad276ac392348b1e146ea00137685eafaf313738b43609ffc3b0df4ca1011b95ef633d53f8d
+  metadata.gz: 8a2e63fbfbc9c455df606679bdfceca6b9622ed0a78ebbcceac470a34b8606928e64ee16b8eadef4cbe784d48428d7dd5c8064a6dc366f9d554e0bf541bee88d
+  data.tar.gz: b04204bfd561b2a22b24814d67fdd2b967ec8d0c8b0a324afde9c3f2e0043be730c7706154b33656ad63125bb60d1dec3ae6e9e63fc51f54aaa2b658598bd6d0

data/bin/template/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'rake'
-gem 'colorize'
+gem 'colorize'
+gem 'cachivache-helpers'

data/bin/template/Rakefile

@@ -1,13 +1,47 @@
-require_relative 'lib/rake-helper'
+require 'rake'
+
+require_relative 'cachivache'
+require 'cabeza-de-termo/cachivache-helpers/helpers'
+
+######################################
+# Include all stuffs behaviours
+######################################
+
+include Stuff::ApiBehaviour
+include Stuff::RemindersBehaviour
+include RakeAdaptor
+ShellContext.set_current( ShellExec.new(self) )
+
+######################################
+# Validate the provision configuration
+######################################
 
 raise_validation_error "Please define the parameter Cachivache.git_user_email in './cachivache.rb' run 'vagrant provision' again" unless Cachivache.is_defined?(:git_user_email)
 raise_validation_error "Please define the parameter Cachivache.git_user_name in './cachivache.rb' run 'vagrant provision' again" unless Cachivache.is_defined?(:git_user_name)
 raise_validation_error "Please define some Cachivache.stuff_to_install in './cachivache.rb' run 'vagrant provision' again" if Cachivache.stuff_to_install.empty?
 
+######################################
+# Load all the .rb files in this folder
+######################################
+
+all_rb_files_in Cachivache.cachivache_folder do |file|
+	require file
+end
+
+######################################
+# Define the tasks that run the provision
+######################################
+
+def stuff_to_install(&block)
+	Cachivache.stuff_to_install.each do |stuff_name|
+		block.call stuff_name
+	end
+end
+
 def provision_stuff_to_install()
 	stuff_to_install do |stuff_name|
     	show_info "Provisioning #{stuff_name}"
-		invoke stuff_name
+		invoke_stuff stuff_name
 	end
    	show_info "All done!!!"
 end
@@ -17,7 +51,7 @@ stuff :provision do
 end
 
 stuff :explain do
-	ShellContext.set_current ShellDebugger.new
+	ShellContext.set_current ShellDebugger.new(self)
 	provision_stuff_to_install
 end
 

data/bin/template/Vagrantfile

@@ -39,23 +39,25 @@ Vagrant.configure(2) do |config|
       type: "shell",
       privileged: false,
       inline: %Q{
-			# From https://www.digitalocean.com/community/tutorials/how-to-install-ruby-on-rails-with-rbenv-on-ubuntu-14-04
-			if [ ! -d $HOME/.rbenv/ ]; then
+  			# From https://www.digitalocean.com/community/tutorials/how-to-install-ruby-on-rails-with-rbenv-on-ubuntu-14-04
+  			if [ ! -d $HOME/.rbenv/ ]; then
 
-	      	sudo apt-get install git-core -y
+          sudo apt-get update
 
-				git clone git://github.com/sstephenson/rbenv.git .rbenv
-				echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bash_profile
-				echo 'eval "$(rbenv init -)"' >> ~/.bash_profile
+  	      sudo apt-get install git-core -y
 
-				git clone git://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
-				echo 'export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bash_profile
-				source ~/.bash_profile
+  				git clone git://github.com/sstephenson/rbenv.git .rbenv
+  				echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bash_profile
+  				echo 'eval "$(rbenv init -)"' >> ~/.bash_profile
 
-				git clone git://github.com/carsomyr/rbenv-bundler.git ~/.rbenv/plugins/bundler
+  				git clone git://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
+  				echo 'export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bash_profile
+  				source ~/.bash_profile
 
-				sudo gem install bundler
-			fi
+  				git clone git://github.com/carsomyr/rbenv-bundler.git ~/.rbenv/plugins/bundler
+
+  				sudo gem install bundler
+  			fi
       }
 
   config.vm.provision "rake-provision",

data/bin/template/cachivache.rb

@@ -1,4 +1,4 @@
-require_relative 'lib/stuff-configuration'
+require_relative 'utilities/stuff-configuration'
 
 class Cachivache < Stuff::Configuration
    # Vagrant params

data/bin/template/stuff/php-site-sample/cachivache-com.rb

@@ -21,13 +21,13 @@ namespace :'cachivache-com' do
 	task :'enable-site' do
 		shell %Q{
 			# Copy .conf to /etc/apache2/sites-available
-			sudo cp -f #{Cachivache.provision_folder}/stuff/php-site-sample/cachivache-com.conf /etc/apache2/sites-available
+			sudo cp -f #{Cachivache.stuff_folder}/php-site-sample/cachivache-com.conf /etc/apache2/sites-available
 
 			# Enable cachivache-com.conf
 			sudo a2ensite cachivache-com.conf
 
 			# Link the /data/www to the actual src location
-			sudo ln -s #{CachivacheDotCom.app_folder}/web /var/www/cachivache-com
+			sudo ln -s #{CachivacheDotCom.app_folder}/web /var/www/cachivache.com
 		}
 	end
 
@@ -54,7 +54,7 @@ namespace :'cachivache-com' do
 
 	task :'populate-mysql' do
 		shell %Q{
-			mysql -uroot -p#{MysqlServer.root_password} < #{Cachivache.provision_folder}/stuff/php-site-sample/populate-mysql.sql
+			mysql -uroot -p#{MysqlServer.root_password} < #{Cachivache.stuff_folder}/php-site-sample/populate-mysql.sql
 		}
 	end
-end
+end

data/bin/template/stuff/php-site-sample/config.rb

@@ -1,4 +1,4 @@
-configure :CachivacheDotCom
-	let(:app_folder) { CachivacheDotCom.src_folder + "/yii2" }
+configure :CachivacheDotCom do
+	let(:app_folder) { Cachivache.src_folder + "/yii2" }
 	let(:domain) { 'cachivache.com' }
 end

data/bin/template/{lib → utilities}/stuff-configuration.rb

@@ -1,3 +1,5 @@
+# Duplicating this class here and in cachivache-helpers sucks, but I haven't
+# come up with a decent workaround yet, so ...
 module Stuff
 	class Configuration
 		# Class methods

data/lib/cachivache/version.rb

@@ -1,3 +1,3 @@
 module Cachivache
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cachivache
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Martin Rubi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -86,22 +86,13 @@ files:
 - bin/template/Rakefile
 - bin/template/Vagrantfile
 - bin/template/cachivache.rb
-- bin/template/lib/rake-helper.rb
-- bin/template/lib/shell-contexts/shell-context.rb
-- bin/template/lib/shell-contexts/shell-exec.rb
-- bin/template/lib/shell-contexts/shell_buffer.rb
-- bin/template/lib/shell-contexts/shell_debugger.rb
-- bin/template/lib/shell-file-context.rb
-- bin/template/lib/shell-if-context.rb
-- bin/template/lib/stuff-api-behaviour.rb
-- bin/template/lib/stuff-configuration.rb
-- bin/template/lib/stuff-reminders-behaviour.rb
 - bin/template/stuff/.gitkeep
 - bin/template/stuff/php-site-sample/cachivache-com.conf
 - bin/template/stuff/php-site-sample/cachivache-com.rb
 - bin/template/stuff/php-site-sample/config.rb
 - bin/template/stuff/php-site-sample/populate-mysql.sql
 - bin/template/stuff/stuff-sample.rb
+- bin/template/utilities/stuff-configuration.rb
 - cachivache.gemspec
 - lib/cachivache.rb
 - lib/cachivache/add-stuff-libraries-command.rb

data/bin/template/lib/rake-helper.rb

@@ -1,53 +0,0 @@
-require 'rake'
-require 'colorize'
-require 'pathname'
-
-require_relative '../cachivache'
-
-# Helper - Iterate all .rb files in a folder
-def all_rb_files_in(folder, &block)
-	Dir[Pathname.new(folder) + '**/*.rb'].each do |file| 
-		block.call(file)
-	end
-end
-
-def stuff_to_install(&block)
-	Cachivache.stuff_to_install.each do |stuff_name|
-		block.call stuff_name
-	end
-end
-
-public
-
-######################################
-# require all the files in /lib first
-######################################
-
-all_rb_files_in Cachivache.cachivache_folder + '/lib' do |file|
-	require file
-end
-
-######################################
-# Stuff Api behaviour
-######################################
-
-def stuff(task_definition, *args, &block)
-	task(task_definition, *args, &block)
-end
-
-def execute_shell_command(command)
-	sh command
-end
-
-include Stuff::ApiBehaviour
-include Stuff::RemindersBehaviour
-
-ShellContext.set_current( ShellExec.new(self) )
-
-######################################
-# Load the rest of the files
-######################################
-
-all_rb_files_in Cachivache.cachivache_folder do |file|
-	require file
-end

data/bin/template/lib/shell-contexts/shell-context.rb

@@ -1,63 +0,0 @@
-class ShellContext
-	@current = nil
-	@reminders = []
-
-	def self.current()
-		@current
-	end
-
-	def self.set_current(shell_context)
-		@current = shell_context
-	end
-
-	def self.during_shell_context(new_shell_context, &block)
-		current_shell_context = @current
-
-		@current = new_shell_context
-
-		block.call
-
-		@current = current_shell_context
-	end
-
-	def self.reminders()
-		@reminders
-	end
-
-	def self.show_info(text)
-		puts '-----------------------------------------------'.red
-		puts text.green
-		puts '-----------------------------------------------'.red
-	end
-
-	# Instance methods
-
-	def shell(command)
-		raise 'Subclass responsibility'
-	end
-
-	def shell!(command)
-		raise 'Subclass responsibility'
-	end
-
-	def invoke(task_name, *args)
-		Rake::Task[task_name].invoke(*args)
-	end
-
-	def execute(task_name, *args)
-		Rake::Task[task_name].execute(*args)
-	end
-
-	def remind_to(text)
-		ShellContext.reminders << text
-	end
-
-	def raise_validation_error(message)
-		show_info(message)
-		exit
-	end
-
-	def show_info(text)
-		ShellContext.show_info(text)
-	end
-end

data/bin/template/lib/shell-contexts/shell-exec.rb

@@ -1,19 +0,0 @@
-require_relative 'shell-context'
-
-class ShellExec < ShellContext
-	def initialize(scope)
-		@scope = scope
-	end
-
-	def scope()
-		@scope
-	end
-
-	def shell(command)
-		shell! command
-	end
-
-	def shell!(command)
-		scope.execute_shell_command(command)
-	end
-end

data/bin/template/lib/shell-contexts/shell_buffer.rb

@@ -1,25 +0,0 @@
-require_relative 'shell-context'
-
-class ShellBuffer < ShellContext
-	def initialize(underlaying_shell_context)
-		@underlaying_shell_context = underlaying_shell_context
-		@contents = ''
-	end
-
-	def underlaying_shell_context()
-		@underlaying_shell_context
-	end
-
-	def contents
-		@contents
-	end
-
-	def shell(command)
-		contents << "\n" unless contents.empty?
-		contents << command
-	end
-
-	def shell!(command)
-		underlaying_shell_context.shell! command
-	end
-end

data/bin/template/lib/shell-contexts/shell_debugger.rb

@@ -1,11 +0,0 @@
-require_relative 'shell-context'
-
-class ShellDebugger < ShellContext
-	def shell(command)
-		puts command.cyan
-	end
-
-	def shell!(command)
-		puts command.red
-	end
-end

data/bin/template/lib/shell-file-context.rb

@@ -1,36 +0,0 @@
-require_relative 'stuff-api-behaviour'
-
-class ShellFileContext
-	include Stuff::ApiBehaviour
-
-	def self.with(args, &block)
-		new(args).evaluate_with block
-	end
-
-	def initialize(args)
-		@filename = args[:file]
-	end
-
-	def evaluate_with(block)
-		instance_eval(&block)
-	end
-
-	# replace pattern: "user: ''", with: "user: 'admin'"
-	def replace(params)
-		pattern = params[:pattern]
-		replacement = params[:with]
-		%Q{
-			sudo sed -i 's|#{pattern}|#{replacement}|g' #{@filename}
-		}
-	end
-
-	# append '[mongo]'
-	# append :new_line
-	def append(text)
-		text = "\n" if text == :new_line
-
-		%Q{
-			echo "#{text}" | sudo tee -a #{@filename}
-		}
-	end
-end

data/bin/template/lib/shell-if-context.rb

@@ -1,21 +0,0 @@
-require_relative 'stuff-api-behaviour'
-
-class ShellIfContext
-	include Stuff::ApiBehaviour
-
-	def self.with(args, &block)
-		new(args).evaluate_with block
-	end
-
-	def initialize(args)
-		@guard = args[:guard]
-	end
-
-	def evaluate_with(block)
-		shell "if #{@guard}; then"
-
-		instance_eval(&block)
-
-		shell "fi"
-	end
-end

data/bin/template/lib/stuff-api-behaviour.rb

@@ -1,145 +0,0 @@
-module Stuff
-	module ApiBehaviour
-		def shell_context()
-			ShellContext.current
-		end
-
-		def invoke(task_name, *args)
-			shell_context.invoke(task_name, *args)
-		end
-
-		def execute(task_name, *args)
-			shell_context.execute(task_name, *args)
-		end
-
-		def shell(command)
-			shell_context.shell(command)
-		end
-
-		def shell!(command)
-			shell_context.shell!(command)
-		end
-
-		# Examples:
-		#
-		# shell_unless file_exists: '/bla.conf' do
-		# 	shell %Q{
-		# 		ls -la
-		# 		rm -rf bla
-		# 	}
-		# end
-		#
-		# shell_unless folder_exists: '/bla' do
-		# 	shell %Q{
-		# 		ls -la
-		# 		rm -rf bla
-		# 	}
-		# end
-		#
-		# shell_unless file: '/bla', contains: 'some regex' do
-		# 	shell %Q{
-		# 		ls -la
-		# 		rm -rf bla
-		# 	}
-		# end
-		#
-		# shell_unless command: 'java -version', contains: 'java 1.8' do
-		# 	shell %Q{
-		# 		ls -la
-		# 		rm -rf bla
-		# 	}
-		# end
-		#
-		def shell_unless(params, &block)
-			if params.key?(:file_exists)
-				shell unless_file_exists(params[:file_exists], &block)
-				return
-			end
-			if params.key?(:folder_exists)
-				shell unless_folder_exists(params[:folder_exists], &block)
-				return
-			end
-			if params.key?(:file) && params.key?(:contains)
-				shell unless_regex_in_file(params[:contains], params[:file], &block)
-				return
-			end
-			if params.key?(:command) && params.key?(:contains)
-				shell unless_regex_in_command(params[:contains], params[:command], &block)
-				return
-			end
-			raise 'Invalid unless option'
-		end
-
-		# Examples:
-		#
-		# in_file "/bla.conf" do
-		# 	shell replace pattern: "%user%", with: "admin"
-		#
-		# 	shell append "[cachivache]"
-		# 	shell append "path='/bla'"
-		# end
-		def in_file(filename, &block)
-			script = during_shell_buffer do
-				ShellFileContext.with(file: filename, &block)
-			end
-
-			shell script
-		end
-
-		# Examples:
-		#
-		# remind_to 'This is shown when the provision ends'
-		def remind_to(text)
-			shell_context.remind_to(text)
-		end
-
-		def raise_validation_error(message)
-			shell_context.raise_validation_error(message)
-		end
-
-		# Example:
-		#
-		# configure :Something do
-		# 	let(:bla)		{ '123' }
-		# 	let(:ble)		{ 'abc' }
-		# end
-		def configure(class_name, &block)
-			Stuff::Configuration.ensure_subclass_exists(class_name)
-			Stuff::Configuration.class_named(class_name).instance_eval(&block)
-		end
-
-		protected
-
-		def during_shell_buffer(&block)
-			temporary_shell_buffer = ShellBuffer.new(shell_context)
-
-			ShellContext.during_shell_context(temporary_shell_buffer, &block)
-
-			temporary_shell_buffer.contents
-		end
-
-		def unless_file_exists(filename, &block)
-			during_shell_buffer do
-				ShellIfContext.with(guard: "[ ! -e #{filename} ]", &block)
-			end
-		end
-
-		def unless_folder_exists(folder, &block)
-			during_shell_buffer do
-				ShellIfContext.with(guard: "[ ! -d #{folder} ]", &block)
-			end
-		end
-
-		def unless_regex_in_file(regex, filename, &block)
-			during_shell_buffer do
-				ShellIfContext.with(guard: "! grep -q \"#{regex}\" \"#{filename}\"", &block)
-			end
-		end
-
-		def unless_regex_in_command(regex, command, &block)
-			during_shell_buffer do
-				ShellIfContext.with(guard: "! #{command} | grep -q \"#{regex}\"", &block)
-			end
-		end
-	end
-end

data/bin/template/lib/stuff-reminders-behaviour.rb

@@ -1,11 +0,0 @@
-module Stuff
-	module RemindersBehaviour
-		def show_reminders()
-			ShellContext.reminders.each { |alert| show_info(alert) }
-		end
-
-		def show_info(text)
-			ShellContext.show_info(text)
-		end
-	end
-end