loops 2.0.4 → 2.0.5

data/.gitignore

@@ -6,3 +6,5 @@ pkg
 spec/rails/logs
 spec/rails/tmp
 *.pid
+Gemfile.lock
+.rvmrc

data/.rspec

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

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/Rakefile

@@ -1,48 +1,21 @@
 require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name        = 'loops'
-    gemspec.summary     = 'Simple background loops framework for ruby'
-    gemspec.description = 'Loops is a small and lightweight framework for Ruby on Rails, Merb and other ruby frameworks created to support simple background loops in your application which are usually used to do some background data processing on your servers (queue workers, batch tasks processors, etc).'
-    gemspec.email       = 'alexey@kovyrin.net'
-    gemspec.homepage    = 'http://github.com/kovyrin/loops'
-    gemspec.authors     = ['Alexey Kovyrin', 'Dmytro Shteflyuk']
-    gemspec.files.include ['lib/**/*']
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts 'Jeweler not available. Install it with: sudo gem install jeweler'
-end
-
-begin
-  require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-  desc 'Default: run unit tests.'
-  task :default => :spec
+desc 'Default: run specs.'
+task :default => :spec
 
-  desc 'Test the loops plugin.'
-  Spec::Rake::SpecTask.new(:spec) do |t|
-    t.libs << 'lib'
-    t.pattern = 'spec/**/*_spec.rb'
-    t.verbose = true
-    t.spec_opts = ['-cfs']
-  end
-rescue LoadError
-  puts 'RSpec not available. Install it with: sudo gem install rspec'
-end
+desc 'Test the loops plugin.'
+RSpec::Core::RakeTask.new
 
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new(:yard) do |t|
-    t.options = ['--title', 'Loops Documentation']
-    if ENV['PRIVATE']
-      t.options.concat ['--protected', '--private']
-    else
-      t.options.concat ['--protected', '--no-private']
-    end
+require 'yard'
+YARD::Rake::YardocTask.new(:yard) do |t|
+  t.options = ['--title', 'Loops Documentation']
+  if ENV['PRIVATE']
+    t.options.concat ['--protected', '--private']
+  else
+    t.options.concat ['--protected', '--no-private']
   end
-rescue LoadError
-  puts 'Yard not available. Install it with: sudo gem install yard'
 end

data/lib/loops/autoload.rb

@@ -14,7 +14,6 @@ module Loops
   autoload :Queue,          __p('queue')
   autoload :Worker,         __p('worker')
   autoload :WorkerPool,     __p('worker_pool')
-  autoload :Version,        __p('version')
 
   include Errors
 end

data/lib/loops/cli/options.rb

@@ -208,9 +208,10 @@ module Loops
       #   occurred when unknown framework option value passed.
       #
       def bootstrap!
+        loops_env = ENV['LOOPS_ENV'] = options[:environment] if options[:environment]
         case options[:framework]
           when 'rails'
-            ENV['RAILS_ENV'] = options[:environment] if options[:environment]
+            ENV['RAILS_ENV'] = loops_env
 
             # Bootstrap Rails
             require Loops.root + 'config/boot'
@@ -221,7 +222,7 @@ module Loops
           when 'merb'
             require 'merb-core'
 
-            ENV['MERB_ENV'] = options[:environment] if options[:environment]
+            ENV['MERB_ENV'] = loops_env
 
             # Bootstrap Merb
             Merb.start_environment(:adapter => 'runner', :environment => ENV['MERB_ENV'] || 'development')

data/lib/loops/engine.rb

@@ -205,7 +205,11 @@ class Loops::Engine
 
     def fix_ar_after_fork
       if Object.const_defined?('ActiveRecord')
-        ActiveRecord::Base.allow_concurrency = true
+        if Rails::VERSION::MAJOR < 3
+          ActiveRecord::Base.allow_concurrency = true
+        else
+          Rails.application.config.allow_concurrency = true
+        end
         ActiveRecord::Base.clear_active_connections!
         ActiveRecord::Base.verify_active_connections!
       end

data/lib/loops/version.rb

@@ -1,31 +1,8 @@
 # Contains information about currently used Loops version.
 #
 # @example
-#   puts "Loops #{Loops::Version}"
+#   puts "Loops #{Loops::VERSION}"
 #
