json-spec 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2136aa485a249788e83e6b962ae039d5cf3ceac9
-  data.tar.gz: 4786b07cf34a2c1045fcd64a8901e20709cc136a
+  metadata.gz: 88fa5f44774aebd47659b16c57b1cf9fb3ef2ccd
+  data.tar.gz: 5d3e524a2f0339defdfeece219eea8fa3d78c014
 SHA512:
-  metadata.gz: 74cc87284c78691d63eeca202be7b6216e1591bf047efa885fb99366956686db57c0ce31014fa1418ee11bd90bb22a25a1eb2864c606868047ec8a19f7179243
-  data.tar.gz: f77c2df721f9c977958774551650a6fe16098fbefd0bab75f826a2d92a6aacaf166bb3915e4d1c4ffd2e1dd8c884776b01100edc4980398cb523fac572dc2ff3
+  metadata.gz: be1e7578c169920b687b50eb9918e24ee2cf1f0f98c265b485d1155df56e28ac87580ee29a846bb817e2af4286571e3ca340fd2a1c67592329336fc80b4bf41e
+  data.tar.gz: d647c78b14358b6977f7c33c6ee7be46f9f68ca81bb3957d178a6f22fd62eae035d06214082e24baa8cc2e0170b0c6c88d39a189be3520d0dbbf8aaf32203334

data/cachivache/Gemfile

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

data/cachivache/README.md

@@ -37,7 +37,7 @@ Once you installed the `cachivache` gem, setup cachivache for your project:
 
 write some stuffs in your `stuff` folder and set what stuff to install and your git email and user:
 
-- `cachivache config`
+- `cachivache configure`
 
 and that's it, you can now start Vagrant with:
 
@@ -78,7 +78,7 @@ dependencies = [
 ]
 
 stuff :'php-json-spec' => dependencies do
