cachivache 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0d05fd61763ddfbaf45081cd997a8044464e9be
-  data.tar.gz: 1b212da0f93c9300540e85b025d85d80d645385b
+  metadata.gz: 6e68c84fc309762c64ddf571c3f53d6e274b9140
+  data.tar.gz: a88c0c0a348c71891bbd17d3628d44a728394c8f
 SHA512:
-  metadata.gz: 2a5e7ce917810238715143a5103d5c01287f20550de257930d83139a79526403e6cd6bc6c2de24b695f72c3f323e16631b68c2b0a4d9ce1079597e1b59d60df2
-  data.tar.gz: b5b95f01aefc1c9826570a1c97098cc3e2a7d658a1d0cce38cee3a4830ea0c72d2bae0ac15ba8bfc7e26c2ac605cad41593c36822a30be097dce4663092cf628
+  metadata.gz: dab8a7e369843262583de50fda7e30a469cc3c4cdfa7bc4d7e75e41916ddcbdb27395a6c6410a52428a745c13632d979cc4e53364c3a01ebcb44bd628c321e8e
+  data.tar.gz: a772bce3e35172d195786f28e60b7420ceeee4b04637905601fbd4b1823152567e8297f46b0b385185d2286d3bf70a5b8e8daa9abff6929e56ed5d13eb8b2baf

data/README.md

@@ -164,7 +164,7 @@ end
 
 You see in the last example that if we define strings using "" we need to scape internals \", so the simpliest is to use `%Q{}`.
 
-### You can call as many `sh` blocks within a task as you like. You can also :invoke and :execute other tasks:
+### You can call as many `shell` blocks within a task as you like. You can also :invoke and :execute other tasks:
 
 ```ruby
 stuff :'do-stuff' do
@@ -298,8 +298,7 @@ To remove a stuff library do:
 
 ## Debugging
 
-During the building of the stuff, it's useful to be able to see what the provision 
-what would do instead of running it.
+During the building of the stuff, it's useful to be able to see what the provision would do instead of running it.
 
 To debug the provision do
 
@@ -321,4 +320,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/cabeza
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/bin/template/Rakefile

@@ -4,27 +4,21 @@ raise_validation_error "Please define the parameter Cachivache.git_user_email in
 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?
 
-def install_cachivache_stuff_with(&block)
-	Cachivache.stuff_to_install.each do |stuff_name|
+def provision_stuff_to_install()
+	stuff_to_install do |stuff_name|
     	show_info "Provisioning #{stuff_name}"
-
-		block.call stuff_name
+		invoke stuff_name
 	end
-
    	show_info "All done!!!"
 end
 
 stuff :provision do
-	install_cachivache_stuff_with do |stuff_name|
-    	invoke stuff_name
-	end
+	provision_stuff_to_install
 end
 
 stuff :explain do
-	install_cachivache_stuff_with do |stuff_name|
-		explained = during_shell_buffer { invoke stuff_name }
-		puts explained.green
-	end
+	ShellContext.set_current ShellDebugger.new
+	provision_stuff_to_install
 end
 
 stuff default: :provision

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

@@ -11,6 +11,12 @@ def all_rb_files_in(folder, &block)
 	end
 end
 
+def stuff_to_install(&block)
+	Cachivache.stuff_to_install.each do |stuff_name|
+		block.call stuff_name
+	end
+end
+
 public
 
 ######################################
@@ -25,9 +31,20 @@ end
 # Stuff Api behaviour
 ######################################
 
-# Raname :task just for fun
-def stuff(*args, &block)
-	task(*args, &block)
+def stuff(task_definition, *args, &block)
+	task_name = fully_qualified_name_of(task_definition)
+
+	Rake::Task[task_name].clear if Rake::Task.task_defined?(task_name)
+
+	task(task_definition, *args, &block)
+end
+
+def fully_qualified_name_of(task_definition)
+	task_name = (task_definition.is_a? Hash) ? task_definition.keys.first : task_definition
+	namespace = Rake.application.current_scope.path
+
+	return task_name if namespace.empty?
+	(namespace.to_s + ':' + task_name.to_s).to_sym
 end
 
 def execute_shell_command(command)
@@ -47,4 +64,4 @@ all_rb_files_in Cachivache.cachivache_folder do |file|
 	Stuff::Configuration.creating_undefined_subclasses do
 		require file
 	end
-end
+end

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

@@ -1,5 +1,6 @@
 class ShellContext
 	@current = nil
+	@reminders = []
 
 	def self.current()
 		@current
@@ -19,20 +20,24 @@ class ShellContext
 		@current = current_shell_context
 	end
 
-	def initialize(scope)
-		@scope = scope
+	def self.reminders()
+		@reminders
 	end
 
-	def scope()
-		@scope
+	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)
-		scope.execute_shell_command(command)
+		raise 'Subclass responsibility'
 	end
 
 	def invoke(task_name, *args)
@@ -44,11 +49,15 @@ class ShellContext
 	end
 
 	def remind_to(text)
-		reminders << 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,7 +1,19 @@
 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,12 +1,15 @@
 require_relative 'shell-context'
 
 class ShellBuffer < ShellContext
-	def initialize(*args)
-		super(*args)
-
+	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
@@ -15,4 +18,8 @@ class ShellBuffer < ShellContext
 		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

@@ -0,0 +1,11 @@
+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/stuff-api-behaviour.rb

@@ -100,7 +100,7 @@ module Stuff
 		protected
 
 		def during_shell_buffer(&block)
-			temporary_shell_buffer = ShellBuffer.new(shell_context.scope)
+			temporary_shell_buffer = ShellBuffer.new(shell_context)
 
 			ShellContext.during_shell_context(temporary_shell_buffer, &block)
 

data/bin/template/lib/stuff-configuration.rb

@@ -21,7 +21,7 @@ module Stuff
 			end
 
 			def is_defined?(name)
-				has_variable?(name) && !variables[name].nil?
+				has_variable?(name) && !self[name].nil?
 			end
 
 			def let(name, &block)
@@ -61,4 +61,4 @@ module Stuff
 			end
 		end
 	end
-end
+end

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

@@ -1,17 +1,11 @@
 module Stuff
 	module RemindersBehaviour
-		def reminders()
-			@reminders ||= []
-		end
-
 		def show_reminders()
-			reminders.each { |alert| show_info(alert) }
+			ShellContext.reminders.each { |alert| show_info(alert) }
 		end
 
 		def show_info(text)
-			puts '-----------------------------------------------'.red
-			puts text.green
-			puts '-----------------------------------------------'.red
+			ShellContext.show_info(text)
 		end
 	end
 end

data/lib/cachivache/version.rb

@@ -1,3 +1,3 @@
 module Cachivache
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cachivache
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Martin Rubi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2015-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -91,6 +91,7 @@ files:
 - 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