-class Loops::Version
-  # @return [Hash<Symbol, Integer>]
-  #   a +Hash+ containing major, minor, and patch version parts.
-  CURRENT = YAML.load_file(File.join(Loops::LIB_ROOT, '../VERSION.yml'))
-
-  # @return [Integer]
-  #   a major part of the Loops version.
-  MAJOR = CURRENT[:major]
-  # @return [Integer]
-  #   a minor part of the Loops version.
-  MINOR = CURRENT[:minor]
-  # @return [Integer]
-  #   a patch part of the Loops version.
-  PATCH = CURRENT[:patch]
-
-  # @return [String]
-  #   a string representation of the Loops version.
-  STRING = "%d.%d.%d" % [MAJOR, MINOR, PATCH]
-
-  # @return [String]
-  #   a string representation of the Loops version.
-  #
-  def self.to_s
-    STRING
-  end
+module Loops
+  VERSION = '2.0.5'
 end

data/loops.gemspec

@@ -1,98 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path('../lib', __FILE__)
+require 'loops/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{loops}
-  s.version = "2.0.4"
+  s.name         = 'loops'
+  s.version      = Loops::VERSION
+  s.platform     = Gem::Platform::RUBY
+  s.authors      = ['Alexey Kovyrin', 'Dmytro Shteflyuk']
+  s.email        = %q{alexey@kovyrin.net}
+  s.homepage     = %q{http://github.com/kovyrin/loops}
+  s.summary      = %q{Simple background loops framework for ruby}
+  s.description  = %q{Loops is a small and lightweight framework for Ruby on Rails, Merb and other ruby frameworks created to support simple background loops in your application which are usually used to do some background data processing on your servers (queue workers, batch tasks processors, etc).}
+  s.rdoc_options = ['--charset=UTF-8']
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alexey Kovyrin", "Dmytro Shteflyuk"]
-  s.date = %q{2010-07-30}
-  s.description = %q{Loops is a small and lightweight framework for Ruby on Rails, Merb and other ruby frameworks created to support simple background loops in your application which are usually used to do some background data processing on your servers (queue workers, batch tasks processors, etc).}
-  s.email = %q{alexey@kovyrin.net}
-  s.executables = ["loops", "loops-memory-stats"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "bin/loops",
-     "bin/loops-memory-stats",
-     "generators/loops/loops_generator.rb",
-     "generators/loops/templates/app/loops/APP_README",
-     "generators/loops/templates/app/loops/queue_loop.rb",
-     "generators/loops/templates/app/loops/simple_loop.rb",
-     "generators/loops/templates/config/loops.yml",
-     "generators/loops/templates/script/loops",
-     "init.rb",
-     "lib/loops.rb",
-     "lib/loops/autoload.rb",
-     "lib/loops/base.rb",
-     "lib/loops/cli.rb",
-     "lib/loops/cli/commands.rb",
-     "lib/loops/cli/options.rb",
-     "lib/loops/command.rb",
-     "lib/loops/commands/debug_command.rb",
-     "lib/loops/commands/list_command.rb",
-     "lib/loops/commands/start_command.rb",
-     "lib/loops/commands/stats_command.rb",
-     "lib/loops/commands/stop_command.rb",
-     "lib/loops/daemonize.rb",
-     "lib/loops/engine.rb",
-     "lib/loops/errors.rb",
-     "lib/loops/logger.rb",
-     "lib/loops/process_manager.rb",
-     "lib/loops/queue.rb",
-     "lib/loops/version.rb",
-     "lib/loops/worker.rb",
-     "lib/loops/worker_pool.rb",
-     "loops.gemspec",
-     "spec/loop_lock_spec.rb",
-     "spec/loops/base_spec.rb",
-     "spec/loops/cli_spec.rb",
-     "spec/loops_spec.rb",
-     "spec/rails/another_loop.rb",
-     "spec/rails/app/loops/complex_loop.rb",
-     "spec/rails/app/loops/simple_loop.rb",
-     "spec/rails/config.yml",
-     "spec/rails/config/boot.rb",
-     "spec/rails/config/environment.rb",
-     "spec/rails/config/loops.yml",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/kovyrin/loops}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Simple background loops framework for ruby}
-  s.test_files = [
-    "spec/loop_lock_spec.rb",
-     "spec/loops/base_spec.rb",
-     "spec/loops/cli_spec.rb",
-     "spec/loops_spec.rb",
-     "spec/rails/another_loop.rb",
-     "spec/rails/app/loops/complex_loop.rb",
-     "spec/rails/app/loops/simple_loop.rb",
-     "spec/rails/config/boot.rb",
-     "spec/rails/config/environment.rb",
-     "spec/spec_helper.rb"
-  ]
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'yard'
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths    = ['lib']
+  s.extra_rdoc_files = ['LICENSE', 'README.rdoc']
 end
