freyr 0.5.1 → 0.5.2

data/Freyrfile

@@ -19,3 +19,5 @@ service :sudosleep do
   start 'sudo sleep 20'
   proc_match /sleep 20/
 end
+
+group :foo, :sleep, :foobar

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/freyr/command.rb

@@ -24,11 +24,12 @@ module Freyr
       
       total_time = Time.now
       
+      Freyr.logger.debug("attempting to run command") {command.inspect}
+
       pid = spawn(command)
       
-      Freyr.logger.debug("attempting to run command") {command.inspect}
-      str = "\nStarting #{info.name} with #{command.inspect}"
-      OUT.puts '',"Starting #{info.name} with #{command.inspect}", '='*str.length
+      str = "Starting #{info.name} with #{command.inspect}"
+      OUT.puts '',str, '='*str.length
       Process.detach(pid)
       
       pid = service.pid_file.wait_for_pid
@@ -83,19 +84,33 @@ module Freyr
       raise AdminRequired if info.sudo && !Freyr.is_root?
     end
     
-    def chdir
-      Dir.chdir File.expand_path(info.dir||'/')
+    def chdir &blk
+      if block_given?
+        Dir.chdir(File.expand_path(info.dir),&blk)
+      else
+        Dir.chdir(File.expand_path(info.dir))
+      end
     end
     
     def spawn(command)
       if info.rvm && RVM.installed?
-        Freyr.logger.debug('attempting to set rvm') {info.rvm}
-        if RVM.installed?(info.rvm)
-          command = "rvm #{info.rvm} exec #{command}"
-          Freyr.logger.debug('changed command to') {command}
-        else
-          abort("must setup rvm correctly, run: rvm --install --create #{info.rvm}")
+        Freyr.logger.debug("rvm insalled")
+        chdir do
+          if File.exist? '.rvmrc'
+            Freyr.logger.debug('adding rvmrc to source')
+            command = "source .rvmrc && #{command}"
+            Freyr.logger.debug('changed command to') {command}
+          else
+            Freyr.logger.debug('attempting to set rvm') {info.rvm}
+            if RVM.installed?(info.rvm)
+              command = "rvm #{info.rvm} exec #{command}"
+              Freyr.logger.debug('changed command to') {command}
+            else
+              abort("must setup rvm correctly, run: rvm --install --create #{info.rvm}")
+            end
+          end
         end
+
       elsif info.rvm
         Freyr.logger.debug("rvm not installed so can't switch to") {info.rvm}
       end

data/lib/freyr/pid_file.rb

@@ -42,7 +42,7 @@ module Freyr
     end
 
     def wait_for_pid wait = 40, interval=0.2
-      OUT.puts "Waiting #{wait}s for pid from match of #{@procname}"
+      OUT.puts "Waiting #{wait}s for pid from match of #{@procname.inspect}"
 
       start = Time.now
 

data/lib/freyr/rvm.rb

@@ -14,22 +14,17 @@ module Freyr
     end
 
     def rubies
-      @rubies ||= `rvm list`.strip.split("\n").collect do |line|
-        next unless line =~ /^(\s{3}|=)/
-        line.strip.sub(/\=\>\s/,'').sub(/\s\[.+\]$/,'')
-      end.compact
+      @rubies ||= `rvm list strings`.chomp.split("\n")
     end
 
     def gemsets_for ruby
       @gemsets_for ||= Hash.new do |h,ruby|
-        output = `rvm #{ruby} exec rvm gemset list`.strip.split("\n")
-        output.shift
+        output = `rvm #{ruby} exec rvm gemset list strings`.chomp.split("\n")
         h[ruby] = output.collect do |line|
-          next unless line =~ /^(\s{3}|=)/
-          line.strip.sub(/\=\>\s/,'')
+          line.strip.sub(/\s\(.+\)/,'')
         end.compact
       end
       @gemsets_for[ruby]
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: freyr
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Tal Atlas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 Z
+date: 2011-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec