loops 2.0.5 → 2.0.6

data/lib/loops/cli/options.rb

@@ -82,7 +82,7 @@ module Loops
           end
 
           opt.on('-Rlibrary', '--require=library', 'require the library before executing the script') do |library|
-            require library
+            options[:require] << library
           end
 
           opt.on_tail("-h", '--help', 'Show this message') do
@@ -108,7 +108,8 @@ module Loops
           :framework   => 'rails',
           :loops_root  => 'app/loops',
           :pid_file    => nil,
-          :root        => nil
+          :root        => nil,
+          :require     => [],
         }
 
         begin
@@ -209,6 +210,11 @@ module Loops
       #
       def bootstrap!
         loops_env = ENV['LOOPS_ENV'] = options[:environment] if options[:environment]
+
+        options[:require].each do |library|
+          require library
+        end
+
         case options[:framework]
           when 'rails'
             ENV['RAILS_ENV'] = loops_env

data/lib/loops/version.rb

@@ -4,5 +4,5 @@
 #   puts "Loops #{Loops::VERSION}"
 #
 module Loops
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

data/spec/loops/cli_spec.rb

@@ -1,6 +1,10 @@
 require 'spec/spec_helper'
 
 describe Loops::CLI do
+  before :each do
+    ENV['LOOPS_ENV'] = nil
+  end
+
   it 'should include Loops::CLI::Options' do
     Loops::CLI.included_modules.should include(Loops::CLI::Options)
   end
@@ -71,13 +75,13 @@ describe Loops::CLI do
 
       it 'should extract command arguments when passed' do
         cli = Loops::CLI.parse(@args << 'arg1' << 'arg2')
-        cli.options[:command].should == 'list'
-        cli.options[:args].should == %w(arg1 arg2)
+        cli.options[:command].should eq('list')
+        cli.options[:args].should eq(%w[arg1 arg2])
       end
 
       it 'should remove all unnecessary options' do
         cli = Loops::CLI.parse(@args << '-r' << RAILS_ROOT << '-p' << 'loop.pid' << '-c' << 'config.yml' << '-l' << '.' << '-d')
-        cli.options.keys.map(&:to_s).sort.should == %w(command args daemonize).sort
+        cli.options.keys.map(&:to_s).sort.should == %w(command args daemonize require).sort
       end
     end
 
@@ -135,8 +139,14 @@ describe Loops::CLI do
       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'
+        ENV['LOOPS_ENV'].should eq('production')
+        ENV['RAILS_ENV'].should eq('production')
+      end
+
+      it 'should set LOOPS_ENV before require files throut -R' do
+        @args << '-R' << File.dirname(__FILE__) + '/../rails/config/init'
+        Loops::CLI.parse(@args)
+        ::CURRENT_LOOPS_ENV.should == 'production'
       end
     end
   end
@@ -149,11 +159,11 @@ describe Loops::CLI do
 
     describe 'in #find_command_possibilities' do
       it 'should return a list of possible commands' do
-        @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 == []
+        @cli.find_command_possibilities('s').sort.should   eq(%w(start stats stop))
+        @cli.find_command_possibilities('sta').sort.should eq(%w(start stats))
+        @cli.find_command_possibilities('star').should     eq(%w(start))
+        @cli.find_command_possibilities('l').should        eq(%w(list))
+        @cli.find_command_possibilities('o').should        eq([])
       end
     end
 

data/spec/rails/config/init.rb

@@ -0,0 +1 @@
+CURRENT_LOOPS_ENV = ENV['LOOPS_ENV']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: loops
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
+  hash: 3
+  prerelease: false
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - Alexey Kovyrin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 -04:00
+date: 2011-06-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,7 @@ files:
 - spec/rails/config.yml
 - spec/rails/config/boot.rb
 - spec/rails/config/environment.rb
+- spec/rails/config/init.rb
 - spec/rails/config/loops.yml
 - spec/spec_helper.rb
 has_rdoc: true
@@ -137,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple background loops framework for ruby
@@ -152,5 +153,6 @@ test_files:
 - spec/rails/config.yml
 - spec/rails/config/boot.rb
 - spec/rails/config/environment.rb
+- spec/rails/config/init.rb
 - spec/rails/config/loops.yml
 - spec/spec_helper.rb