blazing 0.2.7 → 0.2.9

data/lib/blazing/recipe.rb

@@ -21,6 +21,7 @@ class Blazing::Recipe
     end
 
     def list
+      load_recipes!
       descendants = []
       ObjectSpace.each_object(Class) do |k|
         descendants.unshift k if k < self
@@ -28,21 +29,9 @@ class Blazing::Recipe
       descendants
     end
 
-    def load_recipes
-      load_recipe_gems(parse_gemfile)
-    end
-
-    def parse_gemfile(gemfile = 'Gemfile')
-      open(gemfile).grep(/blazing-/).map { |l| l.match(/blazing-(\w+)/)[0] }
-    end
-
-    def load_recipe_gems(gems)
-      gems.each do |gem|
-        gem_lib_path = $:.find { |p| p.include? gem }
-        recipes_path = File.join(gem_lib_path, gem, 'recipes')
-        recipes = Dir.entries(recipes_path).delete_if { |r| r == '.' || r == '..' }
-        recipes.each { |recipe| require File.join(gem, 'recipes', recipe) }
-      end
+    def load_recipes!
+      gems = $:.select{|p| p.match /blazing-\w+(|-\d\.\d\.\d)\/lib/}.map { |r| r.scan(/blazing-\w+/)[0] }
+      gems.each { |gem| require gem }
     end
 
   end

data/lib/blazing/runner.rb

@@ -1,59 +1,79 @@
 require 'erb'
-require 'grit'
+require 'blazing/config'
 
 class Blazing::Runner
 
   include Blazing::Logger
 
-  def initialize(config = nil, target = nil)
-    if config
-      @config = config
-      @target = @config.targets.find { |t| t.name.to_s == target } || @config.default_target
-    end
+  def initialize(target_name, options)
+    prepare_config(target_name, options)
   end
 
-  def exec(command)
-    command_method = "#{command.gsub(':', '_')}_command"
-    raise "Unknown Command: #{command}" unless self.respond_to? command_method
-    self.send command_method
-  end
+  #
+  # Parse config and set up options
+  #
+  def prepare_config(target_name, options = {})
+    @config ||= Blazing::Config.parse(options[:file])
+    @targets = []
 
-  def init_command
-    info "Creating an example config file in #{Blazing::DEFAULT_CONFIG_LOCATION}"
-    info "Customize it to your needs"
+    if target_name == 'all'
+      @targets = @config.targets
+    else
+      @targets  << (@config.targets.find { |t| t.name.to_s == target_name.to_s } || @config.default_target)
+    end
 
-    Dir.mkdir 'config' unless File.exists? 'config'
-    configuration_file = ERB.new(File.read("#{Blazing::TEMPLATE_ROOT}/config.erb")).result
+    @targets.compact!
 
-    File.open(Blazing::DEFAULT_CONFIG_LOCATION,"wb") do |f|
-      f.puts configuration_file
-    end
+    error 'no target given or found' if @targets.empty?
   end
 
-  def setup_git_remotes
-    repository = Grit::Repo.new(Dir.pwd)
-    @config.targets.each do |target|
-      info "Adding new remote #{target.name} pointing to #{target.location}"
-      repository.config["remote.#{target.name}.url"] = target.location
+  def setup
+    return if @targets.empty?
+
+    @targets.each do |target|
+      target.setup
     end
+    update
   end
 
-  def setup_command
-    @target.setup
-    update_command
-  end
+  def update
+    return if @targets.empty?
 
-  def update_command
-    setup_git_remotes
-    @target.apply_hook
+    @targets.each do |t|
+      t.setup_git_remote
+      t.apply_hook
+    end
   end
 
-  def recipes_run_command
-    @config.recipes.each { |recipe| recipe.run(@target.options) }
+  def recipes
+    @config.recipes.each { |recipe| recipe.run }
   end
 
-  def recipes_list_command
-    Blazing::Recipe.list.each { |r| puts r.to_s.demodulize.underscore }
-  end
+  class << self
 
+    include Blazing::Logger
+
+    #
+    # Bootstrap blazing by creating config file
+    #
+    def init
+      info "Creating an example config file in #{Blazing::DEFAULT_CONFIG_LOCATION}"
+      info "Customize it to your needs"
+
+      Dir.mkdir 'config' unless File.exists? 'config'
+      configuration_file = ERB.new(File.read("#{Blazing::TEMPLATE_ROOT}/config.erb")).result
+
+      File.open(Blazing::DEFAULT_CONFIG_LOCATION,"wb") do |f|
+        f.puts configuration_file
+      end
+    end
+
+    #
+    # List available blazing recipes
+    #
+    def list
+      Blazing::Recipe.list.each { |r| puts r.to_s.demodulize.underscore }
+    end
+
+  end
 end

data/lib/blazing/shell.rb

@@ -1,7 +1,7 @@
 class Blazing::Shell
 
   def run(command)
-    system command
+    `#{command}`
   end
 
 end

data/lib/blazing/target.rb

@@ -1,4 +1,5 @@
 require 'blazing/shell'
+require 'grit'
 
 class Blazing::Target
 
