lobster 0.1.2 → 0.2.0

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    lobster (0.1.1.pre)
+    lobster (0.1.3.wip)
       daemons (>= 1.1.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    daemons (1.1.4)
+    daemons (1.1.8)
 
 PLATFORMS
   ruby

data/README.md

@@ -43,9 +43,6 @@ Two environment variables are used (with defaults):
 - `LOBSTER_ENV` is a variable used to handle different environments (default: 
   development)
 
-You need write permission to `/var/run/lobster/` for pids, this path is 
-configurable.
-
 - `lobster run` will run in the console
 - or `lobster start` as a deamon
 

data/bin/lobster

@@ -13,7 +13,9 @@ config = Lobster::Configuration.new(lobster_dir, lobster_env)
 #puts "Config: #{config}"
 
 log_dir = config[:log_dir]
-Dir.mkdir log_dir unless Dir.exist?(log_dir) || ARGV.first == "run"
+pid_dir = config[:pid_dir]
+Dir.mkdir log_dir unless Dir.exist?(log_dir) || ARGV.first == 'run'
+Dir.mkdir pid_dir unless Dir.exist?(pid_dir)
 
 daemon_options = {
   :multiple => false,

data/bin/lobsterize

@@ -60,8 +60,8 @@ unless File.exist?(schedule)
       ## Job named my_job
       #job 'my_job' do
       #
-      ## will just sleep for 5 seconds, this command is run from the
-      ## LOBSTER_DIR directory, so you can use relative paths from here.
+      ## will just sleep for 5 seconds, you can use relative paths
+      ## from the directory defined with the "directory" command
       #  command 'sleep 5'
       #
       ## the user my_user will be use to run the command, Lobster needs 
@@ -71,6 +71,9 @@ unless File.exist?(schedule)
       ## Lobster will wait 2 minutes between 2 runs
       #  delay 2
       #
+      ## will run the command from this directory. Defaults to LOBSTER_DIR
+      #  directory '/my_directory/here/'
+      #
       ## end of job definition
       #end
     EOF

data/lib/lobster/configuration.rb

@@ -3,10 +3,14 @@ require 'yaml'
 module Lobster
   class Configuration
     def initialize(dir, env)
+      reload(dir,env)
+    end
+
+    def reload(dir, env)
       @config = {
         :monitor => true,
         :log_dir => 'log',
-        :pid_dir => File.join('/', 'var', 'run', 'lobster'),
+        :pid_dir => 'pids',
         :schedule_file => File.join('config', 'schedule.rb')
       }
 
@@ -14,7 +18,8 @@ module Lobster
       if File.exist? config_file_path
         config_file = YAML.load_file(config_file_path)
         @config.keys.each do |key|
-          val = config_file[env][key.to_s] # environment-specific override
+          # environment-specific override
+          val = config_file[env][key.to_s] if config_file[env]
           val = config_file[key.to_s] if val.nil?
           @config[key] = val unless val.nil? # keep default if no config
         end

data/lib/lobster/job.rb

@@ -8,10 +8,11 @@ module Lobster
       @pid = nil
     end
 
-    def reload(options)
+    def reload(options, lobster_dir)
       options[:delay] ||= 10
+      options[:directory] ||= lobster_dir
 
-      [:command, :delay, :user].each do |opt|
+      [:command, :delay, :user, :directory].each do |opt|
         val = instance_variable_get "@#{opt}"
         if options[opt] != val
           Lobster.logger.info "Job #{opt} updated for #{@name}, was \"#{val}\", now \"#{options[opt]}\"" if val
@@ -21,7 +22,7 @@ module Lobster
         end
       end
       
-      @name ||= "<unnamed_job_#{command.hash.abs}>"
+      @name ||= "<unnamed_job_#{@command.hash.abs}>"
       @next_run ||= Time.now + rand(@delay*60)
     end
 
@@ -37,12 +38,12 @@ module Lobster
       end
     end
 
-    def run(out,err,dir)
+    def run(out,err)
       Lobster.logger.info "Starting job #{@name}"
-      command_line = @user ? "sudo -inu #{@user} \"cd $PWD ; #{@command}\"" : @command
+      command_line = @user ? "sudo -snu #{@user} '#{@command}'" : @command
 
       begin
-        @pid = spawn(command_line, :out=>out, :err=>err, :chdir=>dir)
+        @pid = spawn(command_line, :out=>out, :err=>err, :chdir=> @directory)
       rescue Exception => e
         Lobster.logger.error "#{e}: error when starting job #{@name}"
         @next_run = Time.now + 10

data/lib/lobster/job_list.rb

@@ -2,8 +2,8 @@ module Lobster
   class JobList
     attr_accessor :jobs
 
-    def initialize(file)
-      @file = file
+    def initialize(config)
+      @config = config
       @current_options = nil
       @jobs = {}
     end
@@ -11,7 +11,8 @@ module Lobster
     def reload
       @new_jobs = {}
 
-      instance_eval(File.read(@file),@file)
+      file = @config[:schedule_file]
+      instance_eval(File.read(file),file)
 
       # purely for logging
       @jobs.each do |name, job|
@@ -25,11 +26,11 @@ module Lobster
       @current_options = {}
       yield
       @new_jobs[name] ||= @jobs[name] || Job.new(name)
-      @new_jobs[name].reload(@current_options)
+      @new_jobs[name].reload(@current_options, @config[:lobster_dir])
       @current_options = nil
     end
 
-    [:command, :delay, :user].each do |opt|
+    [:command, :delay, :user, :directory].each do |opt|
       define_method opt do |value|
         @current_options[opt] = value
       end
@@ -39,5 +40,10 @@ module Lobster
     def cmd(command)
       @current_options[:command] = command
     end
+
+    # config data
+    def environment
+      @config[:environment]
+    end
   end
 end

data/lib/lobster/service.rb

@@ -31,7 +31,7 @@ module Lobster
 
       trap 'HUP' do
         begin
-          @config = Configuration.new(@config[:lobster_dir], @config[:environment])
+          @config.reload(@config[:lobster_dir], @config[:environment])
         rescue Exception => e
           Lobster.logger.error "Cannot reload conf, Exception: #{e}"
           break
@@ -64,16 +64,21 @@ module Lobster
 
         @job_list.jobs.each_value do |job|
           if not job.running? and now >= job.next_run
-            job.run(@wout, @werr, @config[:lobster_dir])
+            job.run(@wout, @werr)
           end
         end
         @sleeping = true
-        sleep @poll_delay
+        begin
+          sleep @poll_delay
+        rescue Exception => e
+          Lobster.logger.info "Sleep caught exception: #{e}"
+          break
+        end
       end
     end
 
     def reload_schedule
-      @job_list ||= JobList.new(@config[:schedule_file])
+      @job_list ||= JobList.new(@config)
       begin
         @job_list.reload
       rescue Exception => e

data/lib/lobster/version.rb

@@ -1,3 +1,3 @@
 module Lobster
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobster
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &75477200 !ruby/object:Gem::Requirement
+  requirement: &78818160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 1.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *75477200
+  version_requirements: *78818160
 description: ''
 email:
 - m.brugidou@criteo.com