blazing 0.2.14 → 0.3.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## 0.3.0 - January 23, 2013
+
+* target name is passed to recipe at runtime
+* Add alias for rvm_scripts (env_scripts) which enables the use of rbenv et al. 
+
 ## 0.2.14 - October 23, 2012
 
 * readme tweaks

data/README.md

@@ -19,7 +19,7 @@ Out of the box, blazing can do the following:
 
 * set up a repository you can push to for deployment
 * set up a git post-receive hook, configurable by a simple DSL
-* works with rvm
+* works with rvm/rbenv/chruby(and probably others)
 * uses bundler for dependency management
 * allows you to run custom rake tasks after deployment
 * is extendable by blazing recipes
@@ -118,6 +118,16 @@ rvm 'ruby-1.9.3@some-gemset'
 rvm_scripts '/opt/rvm/scripts/rvm'
 
 
+# Sample rbenv/chruby/other setup:
+#
+#    env_scripts <path_to_version_manager_script>
+#
+# If you need to source a file for your non-rvm version manager to
+# you can do that with env_scripts. You should also remove the
+# rvm/rvm_scripts options above.
+
+env_scripts '/etc/profile.d/rbenv.sh'
+
 # Sample recipe setup:
 #
 #     recipe <recipe_name>, [options]

data/blazing.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   #
   # TODO: Remove Config.repository in 0.3
   #
-  s.version     = '0.2.14'
+  s.version     = '0.3.0'
 
   s.authors     = ["Felipe Kaufmann"]
   s.email       = ["felipekaufmann@gmail.com"]

data/lib/blazing/commands.rb

@@ -43,7 +43,7 @@ module Blazing
     end
 
     def recipes
-      @config.recipes.each { |recipe| recipe.run }
+      @config.recipes.each { |recipe| recipe.run({:target_name => @target_name}) }
     end
 
     def list

data/lib/blazing/config.rb

@@ -9,7 +9,8 @@ class Blazing::Config
 
   attr_reader :file
   attr_accessor :targets, :recipes
-  dsl_setter :rvm, :rvm_scripts
+  dsl_setter :rvm, :env_scripts
+  alias :rvm_scripts :env_scripts
 
   class << self
     def parse(configuration_file = nil)

data/lib/blazing/templates/config.erb

@@ -36,6 +36,15 @@ rvm 'ruby-1.9.3@some-gemset'
 
 rvm_scripts '/opt/rvm/scripts/rvm'
 
+# Sample rbenv/chruby/other setup:
+#
+#    env_scripts <path_to_version_manager_script>
+#
+# If you need to source a file for your non-rvm version manager to
+# you can do that with env_scripts. You should also remove the
+# rvm/rvm_scripts options above.
+
+env_scripts '/etc/profile.d/rbenv.sh'
 
 # Sample recipe setup:
 #

data/lib/blazing/templates/hook/base.erb

@@ -1,5 +1,6 @@
 <%= load_template 'hook/setup' %>
 <%= load_template 'hook/git-reset' %>
+<%= load_template 'hook/env-scripts' %>
 <%= load_template 'hook/rvm' %>
 <%= load_template 'hook/bundler' %>
 <%= load_template 'hook/recipes' %>

data/lib/blazing/templates/hook/env-scripts.erb

@@ -0,0 +1,6 @@
+<% if @config.env_scripts %>
+
+  source <%= @config.env_scripts %>
+  echo "------> [blazing] Loading environment scripts from custom location"
+
+<% end %>

data/lib/blazing/templates/hook/rvm.erb

@@ -1,17 +1,9 @@
 <% if @config.rvm %>
 
-  #
-  # Custom RVM script location?
-  #
-  <% if @config.rvm_scripts %>
-
-    source <%= @config.rvm_scripts %>
-    echo "------> [blazing] Loading rvmscripts from custom location"
-
   #
   # Normal RVM installation
   #
-  <% else %>
+  <% unless @config.rvm_scripts %>
     # Load RVM into a shell session *as a function*
     if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
 

data/spec/blazing/commands_spec.rb

@@ -126,6 +126,11 @@ module Blazing
         recipes.each { |r| r.should_receive(:run) }
         commands.run(:recipes)
       end
+
+      it 'passes in target_name' do
+        recipes.each { |r| r.should_receive(:run).with({:target_name => :testing}) }
+        commands.run(:recipes, :target_name => :testing)
+      end
     end
 
     describe '#list' do

data/spec/blazing/config_spec.rb

@@ -116,7 +116,7 @@ describe Blazing::Config do
 
       it 'takes an string as argument' do
         @config.rvm_scripts '/opt/rvm/scripts'
-        @config.instance_variable_get('@rvm_scripts').should == '/opt/rvm/scripts'
+        @config.instance_variable_get('@env_scripts').should == '/opt/rvm/scripts'
       end
 
       it 'returns the string if no argument given' do

data/spec/blazing/integration/recipes_spec.rb

@@ -5,7 +5,7 @@ describe '$ blazing recipes' do
   before :each do
     setup_sandbox
     class Blazing::Recipe::Dummy < Blazing::Recipe
-      def run
+      def run(target_options={})
         puts 'dummy recipe was run'
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blazing
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -269,6 +269,7 @@ files:
 - lib/blazing/templates/config.erb
 - lib/blazing/templates/hook/base.erb
 - lib/blazing/templates/hook/bundler.erb
+- lib/blazing/templates/hook/env-scripts.erb
 - lib/blazing/templates/hook/git-reset.erb
 - lib/blazing/templates/hook/rake.erb
 - lib/blazing/templates/hook/recipes.erb