asmodai 0.1.1 → 0.1.2

data/README.md

@@ -9,13 +9,12 @@ stop-scripts, pid-file logic or implementing logging.
 
 ## Installation
 
-$ gem install asmodai
+    $ gem install asmodai
 
 ## Usage
 
-$ asmodai new foobar
-
-$ cd foobar
+    $ asmodai new foobar
+    $ cd foobar
 
 Here you will find a dummy implementation:
 
@@ -38,28 +37,31 @@ Here you will find a dummy implementation:
 
 You can develop your daemon by executing 
 
-$ asmodai foreground
+    $ asmodai foreground
 
 This executes the daemon in the foreground and outputs all logging to standard
 output. It can be terminated with Ctrl-C.
 
 To start your daemon in the background run
 
-$ asmodai start
+    $ asmodai start
+
+This will redirect all the output from the process to log/foobar.log
 
-Check the status of the daemon
+In order to check the status of the daemon run
 
 $ asmodai status
   => foobar runs with pid 75952
-  
+
+
 Stop the daemon
 
-$ asmodai stop
+    $ asmodai stop
 
 ## Example: Using Asmodai with EventMachine
 
-$ asmodai new echo
-$ cd echo
+    $ asmodai new echo
+    $ cd echo
 
 Edit the Gemfile
 
@@ -89,9 +91,7 @@ Edit echo.rb
 
     class Echo < Asmodai::Daemon
       require 'server' # lib is automatically added to the $LOAD_PATH
-      
-      attr_accessor :running
-      
+
       def on_signal(sig)
         EventMachine::stop_event_loop
       end
@@ -103,6 +103,12 @@ Edit echo.rb
       end
     end
 
+Now, run
+
+    $ bundle install
+    $ asmodai start
+
+And you have your own running Echo server. Wheee!
 
 
 

data/asmodai.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Sebastian Morawietz"]
   s.email       = []
-  s.homepage    = "http://rubygems.org/gems/asmodai"
+  s.homepage    = "https://github.com/flitzwald/asmodai"
   s.summary     = "A simple daemon generator"
   s.description = "A simple daemon generator"
 

data/lib/asmodai/cli.rb

@@ -22,14 +22,25 @@ 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 :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"
+    
+    if options[:rvm]
+      wrapper_cmd="rvm wrapper #{ENV['rvm_ruby_string']} bootup asmodai"
+      @asmodai=`which bootup_asmodai`.strip
+    end
+        
     path = "/etc/init.d/#{@info.daemon_name}"
     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."

data/lib/asmodai/generator/templates/Gemfile

@@ -1,3 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'activesupport', ">= 3.0.0"
+gem 'activesupport', ">= 3.0.3"

data/lib/asmodai/generator/templates/init_d.erb

@@ -16,12 +16,12 @@ SCRIPTNAME=/etc/init.d/$NAME
 
 do_start()
 {
-        sudo -u <%= @info.base_file_owner.name %> bash -l -c "cd <%= @info.path %> && asmodai start"
+        sudo -u <%= @info.base_file_owner.name %> bash -l -c "cd <%= @info.path %> && <%= @asmodai %> start"
 }
 
 do_stop()
 {
-        sudo -u <%= @info.base_file_owner.name %> bash -l -c "cd <%= @info.path %> && asmodai stop"
+        sudo -u <%= @info.base_file_owner.name %> bash -l -c "cd <%= @info.path %> && <%= @asmodai %> stop"
 
 	return 0
 }

data/lib/asmodai/version.rb

@@ -1,3 +1,3 @@
 module Asmodai
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Sebastian Morawietz
@@ -96,7 +96,7 @@ files:
 - test/test_daemon/.gitignore
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://rubygems.org/gems/asmodai
+homepage: https://github.com/flitzwald/asmodai
 licenses: []
 
 post_install_message: