heroku-rails-saas 0.1.5 → 0.1.7

data/Gemfile

@@ -1,10 +1,14 @@
 source :rubygems
 gemspec
 
-# gem "ruby-debug", :platforms => :mri_18
-# gem "ruby-debug19", :platforms => :mri_19
+gem "rake"
+group :development, :test do
+   gem "rdoc", '~> 3.12'
+end
 
-gem "autotest", ">= 0"
-gem "growl-glue", ">= 0"
-
-gem "rake", "0.8.7"
+group :test do
+  gem "ruby-debug", :platforms => :mri_18
+  gem "ruby-debug19", :platforms => :mri_19
+  
+  gem "rspec"
+end

data/Gemfile.lock

@@ -1,46 +1,78 @@
 PATH
   remote: .
   specs:
-    heroku-rails-saas (0.1.5)
+    heroku-rails-saas (0.1.7)
       heroku (>= 2.24.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.7.0)
-    addressable (2.2.8)
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.3.2)
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
-    growl-glue (1.0.7)
-    heroku (2.25.0)
+    excon (0.15.5)
+    heroku (2.30.2)
+      heroku-api (~> 0.3.2)
       launchy (>= 0.3.2)
-      netrc (~> 0.7.1)
+      netrc (~> 0.7.5)
       rest-client (~> 1.6.1)
       rubyzip
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
-    mime-types (1.18)
-    netrc (0.7.1)
-    rake (0.8.7)
+    heroku-api (0.3.2)
+      excon (~> 0.15.5)
+    i18n (0.6.0)
+    json (1.7.4)
+    launchy (2.1.2)
+      addressable (~> 2.3)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    mime-types (1.19)
+    multi_json (1.3.4)
+    netrc (0.7.5)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.9)
+    rdoc (3.12)
+      json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    rubyzip (0.9.8)
+    rspec-mocks (2.11.1)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    rubyzip (0.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  autotest
-  growl-glue
+  activesupport
   heroku-rails-saas!
-  rake (= 0.8.7)
-  rspec (~> 2.0)
+  rake
+  rdoc (~> 3.12)
+  rspec
+  ruby-debug
+  ruby-debug19

data/Rakefile

@@ -1,11 +1,14 @@
 require "bundler"
 Bundler.setup
 
-require 'rake'
-require 'rake/gempackagetask'
+# require 'rake'
+# require 'rake/gempackagetask'
+
+require 'rubygems'
+require 'rubygems/package_task'
 
 gemspec = eval(File.read('heroku-rails.gemspec'))
-Rake::GemPackageTask.new(gemspec) do |pkg|
+Gem::PackageTask.new(gemspec) do |pkg|
   pkg.gem_spec = gemspec
 end
 
@@ -19,19 +22,19 @@ task :release => :gem do
   system "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
 end
 
-require "rspec"
+# require "rspec"
 require "rspec/core/rake_task"
 
-Rspec::Core::RakeTask.new(:spec) do |spec|
+RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-Rspec::Core::RakeTask.new('spec:progress') do |spec|
+RSpec::Core::RakeTask.new('spec:progress') do |spec|
   spec.rspec_opts = %w(--format progress)
   spec.pattern = "spec/**/*_spec.rb"
 end
 
-require "rake/rdoctask"
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = "rdoc"
   rdoc.title = "Heroku Rails SaaS #{gemspec.version}"

data/heroku-rails.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = "heroku-rails-saas"
-  s.version = "0.1.5"
+  s.version = "0.1.7"
 
-  s.authors = [ "Elijah Miller", "Glenn Roberts", "Jacques Crocker", "Lance Sanchez"]
+  s.authors = [ "Elijah Miller", "Glenn Roberts", "Jacques Crocker", "Lance Sanchez", "Chris Trinh"]
 
   s.summary = "Deployment and configuration tools for Heroku/Rails"
   s.description = "Manage multiple Heroku instances/apps for a single Rails app using Rake."
@@ -34,5 +34,6 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency "heroku", ">= 2.24.1"
   s.add_development_dependency "rspec", "~> 2.0"
+  s.add_development_dependency "activesupport"
 end
 

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

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/try'
 require 'erb'
 
 module HerokuRailsSaas
@@ -44,6 +45,18 @@ module HerokuRailsSaas
       apps.keys
     end
 
+    def cmd(app_env)
+      if self.stack(app_env) =~ /cedar/i
+        'heroku run '
+      else
+        'heroku '
+      end
+    end
+
+    def rails_cli script
+      Rails::VERSION::MAJOR < 3 ? ".script/#{script}" : "rails #{script}"
+    end
+    
     # Returns the app name on heroku froma string format like so: `app:env`
     # Allows for `rake <app:env> [<app:env>] <command>`
     def app_name_on_heroku(string)
@@ -70,73 +83,62 @@ module HerokuRailsSaas
     def stack(app_env)
       name, env = app_env.split(SEPERATOR)
       stacks = self.settings['stacks'] || {}
-      (stacks[name] && stacks[name][env]) || stacks['all']
+      stacks[name].try("[]", env) || stacks['all']
     end
 
-    def cmd(app_env)
-      if self.stack(app_env) =~ /cedar/i
-        'heroku run '
-      else
-        'heroku '
-      end
+    # return a list of domains for a particular app environment
+    def domains(app_env)
+      name, env = app_env.split(SEPERATOR)
+      domains = self.settings['domains'] || {}
+      domains[name].try("[]", env) || []
     end
 
     # pull out the config setting hash for a particular app environment
     def config(app_env)
-      name, env = app_env.split(SEPERATOR)
-      config = self.settings['config'] || {}
-      all = config['all'] || {}
-
-      app_configs = (config[name] && config[name].reject { |k,v| v.class == Hash }) || {}
-      # overwrite app configs with the environment specific ones
-      merged_environment_configs = app_configs.merge((config[name] && config[name][env]) || {})
-
-      # overwrite all configs with the environment specific ones
-      all.merge(merged_environment_configs)
+      app_setting_hash("config", app_env)
     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)
