blazing 0.0.6 → 0.0.7

data/Gemfile

@@ -3,9 +3,11 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in blazing.gemspec
 gemspec
 
+gem 'rake', '0.8.7'
 gem 'rspec'
-gem 'ruby-debug19'
-gem 'guard'
+gem 'ruby-debug19', :platforms => :ruby_19
+gem 'ruby-debug', :platforms => :ruby_18
+gem 'guard' , '0.4.0.rc'
 gem 'guard-rspec'
 gem 'growl'
-gem 'simplecov', '>= 0.4.0', :require => false, :group => :test
+gem 'simplecov', '>= 0.4.0', :require => false, :group => :test, :platforms => :ruby_19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blazing (0.0.4)
+    blazing (0.0.6)
       activesupport (>= 3.0.5)
       i18n
       thor (>= 0.14.6)
@@ -9,35 +9,34 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.5)
+    activesupport (3.0.7)
     archive-tar-minitar (0.5.2)
     columnize (0.3.2)
-    configuration (1.2.0)
     diff-lcs (1.1.2)
     growl (1.0.3)
-    guard (0.3.0)
-      open_gem (~> 1.4.2)
+    guard (0.4.0.rc)
       thor (~> 0.14.6)
-    guard-rspec (0.2.0)
+    guard-rspec (0.3.0)
       guard (>= 0.2.2)
-    i18n (0.5.0)
-    launchy (0.3.7)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    linecache19 (0.5.11)
+    i18n (0.6.0)
+    linecache (0.43)
+    linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    open_gem (1.4.2)
-      launchy (~> 0.3.5)
     rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
