heroku-rails-saas 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    heroku-rails-saas (0.1.4)
+    heroku-rails-saas (0.1.5)
       heroku (>= 2.24.1)
 
 GEM

data/README.md

@@ -3,9 +3,8 @@ Heroku Rails SaaS
 
 Easier configuration and deployment of Rails apps on Heroku
 
-Configure all your Heroku enviroments via a YML file (config/heroku.yml) that defines all your environments, addons, and environment variables.
-Configure your app specific Heroku environment via a YML file (config/heroku/awesomeapp.yml) thats defines all your environments, addons, and 
-environment variables for awesomeapp.
+Configure all your Heroku environments via a YML file (config/heroku.yml) that defines all your environments, addons, scaling settings and environment variables.
+Configure your app specific Heroku environment via a YML file (config/heroku/awesomeapp.yml) thats defines all your environments, addons, scaling settings and environment variables for awesomeapp.
 
 ## Install
 
@@ -44,6 +43,10 @@ For all configuration settings
       - scheduler:standard
       # add any other addons here
 
+    scale:
+      web: 1
+      worker: 0
+
 For an app specific settings awesomeapp
 
     apps:
@@ -70,6 +73,13 @@ For an app specific settings awesomeapp
       - cron:daily
       - newrelic:bronze
 
+    scale:
+      production:
+        web: 3
+        worker: 2
+      staging:
+        web: 2
+        worker: 1
 
 ### Setting up Heroku
 
@@ -99,7 +109,7 @@ A special rake task 'all' is created that causes any further commands to
 execute on all heroku apps (Note: Any environment labeled `production` will not
 be included, you must explicitly state it).
 
-Futhermore there are rake task 'environments' created from environments in configs
+Furthermore there are rake task 'environments' created from environments in configs
 that causes any further commands to execute on all heroku apps.
 
     rake all:production heroku:info
@@ -120,6 +130,7 @@ A full list of tasks provided:
     rake heroku:remotes             # Add git remotes for all apps in this project
     rake heroku:migrate             # Migrates and restarts remote servers
     rake heroku:restart             # Restarts remote servers
+    rake heroku:scale               # Scales heroku processes
 
     rake heroku:setup               # runs all heroku setup scripts
     rake heroku:setup:addons        # sets up the heroku addons

data/heroku-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "heroku-rails-saas"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.authors = [ "Elijah Miller", "Glenn Roberts", "Jacques Crocker", "Lance Sanchez"]
 

data/lib/generators/templates/heroku.yml

@@ -33,6 +33,11 @@
 #   - cron:daily
 #   - newrelic:bronze
 
+# scale:
+#   production:
+#     web: 2
+#     worker: 1
+
 
 # The following are configuration settings formally under the :all key
 # for all apps and thier environments
@@ -50,3 +55,7 @@ collaborators:
 addons:
   - scheduler:standard
   # add any other addons here
+
+scale:
+  web: 1
+  worker: 0

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

@@ -22,6 +22,12 @@ module HerokuRailsSaas
         name, env = app_env.split(SEPERATOR)
         env
       end
+      
+      def extract_name_from(app_env)
+        name, env = app_env.split(SEPERATOR)
+        name
+      end
+      
     end
 
     attr_accessor :settings
@@ -89,6 +95,20 @@ module HerokuRailsSaas
       all.merge(merged_environment_configs)
     end
 
+    # pull out the scaling setting hash for a particular app environment
+    def scale(app_env)
+      name, env = app_env.split(SEPERATOR)
+      scaling = self.settings['scale'] || {}
+      all = scaling['all'] || {}
+
+      app_scaling = (scaling[name] && scaling[name].reject { |k,v| v.class == Hash }) || {}
+      # overwrite app scaling with the environment specific ones
+      merged_environment_scaling = app_scaling.merge((scaling[name] && scaling[name][env]) || {})
+
+      # overwrite all scaling with the environment specific ones
+      all.merge(merged_environment_scaling)
+    end
+
     # return a list of domains for a particular app environment
     def domains(app_env)
       name, env = app_env.split(SEPERATOR)

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

@@ -204,6 +204,22 @@ module HerokuRailsSaas
       end
     end
 
+    def scale
+      authorize unless @heroku
+      each_heroku_app do |heroku_env, app_name, repo|
+        scaling = @config.scale(heroku_env)
+        scaling.each do |process_name, instance_count|
+          begin
+            puts "Scaling app #{app_name} process #{process_name} to #{instance_count}"
+            response = @heroku.ps_scale(app_name, {:type => process_name, :qty => instance_count })
+            puts "Response: #{response}"
+          rescue => e
+            puts "Failed to scale #{app_name}. Error: #{e.inspect}"
+          end
+        end
+      end
+    end
+
     # cycles through each configured heroku app
     # yields the environment name, the app name, and the repo url
     def each_heroku_app

data/lib/heroku/rails/tasks.rb

@@ -141,13 +141,6 @@ namespace :heroku do
   task :switch_environment do
   end
 