+      app_setting_hash("scale", app_env)
     end
 
-    # return a list of domains for a particular app environment
-    def domains(app_env)
-      name, env = app_env.split(SEPERATOR)
-      domains = self.settings['domains'] || {}
-      (domains[name] && domains[name][env]) || []
-    end
+
     # return a list of collaborators for a particular app environment
     def collaborators(app_env)
-      app_setting_list('collaborators', app_env)
+      app_setting_array('collaborators', app_env)
     end
 
     # return a list of addons for a particular app environment
     def addons(app_env)
-      app_setting_list('addons', app_env)
+      app_setting_array('addons', app_env)
     end
 
-    protected
+    private
 
-    def app_setting_list(setting_key, app_env)
+    # Add app specific settings to the default ones defined in all for an array listing
+    def app_setting_array(setting_key, app_env)
       name, env = app_env.split(SEPERATOR)
       setting = self.settings[setting_key] || {}
-      all = setting['all'] || []
+      default = setting['all'] || []
 
-      # add in collaborators from app environment to the ones defined in all
-      (all + ((setting[name] && setting[name][env]) || [])).uniq
+      app_settings = setting[name].try("[]", env) || []
+      (default + app_settings).uniq
     end
 
-    private
+    # Add app specific settings to the default ones defined in all for a hash listing
+    def app_setting_hash(setting_key, app_env)
+      name, env = app_env.split(SEPERATOR)
+      config = self.settings[setting_key] || {}
+      all = config['all'] || {}
+
+      app_configs = (config[name] && config[name].reject { |k,v| v.class == Hash }) || {}
+      # overwrite app settings with the environment specific ones
+      merged_environment_configs = app_configs.merge((config[name] && config[name][env]) || {})
+
+      # overwrite all settings with the environment specific ones
+      all.merge(merged_environment_configs)
+    end
 
     def parse_yml(config_filepath, options)
       if File.exists?(config_filepath)
@@ -157,8 +159,7 @@ module HerokuRailsSaas
     end
 
     def aggregate_heroku_configs(config_files)
-      hsh = {}
-      config_files[:apps].each_with_object(hsh) { |file, h| h.rmerge!(parse_yml(file, :apps)) }
+      hsh = config_files[:apps].each_with_object({}) { |file, h| h.rmerge!(parse_yml(file, :apps)) }
       # overwrite all configs with the environment specific ones
       hsh.rmerge!(parse_yml(config_files[:default], :default))
     end

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

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/object/blank'
 require 'heroku/client'
 
 module HerokuRailsSaas
@@ -130,7 +131,7 @@ module HerokuRailsSaas
           creation_command "heroku config:add #{set_config} --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}")
+          system_with_echo("#{@config.cmd(app_env)} \"#{@config.rails_cli(:runner)} 'Rails.cache.clear'\" --app #{app_name}")
         end
       end
     end
@@ -223,7 +224,6 @@ module HerokuRailsSaas
     # cycles through each configured heroku app
     # yields the environment name, the app name, and the repo url
     def each_heroku_app
-
       if @config.apps.size == 0
         puts "\nNo heroku apps are configured. Run:
           rails generate heroku:config\n\n"
@@ -295,9 +295,5 @@ module HerokuRailsSaas
       Regexp.new("#{@config.class::SEPERATOR}(#{match})")
     end
 
-    def rails_cli script
-      Rails::VERSION::MAJOR < 3 ? ".script/#{script}" : "rails #{script}"
-    end
-
   end
 end

data/lib/heroku/rails/tasks.rb

@@ -75,7 +75,7 @@ namespace :heroku do
       Rake::Task["heroku:before_each_deploy"].invoke(app_name)
 
       cmd = HEROKU_CONFIG.cmd(heroku_env)