-

data/spec/loops/cli_spec.rb

@@ -65,7 +65,7 @@ describe Loops::CLI do
       end
 
       it 'should extract command when passed' do
-        cli = Loops::CLI.parse(@args << 'list')
+        cli = Loops::CLI.parse(@args)
         cli.options[:command].should == 'list'
       end
 
@@ -99,7 +99,7 @@ describe Loops::CLI do
 
     context 'with Rails framework' do
       before :each do
-        @args = [ 'list', '-r', File.dirname(__FILE__) + '/../rails' ]
+        @args = [ 'start', 'test', '-r', File.dirname(__FILE__) + '/../rails' ]
         Loops::CLI.parse(@args)
       end
 
@@ -114,6 +114,30 @@ describe Loops::CLI do
       it 'should inialize default logger' do
         Loops.default_logger.should == 'rails default logger'
       end
+
+      it 'should not have LOOPS_ENV envionment variable by default' do
+        Loops::CLI.parse(@args)
+        ENV['LOOPS_ENV'].should be_nil
+        ENV['RAILS_ENV'].should be_nil
+      end
+    end
+
+    context 'with environment passed in arguments' do
+      before :each do
+        @args << '-e' << 'production'
+      end
+
+      it 'should set LOOPS_ENV environment variable' do
+        Loops::CLI.parse(@args)
+        ENV['LOOPS_ENV'].should == 'production'
+      end
+
+      it 'should set RAILS_ENV environment variable for Rails framework' do
+        @args = [ 'start', 'test', '-r', File.dirname(__FILE__) + '/../rails', '-e', 'production' ]
+        Loops::CLI.parse(@args)
+        ENV['LOOPS_ENV'].should == 'production'
+        ENV['RAILS_ENV'].should == 'production'
+      end
     end
   end
 
@@ -125,8 +149,8 @@ describe Loops::CLI do
 
     describe 'in #find_command_possibilities' do
       it 'should return a list of possible commands' do
-        @cli.find_command_possibilities('s').should == %w(start stats stop)
-        @cli.find_command_possibilities('sta').should == %w(start stats)
+        @cli.find_command_possibilities('s').sort.should == %w(start stats stop)
+        @cli.find_command_possibilities('sta').sort.should == %w(start stats)
         @cli.find_command_possibilities('star').should == %w(start)
         @cli.find_command_possibilities('l').should == %w(list)
         @cli.find_command_possibilities('o').should == []

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loops
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -16,10 +16,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -04:00
+date: 2011-06-21 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Loops is a small and lightweight framework for Ruby on Rails, Merb and other ruby frameworks created to support simple background loops in your application which are usually used to do some background data processing on your servers (queue workers, batch tasks processors, etc).
 email: alexey@kovyrin.net
 executables: 
@@ -32,10 +59,11 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- .rspec
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION.yml
 - bin/loops
 - bin/loops-memory-stats
 - generators/loops/loops_generator.rb
@@ -109,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple background loops framework for ruby
@@ -121,6 +149,8 @@ test_files:
 - spec/rails/another_loop.rb
 - spec/rails/app/loops/complex_loop.rb
 - spec/rails/app/loops/simple_loop.rb
+- spec/rails/config.yml
 - spec/rails/config/boot.rb
 - spec/rails/config/environment.rb
+- spec/rails/config/loops.yml
 - spec/spec_helper.rb

data/VERSION.yml

@@ -1,5 +0,0 @@
---- 
-:minor: 0
-:build: 
-:patch: 4
-:major: 2