sneakers 0.0.6 → 0.0.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sneakers (0.0.5)
+    sneakers (0.0.6)
       bunny (>= 0.10.0)
       serverengine
       thor

data/README.md

@@ -84,13 +84,11 @@ Let's test it out quickly from the command line:
 
 
 ```bash
-sneakers work Processor --require boot.rb --front
+sneakers work Processor --require boot.rb
 ```
 
 We just told Sneakers to spawn a worker named `Processor`, but first `--require` a file that we dedicate to setting up environment, including workers and what-not.
 
-For simplicity, we also told Sneakers to *not* daemonize and work at the `--front`.
-
 If you go to your RabbitMQ admin now, you'll see a new queue named `logs` was created. Push a couple messages, and this is the output you should see at your terminal.
 
 

data/lib/sneakers.rb

@@ -20,14 +20,14 @@ require 'sneakers/publisher'
 
 module Sneakers
 
-  Config = {
+  DEFAULTS = {
     # runner
     :runner_config_file => nil,
     :metrics => nil,
-    :daemonize => true,
+    :daemonize => false,
     :start_worker_delay => 0.2,
     :workers => 4,
-    :log  => 'sneakers.log',
+    :log  => STDOUT,
     :pid_path => 'sneakers.pid',
 
     #workers
@@ -43,7 +43,9 @@ module Sneakers
     :exchange => 'sneakers',
     :exchange_type => :direct,
     :hooks => {}
-  }
+  }.freeze
+
+  Config = DEFAULTS.dup
 
   def self.configure(opts={})
     # worker > userland > defaults
@@ -55,6 +57,21 @@ module Sneakers
     @configured = true
   end
 
+  def self.clear!
+    Config.clear
+    Config.merge!(DEFAULTS.dup)
+    @logger = nil
+    @publisher = nil
+    @configured = false
+  end
+
+  def self.daemonize!(loglevel=Logger::INFO)
+    Config[:log] = 'sneakers.log'
+    Config[:daemonize] = true
+    setup_general_logger!
+    logger.level = loglevel
+  end
+
   def self.logger
     @logger
   end
@@ -71,8 +88,12 @@ module Sneakers
 private
 
   def self.setup_general_logger!
-    @logger = Logger.new(Config[:log])
-    @logger.formatter = Sneakers::Support::ProductionFormatter
+    if [:info, :debug, :error, :warn].all?{ |meth| Config[:log].respond_to?(meth) }
+      @logger = Config[:log]
+    else
+      @logger = Logger.new(Config[:log])
+      @logger.formatter = Sneakers::Support::ProductionFormatter
+    end
   end
 
   def self.setup_worker_concerns!

data/lib/sneakers/cli.rb

@@ -24,20 +24,19 @@ module Sneakers
     BANNER = SNEAKERS
 
     method_option :debug
-    method_option :front
+    method_option :daemonize
     method_option :require
 
     desc "work FirstWorker,SecondWorker ... ,NthWorker", "Run workers"
     def work(workers)
       opts = {
-        :daemonize => !options[:front]
+        :daemonize => !!options[:daemonize]
       }
-      unless opts[:daemonize]
-        opts[:log] = STDOUT
-      end
+
+      opts[:log] =  opts[:daemonize] ? 'sneakers.log' : STDOUT
+
 
       Sneakers.configure(opts)
-      puts Sneakers::Config
 
       require_boot File.expand_path(options[:require]) if options[:require]
 

data/lib/sneakers/runner.rb

@@ -1,6 +1,5 @@
 require 'serverengine'
 require 'sneakers/workergroup'
-require 'sneakers/runner_config'
 
 module Sneakers
   class Runner
@@ -17,4 +16,60 @@ module Sneakers
       @se.stop
     end
   end
+
+
+  class RunnerConfig
+    def method_missing(meth, *args, &block)
+      if %w{ before_fork after_fork }.include? meth.to_s
+        @conf[meth] = block
+      elsif %w{ workers start_worker_delay amqp }.include? meth.to_s
+        @conf[meth] = args.first
+      else
+        super
+      end
+    end
+
+    def initialize(worker_classes)
+      @worker_classes = worker_classes
+      @conf = {}
+    end
+
+    def to_h
+      @conf
+    end
+
+
+    def reload_config!
+      Sneakers.logger.warn("Loading runner configuration...")
+      config_file = Sneakers::Config[:runner_config_file]
+
+      if config_file
+        begin
+          instance_eval(File.read(config_file), config_file)
+          Sneakers.logger.info("Loading config with file: #{config_file}")
+        rescue
+          Sneakers.logger.error("Cannot load from file '#{config_file}', #{$!}")
+        end
+      end
+
+      config = make_serverengine_config
+
+      [:before_fork, :after_fork].each do | hook |
+        Sneakers::Config[:hooks][hook] = config.delete(hook) if config[hook]
+      end
+
+
+      Sneakers.logger.info("New configuration: #{config.inspect}")
+      config
+    end
+
+  private
+    def make_serverengine_config
+      Sneakers::Config.merge(@conf).merge({
+        :worker_type => 'process',
+        :worker_classes => @worker_classes
+      })
+    end
+  end
+  
 end

data/lib/sneakers/version.rb

@@ -1,3 +1,3 @@
 module Sneakers
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/sneakers/cli_spec.rb

