ors 0.1.8 → 0.2.0

data/lib/ors/commands/deploy.rb

@@ -6,6 +6,8 @@ module ORS::Commands
       info "deploying #{name} #{environment}..."
 
       [Update, Migrate, Restart].each {|command| run command }
+
+      eval ERB.new(deploy_hook).result(binding) if deploy_hook
     end
 
   end

data/lib/ors/commands/env.rb

@@ -5,8 +5,8 @@ module ORS::Commands
     def execute
       puts "ORS v#{ORS::VERSION} configuration:\n\n"
 
-      [:name, :environment, :use_gateway, :pretending, :log_lines, :rails2, :gateway, :deploy_user,
-       :repo, :base_path, :web_servers, :app_servers, :migration_server, :console_server, :cron_server].each do |config_variable|
+      [:name, :environment, :use_gateway, :pretending, :log_lines, :rails2, :gateway, :deploy_user, :repo,
+       :base_path, :deploy_hook, :web_servers, :app_servers, :migration_server, :console_server, :cron_server].each do |config_variable|
         puts "%20s: %-40s" % [config_variable, ORS::Config.send(config_variable).inspect]
       end
     end

data/lib/ors/commands/setup.rb

@@ -5,12 +5,17 @@ module ORS::Commands
     def execute
       info "setting up #{name} #{environment}..."
 
-      execute_in_parallel(all_servers) {|server| setup_repo server }
-      execute_in_parallel(ruby_servers) {|server| setup_ruby server }
+      info "Are you sure? ('crashandburn' + ctrl+D^2)"
+      if STDIN.read == "crashandburn"
+        execute_in_parallel(all_servers) {|server| setup_repo server }
+        execute_in_parallel(ruby_servers) {|server| setup_ruby server }
 
-      execute_command migration_server, %(source ~/.rvm/scripts/rvm),
-                                        %(cd #{deploy_directory}),
-                                        %(RAILS_ENV=#{environment} bundle exec rake db:create)
+        execute_command migration_server, %(source ~/.rvm/scripts/rvm),
+                                          %(cd #{deploy_directory}),
+                                          %(RAILS_ENV=#{environment} bundle exec rake db:create)
+      else
+        info "Stopping crash and burn setup"
+      end
     end
 
   end

data/lib/ors/config.rb

@@ -3,7 +3,7 @@ module ORS
 
     CONFIG_FILENAME="config/deploy.yml"
 
-    mattr_accessor :name, :environment, :use_gateway, :pretending, :log_lines, :rails2
+    mattr_accessor :name, :environment, :use_gateway, :pretending, :log_lines, :rails2, :deploy_hook
     mattr_accessor :gateway, :deploy_user, :repo, :base_path, :web_servers, :app_servers, :migration_server, :console_server, :cron_server
 
     self.environment = "production"
@@ -49,16 +49,16 @@ module ORS
         %w(production demo staging)
       end
 
+      def git
+        @git ||= Git.open(Dir.pwd)
+      end
+
       private
 
       def name_from_git
         git.config["remote.origin.url"].gsub /.*?:(.*?).git/, '\1'
       end
 
-      def git
-        @git ||= Git.open(Dir.pwd)
-      end
-
     end
     extend ModuleMethods
 
@@ -70,6 +70,10 @@ module ORS
       (web_servers + ruby_servers).uniq
     end
 
+    def revision
+      Config.git.log(1).first.sha
+    end
+
     def deploy_directory
       directory = File.join base_path, name
 

data/lib/ors/version.rb

@@ -1,3 +1,3 @@
 module ORS
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/lib/ors.rb

@@ -1,6 +1,7 @@
 require "rubygems"
 require "git"
 require "yaml"
+require "erb"
 
 require "ors/version"
 require "ors/core_ext"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ors
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jason Dew and John Long
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -04:00
+date: 2011-04-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ors
-rubygems_version: 1.4.2
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Heroku-like deployment utilities for ORS