standup 0.5.14 → 0.6.0

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.2-p290

data/lib/standup/remoting.rb

@@ -118,12 +118,12 @@ module Standup
     def remote_command command
       command = "#{@context[:prefix].strip} #{command}" if @context[:prefix].present?
       command = "cd #{@context[:path]} && #{command}"   if @context[:path].present?
-      command = "#{shell_command} -c \"#{command.gsub(/"/, '\"')}\""
+      command = "bash -c \"#{command.gsub(/"/, '\"')}\""
 
-      if @context[:user].present?
-        command = "sudo -u #{@context[:user]} #{command}"
-      elsif @context[:sudo]
+      if @context[:sudo]
         command = "sudo #{command}"
+      elsif @context[:user].present?
+        command = "sudo -u #{@context[:user]} #{command}"
       end
 
       command
@@ -133,10 +133,6 @@ module Standup
       with_context(context) { raw_exec(remote_command(command), timeout_sec) }
     end
 
-    def shell_command
-      rvm_installed? ? 'rvm-shell' : 'bash'
-    end
-
     def sudo command = nil, &block
       block = Proc.new { exec command } unless block_given?
       with_context(:sudo => true, &block)
@@ -152,7 +148,7 @@ module Standup
       tmp_dirname = "/tmp/standup_tmp_#{rand 10000}"
       exec "mkdir -m 777 #{tmp_dirname}"
       result = in_dir tmp_dirname, &block
-      exec "rm -rf #{tmp_dirname}"
+      sudo "rm -rf #{tmp_dirname}"
       result
     end
       
@@ -200,13 +196,6 @@ module Standup
       @ssh = nil
     end
     
-    def rvm_installed?
-      unless instance_variable_defined? :@rvm_installed
-        @rvm_installed = !!(raw_exec('which rvm') =~ /rvm/)
-      end
-      @rvm_installed
-    end
-
     protected
 
     def ssh

data/lib/standup/version.rb

@@ -1,5 +1,5 @@
 module Standup
-  VERSION = "0.5.14"
+  VERSION = "0.6.0"
 
   def self.version
     VERSION

data/scripts/passenger/{nginx.conf → nginx.conf.erb}

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

data/scripts/passenger.rb

@@ -1,15 +1,19 @@
 Standup.script :node do
+  self.default_params = {
+      :version => '3.0.9'
+  }
+
   def run
     scripts.ec2.open_port 80, 443
 
-    if install_gem('passenger', '3.0.8') || !file_exists?('/opt/nginx/sbin/nginx')
+    if install_gem('passenger', params.version) || !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|
+    with_processed_file script_file('nginx.conf.erb') do |file|
       upload file,
              :to =>'/opt/nginx/conf/nginx.conf',
              :sudo => true

data/scripts/ruby.rb

@@ -1,69 +1,62 @@
 Standup.script :node do
   def run
-    unless remoting.rvm_installed?
-      install_package 'git-core'
-      sudo 'bash < <(curl -s https://rvm.beginrescueend.com/install/rvm)'
-      sudo 'usermod -a -G rvm ubuntu'
-      sudo 'usermod -a -G rvm www-data'
-      sudo 'cd /usr/local/bin && sudo ln -s /usr/local/rvm/bin/rvm-shell'
-      upload script_file('rvmrc'), :to => '/etc/rvmrc', :sudo => true
-      exec 'source /usr/local/rvm/scripts/rvm'
-      remoting.instance_variable_set :@rvm_installed, true
-    end
-
-    unless exec('rvm list')[version]
-      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}"
-      sudo "rvm use #{version} --default"
-
-      upload script_file('gemrc'),
-             :to => '/etc/gemrc',
-             :sudo => true
+    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'
+    build_ruby
+    setup_env
+  end
+  
+  def build_ruby
+    return if exec('ruby -v') =~ /#{version.gsub(/-/, '')}/
+    
+    install_ruby_build
+    
+    sudo "ruby-build #{version} /usr/local" 
+  end
+  
+  def install_ruby_build
+    return if file_exists? '/usr/local/bin/ruby-build'
+    in_temp_dir do |path|
+      exec 'git clone git://github.com/sstephenson/ruby-build.git'
+      in_dir "#{path}/ruby-build" do
+        sudo './install.sh'
+      end
     end
   end
-
-  def info
-    @rvminfo ||= YAML.load(exec('rvm info')).values.first
-    {
-        :gem_dir => "#{@rvminfo['homes']['gem']}/gems",
-        :bin_ruby => @rvminfo['binaries']['ruby'],
-        :wrapper => "#{@rvminfo['homes']['ruby'].gsub('/rubies/', '/wrappers/')}/ruby"
-    }
+  
+  def setup_env
+    upload script_file('gemrc'),
+           :to => '/etc/gemrc',
+           :sudo => true
+  end
+  
+  def gems_dir
+    "#{exec('gem environment gemdir').strip}/gems"
   end
