heroku_san 4.2.5 → 4.3.0

data/.ruby-gemset

@@ -0,0 +1 @@
+heroku_san

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p327

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log (curated)
 
+## v4.3.0
+
+  * Add #ensure_{all|one}_worker(s)_running -- which will restart your web workers until they stay up
+  * Closes #137
+
 ## v4.2.0
 
   * Wrap API calls so that errors are reported in a more human-fiendly way

data/Gemfile

@@ -1,4 +1,23 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify dependencies in heroku_san.gemspec
-gemspec
+gemspec
+
+group :development do
+  gem 'rails', '>= 2'
+  gem 'rspec'
+  gem 'aruba'
+  gem 'cucumber'
+  gem 'rake'
+  gem 'bundler', '~> 1.1'
+  gem 'git-smart'
+  gem 'godot'
+  gem 'guard'
+  gem 'rb-inotify', :require => false
+  gem 'rb-fsevent', :require => false
+  gem 'rb-fchange', :require => false
+  gem 'terminal-notifier-guard'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
+  gem 'guard-cucumber'
+end

data/Guardfile

@@ -0,0 +1,21 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end
+
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch(%r{^spec/fixtures/(.+)\.yml$})                  { "spec" }
+end
+
+guard 'cucumber', :cli => '--tags ~@slow_process --format progress' do
+  watch(%r{^features/.+\.feature$})
+  watch(%r{^features/support/.+$})          { 'features' }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+end

data/README.md

