blazing 0.0.12 → 0.0.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blazing (0.0.12)
+    blazing (0.0.13)
       activesupport (>= 3.0.5)
       grit
       i18n

data/lib/blazing/cli/base.rb

@@ -61,13 +61,6 @@ module Blazing
         target = config.find_target(target_name)
         Blazing::Remote.new(target.name).post_receive
       end
-
-      desc 'rvm', 'used by post_receive hook to decide if rvm env needs to be switched'
-      def rvm(target_name = nil)
-        target = config.find_target(target_name)
-        log :info, Blazing::Remote.new(target.name).use_rvm?
-        report
-      end
     end
   end
 end

data/lib/blazing/cli/hook.rb

@@ -6,7 +6,7 @@ module Blazing
 
       include Thor::Actions
 
-      argument :target
+      argument :rvm_string
 
       desc 'generate', 'generate post-receive hook from template'
       def generate

data/lib/blazing/cli/templates/post-hook.tt

@@ -1,12 +1,25 @@
 #!/bin/bash
 
-cd ..
-unset GIT_DIR
+<%- unless rvm_string == 'none' %>
+  # 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"
+    <%= "rvm use #{rvm_string}" %>
+
+  elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
 
-rvm=$(bundle exec blazing rvm)
+    # Then try to load from a root install
+    source "/usr/local/rvm/scripts/rvm"
+    <%= "rvm use #{rvm_string}" %>
 
-if [ $rvm != 'false' ]; then
-  rvm use $rvm
-fi
+  else
+    printf "ERROR: RVM was enabled in config but no RVM installation was not found.\n"
+  fi
+<%- end -%>
+
+cd ..
+unset GIT_DIR
 
 bundle exec blazing post_receive

data/lib/blazing/remote.rb

@@ -40,7 +40,7 @@ module Blazing
       if @rvm_recipe
         @rvm_recipe.options[:rvm_string]
       else
-        false
+        'none'
       end
     end
 

data/lib/blazing/target.rb

@@ -82,7 +82,7 @@ module Blazing
     end
 
     def setup_post_receive_hook
-      @hook.new([@name]).generate
+      @hook.new([Blazing::Remote.new(@name).use_rvm?]).generate
       @runner.run "scp /tmp/post-receive #{@user}@#{@host}:#{@path}/.git/hooks/post-receive"
       @runner.run "ssh #{@user}@#{@host} 'chmod +x #{@path}/.git/hooks/post-receive'"
     end

data/lib/blazing/version.rb

@@ -1,3 +1,3 @@
 module Blazing
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -2,7 +2,7 @@
 name: blazing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Felipe Kaufmann
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 777711064405027808
+      hash: -3305365196802226824
       segments: 
       - 0
       version: "0"
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 777711064405027808
+      hash: -3305365196802226824
       segments: 
       - 0
       version: "0"