standup 0.3.16 → 0.3.17

data/VERSION

@@ -1 +1 @@
-0.3.16
+0.3.17

data/lib/standup.rb

@@ -65,7 +65,7 @@ module Standup
   end
   
   def self.run_from_command_line
-    unless ENV['BUNDLE_GEMFILE']
+    if File.exists?('Gemfile') && !ENV['BUNDLE_GEMFILE']
       Kernel.exec "bundle exec standup #{ARGV.join(' ')}"
     end
     

data/scripts/delayed_job/delayed_job_monit.conf

@@ -1,4 +1,4 @@
-<% env = "/usr/bin/env PATH=$PATH:/usr/local/bin RAILS_ENV=production" %>
+<% env = "/usr/bin/env PATH=$PATH:/usr/local/bin RAILS_ENV=#{scripts.webapp.params.rails_env}" %>
 check process delayed_job
     with pidfile <%= scripts.webapp.app_path %>/tmp/pids/delayed_job.pid
     start program = "<%= env %> <%= scripts.webapp.app_path %>/script/delayed_job start"

data/scripts/update.rb

@@ -18,6 +18,7 @@ Standup.script :node do
   protected
   
   def pull_changes
+    exec 'git checkout HEAD .'
     exec 'git pull'
     exec "git checkout #{scripts.webapp.params.git_branch}"
   end

data/scripts/webapp.rb

@@ -68,7 +68,12 @@ Standup.script :node do
           install_gem 'bundler'
           exec 'bundle install'
         when :rake_gems
-          exec "RAILS_ENV=#{params.rails_env} rake gems:install"
+          cmd = "RAILS_ENV=#{params.rails_env} rake gems:install"
+          output = exec cmd
+          if output.match(/Missing the Rails ([\d\.]+) gem/) || output.match(/RubyGem version error: rails\([\d\.]+ not = ([\d\.]+)\)/)
+            install_gem 'rails', $1
+            exec cmd
+          end
       end
     end
   end

data/standup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.16"
+  s.version = "0.3.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Artem Orlov", "Cloud Castle Inc."]
-  s.date = %q{2011-01-14}
+  s.date = %q{2011-01-27}
   s.default_executable = %q{standup}
   s.email = %q{ilia@flamefork.ru}
   s.executables = ["standup"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 3
-  - 16
-  version: 0.3.16
+  - 17
+  version: 0.3.17
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 +03:00
+date: 2011-01-27 00:00:00 +03:00
 default_executable: standup
 dependencies: 
 - !ruby/object:Gem::Dependency