blazing 0.0.14 → 0.0.15

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blazing (0.0.14)
+    blazing (0.0.15)
       activesupport (>= 3.0.5)
       grit
       i18n

data/blazing.gemspec

@@ -19,9 +19,10 @@ Gem::Specification.new do |s|
 
   # TODO: better to use ~ ?
   s.add_dependency "thor", ">= 0.14.6"
+  s.add_dependency "grit"
 
   # TODO: Get rid of those, just used for guessing recipe names etc in lib/recipes.rb
   s.add_dependency "activesupport", ">= 3.0.5"
   s.add_dependency "i18n"
-  s.add_dependency "grit"
+
 end

data/lib/blazing.rb

@@ -5,9 +5,7 @@ require 'blazing/config'
 require 'blazing/runner'
 require 'blazing/logger'
 require 'blazing/target'
-require 'blazing/remote'
 require 'blazing/recipe'
-require 'blazing/object'
 require 'blazing/cli/base'
 require 'blazing/cli/create'
 require 'blazing/cli/hook'

data/lib/blazing/base.rb

@@ -4,7 +4,7 @@ module Blazing
   module Base
 
     def config
-      @config ||= Blazing::Config.load
+      @config ||= Blazing::Config.parse
     end
 
     def log(type, message)
@@ -30,5 +30,12 @@ module Blazing
       Grit::Repo.new(Dir.pwd).config['remote.origin.url'] || 'user@host:/some/path'
     end
 
+    #
+    # Return true if a Gemfile exists in pwd
+    #
+    def gemfile_present?
+      File.exists? 'Gemfile'
+    end
+
   end
 end

data/lib/blazing/bootstrap.rb

@@ -0,0 +1,27 @@
+module Blazing
+  class Target
+    module Bootstrap
+
+      def clone_command
+        "if [ -e #{@path} ]; then \
+        echo 'directory exists already'; else \
+        git clone #{@repository} #{"--branch #{@branch}" if @branch} #{@path} && cd #{@path} && git config receive.denyCurrentBranch ignore; fi"
+      end
+
+      def clone_repository
+        @runner.run "ssh #{@user}@#{@host} '#{clone_command}'"
+      end
+
+      def add_target_as_remote
+        @runner.run "git remote add #{@name} #{@user}@#{@host}:#{@path}"
+      end
+
+      def setup_post_receive_hook
+        @hook.new([use_rvm?]).generate
+        @runner.run "scp /tmp/post-receive #{@user}@#{@host}:#{@path}/.git/hooks/post-receive"
+        @runner.run "ssh #{@user}@#{@host} 'chmod +x #{@path}/.git/hooks/post-receive'"
+      end
+
+    end
+  end
+end

data/lib/blazing/cli/base.rb

@@ -18,31 +18,32 @@ module Blazing
         @task.invoke_all
       end
 
-      desc 'setup TARGET_NAME', 'setup or update blazing on specified target and deploy'
-      def setup(target_name = nil)
-        target = config.find_target(target_name)
-        log :info, "setting up target #{target.name}"
-        target.setup
+      desc 'bootstrap TARGET_NAME', 'setup or update blazing on specified target and deploy'
+      def bootstrap(target_name = nil)
+        Blazing::Target.bootstrap(target_name)
 
         # TODO: Abstract this into module and load it where we need it. Methods / actions should have
         # a success and failure message
         if exit_status == 0
-          log :success, "successfully set up target #{target.name}"
+          log :success, "successfully bootstrapped target #{target_name}"
         else
-          log :error, "failed setting up target #{target.name}"
+          log :error, "failed bootstrapping target #{target_name}"
         end
       end
 
+      desc 'setup TARGET_NAME', 'setup git remote for one or all targets'
+      def setup(target_name = nil)
+        Blazing::Target.setup(target_name)
+      end
+
       desc 'deploy TARGET', 'deploy to TARGET'
       def deploy(target_name = nil)
-        target = config.find_target(target_name)
-        log :info, "deploying target #{target.name}"
-        target.deploy
+        Blazing::Target.deploy(target_name)
 
         if exit_status == 0
-          log :success, "successfully deployed target #{target.name}"
+          log :success, "successfully deployed target #{target_name}"
         else
-          log :error, "failed deploying on target #{target.name}"
+          log :error, "failed deploying on target #{target_name}"
         end
       end
 
@@ -54,12 +55,9 @@ module Blazing
         report
       end
 
-      #TODO: move post_recevie and rvm somewhere else, they must only be called by the post-receive hook and not visible to user
-
       desc 'post_receive', 'trigger the post-receive actions'
       def post_receive(target_name = nil)
-        target = config.find_target(target_name)
-        Blazing::Remote.new(target.name).post_receive
+        Blazing::Target.post_receive(target_name)
       end
     end
   end

data/lib/blazing/config.rb

