asmodai 0.1.6 → 0.1.7

data/lib/asmodai/cli.rb

@@ -22,8 +22,6 @@ class Asmodai::CLI < Thor
   end
   
   desc "install", "Installs startup scripts to /etc/init.d"
-  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.}
@@ -36,17 +34,19 @@ class Asmodai::CLI < Thor
     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")
+        system "rvm wrapper #{@info.rvm_ruby_string} bootup asmodai"
       end
     end
+    
     path = "/etc/init.d/#{@info.daemon_name}"
     
-    if options[:force]
-      FileUtils.rm_f(path)
+    IO.popen "sudo bash -c \"cat > #{path}; chmod a+x #{path}\"", "r+" do |io|
+      template_path = File.join(
+        File.dirname(__FILE__), "generator/templates/init_d.erb")
+
+      io.puts ERB.new(File.read(template_path)).result(binding)
+      io.close
     end
-    
-    template "templates/init_d.erb", path
-    system "chmod a+x #{path}"
 
     if options[:autostart]
       if (update_bin=`which update-rc.d`.strip).blank?

data/lib/asmodai/info.rb

@@ -26,7 +26,7 @@ class Asmodai::Info
   end
   
   def rvm_environment?
-    !rvm_ruby_string.empty?
+    !rvm_ruby_string.empty? || ENV['GEM_PATH']
   end
   
   def rvm_ruby_string

data/lib/asmodai/version.rb

@@ -1,3 +1,3 @@
 module Asmodai
-  VERSION = "0.1.6"
-end
+  VERSION = "0.1.7"
+end

metadata

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