asmodai 0.1.3 → 0.1.4

data/lib/asmodai.rb

@@ -27,4 +27,5 @@ module Asmodai
   require 'asmodai/info'  
   require 'asmodai/logging'
   require 'asmodai/daemon'
+  require 'asmodai/version'
 end

data/lib/asmodai/cli.rb

@@ -22,25 +22,32 @@ class Asmodai::CLI < Thor
   end
   
   desc "install", "Installs startup scripts to /etc/init.d"
-  method_option :rvm, :type => :boolean,
-                :desc => "Create an rvm-wrapper for asmodai"
+  method_option :force, :type => :boolean,
+                :desc => "Overwrite a given init.d-file"
   method_option :autostart,
                 :type => :boolean,
                 :desc => %{If you provide this, startup-links will be generated for the given runlevel. This is currently only supported on Debian/Ubuntu.}
+  
   def install
     @info = Asmodai::Info.current
     @asmodai = "asmodai"
+    rvm_ruby_string = (ENV['rvm_ruby_string'] || "")
     
-    if options[:rvm]
-      wrapper_cmd="rvm wrapper #{ENV['rvm_ruby_string']} bootup asmodai"
-      @asmodai=`which bootup_asmodai`.strip
+    if @info.rvm_environment?
+      @asmodai=Pathname.new(@info.rvm_wrapper_path)
+      if !@asmodai.exist?
+        @info.execute_sudo_checked("rvm wrapper #{@info.rvm_ruby_string} bootup asmodai")
+      end
     end
-        
     path = "/etc/init.d/#{@info.daemon_name}"
+    
+    if options[:force]
+      FileUtils.rm_f(path)
+    end
+    
     template "templates/init_d.erb", path
     system "chmod a+x #{path}"
 
-    
     if options[:autostart]
       if (update_bin=`which update-rc.d`.strip).blank?
         warn "update-rc.d was not found. Omitting autostart installation."
@@ -49,13 +56,13 @@ class Asmodai::CLI < Thor
       end
     end
   end
-    
+  
   desc "foreground", "Runs the daemon in foreground logging to stdout"
   def foreground
     instance=Asmodai::Info.current.daemon_class.new
     instance.foreground
   end
-  
+    
   desc "start", "Runs the daemon in the background"
   def start
     klass = Asmodai::Info.current.daemon_class
@@ -94,4 +101,10 @@ class Asmodai::CLI < Thor
     klass = Asmodai::Info.current.daemon_class
     exec "irb -r rubygems -r asmodai -r ./#{klass.daemon_name}"
   end
+  
+  desc "version", "Prints Asmodai's version and exists"
+  def version
+    puts "Asmodai version #{Asmodai::VERSION}"
+  end
+  map %w(-v --version) => :version
 end

data/lib/asmodai/info.rb

@@ -25,6 +25,23 @@ class Asmodai::Info
     daemon_name.camelize
   end
   
+  def rvm_environment?
+    !rvm_ruby_string.empty?
+  end
+  
+  def rvm_ruby_string
+    execute_sudo_checked("env | grep rvm_ruby_string | grep -v SUDO").strip
+  end
+  
+  def rvm_path
+    execute_sudo_checked(
+      "env | grep rvm_path | grep -v SUDO").strip.split("=").last
+  end
+  
+  def rvm_wrapper_path
+    File.join(rvm_path, "bin/bootup_asmodai")
+  end
+
   # Returns the class of the Daemon
   def daemon_class
     require "./#{daemon_name}"
@@ -40,4 +57,23 @@ class Asmodai::Info
   def base_file_owner
     Etc.getpwuid(Pathname.new(base_file).stat.uid)
   end
+
+  # Return the sudoer if present, false otherwise
+  def run_as_sudo?
+    if ENV['USER']=='root' and (su=ENV['SUDO_USER'])
+      su
+    else
+      false
+    end
+  end
+
+  # Executes cmd in the context of the user, even if asmodai
+  # is called sudoed
+  def execute_sudo_checked(cmd)
+    if (su=run_as_sudo?)
+      `sudo -u #{su} bash -l -c '#{cmd}'`.strip
+    else
+      `#{cmd}`.strip
+    end
+  end
 end

data/lib/asmodai/version.rb

@@ -1,3 +1,3 @@
 module Asmodai
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sebastian Morawietz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +01:00
+date: 2011-01-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency