blazing 0.2.5 → 0.2.6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## 0.2.6 - November 24, 2011
+
+* Add option to specify custom rvm scripts location
+* Fix failing setup command when target directory already exists
+
 ## 0.2.5 - November 9, 2011
 
 * Fix missing logger include in Recipe

data/lib/blazing/config.rb

@@ -8,7 +8,7 @@ class Blazing::Config
 
   attr_reader :file
   attr_accessor :targets, :recipes
-  dsl_setter :repository, :rvm, :rake
+  dsl_setter :repository, :rvm, :rvm_scripts, :rake
 
   class << self
 

data/lib/blazing/target.rb

@@ -52,7 +52,7 @@ class Blazing::Target
   def init_repository
     # Instead of git init with a path, so it does not fail on older
     # git versions (https://github.com/effkay/blazing/issues/53)
-    "mkdir #{path} && cd #{path} && git init"
+    "mkdir #{path}; cd #{path} && git init"
   end
 
   def copy_hook

data/lib/blazing/templates/hook.erb

@@ -16,36 +16,46 @@ do
 done
 
 <% if @config.rvm %>
-  # Load RVM into a shell session *as a function*
-  if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
-
-    # First try to load from a user install
-    source "$HOME/.rvm/scripts/rvm"
-
-    <% if @config.rvm == :rvmrc %>
-      echo "------> [blazing] Loading rvm from .rvmrc"
-      source .rvmrc
-    <% else %>
-      echo "------> [blazing] Loading rvm string: <%= @config.rvm %>"
-      rvm use <%= @config.rvm %>
-    <% end %>
-
-  elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
-
-    # Then try to load from a root install
-    source "/usr/local/rvm/scripts/rvm"
-
-    <% if @config.rvm == :rvmrc %>
-      echo "------> [blazing] Loading rvm from .rvmrc"
-      source .rvmrc
-    <% else %>
-      echo "------> [blazing] Loading rvm string: <%= @config.rvm %>"
-      rvm use <%= @config.rvm %>
-    <% end %>
-
-  else
-    echo '------> [blazing] ERROR: RVM was enabled in config but no RVM installation was not found\n'
-  fi
+
+  #
+  # Custom RVM script location?
+  #
+  <% if @config.rvm_scripts %>
+
+    source <%= @config.rvm_scripts %>
+    echo "------> [blazing] Loading rvmscripts from custom location"
+
+  #
+  # Normal RVM installation
+  #
+  <% else %>
+    # Load RVM into a shell session *as a function*
+    if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+
+      # First try to load from a user install
+      source "$HOME/.rvm/scripts/rvm"
+
+    elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+
+      # Then try to load from a root install
+      source "/usr/local/rvm/scripts/rvm"
+
+    else
+      echo '------> [blazing] ERROR: RVM was enabled in config but no RVM installation was not found\n'
+    fi
+  <% end %>
+
+  #
+  # Apply rvm env
+  #
+  <% if @config.rvm == :rvmrc %>
+    echo "------> [blazing] Loading rvm from .rvmrc"
+    source .rvmrc
+  <% else %>
+    echo "------> [blazing] Loading rvm string: <%= @config.rvm %>"
+    rvm use <%= @config.rvm %>
+  <% end %>
+
 <% end %>
 
 echo "------> [blazing] Bundling gems"

data/lib/blazing/version.rb

@@ -1,3 +1,3 @@
 module Blazing
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/blazing/config_spec.rb

@@ -140,5 +140,19 @@ describe Blazing::Config do
       end
 
     end
+
+    describe 'rvm_scripts' do
+
+      it 'takes an string as argument' do
+        @config.rvm_scripts '/opt/rvm/scripts'
+        @config.instance_variable_get('@rvm_scripts').should == '/opt/rvm/scripts'
+      end
+
+      it 'returns the string if no argument given' do
+        @config.rvm_scripts '/opt/rvm/scripts'
+        @config.rvm_scripts.should == '/opt/rvm/scripts'
+      end
+
+    end
   end
 end

data/spec/blazing/integration/setup_remote_spec.rb

@@ -24,7 +24,7 @@ describe 'blazing setup' do
     @shell = Blazing::Shell.new
     @target = @config.default_target
     @target.instance_variable_set('@shell', @shell)
-    @shell.should_receive(:run).with("ssh user@host 'mkdir /some/where/else && cd /some/where/else && git init && cd /some/where/else && git config receive.denyCurrentBranch ignore'")
+    @shell.should_receive(:run).with("ssh user@host 'mkdir /some/where/else; cd /some/where/else && git init && cd /some/where/else && git config receive.denyCurrentBranch ignore'")
     @target.should_receive(:apply_hook)
     @runner.exec('setup')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blazing
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000Z
+date: 2011-11-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70170681369220 !ruby/object:Gem::Requirement
+  requirement: &70099205952900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170681369220
+  version_requirements: *70099205952900
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70170681368660 !ruby/object:Gem::Requirement
+  requirement: &70099205951780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70170681368660
+  version_requirements: *70099205951780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70170681368180 !ruby/object:Gem::Requirement
+  requirement: &70099205950920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170681368180
+  version_requirements: *70099205950920
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70170681367640 !ruby/object:Gem::Requirement
+  requirement: &70099205949680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170681367640
+  version_requirements: *70099205949680
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70170681367200 !ruby/object:Gem::Requirement
+  requirement: &70099205948940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170681367200
+  version_requirements: *70099205948940
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70170681366720 !ruby/object:Gem::Requirement
+  requirement: &70099205947980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170681366720
+  version_requirements: *70099205947980
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70170681366220 !ruby/object:Gem::Requirement
+  requirement: &70099205946180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70170681366220
+  version_requirements: *70099205946180
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70170681309100 !ruby/object:Gem::Requirement
+  requirement: &70099205848100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170681309100
+  version_requirements: *70099205848100
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &70170681308560 !ruby/object:Gem::Requirement
+  requirement: &70099205847200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170681308560
+  version_requirements: *70099205847200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70170681308080 !ruby/object:Gem::Requirement
+  requirement: &70099205846160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170681308080
+  version_requirements: *70099205846160
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70170681307600 !ruby/object:Gem::Requirement
+  requirement: &70099205845360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170681307600
+  version_requirements: *70099205845360
 description: painless git push deployments for everyone
 email:
 - felipekaufmann@gmail.com
@@ -187,12 +187,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1818648821680842616
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1818648821680842616
 requirements: []
 rubyforge_project: blazing
 rubygems_version: 1.8.10