smartguard 0.3.8 → 0.3.9

data/lib/smartguard/applications/smartkiosk/scheduler.rb

@@ -10,7 +10,7 @@ module Smartguard
           Logging.logger.info "Starting scheduler"
 
           run @path, {
-              'RAILS_ENV' => Smartguard.environment.to_s
+              'RACK_ENV' => Smartguard.environment.to_s
             }, "rake", "schedule"
         end
 

data/lib/smartguard/applications/smartkiosk/{thin.rb → web.rb}

@@ -6,25 +6,25 @@ module Smartguard
           super
 
           if Smartguard.environment == :development
-            Logging.logger.info "Skipping thin; Please run manually".black_on_white.bold
+            Logging.logger.info "Skipping web; Please run manually with `rack web`".black_on_white.bold
             return true
           else
-            Logging.logger.info "Starting thin"
+            Logging.logger.info "Starting web"
           end
 
-          log_path = @path.join('log/thin.log')
+          log_path = @path.join('log/web.log')
 
-          if !run(@path,
-                  {},
+          if !run(@path, {
+                  'RACK_ENV' => Smartguard.environment.to_s
+                },
                   "bundle", "exec",
-                  "thin", "-e", Smartguard.environment.to_s, "-p", "3000", "-l", "#{log_path}",
-                  "start"
+                  "rack", "web"
                  )
             return false
           end
 
           result = without_respawn do
-            wait_for_port 3000
+            wait_for_port 3001
           end
 
           result
@@ -33,7 +33,7 @@ module Smartguard
         def stop
           super
 
-          Logging.logger.info "Stoping thin"
+          Logging.logger.info "Stoping web"
           kill_and_wait :TERM, 15
         end
       end

data/lib/smartguard/applications/smartkiosk.rb

@@ -13,7 +13,7 @@ module Smartguard
         @services = {
           smartware: Smartware.new(wrap_path),
           sidekiq: Sidekiq.new(wrap_path),
-          thin: Thin.new(wrap_path),
+          web: Web.new(wrap_path),
           scheduler: Scheduler.new(wrap_path),
         }
       end
@@ -79,14 +79,9 @@ module Smartguard
           end
 
           Logging.logger.info "Migrating database"
-          if !system("bundle", "exec", "rake", "db:migrate", "--trace", "RAILS_ENV=production")
+          if !system("bundle", "exec", "rake", "db:migrate", "--trace", "RACK_ENV=production")
             raise "migration failed"
           end
-
-          Logging.logger.info "Compiling assets"
-          if !system("bundle", "exec", "rake", "assets:precompile", "--trace", "RAILS_ENV=production")
-            raise "asset precompilation failed"
-          end
         end
 
         begin

data/lib/smartguard/version.rb

@@ -1,3 +1,3 @@
 module Smartguard
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/lib/smartguard.rb

@@ -17,7 +17,7 @@ require 'smartguard/applications/smartkiosk'
 require 'smartguard/applications/smartkiosk/sidekiq'
 require 'smartguard/applications/smartkiosk/smartware'
 require 'smartguard/applications/smartkiosk/scheduler'
-require 'smartguard/applications/smartkiosk/thin'
+require 'smartguard/applications/smartkiosk/web'
 
 module Smartguard
   class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartguard
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartkiosk-common
-  requirement: &70134897221900 !ruby/object:Gem::Requirement
+  requirement: &70271466544820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70134897221900
+  version_requirements: *70271466544820
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70134897221100 !ruby/object:Gem::Requirement
+  requirement: &70271466542920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70134897221100
+  version_requirements: *70271466542920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70134897236580 !ruby/object:Gem::Requirement
+  requirement: &70271466541980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70134897236580
+  version_requirements: *70271466541980
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70134897235080 !ruby/object:Gem::Requirement
+  requirement: &70271466540600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70134897235080
+  version_requirements: *70271466540600
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70134897234440 !ruby/object:Gem::Requirement
+  requirement: &70271466721780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70134897234440
+  version_requirements: *70271466721780
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70134897233740 !ruby/object:Gem::Requirement
+  requirement: &70271466721180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134897233740
+  version_requirements: *70271466721180
 description: Smartguard is the Smartkiosk services control daemon
 email:
 - boris@roundlake.ru
@@ -99,7 +99,7 @@ files:
 - lib/smartguard/applications/smartkiosk/scheduler.rb
 - lib/smartguard/applications/smartkiosk/sidekiq.rb
 - lib/smartguard/applications/smartkiosk/smartware.rb
-- lib/smartguard/applications/smartkiosk/thin.rb
+- lib/smartguard/applications/smartkiosk/web.rb
 - lib/smartguard/client.rb
 - lib/smartguard/logging.rb
 - lib/smartguard/process.rb