standup 0.5.4 → 0.5.5

data/lib/standup/version.rb

@@ -1,5 +1,5 @@
 module Standup
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 
   def self.version
     VERSION

data/scripts/passenger/nginx.conf

@@ -9,7 +9,7 @@ events {
 
 http {
     passenger_root <%= scripts.ruby.info[:gem_dir] %>/passenger-3.0.7;
-    passenger_ruby <%= scripts.ruby.info[:bin_ruby] %>;
+    passenger_ruby <%= scripts.ruby.info[:wrapper] %>;
 
     include       mime.types;
     default_type  application/octet-stream;

data/scripts/passenger.rb

@@ -1,14 +1,14 @@
 Standup.script :node do
   def run
     scripts.ec2.open_port 80, 443
-    
+
     if install_gem('passenger', '3.0.7') || !file_exists?('/opt/nginx/sbin/nginx')
       install_package 'libcurl4-openssl-dev'
       sudo 'passenger-install-nginx-module --auto --auto-download --prefix=/opt/nginx'
     end
-    
+
     sudo 'mkdir -p /opt/nginx/conf/servers'
-    
+
     with_processed_file script_file('nginx.conf') do |file|
       upload file,
              :to =>'/opt/nginx/conf/nginx.conf',
@@ -18,12 +18,12 @@ Standup.script :node do
     upload script_file('nginx'),
            :to =>'/etc/init.d/nginx',
            :sudo => true
-    
+
     sudo 'chmod +x /etc/init.d/nginx'
     sudo '/usr/sbin/update-rc.d -f nginx defaults'
-    
+
     scripts.monit.add_watch script_file('nginx_monit.conf')
-    
+
     restart_nginx
   end
   
@@ -31,7 +31,7 @@ Standup.script :node do
     upload file,
            :to   => "/opt/nginx/conf/servers/#{name}",
            :sudo => true
-    
+
     restart_nginx if restart
   end
   

data/scripts/redis.rb

@@ -36,4 +36,8 @@ Standup.script :node do
   def installed?
     sudo('find /usr/local/bin/redis-server').match(/No such file or directory/).blank?
   end
+
+  def restart
+    scripts.monit.restart_watch 'redis'
+  end
 end

data/scripts/ruby/gemrc

@@ -0,0 +1,2 @@
+install: --no-rdoc --no-ri
+update: --no-rdoc --no-ri

data/scripts/ruby.rb

@@ -12,7 +12,11 @@ Standup.script :node do
       install_packages 'build-essential bison openssl libreadline6 libreadline6-dev curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-0 libsqlite3-dev sqlite3 libxml2-dev libxslt-dev autoconf libc6-dev ncurses-dev'
 
       sudo "rvm install #{version}"
-      exec "rvm use #{version} --default"
+      sudo "rvm use #{version} --default"
+
+      upload script_file('gemrc'),
+             :to => '/etc/gemrc',
+             :sudo => true
     end
   end
 
@@ -20,7 +24,8 @@ Standup.script :node do
     @rvminfo ||= YAML.load(exec('rvm info')).values.first
     {
         :gem_dir => "#{@rvminfo['homes']['gem']}/gems",
-        :bin_ruby => @rvminfo['binaries']['ruby']
+        :bin_ruby => @rvminfo['binaries']['ruby'],
+        :wrapper => "#{@rvminfo['homes']['ruby'].gsub('/rubies/', '/wrappers/')}/ruby"
     }
   end
 

data/scripts/webapp.rb

@@ -39,6 +39,7 @@ Standup.script :node do
 
     bootstrap_db if params.bootstrap_db
 
+    #TODO replace rvm ruby with wrapper!!!
     with_processed_file script_file('webapp.conf') do |file|
       scripts.passenger.add_server_conf file, "#{params.name}.conf"
     end

metadata

@@ -1,116 +1,158 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: standup
-version: !ruby/object:Gem::Version
-  version: 0.5.4
+version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: 
+  segments: 
+  - 0
+  - 5
+  - 5
+  version: 0.5.5
 platform: ruby
-authors:
+authors: 
 - Ilia Ablamonov
 - Artem Orlov
 - Cloud Castle Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-06 00:00:00.000000000 +04:00
+
+date: 2011-07-12 00:00:00 +04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: trollop
-  requirement: &2153220240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.16'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 1
+        - 16
+        version: "1.16"
   type: :runtime
-  prerelease: false
-  version_requirements: *2153220240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: i18n
-  requirement: &2153219740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 5
+        - 0
         version: 0.5.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2153219740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2153219220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2153219220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: settingslogic
-  requirement: &2153218740 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2153218740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: amazon-ec2
-  requirement: &2153218260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :runtime
-  prerelease: false
-  version_requirements: *2153218260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: aws-s3
-  requirement: &2153217800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.5'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
   type: :runtime
-  prerelease: false
-  version_requirements: *2153217800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: net-ssh
-  requirement: &2153217340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2153217340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: highline
-  requirement: &2153216880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
   type: :runtime
-  prerelease: false
-  version_requirements: *2153216880
-description: ''
-email:
+  version_requirements: *id008
+description: ""
+email: 
 - ilia@flamefork.ru
 - art.orlov@gmail.com
-executables:
+executables: 
 - standup
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -170,6 +212,7 @@ files:
 - scripts/resque/resque
 - scripts/resque/resque_monit.conf
 - scripts/ruby.rb
+- scripts/ruby/gemrc
 - scripts/setup.rb
 - scripts/shell.rb
 - scripts/status.rb
@@ -183,27 +226,36 @@ files:
 has_rdoc: true
 homepage: https://github.com/cloudcastle/standup
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: standup
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Standup is an application deployment and infrastructure management tool for
-  Rails and Amazon EC2
+summary: Standup is an application deployment and infrastructure management tool for Rails and Amazon EC2
 test_files: []
+