-
+  
   def version
     @version ||= begin
-      files = Dir['**/.rvmrc']
-
-      if files.empty?
-        if params.version.present?
-          params.version
-        else
-          puts "Cannot fine ruby version declaration neither in .rvmrc file or ruby script param"
-          raise Exception.new('Cannot find ruby version declaration')
-        end
+      versions = ([params.version] + rbenv_versions + rvm_versions).compact.uniq
+      
+      if versions.size == 1
+        versions.first
       else
-        declarations = files.map do |file|
-          if (rvm_declaration = IO.read(file)).index('rvm') == 0
-            rvm_declaration.split(' ').second.split('@').first
-          else
-            puts "Cannot parse .rvmrc declaration:\n#{rvm_declaration}"
-            raise Exception.new("Cannot parse #{file}")
-          end
-        end.uniq
-
-        if declarations.size > 1
-          puts "Found different ruby version declarations #{declarations}"
-          if params.version.present?
-            params.version
-          else
-            raise Exception.new('Several ruby version declarations found')
-          end
-        else
-          declarations.first
-        end
+        raise "Found different ruby version declarations #{versions}"
       end
     end
   end
+  
+  def rvm_versions
+    Dir['**/.rvmrc'].map do |f|
+      if (rvm_declaration = IO.read(f)).index('rvm') == 0
+        rvm_declaration.split(' ').second.split('@').first
+      else
+        puts "Cannot parse .rvmrc declaration:\n#{rvm_declaration}"
+        raise Exception.new("Cannot parse #{f}")
+      end
+    end
+  end
+  
+  def rbenv_versions
+    Dir['**/.rbenv-version'].map{|f| IO.read(f).strip}
+  end
 end

data/scripts/webapp.rb

@@ -80,14 +80,14 @@ Standup.script :node do
     with_context(:user => 'www-data', :path => app_path) do
       case params.gem_manager.to_sym
         when :bundler
-          install_gem 'bundler'
-          exec 'bundle install'
+          install_gem 'bundler', '1.0.18'
+          sudo 'bundle install'
         when :rake_gems
           cmd = "RAILS_ENV=#{params.rails_env} rake gems:install"
-          output = exec cmd
+          output = sudo cmd
           if output.match(/Missing the Rails ([\d\.]+) gem/) || output.match(/RubyGem version error: rails\([\d\.]+ not = ([\d\.]+)\)/)
             install_gem 'rails', $1
-            exec cmd
+            sudo cmd
           end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: standup
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000Z
+date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
-  requirement: &70135903137000 !ruby/object:Gem::Requirement
+  requirement: &70308367915600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70135903137000
+  version_requirements: *70308367915600
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70135903135900 !ruby/object:Gem::Requirement
+  requirement: &70308367914900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70135903135900
+  version_requirements: *70308367914900
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70135903135000 !ruby/object:Gem::Requirement
+  requirement: &70308367914100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135903135000
+  version_requirements: *70308367914100
 - !ruby/object:Gem::Dependency
   name: settingslogic
-  requirement: &70135903133500 !ruby/object:Gem::Requirement
+  requirement: &70308367913640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135903133500
+  version_requirements: *70308367913640
 - !ruby/object:Gem::Dependency
   name: amazon-ec2
-  requirement: &70135903132900 !ruby/object:Gem::Requirement
+  requirement: &70308367913160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70135903132900
+  version_requirements: *70308367913160
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &70135903132060 !ruby/object:Gem::Requirement
+  requirement: &70308367912480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70135903132060
+  version_requirements: *70308367912480
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70135903131480 !ruby/object:Gem::Requirement
+  requirement: &70308367911700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70135903131480
+  version_requirements: *70308367911700
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70135903112120 !ruby/object:Gem::Requirement
+  requirement: &70308367911040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *70135903112120
+  version_requirements: *70308367911040
 description: ''
 email:
 - ilia@flamefork.ru
@@ -111,6 +111,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rbenv-version
 - .rvmrc
 - Gemfile
 - LICENSE
@@ -156,7 +157,7 @@ files:
 - scripts/mysql.rb
 - scripts/passenger.rb
 - scripts/passenger/nginx
-- scripts/passenger/nginx.conf
+- scripts/passenger/nginx.conf.erb
 - scripts/passenger/nginx_monit.conf
 - scripts/postgresql.rb
 - scripts/postgresql/pg_hba.conf
@@ -172,7 +173,6 @@ files:
 - scripts/resque/resque_monit.conf
 - scripts/ruby.rb
 - scripts/ruby/gemrc
-- scripts/ruby/rvmrc
 - scripts/setup.rb
 - scripts/shell.rb
 - scripts/status.rb
@@ -196,21 +196,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2029569967480200357
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2029569967480200357
 requirements: []
 rubyforge_project: standup
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Standup is an application deployment and infrastructure management tool for

data/scripts/ruby/rvmrc

@@ -1 +0,0 @@
-export rvm_path=/usr/local/rvm