-
+      
       if heroku_env[HEROKU_RUNNER.regex_for(:production)]
         all_tags = `git tag`
         target_tag = `git describe --tags --abbrev=0`.chomp # Set latest tag as default
@@ -102,16 +102,19 @@ namespace :heroku do
         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'
+      @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 "#{cmd} rake --app #{app_name} db:migrate"
 
+      system_with_echo "#{cmd} \"#{HEROKU_CONFIG.rails_cli(:runner)} 'Rails.cache.clear'\" --app #{app_name}"
+      
+      system_with_echo "heroku restart --app #{app_name}"
+      
       system_with_echo "heroku maintenance:off --app #{app_name}"
 
       Rake::Task["heroku:after_each_deploy"].reenable
@@ -233,7 +236,7 @@ namespace :heroku do
         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"
+        file = "#{HerokuRailsSaas::Config.root}/db/dumps/#{app_name}-#{dump}.sql.gz"
         url = `heroku pgbackups:url --app #{app_name} #{dump}`.chomp
         system_with_echo "wget", url, "-O", file
 

data/spec/fixtures/mediocreapp.yml

@@ -12,3 +12,8 @@ collaborators:
 domains:
   development:
     - "mediocreapp.com"
+
+scale:
+  development:
+    web: 1
+    worker: 0

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

@@ -156,7 +156,7 @@ module HerokuRailsSaas
     describe "#scale" do
       context "mediocrapp" do
         it "should include the scaling settings defined in 'all'" do
-          @scale = @config.scale('mediocreapp')
+          @scale = @config.scale('mediocreapp:development')
           @scale['web'].should_not be_nil
           @scale['worker'].should_not be_nil
           @scale['web'].should eql 1

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

@@ -2,13 +2,21 @@ require 'spec_helper'
 
 module HerokuRailsSaas
   describe Runner do
-    describe "each_heroku_app" do
-      it "should return my apps" do
-        pending
+    describe "#each_heroku_app" do
+      it "should return all apps in all environments" do
+        config_files = {:default => config_path("heroku-config.yml"), :apps => [config_path("awesomeapp.yml"), config_path("mediocreapp.yml")]}
+        config = Config.new(config_files)
+        runner = Runner.new(config)
+        runner.all_environments
+        runner.each_heroku_app {}.should == ["awesomeapp:production", "awesomeapp:staging", "mediocreapp:development"]
       end
 
       it "should not return a production app if @environment is not specified and there's only one app" do
-        pending
+        config_files = {:default => config_path("heroku-config.yml"), :apps => [config_path("mediocreapp.yml")]}
+        config = Config.new(config_files)
+        runner = Runner.new(config)
+        runner.instance_variable_set("@environments", [])
+        lambda { runner.each_heroku_app }.should raise_error(SystemExit)
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,16 +2,38 @@ require 'heroku-rails-saas'
 require 'bundler/setup'
 
 
-RSpec.configure do |c|
-  # setup fixtures path
-  c.before(:all) do
+RSpec.configure do |config|
+  config.before(:all) do
     @fixture_path = Pathname.new(File.join(File.dirname(__FILE__), "/fixtures"))
     raise "Fixture folder not found: #{@fixture_path}" unless @fixture_path.directory?
+    silence_output
+  end
+
+  config.after(:all) do
+    enable_output
   end
 
   # returns the file path of a fixture setting file
   def config_path(filename)
     @fixture_path.join(filename)
   end
+
+  # Redirects stderr and stdout to /dev/null.
+  def silence_output
+    @orig_stderr = $stderr
+    @orig_stdout = $stdout
+
+    # redirect stderr and stdout to /dev/null
+    $stderr = File.new('/dev/null', 'w')
+    $stdout = File.new('/dev/null', 'w')
+  end
+
+  # Replace stdout and stderr so anything else is output correctly.
+  def enable_output
+    $stderr = @orig_stderr
+    $stdout = @orig_stdout
+    @orig_stderr = nil
+    @orig_stdout = nil
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-rails-saas
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,14 +9,15 @@ authors:
 - Glenn Roberts
 - Jacques Crocker
 - Lance Sanchez
+- Chris Trinh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000Z
+date: 2012-08-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &2156355220 !ruby/object:Gem::Requirement
+  requirement: &2165278020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +25,10 @@ dependencies:
         version: 2.24.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156355220
+  version_requirements: *2165278020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156354200 !ruby/object:Gem::Requirement
+  requirement: &2165277300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,7 +36,18 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2156354200
+  version_requirements: *2165277300
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2165276480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2165276480
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake.
 email: lance.sanchez@gmail.com
 executables: []
@@ -84,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3808687770431151887
+      hash: 2780192577745053897
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -93,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3808687770431151887
+      hash: 2780192577745053897
 requirements: []
 rubyforge_project: none
 rubygems_version: 1.8.6