@@ -19,7 +19,7 @@ module Blazing
       #
       # Load configuration file and parse it
       #
-      def load
+      def parse
         read do
           instance_eval(File.read(Blazing::CONFIGURATION_FILE))
         end
@@ -53,7 +53,7 @@ module Blazing
     end
 
     def target(name, options = {})
-      @targets << Blazing::Target.new(name, options)
+      @targets << Blazing::Target.new(name, options.merge(:config => self))
     end
 
     def use(name, options = {})
@@ -65,23 +65,25 @@ module Blazing
     # If only one target is defined, it is the default one
     #
     def find_target(target_name = nil)
+      active_target = nil
+
       if target_name
-        target = targets.find {|target| target.name == target_name }
+        active_target = targets.find {|target| target.name == target_name }
       end
 
-      if target.nil? && targets.size == 1
-        target = targets.first
+      if active_target.nil? && targets.size == 1
+        active_target = targets.first
       end
 
-      if target.nil?
-        target = targets.find {|target| target.default }
+      if active_target.nil?
+        active_target = targets.find {|target| target.default }
       end
 
-      if target.nil?
+      if active_target.nil?
         raise 'no target specified and no default targets found'
       end
 
-      target
+      active_target
     end
 
   end

data/lib/blazing/recipe.rb

@@ -18,10 +18,17 @@ module Blazing
     end
 
     def recipe_class
-      ('Blazing::' + (@name.to_s + '_recipe').camelize).constantize
+      # TODO: Unify naming conventions
+      # Gem Recipe Naming Convention
+      ('Blazing::' + @name.to_s.gsub('_','/').camelize).constantize
     rescue NameError
-      @logger.log :error, "unable to load #{@name} recipe"
-      return nil
+      begin
+        # Builtin Recipe Naming Convention
+        ('Blazing::' + (@name.to_s + '_recipe').camelize).constantize
+      rescue NameError
+        @logger.log :error, "unable to load #{@name} recipe"
+        return nil
+      end
     end
 
     def run
@@ -42,7 +49,15 @@ module Blazing
       end
 
       def load_gem_recipes