@@ -2,7 +2,7 @@
 Helpful rake tasks for Heroku.
 
 [![Build Status](https://secure.travis-ci.org/fastestforward/heroku_san.png)](http://travis-ci.org/fastestforward/heroku_san)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/fastestforward/heroku_san)
+[![Code Climate](https://codeclimate.com/github/fastestforward/heroku_san.png)](https://codeclimate.com/github/fastestforward/heroku_san)
 
 ## Install
 

data/features/config.feature

@@ -1,7 +1,7 @@
 Feature: Command Line
 
   Background:
-    Given I run `rails new heroku_san_test --quiet --force --database=postgresql --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets`
+    Given I run `rails new heroku_san_test --quiet --force --skip-active-record --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets`
     And I cd to "heroku_san_test"
     And I overwrite "Gemfile" with:
       """

data/features/remote.feature

@@ -15,7 +15,7 @@ Feature: heroku_san can control a project on Heroku
     Given I have a new Rails project
     When I am in the project directory
     And I commit any changes with "Initial commit"
-    And I add heroku_san to the Gemfile
+    And I add heroku_san to the rails Gemfile
     And I run bundle install
     And I generate a new config file
     And I create my project on Heroku
@@ -35,7 +35,7 @@ Feature: heroku_san can control a project on Heroku
     Given I have a new Sinatra project
     When I am in the project directory
     And I commit any changes with "Initial commit"
-    And I add heroku_san to the Gemfile
+    And I add heroku_san to the sinatra Gemfile
     And I run bundle install
     And I create a new config/heroku.yml file
     And I create my project on Heroku

data/features/step_definitions/remote_steps.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/string/strip'
 require 'godot'
 
 Given /^I have a new Rails project$/ do
-  cmd = "rails new test_app --quiet --force --database=postgresql --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets"
+  cmd = "rails new test_app --quiet --force --skip-bundle --skip-javascript --skip-test-unit --skip-sprockets"
   run_clean unescape(cmd)
 end
 
@@ -51,8 +51,24 @@ When /^I tag the commit with "([^"]*)" annotated by "([^"]*)"$/ do |tag, annotat
   run_clean "git tag -a '#{tag}' -m '#{annotation}' HEAD"
 end
 
-When /^I add heroku_san to the Gemfile$/ do
-  append_to_file 'Gemfile', <<EOT.strip_heredoc
+When /^I add heroku_san to the rails Gemfile$/ do
+  overwrite_file 'Gemfile', <<EOT.strip_heredoc
+    source 'https://rubygems.org'
+    ruby '1.9.3'
+    gem 'rails', '3.2.7'
+    gem 'pg'
+    group :development, :test do
+      gem 'heroku_san', :path => '../../../.'
+      gem 'sqlite3'
+    end
+EOT
+end
+
+When /^I add heroku_san to the sinatra Gemfile$/ do
+  overwrite_file 'Gemfile', <<EOT.strip_heredoc
+    source 'https://rubygems.org'
+    ruby '1.9.3'
+    gem 'sinatra'
     group :development, :test do
       gem 'heroku_san', :path => '../../../.'
     end
@@ -142,7 +158,7 @@ When /^I restart my project$/ do
 end
 
 When /^I generate a scaffold$/ do
-  run_clean 'rails generate scaffold droid'
+  run_clean 'rails generate resource droid'
   append_to_file 'app/views/droids/index.html.erb', %Q{\n<div><code><%= ENV['DROIDS'] -%></code></div>\n}
 end
 
@@ -181,15 +197,13 @@ When /^I install an addon$/ do
     test_app:
       app: #{@app}
       addons:
-        - deployhooks:campfire
+        - scheduler:standard
 
 END_CONFIG
 
   output = run_clean 'rake test_app heroku:addons'
   # The output should show the new one ...
-  assert_partial_output "deployhooks:campfire", output
-  # ... with a note about needing to configure it.
-  assert_partial_output "https://api.heroku.com/myapps/#{@app}/addons/deployhooks:campfire", output
+  assert_partial_output "scheduler:standard", output
 end
 
 Then /^(?:heroku_san|issue \d+) (?:is green|has been fixed)$/ do
@@ -204,6 +218,7 @@ def vladimir
   @vladimir ||= begin
     Godot.new("#{@app}.herokuapp.com", 80).tap do |vladimir|
       vladimir.timeout = 60
+      vladimir.interval = 5
     end
   end
 end

data/heroku_san.gemspec

@@ -29,14 +29,6 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<heroku-api>, ['>= 0.1.2'])
       s.add_runtime_dependency(%q<rake>)
-      s.add_development_dependency(%q<rails>, ['>= 2'])
-      s.add_development_dependency(%q<rspec>)
-      s.add_development_dependency(%q<aruba>)
-      s.add_development_dependency(%q<cucumber>)
-      s.add_development_dependency(%q<rake>)
-      s.add_development_dependency(%q<bundler>, ['~> 1.1  '])
-      s.add_development_dependency('git-smart')
-      s.add_development_dependency('godot')
     else
       s.add_dependency(%q<rails>, ['>= 2'])
       s.add_dependency(%q<heroku-api>, ['>= 0.1.2'])

data/lib/heroku_san/api.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module HerokuSan
   class API
     def initialize(options = {})

data/lib/heroku_san/application.rb

@@ -0,0 +1,36 @@
+require 'heroku-api'
+
+module HerokuSan
+  module Application
+    def ensure_one_worker_running(at_least = 1)
+      begin
+        web_processes = heroku.get_ps(app).body.select { |p| p["process"] =~ /web\./ }
+      end until restart_processes(web_processes) >= at_least
+    end
+
+    def ensure_all_workers_running
+      while true do
+        processes = heroku.get_ps(app).body
+
+        return if processes.all? { |p| p["state"] == "up" }
+
+        restart_processes(processes)
+      end
+    end
+
+    private
+
+    def restart_processes(web_processes)
+      up = 0
+      web_processes.each do |process|
+        case process["state"]
+          when "up"
+            up += 1
+          when "crashed"
+            heroku.post_ps_restart(app, ps: process["process"])
+        end
+      end
+      up
+    end
+  end
+end

data/lib/heroku_san/parser.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module HerokuSan
   class Parser
     include HerokuSan::Git
@@ -5,8 +7,8 @@ module HerokuSan
     def parse(parseable)
       @settings = parse_yaml(parseable.config_file)
       convert_from_heroku_san_format
-      each_setting_has_a_config_section
       parseable.external_configuration = @settings.delete 'config_repo'
+      each_setting_has_a_config_section
       parseable.configuration = @settings
 
     end

data/lib/heroku_san/stage.rb

@@ -1,5 +1,6 @@
 require 'heroku-api'
 require 'json'
+require_relative 'application'
 
 MOCK = false unless defined?(MOCK)
 
@@ -8,6 +9,7 @@ module HerokuSan
     include HerokuSan::Git
     attr_reader :name
     attr_reader :options
+    include HerokuSan::Application
 
     def initialize(stage, options = {})
       @name = stage

data/lib/heroku_san/version.rb

@@ -1,3 +1,3 @@
 module HerokuSan
-  VERSION = "4.2.5"
+  VERSION = "4.3.0"
 end

data/spec/heroku_san/api_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 # https://github.com/fastestforward/heroku_san/issues/105
+module HerokuSan
 describe HerokuSan::API do
   subject(:api) { HerokuSan::API.new(:api_key => 'key', :mock => true)}
   it "is a proxy to the Heroku::API" do
@@ -23,3 +24,4 @@ describe HerokuSan::API do
     }
   end
 end
+end

data/spec/heroku_san/application_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+module HerokuSan
+  describe HerokuSan::Application do
+    let(:stage) { HerokuSan::Stage.new('production', {"deploy" => HerokuSan::Deploy::Rails, "app" => "awesomeapp", "stack" => "cedar"}) }
+    let(:response) { stub }
+
+    before do
+      stage.heroku.stub(:get_ps).with(stage.app) { response }
+    end
+
+    describe "#ensure_one_worker_running" do
+      # API: {"action" => "up", "app_name" => "awesomeapp", "attached" => false, "command" => "thin -p $PORT -e $RACK_ENV -R $HEROKU_RACK start", "elapsed" => 0, "pretty_state" => "created for 0s", "process" => "web.1", "rendezvous_url" => nil, "slug" => "NONE", "state" => "created", "transitioned_at" => "2013/07/28 15:04:24 -0700", "type" => "Dyno", "upid" => "56003928"}
+      let(:none_running) do
+        [
+          {"process" => "worker.1", "state" => "up"},
+          {"process" => "web.1", "state" => "starting"},
+          {"process" => "web.2", "state" => "starting"}
+        ]
+      end
+      let(:one_running_with_crash) do
+        [
+          {"process" => "worker.1", "state" => "up"},
+          {"process" => "web.1", "state" => "crashed"},
+          {"process" => "web.2", "state" => "up"}
+        ]
+      end
+
+      it "should block until at least one worker is running, and restart any crashed workers it sees" do
+
+        with_app(stage, 'name' => stage.app) do |app_data|
+          response.should_receive(:body).twice.and_return(none_running, one_running_with_crash)
+          stage.heroku.should_receive(:post_ps_restart).with(stage.app, ps: 'web.1')
+
+          stage.ensure_one_worker_running
+        end
+      end
+    end
+
+    describe "#ensure_all_workers_running" do
+      let(:some_crashes) do
+        [
+          {"process" => "worker.1", "state" => "crashed"},
+          {"process" => "web.1", "state" => "crashed"},
+          {"process" => "web.2", "state" => "starting"}
+        ]
+      end
+      let(:some_restarting) do
+        [
+          {"process" => "worker.1", "state" => "restarting"},
+          {"process" => "web.1", "state" => "restarting"},
+          {"process" => "web.2", "state" => "up"}
+        ]
+      end
+      let(:one_crash) do
+        [
+          {"process" => "worker.1", "state" => "crashed"},
+          {"process" => "web.1", "state" => "up"},
+          {"process" => "web.2", "state" => "up"}
+        ]
+      end
+      let(:all_up) do
+        [
+          {"process" => "worker.1", "state" => "up"},
+          {"process" => "web.1", "state" => "up"},
+          {"process" => "web.2", "state" => "up"}
+        ]
+      end
+
+      it "should block until all workers are running, and restart any crashed workers it sees" do
+        with_app(stage, 'name' => stage.app) do |app_data|
+          response.should_receive(:body).exactly(4).times.and_return(some_crashes, some_restarting, one_crash, all_up)
+          stage.heroku.should_receive(:post_ps_restart).with(stage.app, ps: 'worker.1').twice
+          stage.heroku.should_receive(:post_ps_restart).with(stage.app, ps: 'web.1').once
+
+          stage.ensure_all_workers_running
+        end
+      end
+    end
+  end
+end

data/spec/heroku_san/configuration_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+module HerokuSan
 describe HerokuSan::Configuration do
   let(:configurable) { Configurable.new }
   let(:configuration) { HerokuSan::Configuration.new(configurable) }
@@ -38,4 +39,5 @@ describe HerokuSan::Configuration do
       end
     end
   end
-end
+end
+end

data/spec/heroku_san/parser_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+module HerokuSan
 describe HerokuSan::Parser do
   let(:parser) { subject }
 
@@ -86,3 +87,4 @@ describe HerokuSan::Parser do
     end
   end
 end
+end

data/spec/heroku_san/project_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'tmpdir'
 
+module HerokuSan
 describe HerokuSan::Project do
   let(:heroku_san) { HerokuSan::Project.new }
   subject { heroku_san }
@@ -82,3 +83,4 @@ describe HerokuSan::Project do
     end
   end
 end
+end

data/spec/heroku_san/stage_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+module HerokuSan
 describe HerokuSan::Stage do
   include HerokuSan::Git
   subject { HerokuSan::Stage.new('production', {"deploy" => HerokuSan::Deploy::Rails, "app" => "awesomeapp", "stack" => "cedar"})}
@@ -282,3 +283,4 @@ describe HerokuSan::Stage do
     end
   end
 end
+end

data/spec/spec_helper.rb

@@ -10,13 +10,6 @@ MOCK = ENV['MOCK'] != 'false'
 Dir[File.join(SPEC_ROOT, "support/**/*.rb")].each {|f| require f}
 
 RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
   config.mock_with :rspec
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku_san
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 4.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -46,134 +46,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: git-smart
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: godot
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Manage multiple Heroku instances/apps for a single Rails app using Rake
 email: elijah.miller@gmail.com
 executables: []
@@ -182,9 +54,12 @@ extra_rdoc_files:
 - README.md
 files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -202,6 +77,7 @@ files:
 - lib/generators/heroku_san_generator.rb
 - lib/heroku_san.rb
 - lib/heroku_san/api.rb
+- lib/heroku_san/application.rb
 - lib/heroku_san/configuration.rb
 - lib/heroku_san/deploy/base.rb
 - lib/heroku_san/deploy/noop.rb
@@ -219,11 +95,12 @@ files:
 - spec/fixtures/example.yml
 - spec/fixtures/extended_config.yml
 - spec/fixtures/old_format.yml
-- spec/git_spec.rb
 - spec/heroku_san/api_spec.rb
+- spec/heroku_san/application_spec.rb
 - spec/heroku_san/configuration_spec.rb
 - spec/heroku_san/deploy/base_spec.rb
 - spec/heroku_san/deploy/rails_spec.rb
+- spec/heroku_san/git_spec.rb
 - spec/heroku_san/parser_spec.rb
 - spec/heroku_san/project_spec.rb
 - spec/heroku_san/stage_spec.rb
@@ -245,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4414701449810336455
+      hash: -1774718932546341856
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -254,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ! 'A bunch of useful Rake tasks for managing your Heroku apps. NOTE: The
@@ -269,11 +146,12 @@ test_files:
 - spec/fixtures/example.yml
 - spec/fixtures/extended_config.yml
 - spec/fixtures/old_format.yml
-- spec/git_spec.rb
 - spec/heroku_san/api_spec.rb
+- spec/heroku_san/application_spec.rb
 - spec/heroku_san/configuration_spec.rb
 - spec/heroku_san/deploy/base_spec.rb
 - spec/heroku_san/deploy/rails_spec.rb
+- spec/heroku_san/git_spec.rb
 - spec/heroku_san/parser_spec.rb
 - spec/heroku_san/project_spec.rb
 - spec/heroku_san/stage_spec.rb