blazing 0.4.2 → 0.5.0

data/Rakefile

@@ -7,16 +7,15 @@ include Rake::DSL
 
 Bundler::GemHelper.install_tasks
 
-desc "Run specs"
+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.rspec_opts = %w(--colour --fail-fast)
   t.ruby_opts  = %w(-w)
 end
 
 Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc","lib/**/*.rb","bin/**/*")
+  rd.main = 'README.rdoc'
+  rd.rdoc_files.include('README.rdoc', 'lib/**/*.rb', 'bin/**/*')
 end
 
-task :default => [:spec]
+task default: [:spec]

data/bin/blazing

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.expand_path('../lib/', File.dirname(__FILE__))
 
-require 'blazing'
 require 'blazing/cli'
-
 Blazing::CLI.start

data/blazing.gemspec

@@ -1,43 +1,34 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'blazing/version'
 
 Gem::Specification.new do |s|
-  s.name        = "blazing"
-
-  #
-  # TODO: Remove Config.repository in 0.3
-  #
-  s.version     = '0.4.2'
-
-  s.authors     = ["Felipe Kaufmann"]
-  s.email       = ["felipekaufmann@gmail.com"]
-  s.homepage    = "https://github.com/effkay/blazing"
-  s.summary     = %q{git push deployment helper}
-  s.description = %q{painless git push deployments for everyone}
-  s.rubyforge_project = "blazing"
+  s.name        = 'blazing'
+  s.version     =  ::Blazing::VERSION
+  s.authors     = ['Felipe Kaufmann', 'Alexander Adam']
+  s.email       = ['felipekaufmann@gmail.com']
+  s.homepage    = 'https://github.com/effkay/blazing'
+  s.summary     = 'git push deployment helper'
+  s.description = 'painless git push deployments for everyone'
+  s.rubyforge_project = 'blazing'
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_path  = 'lib'
+  s.required_ruby_version = '>= 2.0.0'
 
-  # specify any dependencies here; for example:
-  # s.add_development_dependency "rspec"
-  # s.add_runtime_dependency "rest-client"
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('rake','~> 0.9.2')
-  s.add_development_dependency('rspec')
+  s.add_development_dependency('rake', '~> 0.9.2')
+  s.add_development_dependency('rspec', '>= 3.0')
   s.add_development_dependency('guard')
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('ruby_gntp')
   s.add_development_dependency('rb-fsevent')
   s.add_development_dependency('pry')
   s.add_development_dependency('pimpmychangelog')
+  s.add_development_dependency('rubocop')
 
   s.add_dependency('grit')
-  s.add_dependency('logging', '~> 1.8')
+  s.add_dependency('logging')
   s.add_dependency('thor')
-
-  # TODO: Get rid of those, just used for guessing recipe names etc in lib/recipes.rb
-  s.add_dependency "activesupport"
-  s.add_dependency "i18n"
 end

data/lib/blazing.rb

@@ -1,19 +1,7 @@
-require "blazing/logger"
+require_relative 'blazing/config'
 
 module Blazing
-
-  autoload :CLI, 'blazing/cli'
-  autoload :Config, 'blazing/config'
-  autoload :DSLSetter, 'blazing/dsl_setter'
-  autoload :Recipe, 'blazing/recipe'
-  autoload :COmmands, 'blazing/commands'
-  autoload :Shell, 'blazing/shell'
-  autoload :Target, 'blazing/target'
-  autoload :Hook, 'blazing/hook'
-  autoload :Repository, 'blazing/repository'
-
-  TEMPLATE_ROOT = File.expand_path(File.dirname(__FILE__) + File.join('/', 'blazing', 'templates'))
+  TEMPLATE_ROOT = File.expand_path(File.join(File.dirname(__FILE__), 'blazing/templates'))
   DEFAULT_CONFIG_LOCATION = 'config/blazing.rb'
   TMP_HOOK = '/tmp/post-receive'
-
 end

data/lib/blazing/cli.rb

@@ -1,78 +1,71 @@
 require 'thor'
-require 'blazing/commands'
+require_relative 'commands'
+require_relative 'version'
 
 module Blazing
   class CLI < Thor
-
     default_task :help
 
-    desc 'init', 'Generate a blazing config file'
-
     #
     # Bootstrap blazing by creating a sample config file
     #
+    desc 'init', 'Generate a sample blazing config file'
+
     def init
       Blazing::Commands.run(:init)
     end
 