-        #TODO: Implement
+        # TODO: I'm sure there is a better way to do this...
+        gems = open('Gemfile').grep(/blazing-/).map { |l| l.match(/(blazing-.*)\'\,/)[1] }
+        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 == '..' }
+          debugger
+          recipes.each { |recipe| require File.join(gem, 'recipes', recipe) }
+        end
       end
 
       def load_local_recipes
@@ -57,6 +72,7 @@ module Blazing
         descendants = []
 
         load_builtin_recipes
+        load_gem_recipes
 
         ObjectSpace.each_object(Class) do |k|
           descendants.unshift k if k < self

data/lib/blazing/target.rb

@@ -1,40 +1,80 @@
 require 'blazing'
-require 'blazing/object'
+require 'blazing/core_ext/object'
+require 'blazing/config'
+require 'blazing/bootstrap'
 
 module Blazing
   class Target
 
+    include Blazing::Target::Bootstrap
+
     attr_accessor :name, :recipes
 
     AVAILABLE_SETTINGS = [:deploy_to, :host, :user, :path, :default, :branch]
 
+    class << self
+
+      def bootstrap(name)
+        target = config.find_target(name)
+        runner = Blazing::Runner.new
+        # TODO: Use a Wrapper to Net::SSH
+        target.clone_repository
+        target.setup_post_receive_hook
+        setup target.name
+      end
+
+      def deploy(name)
+        target = config.find_target(name)
+        runner = Blazing::Runner.new
+        deploy_command = "git push #{name}"
+        deploy_command += " #{target.branch}:#{target.branch}" if target.branch
+
+        # TODO: checkout branch if we pushed to a branch which is not checked out
+        runner.run deploy_command
+      end
+
+      def setup(name)
+        if name
+          config.find_target(name).add_target_as_remote
+        else
+          config.targets.each do |target|
+            target.add_target_as_remote
+          end
+        end
+      end
+
+      def post_receive(name)
+        target = config.find_target(name)
+        target.set_git_dir
+        target.reset_head!
+        @recipes.delete_if { |recipe| recipe.name == 'rvm' }
+        target.run_recipes
+      end
+
+      def config
+        Blazing::Config.parse
+      end
+
+      def runner
+        Blazing::Runner.new
+      end
+
+    end
+
     def initialize(name, options = {})
       @name = name.to_s
       @logger = options[:_logger] ||= Blazing::Logger.new
       @runner = options[:_runner] ||= Blazing::Runner.new
       @hook = options[:_hook] ||= Blazing::CLI::Hook
-      create_accessors(options)
-    end
 
-    def setup
-      # TODO: Use a Wrapper to Net::SSH
-      clone_repository
-      add_target_as_remote
-      setup_post_receive_hook
-    end
+      @config = options[:config] || Blazing::Config.parse
 
-    def deploy
-      deploy_command = "git push #{name}"
-      deploy_command += " #{@branch}:#{@branch}" if @branch
-      @runner.run deploy_command
+      @repository = @config.repository
+      create_accessors_from_config(options)
+      load_recipes
     end
 
-    def config
-      @_config ||= Blazing::Config
-      @_config.load
-    end
-
-    def create_accessors(options)
+    def create_accessors_from_config(options)
       assign_settings(options)
       parse_deploy_to_string unless @deploy_to.blank?
       ensure_mandatory_settings
@@ -61,25 +101,51 @@ module Blazing
       end
     end
 
-    def clone_command
-      "if [ -e #{@path} ]; then \
-      echo 'directory exists already'; else \
-      git clone #{config.repository} #{"--branch #{@branch}" if @branch} #{@path} && cd #{@path} && git config receive.denyCurrentBranch ignore; fi"
+    def set_git_dir
+      ENV['GIT_DIR'] = '.git'
+    end
+
+    def reset_head!
+      @runner ||= Blazing::Runner.new
+      @runner.run 'git reset --hard HEAD'
     end
 
-    def clone_repository
-      @runner.run "ssh #{@user}@#{@host} '#{clone_command}'"
+    #
+    # Called by post-receive hook to determine rvm usage
+    #
+    def use_rvm?
+      @rvm_recipe = @recipes.find { |recipe| recipe.name == 'rvm' }
+      @recipes.delete_if { |recipe| recipe.name == 'rvm' }
+      if @rvm_recipe
+        @rvm_recipe.options[:rvm_string]
+      else
+        'none'
+      end
     end
 
-    def add_target_as_remote
-      @runner.run "git remote add #{@name} #{@user}@#{@host}:#{@path}"
+    def load_recipes
+
+      # TODO: For now, recipes can be assigned only in the global
+      # namespace of the config. Make it possible for targets to
+      # define recipes individually
+
+      @recipes = @config.recipes if @recipes.blank?
+      Blazing::Recipe.load_builtin_recipes
     end
 
-    def setup_post_receive_hook
-      @hook.new([Blazing::Remote.new(@name).use_rvm?]).generate
-      @runner.run "scp /tmp/post-receive #{@user}@#{@host}:#{@path}/.git/hooks/post-receive"
-      @runner.run "ssh #{@user}@#{@host} 'chmod +x #{@path}/.git/hooks/post-receive'"
+    def run_recipes
+      run_bootstrap_recipes
+      @recipes.each do |recipe|
+        recipe.run
+      end
     end
 
+    def run_bootstrap_recipes
+      bundler = @recipes.find { |r| r.name == 'bundler' }
+      if bundler
+        bundler.run
+        @recipes.delete_if { |r| r.name == 'bundler' }
+      end
+    end
   end
 end

data/lib/blazing/version.rb

@@ -1,3 +1,3 @@
 module Blazing
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/spec/blazing/cli/base_spec.rb

@@ -14,6 +14,7 @@ describe Blazing::CLI::Base do
     @hook = double('hook', :new => double('template', :generate => nil))
     @base =  Blazing::CLI::Base.new
     @base.instance_variable_set('@logger', @logger)
+    @some_target_name = 'test_target'
   end
 
   describe '#init' do
@@ -25,68 +26,51 @@ describe Blazing::CLI::Base do
     end
   end
 
-  describe '#setup' do
-
-    before :each do
-      @some_target_name = 'test_target'
-      hook = double('hook', :new => double('template', :generate => nil))
-      config = Blazing::Config.new
-      config.target(@some_target_name, :deploy_to => 'smoeone@somewhere:/asdasdasd', :_logger => @logger, :_runner => @runner, :_hook => hook)
-      @base.instance_variable_set('@config', config)
-    end
+  describe '#bootstrap' do
 
-    it 'says what target is being setup' do
-      @logger.should_receive(:log).with(:info, "setting up target test_target")
-      @base.setup(@some_target_name)
-    end
-
-    it 'runs setup on selected target' do
-      @target = @base.instance_variable_get('@config').instance_variable_get('@targets').first
-      @target.should_receive(:setup)
-      @base.setup(@some_target_name)
+    it 'runs bootstrap on selected target' do
+      Blazing::Target.should_receive(:bootstrap).with(@some_target_name)
+      @base.bootstrap(@some_target_name)
     end
 
     it 'logs a success message if exitstatus of setup was 0' do
+      Blazing::Target.stub!(:bootstrap)
       @base.instance_variable_set('@exit_status', 0)
-      @logger.should_receive(:log).with(:success, "successfully set up target test_target")
-      @base.setup(@some_target_name)
+      @logger.should_receive(:log).with(:success, "successfully bootstrapped target test_target")
+      @base.bootstrap(@some_target_name)
     end
 
     it 'logs an error if exitstatus of setup was not 0' do
+      Blazing::Target.stub!(:bootstrap)
       @base.instance_variable_set('@exit_status', 1)
-      @logger.should_receive(:log).with(:error, "failed setting up target test_target")
-      @base.setup(@some_target_name)
+      @logger.should_receive(:log).with(:error, "failed bootstrapping target test_target")
+      @base.bootstrap(@some_target_name)
     end
   end
 
-  describe '#deploy' do
-
-    before :each do
-      @some_target_name = 'test_target'
-      hook = double('hook', :new => double('template', :generate => nil))
-      config = Blazing::Config.new
-      config.target(@some_target_name, :deploy_to => 'smoeone@somewhere:/asdasdasd', :_logger => @logger, :_runner => @runner, :_hook => hook)
-      @base.instance_variable_set('@config', config)
+  describe '#setup' do
+    it 'runs setup on given target' do
+      Blazing::Target.should_receive(:setup).with(@some_target_name)
+      @base.setup(@some_target_name)
     end
+  end
 
-    it 'says what target is being deployed' do
-      @logger.should_receive(:log).with(:info, "deploying target test_target")
-      @base.deploy(@some_target_name)
-    end
+  describe '#deploy' do
 
     it 'runs setup on selected target' do
-      @target = @base.instance_variable_get('@config').instance_variable_get('@targets').first
-      @target.should_receive(:deploy)
+      Blazing::Target.should_receive(:deploy).with(@some_target_name)
       @base.deploy(@some_target_name)
     end
 
     it 'logs a success message if exitstatus of setup was 0' do
+      Blazing::Target.stub!(:deploy)
       @base.instance_variable_set('@exit_status', 0)
       @logger.should_receive(:log).with(:success, "successfully deployed target test_target")
       @base.deploy(@some_target_name)
     end
 
     it 'logs an error if exitstatus of setup was not 0' do
+      Blazing::Target.stub!(:deploy)
       @base.instance_variable_set('@exit_status', 1)
       @logger.should_receive(:log).with(:error, "failed deploying on target test_target")
       @base.deploy(@some_target_name)
@@ -102,39 +86,9 @@ describe Blazing::CLI::Base do
 
   describe '#post_receive' do
 
-    before :each do
-      @some_target_name = 'test_target'
-      config = Blazing::Config.new
-      config.target(@some_target_name, :deploy_to => 'smoeone@somewhere:/asdasdasd')
-      @base.instance_variable_set('@config', config)
-    end
-
     it 'instantiates a new remote and calls its post_receive method' do
-      Blazing::Remote.should_receive(:new).with(@some_target_name).and_return(double('remote', :post_receive => nil))
-      @base.post_receive
-    end
-  end
-
-  describe '#rvm' do
-
-    before :each do
-      @some_target_name = 'test_target'
-      hook = double('hook', :new => double('template', :generate => nil))
-      @config = Blazing::Config.new
-      @config.target(@some_target_name, :deploy_to => 'smoeone@somewhere:/asdasdasd', :_logger => @logger, :_runner => @runner, :_hook => hook)
-      @base.instance_variable_set('@config', @config)
-    end
-
-    it 'writes a log with the rvm string if the target has rvm enabled' do
-      @logger.should_receive(:log).with(:info, 'someruby@somegemset')
-      Blazing::Remote.stub!(:new).and_return(double('remote', :use_rvm? => 'someruby@somegemset'))
-      @base.rvm(@some_target_name)
-    end
-
-    it 'writes a log saying false if the target has no rvm enabled' do
-      @logger.should_receive(:log).with(:info, false)
-      Blazing::Remote.stub!(:new).and_return(double('remote', :use_rvm? => false))
-      @base.rvm(@some_target_name)
+      Blazing::Target.should_receive(:post_receive).with(@some_target_name)
+      @base.post_receive(@some_target_name)
     end
   end
 end

data/spec/blazing/config_spec.rb

@@ -69,7 +69,7 @@ describe Blazing::Config do
     it 'reads and parses the config file and returns a config object' do
       Blazing.send(:remove_const, 'CONFIGURATION_FILE')
       Blazing::CONFIGURATION_FILE = 'spec/support/config.rb'
-      Blazing::Config.load.should be_a Blazing::Config
+      Blazing::Config.parse.should be_a Blazing::Config
     end
   end
 

data/spec/blazing/integration/init_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+require 'blazing'
+require 'fileutils'
+
+describe 'blazing init' do
+
+  before :each do
+    @blazing_root = Dir.pwd
+    @sandbox_directory = File.join(@blazing_root, 'spec/support/sandbox')
+    @blazing =  Blazing::CLI::Base.new
+
+    # Sometimes, when specs failed, the sandbox would stick around
+    FileUtils.rm_rf(@sandbox_directory) if Dir.exists?(@sandbox_directory)
+
+    # Setup Sandbox
+    Dir.mkdir(@sandbox_directory)
+    Dir.chdir(@sandbox_directory)
+
+    # Setup empty repository
+    @repository_dir = 'repo_without_config'
+    Dir.mkdir(@repository_dir)
+    Dir.chdir(@repository_dir)
+    `git init`
+  end
+
+  after :each do
+    # Teardown Sandbox
+    Dir.chdir(@blazing_root)
+    FileUtils.rm_rf(@sandbox_directory)
+  end
+
+  it 'creates the config directory if it does not exist' do
+    silence(:stdout) { @blazing.init }
+    Dir.exists?('config').should be true
+  end
+
+  it 'does not fail when config directory exists already' do
+    silence(:stdout) { lambda { @blazing.init }.should_not raise_error }
+  end
+
+  it 'attempts to use the origin remote to setup the repository in the config' do
+    @origin = 'git@github.com:someone/somerepo.git'
+    `git remote add origin #{@origin}`
+    silence(:stdout) { @blazing.init }
+    Blazing::Config.parse.repository.should == @origin
+  end
+
+  it 'sets a dummy repository config when no remote was found' do
+    silence(:stdout) { @blazing.init }
+    Blazing::Config.parse.repository.should == 'user@host:/some/path'
+  end
+
+end

data/spec/blazing/logger_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'blazing/logger'
-require 'blazing/object'
+require 'blazing/core_ext/object'
 
 describe Blazing::Logger do
 

data/spec/blazing/remote_spec.rb

@@ -1,136 +1,136 @@
-require 'spec_helper'
-require 'blazing/remote'
-
-describe Blazing::Remote do
-
-  before :each do
-    # recipes = []
-    # @config = double('config', :load => double('actual_config', :recipes => recipes, :find_target => double('target', :recipes => recipes)))
-    @config = Blazing::Config.new
-    @config.target :some_name, :deploy_to => 'user@hostname:/path'
-    @remote = Blazing::Remote.new('some_name', :config => @config)
-    @remote.instance_variable_set('@_dir', double('Dir', :chdir => nil))
-  end
-
-  describe '#post_receive' do
-    before :each do
-      @remote.instance_variable_set('@runner', double('runner', :run => true))
-      Dir.stub!(:chdir)
-    end
-
-    it 'sets up the git dir' do
-      @remote.should_receive(:set_git_dir)
-      @remote.post_receive
-    end
-
-    it 'runs the recipes' do
-      @remote.should_receive(:run_recipes)
-      @remote.post_receive
-    end
-
-    it 'resets the git repository' do
-      @remote.should_receive(:reset_head!)
-      @remote.post_receive
-    end
-  end
-
-  describe '#gemfile_present?' do
-    it 'checks if a Gemfile is in the cwd' do
-      File.should_receive(:exists?).with('Gemfile')
-      @remote.gemfile_present?
-    end
-  end
-
-  describe '#set_git_dir' do
-    it 'sets .git as gitdir if git dir is "."' do
-      # Dir.should_receive(:chdir).with('.git')
-      # @remote.set_git_dir
-    end
-  end
-
-  describe '#reset_head!' do
-    it 'does a git reset --hard HEAD' do
-      runner = double('runner', :run => nil)
-      @remote.instance_variable_set('@runner', runner)
-      runner.should_receive(:run).with('git reset --hard HEAD')
-      @remote.reset_head!
-    end
-  end
-
-  describe '#use_rvm?' do
-    context 'with rvm recipe enabled' do
-      it 'returns the rvm string' do
-        @remote.instance_variable_set('@recipes', double('recipes', :find => double('recipe', :options => { :rvm_string => 'someruby@somegemset'}), :delete_if => nil))
-        @remote.use_rvm?.should == 'someruby@somegemset'
-      end
-
-      it 'deletes the rvm recipes from the recipes array' do
-        @remote.instance_variable_set('@recipes', [double('rvm_recipe', :name => 'rvm', :options => {})])
-        @remote.use_rvm?
-        @remote.instance_variable_get('@recipes').should be_blank
-      end
-    end
-
-    context 'without rvm_recipe' do
-      it 'returns false' do
-        @remote.instance_variable_set('@recipes', double('rvm_recipe', :find => false, :delete_if => nil))
-        @remote.use_rvm?.should be false
-      end
-    end
-  end
-
-  describe '#setup_recipes' do
-    context 'when the target has no recipes' do
-      it 'assigns the global recipes settings from the config' do
-        recipe_probe = double('recipe_probe', :name => 'noname', :run => nil)
-        config = double('config', :recipes => [recipe_probe])
-        @remote.instance_variable_set('@config', config)
-        @remote.setup_recipes
-        @remote.instance_variable_get('@recipes').first.should be recipe_probe
-      end
-    end
-
-    context 'when the target has recipes' do
-      it 'does not touch the target recipes' do
-        target_recipe_probe = double('target_recipe_probe', :name => 'target', :run => nil)
-        global_recipe_probe = double('global_recipe_probe', :name => 'global', :run => nil)
-        global_config = double('config', :recipes => [global_recipe_probe])
-        blazing_config_class = double('blazing_config', :load => global_config)
-        @remote.instance_variable_set('@_config', blazing_config_class)
-        @remote.instance_variable_set('@recipes', [target_recipe_probe])
-        @remote.setup_recipes
-        @remote.instance_variable_get('@recipes').first.name.should == 'target'
-      end
-    end
-  end
-
-  describe '#run_recipes' do
-    it 'runs all recipes' do
-      recipes =  [double('one', :name => nil), double('two', :name => nil), double('three', :name => nil)]
-      @remote.instance_variable_set('@recipes', recipes)
-      recipes.each do |recipe|
-        recipe.should_receive(:run)
-      end
-      @remote.run_recipes
-    end
-  end
-
-  describe '#run_bootstrap_recipes' do
-
-    before :each do
-      @bundler = double('bundler', :name => 'bundler', :run => nil)
-      @recipes =  [@bundler, double('two', :name => nil), double('three', :name => nil)]
-      @remote.instance_variable_set('@recipes', @recipes)
-    end
-
-    it 'runs bundler recipe if it is enabled' do
-      @bundler.should_receive(:run)
-      @remote.run_bootstrap_recipes
-    end
-
-    it 'deletes the bundler recipe from the array after running it' do
-      @remote.run_bootstrap_recipes
-      @recipes.find { |r| r.name == 'bundler' }.should be nil
-    end
-  end
-end
+# require 'spec_helper'
+# require 'blazing/remote'
+
+# describe Blazing::Remote do
+
+#   before :each do
+#     # recipes = []
+#     # @config = double('config', :load => double('actual_config', :recipes => recipes, :find_target => double('target', :recipes => recipes)))
+#     @config = Blazing::Config.new
+#     @config.target :some_name, :deploy_to => 'user@hostname:/path'
+#     @remote = Blazing::Remote.new('some_name', :config => @config)
+#     @remote.instance_variable_set('@_dir', double('Dir', :chdir => nil))
+#   end
+
+#   describe '#post_receive' do
+#     before :each do
+#       @remote.instance_variable_set('@runner', double('runner', :run => true))
+#       Dir.stub!(:chdir)
+#     end
+
+#     it 'sets up the git dir' do
+#       @remote.should_receive(:set_git_dir)
+#       @remote.post_receive
+#     end
+
+#     it 'runs the recipes' do
+#       @remote.should_receive(:run_recipes)
+#       @remote.post_receive
+#     end
+
+#     it 'resets the git repository' do
+#       @remote.should_receive(:reset_head!)
+#       @remote.post_receive
+#     end
+#   end
+
+#   describe '#gemfile_present?' do
+#     it 'checks if a Gemfile is in the cwd' do
+#       File.should_receive(:exists?).with('Gemfile')
+#       @remote.gemfile_present?
+#     end
+#   end
+
+#   describe '#set_git_dir' do
+#     it 'sets .git as gitdir if git dir is "."' do
+#       # Dir.should_receive(:chdir).with('.git')
+#       # @remote.set_git_dir
+#     end
+#   end
+
+#   describe '#reset_head!' do
+#     it 'does a git reset --hard HEAD' do
+#       runner = double('runner', :run => nil)
+#       @remote.instance_variable_set('@runner', runner)
+#       runner.should_receive(:run).with('git reset --hard HEAD')
+#       @remote.reset_head!
+#     end
+#   end
+
+#   describe '#use_rvm?' do
+#     context 'with rvm recipe enabled' do
+#       it 'returns the rvm string' do
+#         @remote.instance_variable_set('@recipes', double('recipes', :find => double('recipe', :options => { :rvm_string => 'someruby@somegemset'}), :delete_if => nil))
+#         @remote.use_rvm?.should == 'someruby@somegemset'
+#       end
+
+#       it 'deletes the rvm recipes from the recipes array' do
+#         @remote.instance_variable_set('@recipes', [double('rvm_recipe', :name => 'rvm', :options => {})])
+#         @remote.use_rvm?
+#         @remote.instance_variable_get('@recipes').should be_blank
+#       end
+#     end
+
+#     context 'without rvm_recipe' do
+#       it 'returns false' do
+#         @remote.instance_variable_set('@recipes', double('rvm_recipe', :find => false, :delete_if => nil))
+#         @remote.use_rvm?.should be false
+#       end
+#     end
+#   end
+
+#   describe '#setup_recipes' do
+#     context 'when the target has no recipes' do
+#       it 'assigns the global recipes settings from the config' do
+#         recipe_probe = double('recipe_probe', :name => 'noname', :run => nil)
+#         config = double('config', :recipes => [recipe_probe])
+#         @remote.instance_variable_set('@config', config)
+#         @remote.setup_recipes
+#         @remote.instance_variable_get('@recipes').first.should be recipe_probe
+#       end
+#     end
+
+#     context 'when the target has recipes' do
+#       it 'does not touch the target recipes' do
+#         target_recipe_probe = double('target_recipe_probe', :name => 'target', :run => nil)
+#         global_recipe_probe = double('global_recipe_probe', :name => 'global', :run => nil)
+#         global_config = double('config', :recipes => [global_recipe_probe])
+#         blazing_config_class = double('blazing_config', :parse => global_config)
+#         @remote.instance_variable_set('@_config', blazing_config_class)
+#         @remote.instance_variable_set('@recipes', [target_recipe_probe])
+#         @remote.setup_recipes
+#         @remote.instance_variable_get('@recipes').first.name.should == 'target'
+#       end
+#     end
+#   end
+
+#   describe '#run_recipes' do
+#     it 'runs all recipes' do
+#       recipes =  [double('one', :name => nil), double('two', :name => nil), double('three', :name => nil)]
+#       @remote.instance_variable_set('@recipes', recipes)
+#       recipes.each do |recipe|
+#         recipe.should_receive(:run)
+#       end
+#       @remote.run_recipes
+#     end
+#   end
+
+#   describe '#run_bootstrap_recipes' do
+
+#     before :each do
+#       @bundler = double('bundler', :name => 'bundler', :run => nil)
+#       @recipes =  [@bundler, double('two', :name => nil), double('three', :name => nil)]
+#       @remote.instance_variable_set('@recipes', @recipes)
+#     end
+
+#     it 'runs bundler recipe if it is enabled' do
+#       @bundler.should_receive(:run)
+#       @remote.run_bootstrap_recipes
+#     end
+
+#     it 'deletes the bundler recipe from the array after running it' do
+#       @remote.run_bootstrap_recipes
+#       @recipes.find { |r| r.name == 'bundler' }.should be nil
+#     end
+#   end
+# end

data/spec/blazing/target_spec.rb

@@ -8,6 +8,7 @@ describe Blazing::Target do
     @runner = double('runner', :run => nil)
     @hook = double('hook', :new => double('template', :generate => nil))
     @options = { :deploy_to => 'someone@somehost:/some/path', :_hook => @hook, :_runner => @runner, :_logger => @logger }
+    Blazing::Config.stub!(:parse).and_return(Blazing::Config.new)
   end
 
   describe '#initialize' do
@@ -66,57 +67,56 @@ describe Blazing::Target do
     end
   end
 
-  describe '#setup' do
+  describe '.bootstrap' do
     before :each do
-      blazing_config = double('config', :load => Blazing::Config.new)
       @target = Blazing::Target.new('somename', @options)
-      @target.instance_variable_set("@_config", blazing_config)
+      @config = Blazing::Config.new
+      @config.targets << @target
+      Blazing::Config.stub!(:parse).and_return(@config)
     end
 
     it 'clones the repository on the target location' do
       @target.should_receive(:clone_repository)
-      @target.setup
+      Blazing::Target.bootstrap('somename')
     end
 
     it 'adds the target as a git remote' do
       @target.should_receive(:add_target_as_remote)
-      @target.setup
+      Blazing::Target.bootstrap('somename')
     end
 
     it 'sets up the post-receive hook' do
       @target.should_receive(:setup_post_receive_hook)
-      @target.setup
+      Blazing::Target.bootstrap('somename')
     end
+  end
 
-    it 'checks out the correct branch if a branch is specified' do
-      @target.branch = 'test'
-      @target.should_receive(:checkout_correct_branch)
-      @target.setup
+  describe '.deploy' do
+    before :each do
+      @target = Blazing::Target.new('somename', @options)
+      @config = Blazing::Config.new
+      @config.targets << @target
+      Blazing::Config.stub!(:parse).and_return(@config)
+      @runner = double('runner', :run => nil)
+      Blazing::Runner.stub!(:new).and_return(@runner)
     end
-  end
 
-  describe '#deploy' do
     it 'uses git push to deploy to the target' do
-      target = Blazing::Target.new('somename', @options)
       @runner.should_receive(:run).with(/git push somename/)
-      target.deploy
+      Blazing::Target.deploy('somename')
     end
 
     it 'pushes the correct branch when one is configured' do
-      target = Blazing::Target.new('somename', @options)
-      target.branch = 'somebranch'
+      @target.branch = 'somebranch'
       @runner.should_receive(:run).with(/git push somename somebranch:somebranch/)
-      target.deploy
+      Blazing::Target.deploy('somename')
     end
   end
 
-  describe '#config' do
+  describe 'config' do
     it 'delegates to Blazing::Config.load' do
-      blazing_config = double
-      target = Blazing::Target.new('somename', @options)
-      target.instance_variable_set("@_config", blazing_config)
-      blazing_config.should_receive(:load)
-      target.config
+      Blazing::Config.should_receive(:parse)
+      Blazing::Target.config
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: blazing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - Felipe Kaufmann
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 Z
+date: 2011-07-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -24,29 +24,29 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: grit
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.5
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: i18n
+  name: activesupport
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: grit
+  name: i18n
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,19 +79,18 @@ files:
 - blazing.gemspec
 - lib/blazing.rb
 - lib/blazing/base.rb
+- lib/blazing/bootstrap.rb
 - lib/blazing/cli/base.rb
 - lib/blazing/cli/create.rb
 - lib/blazing/cli/hook.rb
 - lib/blazing/cli/templates/blazing.tt
 - lib/blazing/cli/templates/post-hook.tt
-- lib/blazing/cli/templates/pre-hook.tt
 - lib/blazing/config.rb
+- lib/blazing/core_ext/object.rb
 - lib/blazing/logger.rb
-- lib/blazing/object.rb
 - lib/blazing/recipe.rb
 - lib/blazing/recipes/bundler_recipe.rb
 - lib/blazing/recipes/rvm_recipe.rb
-- lib/blazing/remote.rb
 - lib/blazing/runner.rb
 - lib/blazing/target.rb
 - lib/blazing/version.rb
@@ -100,6 +99,7 @@ files:
 - spec/blazing/cli/create_spec.rb
 - spec/blazing/cli/hook_spec.rb
 - spec/blazing/config_spec.rb
+- spec/blazing/integration/init_spec.rb
 - spec/blazing/logger_spec.rb
 - spec/blazing/recipe_spec.rb
 - spec/blazing/recipes/bundler_recipe_spec.rb
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2643917059137636160
+      hash: 3198654558293204946
       segments: 
       - 0
       version: "0"
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2643917059137636160
+      hash: 3198654558293204946
       segments: 
       - 0
       version: "0"
@@ -149,6 +149,7 @@ test_files:
 - spec/blazing/cli/create_spec.rb
 - spec/blazing/cli/hook_spec.rb
 - spec/blazing/config_spec.rb
+- spec/blazing/integration/init_spec.rb
 - spec/blazing/logger_spec.rb
 - spec/blazing/recipe_spec.rb
 - spec/blazing/recipes/bundler_recipe_spec.rb

data/lib/blazing/cli/templates/pre-hook.tt

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'thor'
-require 'blazing'
-require 'blazing/cli'
-require 'blazing/remote'
-
-Blazing::Remote.pre_receive('<%= remote.name %>')

data/lib/blazing/remote.rb

@@ -1,73 +0,0 @@
-require 'blazing'
-require 'blazing/config'
-
-module Blazing
-  class Remote
-
-    def initialize(target_name, options = {})
-      @config = options[:config] || Blazing::Config.load
-      @target = @config.find_target(target_name)
-      @recipes = @target.recipes
-      setup_recipes
-    end
-
-    def post_receive
-      set_git_dir
-      reset_head!
-      @recipes.delete_if { |recipe| recipe.name == 'rvm' }
-      run_recipes
-    end
-
-    def gemfile_present?
-      File.exists? 'Gemfile'
-    end
-
-    def set_git_dir
-      ENV['GIT_DIR'] = '.git'
-    end
-
-    def reset_head!
-      @runner ||= Blazing::Runner.new
-      @runner.run 'git reset --hard HEAD'
-    end
-
-    #
-    # Called by post-receive hook to determine rvm usage
-    #
-    def use_rvm?
-      @rvm_recipe = @recipes.find { |recipe| recipe.name == 'rvm' }
-      @recipes.delete_if { |recipe| recipe.name == 'rvm' }
-      if @rvm_recipe
-        @rvm_recipe.options[:rvm_string]
-      else
-        'none'
-      end
-    end
-
-    def setup_recipes
-
-      # TODO: For now, recipes can be assigned only in the global
-      # namespace of the config. Make it possible for targets to
-      # define recipes individually
-
-      @recipes = @config.recipes if @recipes.blank?
-      Blazing::Recipe.load_builtin_recipes
-    end
-
-    def run_recipes
-      run_bootstrap_recipes
-      @recipes.each do |recipe|
-        recipe.run
-      end
-    end
-
-    def run_bootstrap_recipes
-      bundler = @recipes.find { |r| r.name == 'bundler' }
-      if bundler
-        bundler.run
-        @recipes.delete_if { |r| r.name == 'bundler' }
-      end
-    end
-  end
-
-end