@@ -12,11 +13,18 @@ class Blazing::Target
     @config = config
     @options = options
     @shell = Blazing::Shell.new
+    @target = self
   end
 
   def setup
     info "Setting up repository for #{name} in #{location}"
-    @shell.run "ssh #{user}@#{host} '#{init_repository} && #{setup_repository}'"
+
+    # TODO: Handle case where user is empty
+    if host
+      @shell.run "ssh #{user}@#{host} '#{init_repository} && #{setup_repository}'"
+    else
+      @shell.run "#{init_repository} && #{setup_repository}"
+    end
   end
 
   def apply_hook
@@ -29,11 +37,25 @@ class Blazing::Target
 
     debug "Copying hook for #{name} to #{location}"
     copy_hook
-    @shell.run "ssh #{user}@#{host} #{make_hook_executable}"
+    if host
+      @shell.run "ssh #{user}@#{host} #{make_hook_executable}"
+    else
+      @shell.run "#{make_hook_executable}"
+    end
+  end
+
+  def setup_git_remote
+    repository = Grit::Repo.new(Dir.pwd)
+    info "Adding new remote #{name} pointing to #{location}"
+    repository.config["remote.#{name}.url"] = location
   end
 
   def path
-    @location.match(/:(.*)$/)[1]
+    if host
+      @location.match(/:(.*)$/)[1]
+    else
+      @location
+    end
   end
 
   def host
@@ -57,10 +79,16 @@ class Blazing::Target
 
   def copy_hook
     debug "Making hook executable"
-    @shell.run "scp #{Blazing::TMP_HOOK} #{user}@#{host}:#{path}/.git/hooks/post-receive"
+    # TODO: handle missing user?
+    if host
+      @shell.run "scp #{Blazing::TMP_HOOK} #{user}@#{host}:#{path}/.git/hooks/post-receive"
+    else
+      @shell.run "cp #{Blazing::TMP_HOOK} #{path}/.git/hooks/post-receive"
+    end
   end
 
   def make_hook_executable
+    debug "Making hook executable"
     "chmod +x #{path}/.git/hooks/post-receive"
   end
 
@@ -68,4 +96,13 @@ class Blazing::Target
     "cd #{path} && git config receive.denyCurrentBranch ignore"
   end
 
+  def rake_command
+    rake_config = @config.instance_variable_get("@rake") || {}
+    rails_env = "RAILS_ENV=#{@options[:rails_env]}" if @options[:rails_env]
+
+    if rake_config[:task]
+      "#{rake_config[:env]} #{rails_env} bundle exec rake #{rake_config[:task]}"
+    end
+  end
+
 end

data/lib/blazing/templates/config.erb

@@ -1,35 +1,61 @@
 #
 # Blazing Configuration File
 #
-
+# Sample target definition:
+#
+#   target <target_name>, <target_location>, [options]
 #
-# Specify the location of your repository:
+# The options provided in the target definition will override any
+# options provided in the recipe call.
 #
-# repository 'git@github.com:path/to/your/repository'
+# Options recognized by blazing core:
+#   rails_env: used when calling the rake task after deployment
+
+target :staging, 'screenconcept@ruby:/var/www/vischer.ruby.screenconcept.ch',
+       :recipe_specific_option => 'foo', :rails_env => 'production'
 
+
+# Sample rvm setup:
 #
-# Define possible deploy targets:
+#    rvm <rvm-string>
 #
-# target :production, 'blazing@production.server.com:/where/your/code/is/shipped/to'
-# target :staging, 'blazing@production.server.com:/where/your/code/is/shipped/to', :default => true, :some_option => 'foo' # note: options defined here will override options defined globally for a recipe
+# Setting the rvm string will make sure that the correct rvm ruby and
+# gemset is used before the post-receive hook does anything at all.
+# Use :rvmrc as rvm string if you want blazing to use the rvm
+# environment specified in your project's .rvmrc file.
+
+rvm 'ruby-1.9.3@some-gemset'
+
 
+# Sample config for custom rvm location:
 #
-# Optional: RVM handling
+#    rvm_scripts <path_to_rvm_scripts>
 #
-# Use Ruby Enterprise Edition and gemset 123
-# rvm 'ree@123'
+# If you have installed rvm to a custom location, use this method to
+# specify where the rvm scripts are located.
+
+rvm_scripts '/opt/rvm/scripts/rvm'
 
-# Or use the rvmrc
-# rvm :rvmrc
-#
 
+# Sample recipe setup:
 #
-# Define Recipes to be used (See the README for available recipes).
-# Recipes are run in the order they are specified
+#     recipe <recipe_name>, [options]
 #
-# recipe :recipe_name
+# The given recipe will be called with the provided options. Refer to each
+# recipe's documentation for available options. Options provided here
+# may be overridden by target specific options.
+# Recipes will be executed in the order they are defined!yy
+
+recipe :precompile_assets, :recipe_specific_option => 'bar'
 
+
+# Sample rake file config:
 #
-# Define a rake task that should be run after deployment. The rake task will run after the recipes have run.
+#     rake <task>, [environment variables]
 #
