standup 0.5.3 → 0.5.4

data/lib/standup/remoting.rb

@@ -8,7 +8,6 @@ module Standup
       @keypair_file = Settings.aws.keypair_file
       @user = @node.scripts.ec2.params.ssh_user
       @ssh = nil
-      @rvm_installed = nil
       @context = {}
     end
     
@@ -140,8 +139,8 @@ module Standup
       result
     end
       
-    def file_exists? path, raw = false
-      send(:"#{raw ? 'raw_' : ''}exec", "if [ -e #{path} ]; then echo 'true'; fi") == "true\n"
+    def file_exists? path
+      exec("if [ -e #{path} ]; then echo 'true'; fi") =~ /true/
     end
 
     def install_packages packages, opts = {}
@@ -186,7 +185,7 @@ module Standup
     
     def rvm_installed?
       unless instance_variable_defined? :@rvm_installed
-        @rvm_installed = file_exists?('/usr/local/rvm/bin/rvm', true)
+        @rvm_installed = !!(raw_exec('which rvm') =~ /rvm/)
       end
       @rvm_installed
     end

data/lib/standup/version.rb

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

data/scripts/db_backup.rb

@@ -1,4 +1,4 @@
-klnblkblkbklblkcdStandup.script :node do
+Standup.script :node do
   def run
     exec "s3cmd mb #{bucket}"
     

data/scripts/passenger.rb

@@ -9,10 +9,12 @@ Standup.script :node do
     
     sudo 'mkdir -p /opt/nginx/conf/servers'
     
-    upload script_file('nginx.conf'),
-           :to =>'/opt/nginx/conf/nginx.conf',
-           :sudo => true
-    
+    with_processed_file script_file('nginx.conf') do |file|
+      upload file,
+             :to =>'/opt/nginx/conf/nginx.conf',
+             :sudo => true
+    end
+
     upload script_file('nginx'),
            :to =>'/etc/init.d/nginx',
            :sudo => true

data/scripts/passenger/nginx.conf

@@ -8,8 +8,8 @@ events {
 }
 
 http {
-    passenger_root /usr/local/lib/ruby/gems/1.8/gems/passenger-3.0.4;
-    passenger_ruby /usr/local/bin/ruby;
+    passenger_root <%= scripts.ruby.info[:gem_dir] %>/passenger-3.0.7;
+    passenger_ruby <%= scripts.ruby.info[:bin_ruby] %>;
 
     include       mime.types;
     default_type  application/octet-stream;

data/scripts/ruby.rb

@@ -16,6 +16,14 @@ Standup.script :node do
     end
   end
 
+  def info
+    @rvminfo ||= YAML.load(exec('rvm info')).values.first
+    {
+        :gem_dir => "#{@rvminfo['homes']['gem']}/gems",
+        :bin_ruby => @rvminfo['binaries']['ruby']
+    }
+  end
+
   def version
     @version ||= begin
       files = Dir['**/.rvmrc']

metadata

@@ -1,119 +1,116 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: standup
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.4
   prerelease: 
-  version: 0.5.3
 platform: ruby
-authors: 
+authors:
 - Ilia Ablamonov
 - Artem Orlov
 - Cloud Castle Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-06 00:00:00 +04:00
+date: 2011-07-06 00:00:00.000000000 +04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: trollop
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153220240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.16"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153220240
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2153219740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153219740
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2153219220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "3.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: settingslogic
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153219220
+- !ruby/object:Gem::Dependency
+  name: settingslogic
+  requirement: &2153218740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: amazon-ec2
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153218740
+- !ruby/object:Gem::Dependency
+  name: amazon-ec2
+  requirement: &2153218260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: aws-s3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2153218260
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: &2153217800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.5"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2153217800
+- !ruby/object:Gem::Dependency
+  name: net-ssh
+  requirement: &2153217340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2153217340
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &2153216880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
-  version_requirements: *id008
-description: ""
-email: 
+  prerelease: false
+  version_requirements: *2153216880
+description: ''
+email:
 - ilia@flamefork.ru
 - art.orlov@gmail.com
-executables: 
+executables:
 - standup
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - Gemfile
@@ -186,30 +183,27 @@ 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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      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: []
-