-  desc "Force deploys, migrates and restarts latest code"
-  task :force_deploy do
-    @git_push_arguments ||= []
-    @git_push_arguments << '--force'
-    Rake::Task["heroku:deploy"].execute
-  end
-
   desc "Captures a bundle on Heroku"
   task :capture do
     HEROKU_RUNNER.each_heroku_app do |heroku_env, app_name, repo|
@@ -177,6 +170,11 @@ namespace :heroku do
     end
   end
 
+  desc "Scales heroku processes"
+  task :scale do
+    HEROKU_RUNNER.scale
+  end
+
   namespace :setup do
 
     desc "Creates the apps on Heroku"
@@ -232,11 +230,11 @@ namespace :heroku do
     desc "Pulls the database from heroku and stores it into db/dumps/"
     task :pull do
       HEROKU_RUNNER.each_heroku_app do |heroku_env, app_name, repo|
-        system_with_echo "heroku pgdumps:capture --app #{app_name}"
-        dump = `heroku pgdumps --app #{app_name}`.split("\n").last.split(" ").first
+        system_with_echo "heroku pgbackups:capture --app #{app_name}"
+        dump = `heroku pgbackups --app #{app_name}`.split("\n").last.split(" ").first
         system_with_echo "mkdir -p #{HerokuRailsSaas::Config.root}/db/dumps"
         file = "#{HerokuRailsSaas::Config.root}/db/dumps/#{dump}.sql.gz"
-        url = `heroku pgdumps:url --app #{app_name} #{dump}`.chomp
+        url = `heroku pgbackups:url --app #{app_name} #{dump}`.chomp
         system_with_echo "wget", url, "-O", file
 
         # TODO: these are a bit distructive...
@@ -245,5 +243,31 @@ namespace :heroku do
         # system_with_echo "rake jobs:clear"
       end
     end
+    
+    desc "Resets a Non Production database"
+    task :reset do
+      HEROKU_RUNNER.each_heroku_app do |heroku_env, app_name, repo|
+        unless heroku_env[HEROKU_RUNNER.regex_for(:production)]
+          system_with_echo "heroku pg:reset DATABASE_URL --app #{app_name} --confirm #{app_name}"
+        else
+          puts "Will not reset the Production database"
+        end
+      end
+    end
+    
+    desc "Copies a database over a Non Production database"
+    task :copy,[ :source]  => :reset do |t, args|
+      HEROKU_RUNNER.each_heroku_app do |heroku_env, app_name, repo|
+        raise "missing source" unless HEROKU_CONFIG.app_name_on_heroku(args.source)
+          
+        unless heroku_env[HEROKU_RUNNER.regex_for(:production)]
+          source_app_name = HEROKU_CONFIG.app_name_on_heroku(args.source)
+          system_with_echo "heroku pgbackups:restore DATABASE_URL `heroku pgbackups:url --app #{source_app_name}` --app #{app_name} --confirm #{app_name}"
+        else
+          puts "Will not overwrite the Production database"
+        end
+      end
+    end
+
   end
 end

data/spec/fixtures/awesomeapp.yml

@@ -29,4 +29,12 @@ addons:
   production:
     # list production env specific addons here
     - ssl:piggyback
-    - cron:daily
+    - cron:daily
+
+scale:
+  production:
+    web: 3
+    worker: 2
+  staging:
+    web: 2
+    worker: 1

data/spec/fixtures/heroku-config.yml

@@ -13,4 +13,4 @@ collaborators:
 addons:
   # add any other addons here
   - scheduler:standard
-  - newrelic:bronze
+  - newrelic:bronze

data/spec/fixtures/mediocreapp.yml

@@ -11,4 +11,4 @@ collaborators:
 
 domains:
   development:
-    - "mediocreapp.com"
+    - "mediocreapp.com"

data/spec/heroku/rails/saas/heroku_config_spec.rb

@@ -153,5 +153,37 @@ module HerokuRailsSaas
       end
     end
 
+    describe "#scale" do
+      context "mediocrapp" do
+        it "should include the scaling settings defined in 'all'" do
+          @scale = @config.scale('mediocreapp')
+          @scale['web'].should_not be_nil
+          @scale['worker'].should_not be_nil
+          @scale['web'].should eql 1
+          @scale['worker'].should eql 0
+        end
+      end
+
+      context "staging environment" do
+        it "should include the scaling settings defined in 'staging'" do
+          @scale = @config.scale('awesomeapp:staging')
+          @scale['web'].should_not be_nil
+          @scale['worker'].should_not be_nil
+          @scale['web'].should eql 2
+          @scale['worker'].should eql 1
+        end
+      end
+
+      context "production environment" do
+        it "should include the scaling settings defined in 'production'" do
+          @scale = @config.scale('awesomeapp:production')
+          @scale['web'].should_not be_nil
+          @scale['worker'].should_not be_nil
+          @scale['web'].should eql 3
+          @scale['worker'].should eql 2
+        end
+      end
+    end
+
   end
 end

metadata

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