ors 0.0.6 → 0.0.7

data/lib/ors/config.rb

@@ -7,7 +7,6 @@ module ORS
     self.pretending = false
     self.use_gateway = true
     self.log_lines = 100
-    self.rails2 = false
 
     module ModuleMethods
 
@@ -19,7 +18,6 @@ module ORS
           case option
             when "-p", "--pretend" then self.pretending = true
             when "-ng", "--no-gateway" then self.use_gateway = false
-            when "-r2", "--rails-2" then self.rails2 = true
           end
         end
       end
@@ -45,10 +43,6 @@ module ORS
     end
     extend ModuleMethods
 
-    def unicorn
-      rails2 ? "unicorn-rails" : "unicorn"
-    end
-
     def gateway
       "deploy-gateway"
     end

data/lib/ors/helpers.rb

@@ -46,7 +46,7 @@ module ORS
 
       execute_command server, %(source ~/.rvm/scripts/rvm),
                               %(cd #{deploy_directory}),
-                              %(bundle exec #{unicorn} -c config/unicorn.rb -D -E #{environment})
+                              %(if [ -f config.ru ]; then RAILS_ENV=#{environment} bundle exec unicorn -c config/unicorn.rb -D -E #{environment}; else RAILS_ENV=#{environment} bundle exec unicorn_rails -c config/unicorn.rb -D -E #{environment}; fi)
     end
 
     def stop_server server

data/lib/ors/log_unifier.rb

@@ -33,24 +33,12 @@ module ORS
       entries = Array.new
 
       logs.each do |server, log_rows|
-        entry = {:lines => Array.new, :server => server}
-
-        log_rows.split(/\n/).each do |line|
-          if line == ""
-            unless entry[:lines].empty?
-              entries << entry
-              entry = {:lines => Array.new, :server => server}
-            end
-          else
-            if entry[:lines].empty?
-              entry[:timestamp] = line.gsub(/^(?:Processing|Started).*?(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}).*$/, '\1').gsub(/\D/, '')
-            end
-
-            entry[:lines] << line
-          end
-        end
+        log_rows.split(/\n\n\n/).each do |line|
+          line.gsub!(/^.*?Started/m, "Started") unless line =~ /\AStarted/
+          timestamp, _ = line.scan(/^(?:Processing|Started).*?(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}).*$/).first
 
-        entries << entry
+          entries << {:timestamp => timestamp.gsub(/\D/, ""), :lines => line.split(/\n/), :server => server} if timestamp
+        end
       end
 
       entries

data/lib/ors/version.rb

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

data/spec/ors/config_spec.rb

@@ -41,20 +41,6 @@ describe ORS::Config do
 
       subject.use_gateway.should be_false
     end
-
-    it "should set rails2 to true if -r2 is given" do
-      ORS::Config.rails2 = false
-      ORS::Config.parse_options %w(-r2)
-
-      subject.rails2.should be_true
-    end
-
-    it "should set rails2 to true if --rails-2 is given" do
-      ORS::Config.rails2 = false
-      ORS::Config.parse_options %w(--rails-2)
-
-      subject.rails2.should be_true
-    end
   end
 
   context ".valid_options?" do

data/spec/ors/log_unifier_spec.rb

@@ -59,6 +59,8 @@ Started GET "/" for 10.203.228.96 at 2011-02-02 08:52:33 -0500
   Processing by ReviewsController#index as HTML
 Completed 200 OK in 41ms (Views: 3.6ms | ActiveRecord: 31.6ms)
 
+ERROR: WTFOMGBBQ is on fire!!! /!\\ /!\\
+
 
 Started GET "/" for 10.203.228.96 at 2011-02-03 05:00:33 -0500
   Processing by ReviewsController#index as HTML
@@ -79,6 +81,8 @@ Completed 200 OK in 41ms (Views: 3.6ms | ActiveRecord: 31.6ms)
 [server2] Started GET "/" for 10.203.228.96 at 2011-02-02 08:52:33 -0500
 [server2]   Processing by ReviewsController#index as HTML
 [server2] Completed 200 OK in 41ms (Views: 3.6ms | ActiveRecord: 31.6ms)
+[server2] 
+[server2] ERROR: WTFOMGBBQ is on fire!!! /!\\ /!\\
 
 
 [server1] Started GET "/" for 10.203.228.96 at 2011-02-02 08:58:33 -0500

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ors
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: !!null 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable: !!null
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &2152570360 !ruby/object:Gem::Requirement
+  requirement: &2165489500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152570360
+  version_requirements: *2165489500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152569940 !ruby/object:Gem::Requirement
+  requirement: &2165489080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152569940
+  version_requirements: *2165489080
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2152569520 !ruby/object:Gem::Requirement
+  requirement: &2165488660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152569520
+  version_requirements: *2165488660
 description: Heroku-like deployment utilities for ORS
 email:
 - jason.dew@ors.sc.gov and john.long@ors.sc.gov