blazing 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -0,0 +1,14 @@
+## master
+
+none
+
+## 0.1.1 - October 25, 2011
+
+* [BUGFIX]: fix #48: dont bundle test and dev gems, do it quietly ([@effkay][])
+* [BUGFIX]: fix #44: accept target as argument ([@effkay][])
+* [BUGFIX]: fix #41: recipe gem loading issues resolved
+* [DOCS]: remove documentation of external recipes ([@effkay][])
+
+## 0.1.0 - October 24, 2011
+
+[@effkay]: https://github.com/effkay

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blazing (0.1.0)
+    blazing (0.1.1)
       activesupport
       grit
       i18n

data/README.md

@@ -78,10 +78,7 @@ Right now blazing does the following things out of the box:
 Run all recipes? Well yes, blazing can be extended by recipes. So far, these are available:
 
 * [blazing-passenger](https://github.com/effkay/blazing-passenger)
-	* `:passenger_restart` will touch `tmp/retart.txt`
-	* `:passenger_kickstart, :url => 'http:://somehost'` will do a get requst on somehost to kickstart passenger
 * [blazing-rails](https://github.com/effkay/blazing-rails)
-	* `:precompile_assets` will precompile the assets when deploying
 
 Feel free to roll your own recipes!
 

data/lib/blazing/config.rb

@@ -13,7 +13,7 @@ class Blazing::Config
   class << self
 
     def parse(configuration_file = nil)
-      Blazing::Recipe.load_gem_recipes
+      Blazing::Recipe.load_recipes
       config = self.new(configuration_file)
       config.instance_eval(File.read(config.file))
 

data/lib/blazing/recipe.rb

@@ -25,9 +25,15 @@ class Blazing::Recipe
       descendants
     end
 
-    def load_gem_recipes
-      # TODO: I'm sure there is a better way to do this...
-      gems = open('Gemfile').grep(/blazing-/).map { |l| l.match(/(blazing-.*)\'\,/)[1] }
+    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')
@@ -37,5 +43,4 @@ class Blazing::Recipe
     end
 
   end
-
 end

data/lib/blazing/runner.rb

@@ -40,11 +40,11 @@ class Blazing::Runner
   end
 
   def setup_remote_command
-    @config.default_target.setup
+    @target.setup
   end
 
   def update_command
-    @config.default_target.update
+    @target.update
   end
 
   def recipes_run_command

data/lib/blazing/templates/config.erb

@@ -14,17 +14,20 @@
 # target :staging, 'blazing@production.server.com:/where/your/code/is/shipped/to', :default => true
 
 #
-# Define which recipes should be used. The recipes are run in the order that they are defined
+# Optional: RVM handling
 #
-
 # Use Ruby Enterprise Edition and gemset 123
-# recipe :rvm, :use => 'ree@123'
+# rvm 'ree@123'
 
 # Or use the rvmrc
-# recipe :rvm, :use => :rvmrc
+# rvm :rvmrc
+#
 
-# Bundle after deploying
-# recipe :bundler
+#
+# Define Recipes to be used (See the README for available recipes).
+# Recipes are run in the order they are specified
+#
+# recipe :recipe_name
 
 #
 # Define a rake task that should be run after deployment. The rake task will run after the recipes have run.

data/lib/blazing/templates/hook.erb

@@ -39,7 +39,7 @@ done
   fi
 <% end %>
 
-bundle --deployment
+bundle --deployment --quiet --without development test
 
 <% unless @config.recipes.empty? %>
   bundle exec blazing recipes:run

data/lib/blazing/version.rb

@@ -1,3 +1,3 @@
 module Blazing
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/blazing/recipe_spec.rb

@@ -20,4 +20,24 @@ describe Blazing::Recipe do
     end
   end
 
+  describe '.parse_gemfile' do
+
+    it 'works when the recipe gems are specified with versions' do
+      gemfile = 'spec/support/gemfile_with_versions'
+      Blazing::Recipe.parse_gemfile(gemfile).should == ["blazing-passenger", "blazing-rails"]
+    end
+
+    it 'works when the recipe gems are specified without' do
+      gemfile = 'spec/support/gemfile_without_versions'
+      Blazing::Recipe.parse_gemfile(gemfile).should == ["blazing-passenger", "blazing-rails"]
+    end
+
+    it 'does not load gems that are commented out' do
+      pending
+      gemfile = 'spec/support/gemfile_with_comments'
+      Blazing::Recipe.parse_gemfile(gemfile).should == ["blazing-passenger"]
+    end
+
+  end
+
 end

data/spec/support/gemfile_with_comments

@@ -0,0 +1,2 @@
+gem 'blazing-passenger', '0.1.0'
+# gem 'blazing-rails', '0.0.2'

data/spec/support/gemfile_with_versions

@@ -0,0 +1,2 @@
+gem 'blazing-passenger', '0.1.0'
+gem 'blazing-rails', '0.0.2'

data/spec/support/gemfile_without_versions

@@ -0,0 +1,2 @@
+gem 'blazing-passenger'
+gem 'blazing-rails'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blazing
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-24 00:00:00.000000000Z
+date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70120543055980 !ruby/object:Gem::Requirement
+  requirement: &70305205865040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120543055980
+  version_requirements: *70305205865040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70120543055480 !ruby/object:Gem::Requirement
+  requirement: &70305205864540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70120543055480
+  version_requirements: *70305205864540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70120543055060 !ruby/object:Gem::Requirement
+  requirement: &70305205864120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120543055060
+  version_requirements: *70305205864120
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70120543054600 !ruby/object:Gem::Requirement
+  requirement: &70305205863620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120543054600
+  version_requirements: *70305205863620
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70120543054160 !ruby/object:Gem::Requirement
+  requirement: &70305205863200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120543054160
+  version_requirements: *70305205863200
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70120543053720 !ruby/object:Gem::Requirement
+  requirement: &70305205862780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120543053720
+  version_requirements: *70305205862780
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70120543053300 !ruby/object:Gem::Requirement
+  requirement: &70305205862360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70120543053300
+  version_requirements: *70305205862360
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70120543052880 !ruby/object:Gem::Requirement
+  requirement: &70305205861940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70120543052880
+  version_requirements: *70305205861940
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70120543052460 !ruby/object:Gem::Requirement
+  requirement: &70305205861520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70120543052460
+  version_requirements: *70305205861520
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70120543052040 !ruby/object:Gem::Requirement
+  requirement: &70305205861100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70120543052040
+  version_requirements: *70305205861100
 description: git push deployent utility, ready to be extended by your own recipes
 email:
 - felipekaufmann@gmail.com
@@ -131,6 +131,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -163,6 +164,9 @@ files:
 - spec/blazing/target_spec.rb
 - spec/spec_helper.rb
 - spec/support/empty_config.rb
+- spec/support/gemfile_with_comments
+- spec/support/gemfile_with_versions
+- spec/support/gemfile_without_versions
 homepage: https://github.com/effkay/blazing
 licenses: []
 post_install_message: 
@@ -200,3 +204,6 @@ test_files:
 - spec/blazing/target_spec.rb
 - spec/spec_helper.rb
 - spec/support/empty_config.rb
+- spec/support/gemfile_with_comments
+- spec/support/gemfile_with_versions
+- spec/support/gemfile_without_versions