-   shell %{
+   shell %Q{
       cd #{PhpJsonSpec.project_folder}
 
       composer install
@@ -95,6 +95,11 @@ configure :PhpJsonSpec do
    let(:project_folder)     { Cachivache.src_folder }
 end
 ```
+
+## How about a more complex stuff, like setting up an app for apache?
+
+Here is an example of that: [php-site-sample](bin/template/stuff/php-site-sample)
+
 ## How do I tell Cachivache what to install?
 
 Edit the file `cachivache.rb` and define the stuffs to install in the section
@@ -144,7 +149,7 @@ end
 # or
 
 stuff :'do-stuff' do
-   shell %(
+   shell %Q(
       echo "stuff"
    )
 end

data/cachivache/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/cachivache/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/cachivache/cachivache.rb

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

data/cachivache/{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/json-spec.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0'
 
-  spec.add_dependency "cdt-utilities", '~> 0.2'
+  spec.add_dependency "cdt-utilities", '~> 0.3'
   spec.add_dependency "validates_email_format_of", "~> 1.6"
 
   spec.add_development_dependency "bundler", "~> 1.10"

data/lib/cabeza-de-termo/json-spec/expectations-library/default-expectations/default-expectations-mapping.rb

@@ -47,7 +47,7 @@ module CabezaDeTermo
 			end
 
 			def for_every_expression_of(json_expression_type, &block)
-				CdT.bind_evaluation_of block, to: DefaultExpectationBuilder.new(self, json_expression_type)
+				CdT.bind_block_evaluation_to DefaultExpectationBuilder.new(self, json_expression_type), &block
 			end
 		end
 	end

data/lib/cabeza-de-termo/json-spec/expectations-library/definition-builders/expectation-builders/expectations-definition-builder.rb

@@ -19,7 +19,7 @@ module CabezaDeTermo
 				@expectations_library = expectations_library
 				reset_current_definition
 
-				CdT.bind_evaluation_of block, to: self
+				CdT.bind_block_evaluation_to self, &block
 			end
 
 			# Accessing
@@ -57,7 +57,7 @@ module CabezaDeTermo
 			def define(method_name, &block)
 				@method_name = method_name.to_sym
 
-				CdT.bind_evaluation_of block, to: self
+				CdT.bind_block_evaluation_to self, &block
 
 				define_expectation_in_library
 				define_expectation_message_in_library

data/lib/cabeza-de-termo/json-spec/expectations-library/definition-builders/expectation-library-definition-builder.rb

@@ -27,7 +27,7 @@ module CabezaDeTermo
 			end
 
 			def default_expectations(&block)
-				CdT.bind_evaluation_of block, to: expectations_library.default_expectations
+				CdT.bind_block_evaluation_to expectations_library.default_expectations, &block
 				self
 			end
 		end

data/lib/cabeza-de-termo/json-spec/expectations-library/definition-builders/modifier-builders/modifiers-definition-builder.rb

@@ -11,7 +11,7 @@ module CabezaDeTermo
 			def initialize(expectations_library, &block)
 				@expectations_library = expectations_library
 
-				CdT.bind_evaluation_of block, to: self
+				CdT.bind_block_evaluation_to self, &block
 			end
 
 			# Accessing

data/lib/cabeza-de-termo/json-spec/expectations-library/expectations-library.rb

@@ -58,7 +58,7 @@ module CabezaDeTermo
 			# Defining
 
 			def define(&block)
-				CdT.bind_evaluation_of block, to: ExpectationLibraryDefinitionBuilder.new(self)
+				CdT.bind_block_evaluation_to ExpectationLibraryDefinitionBuilder.new(self), &block
 			end
 
 			# Expectation messages

data/lib/cabeza-de-termo/json-spec/expressions/json-any-of.rb

@@ -34,7 +34,7 @@ module CabezaDeTermo
 			def expect_a(type, &block)
 				expression = add_posibble_expression( new_expression_for(type) )
 
-				CdT.bind_evaluation_of block, to: self unless block.nil?
+				CdT.bind_block_evaluation_to self, &block unless block.nil?
 
 				expression
 			end

data/lib/cabeza-de-termo/json-spec/expressions/json-each-field.rb

@@ -43,7 +43,7 @@ module CabezaDeTermo
 			def expect_a(type, &block)
 				@value_expression = new_expression_for(type)
 
-				CdT.bind_evaluation_of block, to: @value_expression unless block.nil?
+				CdT.bind_block_evaluation_to @value_expression, &block unless block.nil?
 
 				@value_expression
 			end

data/lib/cabeza-de-termo/json-spec/expressions/json-each.rb

@@ -43,7 +43,7 @@ module CabezaDeTermo
 			def expect_a(type, &block)
 				@each_item_expression = new_expression_for(type)
 
-				CdT.bind_evaluation_of block, to: @each_item_expression unless block.nil?
+				CdT.bind_block_evaluation_to @each_item_expression, &block unless block.nil?
 
 				@each_item_expression
 			end

data/lib/cabeza-de-termo/json-spec/expressions/json-expression.rb

@@ -158,7 +158,7 @@ module CabezaDeTermo
 
 				add_expectation(expectation)
 
-				CdT.bind_evaluation_of message.block, to: self unless message.block.nil?
+				CdT.bind_block_evaluation_to self, &message.block unless message.block.nil?
 
 				self
 			end
@@ -178,7 +178,7 @@ module CabezaDeTermo
 
 				run_modifier(modifier)
 
-				CdT.bind_evaluation_of message.block, to: self unless message.block.nil?
+				CdT.bind_block_evaluation_to self, &message.block unless message.block.nil?
 
 				self
 			end

data/lib/cabeza-de-termo/json-spec/expressions/json-field.rb

@@ -34,7 +34,7 @@ module CabezaDeTermo
 
 			def to_be_a(type, &block)
 				expression = set_value_expression( new_expression_for(type) )
-				CdT.bind_evaluation_of block, to: expression unless block.nil?
+				CdT.bind_block_evaluation_to expression, &block unless block.nil?
 				expression
 			end
 

data/lib/cabeza-de-termo/json-spec/expressions/json-list.rb

@@ -25,7 +25,7 @@ module CabezaDeTermo
 			# Defining Expectations
 
 			def each(&block)
-				CdT.bind_evaluation_of block, to: each_expression unless block.nil? 
+				CdT.bind_block_evaluation_to each_expression, &block unless block.nil? 
 
 				each_expression
 			end

data/lib/cabeza-de-termo/json-spec/expressions/json-object.rb

@@ -61,7 +61,7 @@ module CabezaDeTermo
 			def each_field(&block)
 				@each_field_expression = new_each_field
 
-				CdT.bind_evaluation_of block, to: @each_field_expression unless block.nil?
+				CdT.bind_block_evaluation_to @each_field_expression, &block unless block.nil?
 
 				@each_field_expression
 			end

data/lib/cabeza-de-termo/json-spec/expressions/json-spec.rb

@@ -28,7 +28,7 @@ module CabezaDeTermo
 
 				use_expectations_library(global_expectations_library)
 
-				CdT.bind_evaluation_of block, to: self unless block.nil?
+				CdT.bind_block_evaluation_to self, &block unless block.nil?
 			end
 
 			# Accessing
@@ -56,7 +56,7 @@ module CabezaDeTermo
 			# Default expectations
 
 			def define(&block)
-				CdT.bind_evaluation_of block, to: ExpectationLibraryDefinitionBuilder.new(self)
+				CdT.bind_block_evaluation_to ExpectationLibraryDefinitionBuilder.new(self), &block
 			end
 
 			# Expectations
@@ -72,7 +72,7 @@ module CabezaDeTermo
 			def expect_a(type, &block)
 				@root_expression = new_expression_for(type)
 
-				CdT.bind_evaluation_of block, to: @root_expression unless block.nil?
+				CdT.bind_block_evaluation_to @root_expression, &block unless block.nil?
 
 				@root_expression
 			end

data/lib/cabeza-de-termo/json-spec/version.rb

@@ -1,5 +1,5 @@
 module CabezaDeTermo
 	module JsonSpec
-		VERSION = "0.2.0"
+		VERSION = "0.2.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-spec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Martin Rubi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cdt-utilities
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: validates_email_format_of
   requirement: !ruby/object:Gem::Requirement
@@ -118,18 +118,9 @@ files:
 - cachivache/Rakefile
 - cachivache/Vagrantfile
 - cachivache/cachivache.rb
-- cachivache/lib/rake-helper.rb
-- cachivache/lib/shell-contexts/shell-context.rb
-- cachivache/lib/shell-contexts/shell-exec.rb
-- cachivache/lib/shell-contexts/shell_buffer.rb
-- cachivache/lib/shell-contexts/shell_debugger.rb
-- cachivache/lib/shell-file-context.rb
-- cachivache/lib/shell-if-context.rb
-- cachivache/lib/stuff-api-behaviour.rb
-- cachivache/lib/stuff-configuration.rb
-- cachivache/lib/stuff-reminders-behaviour.rb
 - cachivache/stuff/.gitkeep
 - cachivache/stuff/ruby-json-spec.rb
+- cachivache/utilities/stuff-configuration.rb
 - examples/example-1-simple.rb
 - examples/example-2-default-expectations.rb
 - examples/example-3-each-field.rb

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