heroku-rails-saas 0.1.3 → 0.1.4

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    heroku-rails-saas (0.1.3)
+    heroku-rails-saas (0.1.4)
       heroku (>= 2.24.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.7.0)
-    addressable (2.2.7)
+    addressable (2.2.8)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     diff-lcs (1.1.3)

data/heroku-rails.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = "heroku-rails-saas"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.authors = [ "Elijah Miller", "Glenn Roberts", "Jacques Crocker", "Lance Sanchez"]
-              
+
   s.summary = "Deployment and configuration tools for Heroku/Rails"
   s.description = "Manage multiple Heroku instances/apps for a single Rails app using Rake."
 
-  s.email = "railsjedi@gmail.com"
+  s.email = "lance.sanchez@gmail.com"
   s.homepage = "http://github.com/darkbushido/heroku-rails-saas"
   s.rubyforge_project = "none"
 

data/lib/heroku-rails-saas/config.rb

@@ -42,7 +42,7 @@ module HerokuRailsSaas
     # Allows for `rake <app:env> [<app:env>] <command>`
     def app_name_on_heroku(string)
       app_name, env = string.split(SEPERATOR)
-      apps[app_name][env] 
+      apps[app_name][env]
     end
 
     # return all enviromnets in this format app:env
@@ -53,7 +53,7 @@ module HerokuRailsSaas
     end
 
     # return all environments e.g. staging, production, development
-    def all_environments 
+    def all_environments
       environments = apps.each_with_object([]) do |(app, hsh), arr|
         hsh.each { |env, app_name| arr << env }
       end
@@ -74,7 +74,7 @@ module HerokuRailsSaas
         'heroku '
       end
     end
-    
+
     # pull out the config setting hash for a particular app environment
     def config(app_env)
       name, env = app_env.split(SEPERATOR)

data/lib/heroku-rails-saas/runner.rb

@@ -18,8 +18,8 @@ module HerokuRailsSaas
 
     # use all environments or filter out production environments
     def all_environments(filter=false)
-      @environments = @config.app_environments 
-      filter ? @environments.reject! { |app| app[production_regex] } : @environments
+      @environments = @config.app_environments
+      filter ? @environments.reject! { |app| app[regex_for(:production)] } : @environments
     end
 
     # use all heroku apps filtered by environments
@@ -37,9 +37,9 @@ module HerokuRailsSaas
       each_heroku_app do |heroku_env, app_name, repo|
         next if @my_apps.include?(app_name)
 
-        stack = @config.stack(heroku_env)
-        stack_option = " --stack #{stack}" if stack.to_s.size > 0
-        creation_command "heroku create #{app_name}#{stack_option} --remote #{app_name}"
+        options = { :remote => app_name, :stack => @config.stack(heroku_env) }
+
+        @heroku.create(app_name, options)
       end
     end
 
@@ -119,7 +119,7 @@ module HerokuRailsSaas
         new_config.each do |new_key, new_val|
           add_config[new_key] = new_val unless existing_config[new_key] == new_val
         end
-        
+
         # persist the changes onto heroku
         unless add_config.empty?
           # add the config
@@ -128,7 +128,9 @@ module HerokuRailsSaas
             set_config << "#{key}='#{val}' "
           end
           creation_command "heroku config:add #{set_config} --app #{app_name}"
-          system_with_echo("#{@config.cmd(app_env)} rails runner 'Rails.cache.clear' --app #{app_name}")
+
+          # This fails on a newly created app
+          system_with_echo("#{@config.cmd(app_env)} \"#{rails_cli(:runner)} 'Rails.cache.clear'\" --app #{app_name}")
         end
       end
     end
@@ -269,10 +271,17 @@ module HerokuRailsSaas
       raise "*** command \"#{args.join ' '}\" failed" unless system(*args)
     end
 
-    private
+    def regex_for env
+      match = case env
+        when :production then "production|prod|live"
+        when :staging    then "staging|stage"
+      end
+      Regexp.new("#{@config.class::SEPERATOR}(#{match})")
+    end
 
-    def production_regex
-       Regexp.new("#{@config.class::SEPERATOR}(production|prod|live)")
+    def rails_cli script
+      Rails::VERSION::MAJOR < 3 ? ".script/#{script}" : "rails #{script}"
     end
+
   end
 end

data/lib/heroku/rails/tasks.rb

@@ -75,10 +75,10 @@ namespace :heroku do
       Rake::Task["heroku:before_each_deploy"].invoke(app_name)
 
       cmd = HEROKU_CONFIG.cmd(heroku_env)
-      if heroku_env == "production"
-        branch = `git branch`.scan(/^\* (.*)\n/).flatten.first.to_s
+
+      if heroku_env[HEROKU_RUNNER.regex_for(:production)]
         all_tags = `git tag`
-        target_tag = all_tags[/.+\Z/] # Set lastest tag as default
+        target_tag = `git describe --tags --abbrev=0`.chomp # Set latest tag as default
 
         begin
           puts "\nGit tags:"
@@ -93,24 +93,27 @@ namespace :heroku do
               puts "\n\nInvalid git tag!"
               invalid = true
             end
-          end  
+          end
         end while invalid
+        puts "Unable to determine the tag to deploy." and exit(1) if target_tag.empty?
+        to_deploy = "#{target_tag}^{}"
       else
-        branch = `git branch`.scan(/^\* (.*)\n/).flatten.first.to_s
-        if branch.present?
-          @git_push_arguments ||= []
-          @git_push_arguments << '--force'
-          to_deploy = "#{target_tag}^{}"
-          system_with_echo "git push #{repo} #{@git_push_arguments.join(' ')} #{branch}:master"
-          Rake::Task["heroku:setup:config"].invoke
-          system_with_echo "#{cmd} rake --app #{app_name} db:migrate && heroku restart --app #{app_name}"
-        else
-          puts "Unable to determine the current git branch, please checkout the branch you'd like to deploy."
-
-          exit(1)
-        end
+        to_deploy = `git branch`.scan(/^\* (.*)\n/).flatten.first.to_s
+        puts "Unable to determine the current git branch, please checkout the branch you'd like to deploy." and exit(1) if to_deploy.empty?
       end
-      
+
+      @git_push_arguments ||= []
+      @git_push_arguments << '--force'
+
+      system_with_echo "git push #{repo} #{@git_push_arguments.join(' ')} #{to_deploy}:master"
+
+      system_with_echo "heroku maintenance:on --app #{app_name}"
+
+      Rake::Task["heroku:setup:config"].invoke
+      system_with_echo "#{cmd} rake --app #{app_name} db:migrate && heroku restart --app #{app_name}"
+
+      system_with_echo "heroku maintenance:off --app #{app_name}"
+
       Rake::Task["heroku:after_each_deploy"].reenable
       Rake::Task["heroku:after_each_deploy"].invoke(app_name)
       puts "\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-rails-saas
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000Z
+date: 2012-05-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &2164893760 !ruby/object:Gem::Requirement
+  requirement: &2169042360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 2.24.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164893760
+  version_requirements: *2169042360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164892680 !ruby/object:Gem::Requirement
+  requirement: &2169041700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,9 +35,9 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2164892680
+  version_requirements: *2169041700
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake.
-email: railsjedi@gmail.com
+email: lance.sanchez@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -84,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3605644454962400049
+      hash: 4416327361781470259
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3605644454962400049
+      hash: 4416327361781470259
 requirements: []
 rubyforge_project: none
 rubygems_version: 1.8.6