+    #
+    # Setup a target to be deployed with blazing
+    #
     desc 'setup [TARGET]', 'Setup local and remote repository/repositories for deployment'
 
     method_option :file,
-      :type    => :string,
-      :aliases => '-f',
-      :banner  => 'Specify a configuration file'
+                  type: :string,
+                  aliases: '-f',
+                  banner: 'Specify a configuration file'
 
-    #
-    # Setup a target to be deployed with blazing
-    #
     def setup(target_name = nil)
-      Blazing::Commands.run(:setup, :target_name => target_name, :options => options)
+      Blazing::Commands.run(:setup, target_name: target_name, cli_options: options)
     end
 
-    desc 'update [TARGET]', 'Re-Generate and uplaod hook based on current configuration'
-
-    method_option :file,
-      :type    => :string,
-      :aliases => '-f',
-      :banner  => 'Specify a configuration file'
-
     #
     # Update the target hook so it matches the settings in the config
     #
+    desc 'update [TARGET]', 'Re-Generate and upload hook based on current configuration'
+
+    method_option :file,
+                  type: :string,
+                  aliases: '-f',
+                  banner: 'Specify a configuration file'
+
     def update(target_name = nil)
-      Blazing::Commands.run(:update, :target_name => target_name, :options => options)
+      Blazing::Commands.run(:update, target_name: target_name, cli_options: options)
     end
 
-    desc 'recipes [TARGET]', 'Run the recipes for the given target'
-
     #
-    # Run the configured blazing recipes (used on remote machien)
+    # SSH to the server and cd into the app directory. Of course it also sets the appropriate RAILS_ENV
     #
-    def recipes(target_name)
-      Blazing::Commands.run(:recipes, :target_name => target_name, :options => options)
-    end
-
-    desc 'goto [TARGET]', 'Open a shell for specified target'
+    desc 'goto [TARGET]', 'Open ssh session on target. Use -c to specify a command to be run'
 
     method_option :run,
-      :type    => :string,
-      :aliases => '-c',
-      :banner  => 'Specify a command'
+                  type: :string,
+                  aliases: '-c',
+                  banner: 'Specify a command'
 
-    #
-    # SSH to the server and cd into the app directory. Of course it also sets the appropriate RAILS_ENV
-    #
     def goto(target_name)
-      Blazing::Commands.run(:goto, :target_name => target_name, :options => options)
+      Blazing::Commands.run(:goto, target_name: target_name, cli_options: options)
     end
 
-    desc 'list', 'List available recipes'
-
     #
-    # List the available blazing recipes
+    # Show blazing version
     #
-    def list
-      Blazing::Commands.run(:list)
+    desc 'version', 'Show the blazing version'
+
+    map %w(-v --version) => :version
+
+    def version
+      puts "blazing version #{::Blazing::VERSION}"
     end
   end
 end

data/lib/blazing/commands.rb

@@ -1,49 +1,46 @@
 require 'erb'
+require 'blazing'
+require_relative 'config'
 
 module Blazing
   class Commands
-
-    include Logger
+    include Blazing::Logger
 
     class << self
       def run(command, options = {})
-        self.new(options.merge({ :command => command })).send(command)
+        new(options.merge(command: command)).send(command)
       end
     end
 
     def initialize(options = {})
-      warn 'The :default Target option has been deprecated and will be ignored' if options.has_key?(:default)
-      @cli_options = options[:options] # that stinks! TODO: clean up options handling.
+      warn 'The :default Target option has been deprecated and will be ignored' if options.key?(:default)
+      @cli_options = options[:cli_options]
       @target_name = options[:target_name]
       @config_file = options[:file]
       @command = options[:command]
       @targets = []
 
-      if command_requires_config?
-        @config ||= Config.parse(@config_file)
-        @targets = determine_targets
-        error 'no target given or found' if @targets.empty?
-      end
+      return unless command_requires_config?
+
+      @config ||= Blazing::Config.parse(@config_file)
+      @targets = determine_targets
+      error 'no target given or found' if @targets.empty?
     end
 
     def init
       info "Creating an example config file in #{Blazing::DEFAULT_CONFIG_LOCATION}"
-      info "Customize it to your needs"
+      info 'Customize it to your needs'
       create_config_directory
       write_config_file
     end
 
     def setup
-      @targets.each { |target| target.setup }
+      @targets.each(&:setup)
       update
     end
 
     def update
-      @targets.each { |target| target.update }
-    end
-
-    def recipes
-      @config.recipes.each { |recipe| recipe.run({:target_name => @target_name}) }
+      @targets.each(&:update)
     end
 
     def goto