-    ruby-debug-base19 (0.11.24)
+    rspec-mocks (2.5.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -45,11 +44,11 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
+    ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simplecov (0.4.1)
-      simplecov-html (~> 0.4.3)
-    simplecov-html (0.4.3)
+    simplecov (0.4.2)
+      simplecov-html (~> 0.4.4)
+    simplecov-html (0.4.4)
     thor (0.14.6)
 
 PLATFORMS
@@ -58,8 +57,10 @@ PLATFORMS
 DEPENDENCIES
   blazing!
   growl
-  guard
+  guard (= 0.4.0.rc)
   guard-rspec
+  rake (= 0.8.7)
   rspec
+  ruby-debug
   ruby-debug19
   simplecov (>= 0.4.0)

data/README.md

@@ -1,6 +1,8 @@
 Blazing -- Fast and painless git push deploys
 =============================================
 
+[![Build Status](http://travis-ci.org/effkay/blazing.png)](http://travis-ci.org/effkay/blazing) (but still in alpha!)
+
 ## What
 
 Blazing aims to be a fast and hassle free way to deploy web
@@ -21,7 +23,7 @@ Some design goals:
 
 I initially started working on an extension to capistrano which would
 cover most of my needs and the needs we had at [Screen
-Concept](http://www.screencocnept.ch). After a short while I noticed
+Concept](http://www.screenconcept.ch). After a short while I noticed
 that bolting more functionality on top of capistrano was just going to
 be messy (and a PTA to maintain). We were alerady using tons of own recipes and customizations,
 capistrano multistage, capistrano-ext, etc.

data/Rakefile

@@ -2,9 +2,12 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
+
 desc "Run specs"
 RSpec::Core::RakeTask.new do |t|
   # t.rspec_opts = %w(--colour --fail-fast --format nested)
   t.rspec_opts = %w(--colour  --format nested)
   t.ruby_opts  = %w(-w)
 end
+
+task :default => :spec

data/lib/blazing.rb

@@ -2,6 +2,7 @@ require 'thor'
 require 'thor/group'
 require 'blazing'
 require 'blazing/config'
+require 'blazing/runner'
 require 'blazing/logger'
 require 'blazing/target'
 require 'blazing/remote'
@@ -12,7 +13,8 @@ require 'blazing/cli/create'
 require 'blazing/cli/hook'
 
 module Blazing
+
   DIRECTORY = 'config'
   CONFIGURATION_FILE = 'config/blazing.rb'
-  LOGGER ||= Blazing::Logger.new
+
 end

data/lib/blazing/cli/base.rb

@@ -1,49 +1,67 @@
+require 'thor'
+require 'blazing'
+require 'blazing/logger'
+require 'blazing/recipe'
+
+require 'blazing/cli/create'
+
 module Blazing
   module CLI
     class Base < Thor
 
+      def initialize(logger = Blazing::Logger.new)
+        @logger = logger
+        @config = Blazing::Config.load
+        super
+      end
+
       desc 'init', 'prepare project for blazing deploys'
       def init
-        Blazing::CLI::Create.new.invoke_all
+        @task ||= Blazing::CLI::Create.new
+        @task.invoke_all
       end
 
       desc 'setup TARGET_NAME', 'setup or update blazing on specified target and deploy'
       def setup(target_name = nil)
-        config = Blazing::Config.load
-        target = config.find_target(target_name)
-        LOGGER.info "setting up target #{target.name}"
+        target = @config.find_target(target_name)
+        @logger.log :info, "setting up target #{target.name}"
         target.setup
 
         # TODO: Abstract this into module and load it where we need it. Methods / actions should have
         # a success and failure message
-        if $?.exitstatus == 0
-          LOGGER.success "successfully set up target #{target.name}"
+        if exit_status == 0
+          @logger.log :success, "successfully set up target #{target.name}"
         else
-          LOGGER.error "failed setting up target #{target.name}"
+          @logger.log :error, "failed setting up target #{target.name}"
         end
       end
 
       desc 'deploy TARGET', 'deploy to TARGET'
       def deploy(target_name = nil)
-        config = Blazing::Config.load
-        target = config.find_target(target_name)
-        LOGGER.info "deploying target #{target.name}"
+        target = @config.find_target(target_name)
+        @logger.log :info, "deploying target #{target.name}"
         target.deploy
 
-        if $?.exitstatus == 0
-          LOGGER.success "successfully deployed target #{target.name}"
+        if exit_status == 0
+          @logger.log :success, "successfully deployed target #{target.name}"
         else
-          LOGGER.error "failed deploying on target #{target.name}"
+          @logger.log :error, "failed deploying on target #{target.name}"
         end
       end
 
       desc 'recipes', 'List available recipes'
       def recipes
         Blazing::Recipe.list.each do |recipe|
-          puts recipe.name
+          @logger.log :success, recipe.name
         end
+        @logger.report
       end
 
+    private
+
+      def exit_status
+        @exit_status || $?.exitstatus
+      end
     end
   end
 end

data/lib/blazing/cli/create.rb

@@ -1,3 +1,6 @@
+require 'thor'
+require 'thor/group'
+
 module Blazing
   module CLI
     class Create < Thor::Group
@@ -6,6 +9,11 @@ module Blazing
 
       include Thor::Actions
 
+      def initialize(logger = Blazing::Logger.new)
+        @logger = logger
+        super
+      end
+
       def self.source_root
         File.dirname(__FILE__)
       end
@@ -16,8 +24,9 @@ module Blazing
 
       def create_config_file
         template 'templates/blazing.tt', Blazing::CONFIGURATION_FILE
-        say "Blazing config file has been created in #{Blazing::CONFIGURATION_FILE} with a default remote."
-        say "Check the config and then setup your remote with blazing setup REMOTE"
+        @logger.log :info, "Blazing config file has been created in #{Blazing::CONFIGURATION_FILE} with a default remote."
+        @logger.log :info, "Check the config and then setup your remote with blazing setup REMOTE"
+        @logger.report
       end
 
     end

data/lib/blazing/cli/hook.rb

@@ -1,20 +1,22 @@
+require 'thor'
+
 module Blazing
   module CLI
     class Hook < Thor
 
       include Thor::Actions
 
-      def self.source_root
-        File.dirname(__FILE__)
-      end
-
       argument :target
 
       desc 'generate', 'generate post-receive hook from template'
       def generate
         template('templates/post-hook.tt', '/tmp/post-receive')
       end
-      
+
+      def self.source_root
+        File.dirname(__FILE__)
+      end
+
     end
   end
 end

data/lib/blazing/config.rb

@@ -1,8 +1,11 @@
+require 'blazing'
+require 'blazing/target'
+
 module Blazing
   class Config
 
     class << self
-      
+
       #
       # Read the Configuration File
       #
@@ -16,7 +19,6 @@ module Blazing
       # Load configuration file and parse it
       #
       def load
-        # TODO: shorten with something like this: new.instance_eval(File.read(guardfile_path), guardfile_path, 1)
         config = read do
           instance_eval(File.read(Blazing::CONFIGURATION_FILE))
         end
@@ -49,13 +51,11 @@ module Blazing
       @recipes = []
     end
 
-    def target(name, options = {}, &target_definition)
-      # TODO: implement if needed: target_definition.call if target_definition
+    def target(name, options = {})
       @targets << Blazing::Target.new(name, options)
     end
 
-    def use(name, options = {}, &recipe_definition)
-      #TODO: implement if needed: recipe_definition.call if recipe_definition
+    def use(name, options = {})
       @recipes << Blazing::Recipe.new(name, options)
     end
 
@@ -63,7 +63,7 @@ module Blazing
     # Determines which target is picked, based on defaults and CLI argument
     # If only one target is defined, it is the default one
     #
-    def find_target(target_name)
+    def find_target(target_name = nil)
       if target_name
         target = targets.find {|target| target.name == target_name }
       end

data/lib/blazing/logger.rb

@@ -3,122 +3,29 @@ module Blazing
 
     LOG_LEVELS =  [:info, :success, :warn, :error]
 
-    def initialize(use_color = false)
-      @use_color = use_color
+    def initialize(output = $stdout)
+      @output = output
     end
 
     def messages
       @messages ||= []
     end
 
-    def puts(message, type)
-      messages << Hash[:message => message, :type => type]
+    def log(type, message)
+      if LOG_LEVELS.include? type
+        messages << Hash[:message => message, :type => type]
+      else
+        raise
+      end
     end
 
-    LOG_LEVELS.each do |type|
-      define_method type do |message|
-        puts(message, type)
+    def report(type = nil)
+      if type
+        messages.select { |m| m[:type] == type }.each { |m| @output.puts m[:message] }
+      else
+        messages.each { |m| @output.puts m[:message] }
       end
     end
 
-    # def prefix
-    #   '[BLAZING] *** '
-    # end
-
-    # def postfix
-    #   ' ***'
-    # end
-
-    # def message(message, type)
-    #   case type
-    #   when :info
-    #     puts prefix + message.blue + postfix
-    #   when :success
-    #     puts prefix + message.green + postfix
-    #   when :warn
-    #     puts prefix + message.yellow + postfix
-    #   when :error
-    #     puts prefix + message.red + postfix
-    #   end
-    # end
-
   end
 end
-
-class String
-
-# 00  Turn off all attributes
-# 01  Set bright mode
-# 04  Set underline mode
-# 05  Set blink mode
-# 07  Exchange foreground and background colors
-# 08  Hide text (foreground color would be the same as background)
-# 30  Black text
-# 31  Red text
-# 32  Green text
-# 33  Yellow text
-# 34  Blue text
-# 35  Magenta text
-# 36  Cyan text
-# 37  White text
-# 39  Default text color
-# 40  Black background
-# 41  Red background
-# 42  Green background
-# 43  Yellow background
-# 44  Blue background
-# 45  Magenta background
-# 46  Cyan background
-# 47  White background
-# 49  Default background col
-
- def black
-   string = "\033[30m"
-   string << self
-   string << "\033[0m"
- end
-
- def red
-   string = "\033[31m"
-   string << self
-   string << "\033[0m"
- end
-
- def green
-   string = "\033[32m"
-   string << self
-   string << "\033[0m"
- end
-
- def yellow
-   string = "\033[33m"
-   string << self
-   string << "\033[0m"
- end
-
- def blue
-   string = "\033[34m"
-   string << self
-   string << "\033[0m"
- end
-
- def purple
-   string = "\033[35m"
-   string << self
-   string << "\033[0m"
- end
-
- def cyan
-   string = "\033[36m"
-   string << self
-   string << "\033[0m"
- end
-
- def white
-   string = "\033[37m"
-   string << self
-   string << "\033[0m"
- end
-
-end
-