blazing 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,13 +1,22 @@
 ## master
 
-none
+...
+
+## 0.1.2 - October 25, 2011
+
+* setup initializes an empty repository, so first push will work (#47)
+
+* simplified cli workflow (#45):
+  * update runs update and setup:local
+  * setup:remote renamed to setup
+  * setup:remote also runs update
 
 ## 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][])
+* [BUG]: fix #48: dont bundle test and dev gems, do it quietly
+* [BUG]: fix #44: accept target as argument
+* [BUG]: fix #41: recipe gem loading issues resolved
+* remove documentation of external recipes
 
 ## 0.1.0 - October 24, 2011
 

data/Gemfile.lock

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

data/README.md

@@ -8,7 +8,7 @@ Not everyone can or wants to deploy on heroku. But now you can have the same awe
 
 ## Quickstart
 
-`blazing init`, edit the configuration, run `blazing setup:local` and `blazing setup:remote <target>` and you're set. Deploy with `git push <target> <branch>` or setup git to always push your current branch.
+`blazing init`, edit the configuration, run `blazing setup [target]` and you're set. Deploy with `git push <target> <branch>` or setup git to always push your current branch.
 
 ## Overview & Background
 
@@ -49,17 +49,13 @@ See the generated configuration file or [the template file](https://github.com/e
 
 ### Setup
 
-`blazing setup:local` will setup your local repository for deployment with blazing/git push. Basically, it will add a remote for each target you defined in the configuration file.
-
-`blazing setup:remote <target>` will setup the project on the server side. It will:
+`blazing setup` will:
 
+* setup your local repository for deployment with blazing/git push. Basically, it will add a remote for each target you defined in the configuration file.
 * clone the repository to the specified location
 * setup the repository to allow a currently checked out branch to be pushed to it
-* run ``blazing update``
-
-`blazing update <target>`
 
-Whenever you change something in your blazing config file you can run the update command so your git post-receive hook gets updated.
+Whenever you change something in your blazing config file you can run the `update` command so your git post-receive hook and your git remotess get updated.
 
 ### Deploying
 

data/lib/blazing/runner.rb

@@ -9,7 +9,7 @@ class Blazing::Runner
   def initialize(config = nil, target = nil)
     if config
       @config = config
-      @target = @config.targets.find { |t| t.name == target.to_s } || @config.default_target
+      @target = @config.targets.find { |t| t.name.to_s == target } || @config.default_target
     end
   end
 
@@ -31,7 +31,7 @@ class Blazing::Runner
     end
   end
 
-  def setup_local_command
+  def setup_git_remotes
     repository = Grit::Repo.new(Dir.pwd)
     @config.targets.each do |target|
       info("Adding new remote #{target.name} pointing to #{target.location}")
@@ -39,12 +39,14 @@ class Blazing::Runner
     end
   end
 
-  def setup_remote_command
+  def setup_command
     @target.setup
+    update_command
   end
 
   def update_command
-    @target.update
+    setup_git_remotes
+    @target.apply_hook
   end
 
   def recipes_run_command

data/lib/blazing/target.rb

@@ -13,11 +13,10 @@ class Blazing::Target
   end
 
   def setup
-    @shell.run "ssh #{user}@#{host} '#{clone_repository} && #{setup_repository}'"
-    self.update
+    @shell.run "ssh #{user}@#{host} '#{init_repository} && #{setup_repository}'"
   end
 
-  def update
+  def apply_hook
     hook = ERB.new(File.read("#{Blazing::TEMPLATE_ROOT}/hook.erb")).result(binding)
 
     File.open(Blazing::TMP_HOOK, "wb") do |f|
@@ -42,8 +41,8 @@ class Blazing::Target
     user[1] unless user.nil?
   end
 
-  def clone_repository
-    "git clone #{@config.repository} #{path}"
+  def init_repository
+    "git init #{path}"
   end
 
   def copy_hook

data/lib/blazing/version.rb

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

data/spec/blazing/config_spec.rb

@@ -96,15 +96,15 @@ describe Blazing::Config do
       end
 
       it 'accepts a single recipe as argument' do
-        # @config.recipe :dummy
-        # @config.recipes.first.should be_a Blazing::Recipe::Dummy
+        @config.recipe :dummy
+        @config.recipes.first.should be_a Blazing::Recipe::Dummy
       end
 
       it 'allows multiple recipes to be defined' do
-        # @config.recipe :dummy
-        # @config.recipe :dummy
-        # @config.recipes.size.should be 2
-        # @config.recipes.each { |r| r.should be_a Blazing::Recipe::Dummy }
+        @config.recipe :dummy
+        @config.recipe :dummy
+        @config.recipes.size.should be 2
+        @config.recipes.each { |r| r.should be_a Blazing::Recipe::Dummy }
       end
 
       it 'passes the options to the recipe initializer' do

data/spec/blazing/integration/setup_remote_spec.rb

@@ -3,7 +3,7 @@ require 'blazing/config'
 require 'blazing/runner'
 require 'grit'
 
-describe 'blazing setup:remote' do
+describe 'blazing setup' do
 
   before :each do
     setup_sandbox
@@ -24,9 +24,9 @@ describe 'blazing setup:remote' do
     @shell = Blazing::Shell.new
     @target = @config.default_target
     @target.instance_variable_set('@shell', @shell)
-    @shell.should_receive(:run).with("ssh user@host 'git clone  /some/where/else && cd /some/where/else && git config receive.denyCurrentBranch ignore'")
-    @target.should_receive(:update)
-    capture(:stdout) { @runner.exec('setup:remote') }
+    @shell.should_receive(:run).with("ssh user@host 'git init /some/where/else && cd /some/where/else && git config receive.denyCurrentBranch ignore'")
+    @target.should_receive(:apply_hook)
+    capture(:stdout) { @runner.exec('setup') }
   end
 
 end

data/spec/blazing/integration/update_spec.rb

@@ -39,4 +39,9 @@ describe 'blazing update' do
     capture(:stdout) { @runner.exec('update') }
   end
 
+  it 'adds a git remote for each target' do
+    capture(:stdout) { @runner.exec('update') }
+    Grit::Repo.new(Dir.pwd).config['remote.production.url'].should == @production_url
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blazing
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70305205865040 !ruby/object:Gem::Requirement
+  requirement: &70326105257020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305205865040
+  version_requirements: *70326105257020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70305205864540 !ruby/object:Gem::Requirement
+  requirement: &70326105256520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70305205864540
+  version_requirements: *70326105256520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70305205864120 !ruby/object:Gem::Requirement
+  requirement: &70326105256100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305205864120
+  version_requirements: *70326105256100
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70305205863620 !ruby/object:Gem::Requirement
+  requirement: &70326105255640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305205863620
+  version_requirements: *70326105255640
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70305205863200 !ruby/object:Gem::Requirement
+  requirement: &70326105255180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305205863200
+  version_requirements: *70326105255180
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70305205862780 !ruby/object:Gem::Requirement
+  requirement: &70326105254760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305205862780
+  version_requirements: *70326105254760
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70305205862360 !ruby/object:Gem::Requirement
+  requirement: &70326105254340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70305205862360
+  version_requirements: *70326105254340
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70305205861940 !ruby/object:Gem::Requirement
+  requirement: &70326105253920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305205861940
+  version_requirements: *70326105253920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70305205861520 !ruby/object:Gem::Requirement
+  requirement: &70326105253500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305205861520
+  version_requirements: *70326105253500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70305205861100 !ruby/object:Gem::Requirement
+  requirement: &70326105253080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70305205861100
+  version_requirements: *70326105253080
 description: git push deployent utility, ready to be extended by your own recipes
 email:
 - felipekaufmann@gmail.com
@@ -156,7 +156,6 @@ files:
 - spec/blazing/integration/init_spec.rb
 - spec/blazing/integration/recipes_list_spec.rb
 - spec/blazing/integration/recipes_run_spec.rb
-- spec/blazing/integration/setup_local_spec.rb
 - spec/blazing/integration/setup_remote_spec.rb
 - spec/blazing/integration/update_spec.rb
 - spec/blazing/recipe_spec.rb
@@ -196,7 +195,6 @@ test_files:
 - spec/blazing/integration/init_spec.rb
 - spec/blazing/integration/recipes_list_spec.rb
 - spec/blazing/integration/recipes_run_spec.rb
-- spec/blazing/integration/setup_local_spec.rb
 - spec/blazing/integration/setup_remote_spec.rb
 - spec/blazing/integration/update_spec.rb
 - spec/blazing/recipe_spec.rb

data/spec/blazing/integration/setup_local_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-require 'blazing/config'
-require 'blazing/runner'
-require 'grit'
-
-describe 'blazing setup:local' do
-
-  before :each do
-    setup_sandbox
-    @production_url = 'user@host:/some/where'
-    @staging_url = 'user@host:/some/where/else'
-
-    @config = Blazing::Config.new
-    @config.target :production, @production_url
-    @config.target :staging, @staging_url, :default => true
-    capture(:stdout) { Blazing::Runner.new(@config).exec('setup:local') }
-  end
-
-  after :each do
-    teardown_sandbox
-  end
-
-  it 'adds a git remote for each target' do
-    Grit::Repo.new(Dir.pwd).config['remote.production.url'].should == @production_url
-  end
-
-end