stormtroopers 0.0.1 → 0.0.2

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.vagrant
 .yardoc
 Gemfile.lock
 InstalledFiles
@@ -9,6 +10,7 @@ _yardoc
 coverage
 doc/
 lib/bundler/man
+log/*
 pkg
 rdoc
 spec/reports

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation

data/.travis.yml

@@ -0,0 +1,7 @@
+notifications:
+  recipients:
+    - mark@socialreferral.com
+    - andre@socialreferral.com
+rvm:
+  - jruby-19mode
+script: "bundle exec rspec"

data/README.md

@@ -1,6 +1,6 @@
-# Stormtroopers
+# Stormtroopers [![Build Status](https://secure.travis-ci.org/socialreferral/stormtroopers.png)](http://travis-ci.org/socialreferral/stormtroopers)
 
-Stormtroopers is a jruby execution environment for delayed jobs 
+Stormtroopers is a jruby execution environment for delayed jobs, Work In Progress!
 
 ## Installation
 

data/Vagrantfile

@@ -0,0 +1,10 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  config.vm.host_name = "stormtroopers"
+  config.vm.box = "precise64"
+  config.vm.box_url = "http://files.vagrantup.com/precise64.box"
+  config.vm.share_folder "v-root", "/vagrant", "."
+  config.vm.provision :shell, :path => "vagrant-provision"
+end

data/bin/stormtroopers

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+begin
+  require "config/environment"
+rescue LoadError
+  puts "Could not load environment"
+end
+
+require_relative "../lib/stormtroopers"
+
+Stormtroopers::Manager.instance.manage

data/config/stormtroopers.yml

@@ -1,11 +1,12 @@
 armies:
   - factory:
       type: :dummy
-      name: "Dummy army 1"
+      name: "Dummy Trooper 1"
       sleep_duration: 10
     max_threads: 2
+    name: "Dad's Army"
   - factory: 
       type: :dummy
-      name: "Dummy army 2"
+      name: "Dummy Trooper 2"
       sleep_duration: 5
     max_threads: 2

data/lib/stormtroopers.rb

@@ -1,12 +1,8 @@
-require "stormtroopers/version"
-require "stormtroopers/trooper"
-require "stormtroopers/manager"
-require "stormtroopers/factory"
-require "stormtroopers/army"
+require_relative "./stormtroopers/version"
+require_relative "./stormtroopers/trooper"
+require_relative "./stormtroopers/manager"
+require_relative "./stormtroopers/factory"
+require_relative "./stormtroopers/army"
 
-Dir['./lib/stormtroopers/factory/*.rb'].each{ |f| require f }
-Dir['./lib/stormtroopers/trooper/*.rb'].each{ |f| require f }
-
-module Stormtroopers
-
-end
+Dir["#{File.dirname(__FILE__)}/stormtroopers/factory/*.rb"].each{ |f| require f }
+Dir["#{File.dirname(__FILE__)}/stormtroopers/trooper/*.rb"].each{ |f| require f }

data/lib/stormtroopers/already_running.rb

@@ -0,0 +1,4 @@
+module Stormtroopers
+  class AlreadyRunning < StandardError
+  end
+end

data/lib/stormtroopers/army.rb

@@ -1,30 +1,54 @@
 module Stormtroopers
   class Army
-    attr_reader :factory, :threads, :max_threads
+    attr_reader :factory, :threads, :max_threads, :name
 
     def initialize(config)
-      @factory = "stormtroopers/#{config[:factory].delete(:type)}_factory".camelize.constantize.new(config[:factory])
+      @name = config[:name] || factory_class(config).name
+      @factory = factory_class(config).new(config[:factory])
       @max_threads = config[:max_threads] || 1
       @threads = []
     end
 
+    def factory_class(config)
+      @factory_class ||= begin
+        raise ArgumentError, "Factory class or type must be defined" if config[:factory][:class].blank? && config[:factory][:type].blank?
+        class_name ||= config[:factory].delete(:class)
+        class_name ||= "stormtroopers/#{config[:factory].delete(:type)}_factory".camelize
+        class_name.constantize
+      end
+    end
+
     def manage
       cleanup
       if threads.count < max_threads
         if trooper = factory.produce
-          threads << Thread.new { trooper.run }
+          threads << Thread.new do
+            begin
+              trooper.run
+            ensure
+              if defined?(::Mongoid)
+                ::Mongoid::IdentityMap.clear
+                ::Mongoid.session(:default).disconnect
+              end
+            end
+          end
         end
       end
     end
 
     def finish
+      logger.debug("#{name}: Finishing")
       threads.each(&:join)
     end
 
+    def logger
+      Stormtroopers::Manager.logger
+    end
+
     private
 
     def cleanup
       threads.reject!{ |thread| !thread.alive? }
     end
   end
-end
+end

data/lib/stormtroopers/factory.rb

@@ -9,5 +9,9 @@ module Stormtroopers
     def produce
       raise NotImplementedError.new("produce method not implemented on the factory")
     end
+
+    def logger
+      Manager.logger
+    end
   end
-end
+end

data/lib/stormtroopers/factory/delayed_job.rb

@@ -1,10 +1,12 @@
 module Stormtroopers
   class DelayedJobFactory < Factory
     def produce
-      worker = Struct.new(name: "Stormtroopers")
+      worker = Delayed::Worker.new(options)
+      worker.name = "rand #{Time.now.utc.to_f} #{rand(1000)}"
       if job = Delayed::Job.reserve(worker)
+        logger.info("#{options[:name]} producing trooper to run #{job.queue} job #{job.id}")
         DelayedJobTrooper.new(job)
       end
     end
   end
-end
+end

data/lib/stormtroopers/factory/dummy.rb

@@ -5,4 +5,4 @@ module Stormtroopers
       DummyTrooper.new(options)
     end
   end
-end
+end

data/lib/stormtroopers/manager.rb

@@ -1,24 +1,37 @@
+require 'logger'
+require 'yaml'
 require 'singleton'
 require 'active_support/core_ext/hash'
 require 'active_support/hash_with_indifferent_access'
+require_relative "./already_running"
 
 module Stormtroopers
   class Manager
     include Singleton
-    # This class is dependant on rails and active support
 
     def manage
+      raise AlreadyRunning if managing?
+      @managing = true
+
+      Signal.trap("INT") do
+        logger.info "Stopping, waiting for running jobs to complete"
+        @managing = false
+      end
+
       logger.info "Starting"
-      loop do
+      while managing? do
         armies.each(&:manage)
         sleep 0.1
       end
-    rescue Interrupt => e
-      logger.info "Stopping, waiting for running jobs to complete"
+
       armies.each(&:finish)
       logger.info "Stopped, all running jobs completed"
     end
 
+    def managing?
+      @managing || false
+    end
+
     def armies
       @armies ||= config[:armies].map do |army_config|
         Army.new(army_config)
@@ -29,20 +42,22 @@ module Stormtroopers
       @config ||= HashWithIndifferentAccess.new(YAML.load_file(config_file))
     end
 
-    def config_file
+    def working_directory
       if defined?(Rails)
-        "#{Rails.root}/config/stormtroopers.yml"
+        Rails.root
       else
-        "#{File.expand_path('../../../config', __FILE__)}/stormtroopers.yml"
+        Dir.getwd
       end
     end
 
+    def config_file
+      File.join(working_directory, "config", "stormtroopers.yml")
+    end
+
     def logger
-      if defined?(Rails)
-        Rails.logger
-      else
-        @logger ||= Logger.new(STDOUT)
-      end
+      log_directory = File.join(working_directory, "log")
+      Dir.mkdir(log_directory) unless File.directory?(log_directory)
+      @logger ||= Logger.new(File.join(working_directory, "log", "stormtroopers.log"))
     end
 
     private

data/lib/stormtroopers/version.rb

@@ -1,3 +1,3 @@
 module Stormtroopers
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/stormtroopers/manager_spec.rb

@@ -0,0 +1,104 @@
+require "stormtroopers/manager"
+
+describe Stormtroopers::Manager do
+  let(:manager) { Stormtroopers::Manager.instance }
+
+  before(:each) {
+    stub_const("Stormtroopers::Army", Class.new)
+  }
+
+  describe "#working_directory" do
+    context "with Rails" do
+      it "uses the Rails root" do
+        stub_const("Rails", Class.new)
+        Rails.should_receive(:root).and_return("/path/to/app")
+        manager.working_directory.should eq("/path/to/app")
+      end
+    end
+
+    context "without Rails" do
+      it "uses the current working directory" do
+        manager.working_directory.should eq(Dir.pwd)
+      end
+    end
+  end
+
+  describe "#logger" do
+    it "creates a logger to log/stormtroopers.log" do
+      logger = stub.as_null_object
+      Logger.should_receive(:new).with(File.join(manager.working_directory, "log", "stormtroopers.log")).and_return(logger)
+      manager.logger.should equal(logger)
+    end
+  end
+
+  describe "#config_file" do
+    it "uses the config_file relative to the current working directory" do
+      manager.config_file.should eq(File.join(manager.working_directory, "config", "stormtroopers.yml"))
+    end
+  end
+
+  describe "#config" do
+    it "loads the config_file into a HashWithIndifferentAccess" do
+      YAML.should_receive(:load_file).and_return({dummy: "value"})
+      manager.config.should eq(HashWithIndifferentAccess.new({dummy: "value"}))
+    end
+  end
+
+  describe "#armies" do
+    it "returns an array of armies matching using #config" do
+      army1_config = {factory: {type: :dummy, name: "Trooper 1", sleep_duration: 2}, name: "Dad's Army", max_threads: 1}
+      army1 = stub
+      Stormtroopers::Army.should_receive(:new).with(HashWithIndifferentAccess.new(army1_config)).and_return(army1)
+      army2_config = {factory: {type: :dummy, name: "Trooper 2", sleep_duration: 5}, name: "Mom's Army", max_threads: 2}
+      army2 = stub
+      Stormtroopers::Army.should_receive(:new).with(HashWithIndifferentAccess.new(army2_config)).and_return(army2)
+      config = HashWithIndifferentAccess.new(
+        {
+          armies: [
+            army1_config,
+            army2_config,
+          ]
+        }
+      )
+      manager.should_receive(:config).and_return(config)
+      armies = manager.armies
+      manager.armies.size.should eq(2)
+      manager.armies.should include(army1)
+      manager.armies.should include(army2)
+    end
+  end
+
+  describe "#manage" do
+    let(:army1) { stub(manage: nil, finish: nil) }
+    let(:army2) { stub(manage: nil, finish: nil) }
+
+    before(:each) do
+      manager.stub(:armies).and_return([army1, army2])
+    end
+
+    it "calls manage on each army while managing" do
+      manager.stub(:managing?).and_return(false, true, true, false)
+      army1.should_receive(:manage).exactly(2).times
+      army2.should_receive(:manage).exactly(2).times
+      manager.manage
+    end
+
+    it "calls finish on each army when no longer managing" do
+      manager.stub(:managing?).and_return(false)
+      army1.should_receive(:finish)
+      army2.should_receive(:finish)
+      manager.manage
+    end
+
+    it "raises an error when already running" do
+      manager.stub(:managing?).and_return(true)
+      expect { manager.manage }.to raise_error(Stormtroopers::AlreadyRunning)
+    end
+  end
+
+  describe ".logger" do
+    it "returns the singleton instance's logger" do
+      Stormtroopers::Manager.logger.should eq(manager.logger)
+    end
+  end
+end

data/stormtroopers.gemspec

@@ -7,13 +7,16 @@ Gem::Specification.new do |gem|
   gem.name          = "stormtroopers"
   gem.version       = Stormtroopers::VERSION
   gem.authors       = ["Andre Meij", "Mark Kremer"]
-  gem.email         = ["andre@socialreferral.com"]
+  gem.email         = ["andre@socialreferral.com", "mark@socialreferral.com"]
   gem.description   = %q{Stormtroopers is a jruby execution environment for delayed jobs }
   gem.summary       = %q{Execute delayed jobs in a threaded jruby environment}
   gem.homepage      = "http://github.com/socialreferral/stormtroopers"
 
   gem.add_dependency('activesupport', '>= 3.2.0')
 
+  gem.add_development_dependency('rspec')
+
+  gem.bindir        = 'bin'
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/vagrant-provision

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+export DEBIAN_FRONTEND=noninteractive
+
+apt-get update > /dev/null
+apt-get -y install build-essential git-core openjdk-7-jre-headless
+
+# Create directory for local installs
+mkdir -p /home/vagrant/local
+chown -R vagrant:vagrant /home/vagrant/local
+
+if [ -f "/home/vagrant/local/jruby-1.7.0/bin/jruby" ]; then
+  echo "Already installed jruby 1.7"
+else
+  echo "Downloading jruby 1.7"
+  wget -q http://jruby.org.s3.amazonaws.com/downloads/1.7.0/jruby-bin-1.7.0.tar.gz
+  echo "Unpacking jruby 1.7"
+  tar -xzf jruby-bin-1.7.0.tar.gz
+  echo "Installing jruby 1.7"
+  chown -R vagrant:vagrant jruby-1.7.0 && mv jruby-1.7.0 /home/vagrant/local
+  echo "export PATH=\"/home/vagrant/local/jruby-1.7.0/bin:\$PATH\"" >> /home/vagrant/.bashrc
+  echo "export PATH=\"/home/vagrant/local/jruby-1.7.0/bin:\$PATH\"" >> /home/vagrant/.zshenv
+  ln -s /home/vagrant/local/jruby-1.7.0/bin/jruby /home/vagrant/local/jruby-1.7.0/bin/ruby
+fi
+
+echo "Activating jruby 1.7"
+export PATH=/home/vagrant/local/jruby-1.7.0/bin:$PATH
+
+gem install bundler pry
+
+su -c 'cd /vagrant && bundle check || bundle' vagrant

metadata

@@ -1,49 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: stormtroopers
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
+  prerelease:
 platform: ruby
 authors:
 - Andre Meij
 - Mark Kremer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
-  type: :runtime
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 description: ! 'Stormtroopers is a jruby execution environment for delayed jobs '
 email:
 - andre@socialreferral.com
+- mark@socialreferral.com
 executables:
-- stormtroopers.rb
+- stormtroopers
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/stormtroopers.rb
+- Vagrantfile
+- bin/stormtroopers
 - config/stormtroopers.yml
 - lib/stormtroopers.rb
+- lib/stormtroopers/already_running.rb
 - lib/stormtroopers/army.rb
 - lib/stormtroopers/factory.rb
 - lib/stormtroopers/factory/delayed_job.rb
@@ -53,30 +76,34 @@ files:
 - lib/stormtroopers/trooper/delayed_job.rb
 - lib/stormtroopers/trooper/dummy.rb
 - lib/stormtroopers/version.rb
+- spec/stormtroopers/manager_spec.rb
 - stormtroopers.gemspec
+- vagrant-provision
 homepage: http://github.com/socialreferral/stormtroopers
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Execute delayed jobs in a threaded jruby environment
-test_files: []
-has_rdoc: 
+test_files:
+- spec/stormtroopers/manager_spec.rb