@@ -35,12 +35,22 @@ describe Sneakers::CLI do
         out = capture_io{ Sneakers::CLI.start [
           'work',
           "TitleScraper",
-          "--front",
           "--require=#{File.expand_path('../fixtures/require_worker.rb', File.dirname(__FILE__))}"
         ]}.join ''
 
         out.must_match(/Log.*Console/)
       end
+
+      it "should be able to run as daemonized process" do
+        out = capture_io{ Sneakers::CLI.start [
+          'work',
+          "TitleScraper",
+          "--daemonize",
+          "--require=#{File.expand_path('../fixtures/require_worker.rb', File.dirname(__FILE__))}"
+        ]}.join ''
+
+        out.must_match(/sneakers.log/)
+      end
     end
 
     it "should fail when no workers found" do

data/spec/sneakers/sneakers_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'sneakers'
+
+
+
+describe Sneakers do
+  before do
+    Sneakers.clear!
+  end
+
+  describe 'self' do
+    it 'should have defaults set up' do
+      Sneakers::Config[:log].must_equal(STDOUT)
+    end
+
+    it 'should configure itself' do
+      Sneakers.configure
+      Sneakers.logger.wont_be_nil
+    end
+  end
+
+  describe '.daemonize!' do
+    it 'should set a logger to a default info level and not daemonize' do
+      Sneakers.daemonize!
+      Sneakers::Config[:log].must_equal('sneakers.log')
+      Sneakers::Config[:daemonize].must_equal(true)
+      Sneakers.logger.level.must_equal(Logger::INFO)
+    end
+
+    it 'should set a logger to a level given that level' do
+      Sneakers.daemonize!(Logger::DEBUG)
+      Sneakers.logger.level.must_equal(Logger::DEBUG)
+    end
+  end
+
+  describe '.clear!' do
+    it 'must reset dirty configuration to default' do
+      Sneakers::Config[:log].must_equal(STDOUT)
+      Sneakers.configure(:log => 'foobar.log')
+      Sneakers::Config[:log].must_equal('foobar.log')
+      Sneakers.clear!
+      Sneakers::Config[:log].must_equal(STDOUT)
+    end
+  end
+
+
+  describe '#setup_general_logger' do
+    it 'should detect a string and configure a logger' do
+      Sneakers.configure(:log => 'sneakers.log')
+      Sneakers.logger.kind_of?(Logger).must_equal(true)
+    end
+
+    it 'should detect a file-like thing and configure a logger' do
+      Sneakers.configure(:log => STDOUT)
+      Sneakers.logger.kind_of?(Logger).must_equal(true)
+    end
+
+    it 'should detect an actual logger and configure it' do
+      logger = Logger.new(STDOUT)
+      Sneakers.configure(:log => logger)
+      Sneakers.logger.must_equal(logger)
+    end
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sneakers
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-20 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverengine
@@ -236,7 +236,6 @@ files:
 - lib/sneakers/publisher.rb
 - lib/sneakers/queue.rb
 - lib/sneakers/runner.rb
-- lib/sneakers/runner_config.rb
 - lib/sneakers/support/production_formatter.rb
 - lib/sneakers/support/queue_name.rb
 - lib/sneakers/support/utils.rb
@@ -251,6 +250,7 @@ files:
 - spec/sneakers/concerns/metrics.rb
 - spec/sneakers/publisher_spec.rb
 - spec/sneakers/queue_spec.rb
+- spec/sneakers/sneakers_spec.rb
 - spec/sneakers/worker_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -284,6 +284,6 @@ test_files:
 - spec/sneakers/concerns/metrics.rb
 - spec/sneakers/publisher_spec.rb
 - spec/sneakers/queue_spec.rb
+- spec/sneakers/sneakers_spec.rb
 - spec/sneakers/worker_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/sneakers/runner_config.rb

@@ -1,55 +0,0 @@
-module Sneakers
-  class RunnerConfig
-    def method_missing(meth, *args, &block)
-      if %w{ before_fork after_fork }.include? meth.to_s
-        @conf[meth] = block
-      elsif %w{ workers start_worker_delay amqp }.include? meth.to_s
-        @conf[meth] = args.first
-      else
-        super
-      end
-    end
-
-    def initialize(worker_classes)
-      @worker_classes = worker_classes
-      @conf = {}
-    end
-
-    def to_h
-      @conf
-    end
-
-
-    def reload_config!
-      Sneakers.logger.warn("Loading runner configuration...")
-      config_file = Sneakers::Config[:runner_config_file]
-
-      if config_file
-        begin
-          instance_eval(File.read(config_file), config_file)
-          Sneakers.logger.info("Loading config with file: #{config_file}")
-        rescue
-          Sneakers.logger.error("Cannot load from file '#{config_file}', #{$!}")
-        end
-      end
-
-      config = make_serverengine_config
-
-      [:before_fork, :after_fork].each do | hook |
-        Sneakers::Config[:hooks][hook] = config.delete(hook) if config[hook]
-      end
-
-
-      Sneakers.logger.info("New configuration: #{config.inspect}")
-      config
-    end
-
-  private
-    def make_serverengine_config
-      Sneakers::Config.merge(@conf).merge({
-        :worker_type => 'process',
-        :worker_classes => @worker_classes
-      })
-    end
-  end
-end