blazing 0.0.9 → 0.0.10

data/Gemfile

@@ -11,3 +11,4 @@ gem 'guard' , '0.4.0.rc'
 gem 'guard-rspec'
 gem 'growl'
 gem 'simplecov', '>= 0.4.0', :require => false, :group => :test, :platforms => :ruby_19
+gem 'rb-fsevent'

data/Gemfile.lock

@@ -1,18 +1,22 @@
 PATH
   remote: .
   specs:
-    blazing (0.0.8)
+    blazing (0.0.10)
       activesupport (>= 3.0.5)
+      grit
       i18n
       thor (>= 0.14.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.7)
+    activesupport (3.0.9)
     archive-tar-minitar (0.5.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
+    grit (2.4.1)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
     growl (1.0.3)
     guard (0.4.0.rc)
       thor (~> 0.14.6)
@@ -22,7 +26,9 @@ GEM
     linecache (0.43)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
+    mime-types (1.16)
     rake (0.8.7)
+    rb-fsevent (0.4.0)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -60,6 +66,7 @@ DEPENDENCIES
   guard (= 0.4.0.rc)
   guard-rspec
   rake (= 0.8.7)
+  rb-fsevent
   rspec
   ruby-debug
   ruby-debug19

data/README.md

@@ -48,18 +48,22 @@ such systems.
 
 Examples:
 
-    repository 'git@github.com:someones/repository.git'
+```ruby
+repository 'git@github.com:someones/repository.git'
 
-    use [:rvm, :bundler, :whenever]
+use [:bundler, :whenever]
+use :rvm, :rvm_string => 'ree@production'
 
-    target :stagigng, :deploy_to => 'user@hostname:/path/to/target', :default => true
-    target :production, :deploy_to => 'user@somehostname:/path/to/target'
-
-    ...
+target :stagigng, :deploy_to => 'user@hostname:/path/to/target', :default => true
+target :production, :deploy_to => 'user@somehostname:/path/to/target'
+...
+```
 
 ## Deploying
 
-    blazing deploy <target_name>
+```bash
+blazing deploy <target_name>
+```
 
 Or, if everyting is already set up on the remote etc. you can acutally
 just do a git push to your target name.
@@ -80,13 +84,15 @@ create a topic branch for every separate change you intend to make.
 
 Example:
 
-    class SomeFunkyRecipe < Blazing::Recipe
+```ruby
+class SomeFunkyRecipe < Blazing::Recipe
 
-      def self.run
-        # do something
-      end
+  def self.run
+    # do something
+  end
 
-    end
+end
+```
 
 ## Authors
 

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+Bundler.setup
 
 require 'rspec/core/rake_task'
 

data/bin/blazing

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+Bundler.setup
+
 require 'thor'
 require 'thor/group'
 require 'blazing'

data/blazing.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   # 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/base.rb

@@ -1,18 +1,34 @@
+require 'grit'
+
 module Blazing
   module Base
 
+    def config
+      @config ||= Blazing::Config.load
+    end
+
     def log(type, message)
       @logger ||= Blazing::Logger.new
       @logger.log(type, message)
     end
 
-    def config
-      @config ||= Blazing::Config.load
-    end
-
     def report
       @logger.report
     end
 
+    #
+    # Helper that wraps exitstatus of cli stuff
+    #
+    def exit_status
+      @exit_status || $?.exitstatus
+    end
+
+    #
+    # Try to read the default remote
+    #
+    def repository_url
+      Grit::Repo.new(Dir.pwd).config['remote.origin.url'] || 'user@host:/some/path'
+    end
+
   end
 end

data/lib/blazing/cli/base.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'grit'
 require 'blazing'
 require 'blazing/logger'
 require 'blazing/base'
@@ -13,7 +14,7 @@ module Blazing
 
       desc 'init', 'prepare project for blazing deploys'
       def init
-        @task ||= Blazing::CLI::Create.new
+        @task ||= Blazing::CLI::Create.new([repository_url])
         @task.invoke_all
       end
 
@@ -53,8 +54,7 @@ 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
+      #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)
@@ -68,12 +68,6 @@ module Blazing
         log :info, Blazing::Remote.new(target.name).use_rvm?
         report
       end
-
-    private
-
-      def exit_status
-        @exit_status || $?.exitstatus
-      end
     end
   end
 end

data/lib/blazing/cli/create.rb

@@ -8,6 +8,8 @@ module Blazing
 
       desc 'create a blazing config file'
 
+      argument :repository
+
       include Thor::Actions
       include Blazing::Base
 
@@ -25,7 +27,6 @@ module Blazing
         log :info, "Check the config and then setup your remote with blazing setup REMOTE"
         report
       end
-
     end
   end
 end

data/lib/blazing/cli/templates/blazing.tt

@@ -2,6 +2,6 @@
 #  blazing config file  -- generated on <%= Time.now %>
 #
 
-repository 'username@host:path/to/your/repository.git'
+repository '<%= repository %>'
 
 target :default, :deploy_to => 'username@host:path/to/deploy'

data/lib/blazing/config.rb

@@ -12,14 +12,15 @@ module Blazing
       def read(&block)
         config = Blazing::Config.new
         config.instance_eval(&block)
-        return config
+
+        config
       end
 
       #
       # Load configuration file and parse it
       #
       def load
-        config = read do
+        read do
           instance_eval(File.read(Blazing::CONFIGURATION_FILE))
         end
       end

data/lib/blazing/target.rb

@@ -6,24 +6,29 @@ module Blazing
 
     attr_accessor :name, :recipes
 
-    AVAILABLE_SETTINGS = [:deploy_to, :host, :user, :path, :default]
+    AVAILABLE_SETTINGS = [:deploy_to, :host, :user, :path, :default, :branch]
 
     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_accesors(options)
+      create_accessors(options)
     end
 
     def setup
+      # TODO: Use a Wrapper to Net::SSH
+      #
       clone_repository
+      checkout_correct_branch if @branch
       add_target_as_remote
       setup_post_receive_hook
     end
 
     def deploy
-      @runner.run "git push #{name}"
+      deploy_command = "git push #{name}"
+      deploy_command += " #{@branch}:#{@branch}" if @branch
+      @runner.run deploy_command
     end
 
     def config
@@ -31,7 +36,7 @@ module Blazing
       @_config.load
     end
 
-    def create_accesors(options)
+    def create_accessors(options)
       assign_settings(options)
       parse_deploy_to_string unless @deploy_to.blank?
       ensure_mandatory_settings
@@ -64,6 +69,10 @@ module Blazing
       git clone #{config.repository} #{@path} && cd #{@path} && git config receive.denyCurrentBranch ignore; fi"
     end
 
+    def checkout_correct_branch
+      @runner.run "ssh #{@user}@#{@host} 'cd #{@path} && git checkout #{@branch}'" if @branch
+    end
+
     def clone_repository
       @runner.run "ssh #{@user}@#{@host} '#{clone_command}'"
     end

data/lib/blazing/version.rb

@@ -1,3 +1,3 @@
 module Blazing
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/blazing/cli/create_spec.rb

@@ -6,7 +6,7 @@ describe Blazing::CLI::Create do
 
   before :each do
     @logger = double('logger', :log => nil, :report => nil)
-    @config_generator = Blazing::CLI::Create.new
+    @config_generator = Blazing::CLI::Create.new(['repository_url'])
     @config_generator.instance_variable_set('@logger', @logger)
   end
 

data/spec/blazing/target_spec.rb

@@ -66,25 +66,6 @@ describe Blazing::Target do
     end
   end
 
-  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
-    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
-    end
-  end
-
   describe '#setup' do
     before :each do
       blazing_config = double('config', :load => Blazing::Config.new)
@@ -106,5 +87,36 @@ describe Blazing::Target do
       @target.should_receive(:setup_post_receive_hook)
       @target.setup
     end
+
+    it 'checks out the correct branch if a branch is specified' do
+      @target.branch = 'test'
+      @target.should_receive(:checkout_correct_branch)
+      @target.setup
+    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
+    end
+
+    it 'pushes the correct branch when one is configured' do
+      target = Blazing::Target.new('somename', @options)
+      target.branch = 'somebranch'
+      @runner.should_receive(:run).with(/git push somename somebranch:somebranch/)
+      target.deploy
+    end
+  end
+
+  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
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: blazing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Felipe Kaufmann
@@ -10,12 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 +02:00
-default_executable: 
+date: 2011-07-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thor
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -23,10 +21,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.14.6
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,10 +32,10 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.0.5
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: i18n
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,7 +43,19 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
   type: :runtime
+  prerelease: false
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: grit
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
 description: git push deployent utility, ready to be extended by your own recipes
 email: 
 - felipekaufmann@gmail.com
@@ -100,7 +110,6 @@ files:
 - spec/blazing/target_spec.rb
 - spec/spec_helper.rb
 - spec/support/config.rb
-has_rdoc: true
 homepage: https://github.com/effkay/blazing
 licenses: []
 
@@ -114,17 +123,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 1710367293229875195
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 1710367293229875195
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: blazing fast deployment