-# rake :a_rake_task_to_call_after_deployment
+# The provided rake task will be run after all recipes have run.
+# Note: you can only call a single rake task. If you need to run several
+# tasks just create one task that wrapps all the others.
+
+rake :post_deploy, 'RAILS_ENV=production'
+

data/lib/blazing/templates/hook.erb

@@ -66,7 +66,7 @@ bundle --deployment --quiet --without development test
   bundle exec blazing recipes:run <%= name.to_s %>
 <% end %>
 
-<% if @config.rake %>
-  echo "------> [blazing] running rake <%= @config.rake %>"
-  bundle exec rake <%= @config.rake %>
+<% if @target.rake_command %>
+  echo "------> [blazing] running <%= @target.rake_command %>"
+  <%= @target.rake_command %>
 <% end %>

data/lib/blazing/version.rb

@@ -1,3 +1,7 @@
 module Blazing
-  VERSION = "0.2.7"
+
+  VERSION = "0.2.9"
+
+  # TODO: remove Config.repository in 0.3
+
 end

data/spec/blazing/config_spec.rb

@@ -31,23 +31,6 @@ describe Blazing::Config do
       config.default_target.name.should be :sometarget
     end
 
-    context 'when more than 1 target defined in config' do
-
-      it 'raises an error when none is default' do
-        config = Blazing::Config.new
-        config.target :sometarget, 'somewhere'
-        config.target :someothertarget, 'somewhere'
-        lambda { config.default_target }.should raise_error
-      end
-
-      it 'returns the target object with :default => true option if more than 1 target present' do
-        config = Blazing::Config.new
-        config.target :sometarget, 'somewhere', :default => true
-        config.target :someothertarget, 'somewhere'
-        config.default_target.name.should be :sometarget
-      end
-
-    end
   end
 
   describe 'DSL' do
@@ -72,18 +55,6 @@ describe Blazing::Config do
       end
     end
 
-    describe 'repository' do
-      it 'assigns the repository if a value is given' do
-        @config.repository('somewhere')
-        @config.instance_variable_get("@repository").should == 'somewhere'
-      end
-
-      it 'returns the repository string if no value is given' do
-        @config.repository('somewhere')
-        @config.repository.should == 'somewhere'
-      end
-    end
-
     describe 'recipe' do
 
       before :each do
@@ -117,12 +88,12 @@ describe Blazing::Config do
 
       it 'takes the name of the rake task as argument' do
         @config.rake :post_deploy
-        @config.instance_variable_get('@rake').should be :post_deploy
+        @config.instance_variable_get('@rake').should == { :task => :post_deploy }
       end
 
-      it 'returns the name of the task if no argument given' do
-        @config.rake :post_deploy
-        @config.rake.should be :post_deploy
+      it 'accepts environment variables to pass along to rake' do
+        @config.rake :post_deploy, 'RAILS_ENV=production'
+        @config.instance_variable_get('@rake').should == { :task => :post_deploy, :env => 'RAILS_ENV=production' }
       end
 
     end

data/spec/blazing/integration/init_spec.rb

@@ -6,7 +6,7 @@ describe 'blazing init' do
 
   before :each do
     setup_sandbox
-    Blazing::Runner.new.exec('init')
+    Blazing::Runner.init
   end
 
   after :each do

data/spec/blazing/integration/{recipes_list_spec.rb → list_spec.rb}

@@ -1,8 +1,6 @@
 require 'spec_helper'
-require 'blazing/config'
-require 'blazing/runner'
 
-describe 'blazing init' do
+describe 'blazing list' do
 
   before :each do
     setup_sandbox
@@ -15,7 +13,7 @@ describe 'blazing init' do
   it 'prints a list of the available recipes' do
     class Blazing::Recipe::Dummy < Blazing::Recipe
     end
-    capture(:stdout) { Blazing::Runner.new.exec('recipes:list') }.should == "dummy\n"
+    capture(:stdout) { Blazing::Runner.list }.should == "dummy\n"
   end
 
 end

data/spec/blazing/integration/{recipes_run_spec.rb → recipes_spec.rb}

@@ -1,18 +1,20 @@
 require 'spec_helper'
-require 'blazing/config'
-require 'blazing/runner'
 
-describe 'blazing init' do
+describe 'blazing recipes' do
 
   before :each do
     setup_sandbox
     class Blazing::Recipe::Dummy < Blazing::Recipe
+      def run
+        puts 'dummy recipe was run'
+      end
     end
     @dummy_recipe = Blazing::Recipe::Dummy.new
     @config = Blazing::Config.new
     @config.target :production, @production_url
     @config.instance_variable_set('@recipes', [@dummy_recipe])
-    @runner = Blazing::Runner.new(@config)
+    @cli = Blazing::CLI.new
+    Blazing::Config.stub(:parse).and_return @config
   end
 
   after :each do
@@ -20,8 +22,8 @@ describe 'blazing init' do
   end
 
   it 'runs the configured recipes' do
-    @dummy_recipe.should_receive(:run)
-    @runner.exec('recipes:run')
+    output = capture(:stdout) { @cli.recipes(:production) }
+    output.should == "dummy recipe was run\n"
   end
 
 end