@@ -57,19 +54,15 @@ module Blazing
       end
     end
 
-    def list
-      Blazing::Recipe.pretty_list
-    end
-
     private
 
     def create_config_directory
-      Dir.mkdir 'config' unless File.exists? 'config'
+      Dir.mkdir 'config' unless File.exist? 'config'
     end
 
     def write_config_file
       config = ERB.new(File.read("#{Blazing::TEMPLATE_ROOT}/config.erb")).result
-      File.open(Blazing::DEFAULT_CONFIG_LOCATION,"wb") { |f| f.puts config }
+      File.open(Blazing::DEFAULT_CONFIG_LOCATION, 'wb') { |f| f.puts config }
     end
 
     def determine_targets
@@ -77,14 +70,13 @@ module Blazing
         @config.targets
       else
         targets = []
-        targets << @config.find_target(@target_name)
+        targets << @config.target(@target_name)
         targets.compact
       end
     end
 
     def command_requires_config?
-      [:setup, :update, :recipes, :goto].include? @command
+      [:setup, :update, :goto].include? @command
     end
   end
 end
-

data/lib/blazing/config.rb

@@ -1,60 +1,30 @@
-require 'blazing/target'
-require 'blazing/recipe'
-require 'blazing/dsl_setter'
+require_relative 'dsl'
+require_relative 'logger'
 
-class Blazing::Config
+module Blazing
+  class Config
+    include Blazing::Logger
 
-  extend Blazing::DSLSetter
-  include Blazing::Logger
+    attr_reader :file
+    attr_accessor :targets, :rake_task, :env_script
 
-  attr_reader :file
-  attr_accessor :targets, :recipes
-  dsl_setter :rvm, :env_scripts
-  alias :rvm_scripts :env_scripts
-
-  class << self
-    def parse(configuration_file = nil)
-      Blazing::Recipe.load_recipes!
-      config = self.new(configuration_file)
-      config.instance_eval(File.read(config.file))
-
-      config
+    def initialize(configuration_file = nil)
+      @file = configuration_file || Blazing::DEFAULT_CONFIG_LOCATION
+      @targets = []
+      @rake_task = nil
+      @env_script = nil
     end
-  end
-
-  def initialize(configuration_file = nil)
-    @file = configuration_file || Blazing::DEFAULT_CONFIG_LOCATION
-    @targets = []
-    @recipes = []
-  end
-
-  def target(name, location, options = {})
-    raise "Name already taken" if targets.find { |t| t.name == name }
-    targets << Blazing::Target.new(name, location, self, options)
-  end
-
-  def recipe(name, options = {})
-    @recipes << Blazing::Recipe.init_by_name(name, options)
-  end
-
-  def rake(task_name, env = nil)
-    @rake = { :task => task_name }
-    @rake[:env] = env if env
-  end
-
-  def repository(*args)
-    warn 'Ther repository DSL method has been deprecated and is no longer used. This method will be removed in Version 0.3'
-  end
 
-  def default_target
-    if @targets.size == 1
-      @targets.first
+    class << self
+      def parse(configuration_file = nil)
+        config = new(configuration_file)
+        Blazing::DSL.new(config).instance_eval(File.read(config.file))
+        config
+      end
     end
-  end
 
-  # TODO: Spec it!
-  def find_target(target_name)
-    targets.find { |t| t.name.to_s == target_name.to_s }
+    def target(target_name)
+      targets.find { |t| t.name.to_s == target_name.to_s }
+    end
   end
-
 end

data/lib/blazing/dsl.rb

@@ -0,0 +1,37 @@
+require_relative 'target'
+
+module Blazing
+  class DSL
+    attr_accessor :config
+
+    def initialize(config)
+      @config = config
+    end
+
+    def target(name, location, options = {})
+      raise 'Name already taken' if config.targets.find { |t| t.name == name }
+
+      config.targets << Blazing::Target.new(name, location, config, options)
+    end
+
+    def rake(task_name)
+      config.rake_task = task_name
+    end
+
+    def env_script(path)
+      config.env_script = path
+    end
+
+    def rvm_scripts(_args)
+      warn 'rvm_scripts in config has been deprecated and no longer works. Use env_script!'
+    end
+
+    def rvm(_args)
+      warn 'you can not set the rvm ruby with the blazing DSL anymore. Use rake tasks!'
+    end
+
+    def recipes(_args)
+      warn 'recipes have been removed from blazing!'
+    end
+  end
+end