heroku_san 1.3.0 → 2.0.rc.1

data/.gitignore

@@ -3,6 +3,6 @@ doc
 pkg
 Thumbs.db
 tmp
-
+.idea/**
 Gemfile.lock
 *.swp

data/.rvmrc

@@ -1 +1 @@
-rvm @heroku_san --create
+rvm gemset use heroku_san --create

data/README.rdoc

@@ -121,7 +121,8 @@ Issue Tracker:: http://github.com/fastestforward/heroku_san/issues
 * Jon Wood (jon@blankpad.net)
 * Mat Schaffer (mat@schaffer.me)
 * Jonathan Hironaga (jonathan.hironaga@halogennetwork.com)
+* Ken Mayer (ken@bitwrangler.com)
 
 == License
 
-License:: Copyright (c) 2009 Elijah Miller <mailto:elijah.miller@gmail.com>, released under the MIT license.
+License:: Copyright (c) 2009-2012 Elijah Miller <mailto:elijah.miller@gmail.com>, released under the MIT license.

data/Rakefile

@@ -1,5 +1,13 @@
 require 'bundler'
+require 'rspec/core/rake_task'
+
 Bundler::GemHelper.install_tasks
 
-desc 'Default: build gem.'
-task :default => :build
+desc 'Default: run unit tests.'
+task :default => :spec
+
+desc "Run all specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rspec_opts = ["-c", "-f progress"]
+end

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/cucumber.yml

@@ -0,0 +1,2 @@
+default: --tags ~@slow_process
+remote: --tags @slow_process

data/examples/auto_tagger.rake

@@ -0,0 +1,62 @@
+# Support for auto_tagger (0.2.6) (http://github.com/zilkey/auto_tagger)
+
+# Add the following to your ci build script
+# this will create a tag if the build is successful
+# rake ci-test-target autotag:create[ci]
+
+# Add the following to your heroku.yml file:
+# staging:
+#   tag: ci/*
+#
+# production:
+#   tag: staging/*
+
+# Builds will be deployed in the following sequence:
+# 1. ci passes, creates ci tag from HEAD
+# 2. deploy latest ci tag to staging
+# 3. deploy latest staging tag to production
+
+STAGES = %w[ci staging production]
+
+def create_and_push(stage)
+  auto_tag = AutoTagger::Base.new(stages: STAGES, stage: stage, verbose: true, push_refs: false, refs_to_keep: 100)
+  tag = auto_tag.create_ref(auto_tag.last_ref_from_previous_stage.try(:sha))
+  sh "git push origin #{tag.name}"
+  auto_tag.delete_locally
+  auto_tag.delete_on_remote
+end
+
+task :before_deploy do
+  sh "git fetch --tags"
+end
+
+task :after_deploy do
+  each_heroku_app do |stage|
+    create_and_push(stage.name)
+  end
+  Rake::Task['autotag:list'].invoke
+end
+
+namespace :autotag do
+  desc "Create an autotag for stage, default: #{STAGES.first}"
+  task :create, :stage do |t, args|
+    create_and_push(args[:stage] || STAGES.first)
+  end
+
+  desc "Show auto tagger history"
+  task :list do
+    puts "** AUTO TAGGER: release tag history:"
+    auto_tag = AutoTagger::Base.new(stages: STAGES, offline: true)
+    STAGES.each do |stage|
+      ref = auto_tag.refs_for_stage(stage).last
+      if ref
+        log = %x{git log -1 --format=oneline #{ref.sha}}.chomp
+        log = log[0..5] + log[40..-1]
+      else
+        log = "none"
+      end
+      puts " ** %-12s %s" % [stage, log]
+    end
+  end
+end
+end

data/features/{command_line.feature → config.feature}

@@ -1,6 +1,6 @@
 Feature: Command Line
 
-  Scenario: Config file can be formatted like Rails' database.yml
+  Background:
     Given I run `rails new heroku_san_test -O`
     And I cd to "heroku_san_test"
     And I overwrite "Gemfile" with:
@@ -8,6 +8,8 @@ Feature: Command Line
       source :rubygems
       gem 'heroku_san', :path => '../../../.'
       """
+
+  Scenario: Config file can be formatted like Rails' database.yml
     Given a file named "config/heroku.yml" with:
       """
       production: 
@@ -18,20 +20,13 @@ Feature: Command Line
         app: awesomeapp-demo
       """
 
-    When I run `rake heroku:apps:local`
+    When I run `rake --trace heroku:apps:local`
 
     Then the output should contain "production is shorthand for the Heroku app awesomeapp"
     And  the output should contain "staging is shorthand for the Heroku app awesomeapp-staging"
     And  the output should contain "demo is shorthand for the Heroku app awesomeapp-demo"
 
   Scenario: Config file still accepts the heroku_san format
-    Given I run `rails new heroku_san_test -O`
-    And I cd to "heroku_san_test"
-    And I overwrite "Gemfile" with:
-      """
-      source :rubygems
-      gem 'heroku_san', :path => '../../../.'
-      """
     Given a file named "config/heroku.yml" with:
       """
       apps:
@@ -40,8 +35,37 @@ Feature: Command Line
         demo: awesomeapp-demo
       """
 
-    When I run `rake heroku:apps:local`
+    When I run `rake --trace heroku:apps:local`
 
     Then the output should contain "production is shorthand for the Heroku app awesomeapp"
     And  the output should contain "staging is shorthand for the Heroku app awesomeapp-staging"
     And  the output should contain "demo is shorthand for the Heroku app awesomeapp-demo"
+
+  Scenario: Tag information can be listed
+    Given a file named "config/heroku.yml" with:
+      """
+      production:
+        app: awesomeapp
+        tag: ci/*
+      staging:
+        app: awesomeapp-staging
+        tag: staging/*
+      demo:
+        app: awesomeapp-demo
+      """
+
+    When I run `rake --trace all heroku:apps:local`
+
+    Then the output should contain "the production TAG is 'ci/*'"
+    And  the output should contain "the staging TAG is 'staging/*'"
+
+  Scenario: heroku:create_config
+    When I run `rake --trace heroku:create_config`
+    Then a file named "config/heroku.yml" should exist
+    And the output should match /Copied example config to ".*.config.heroku.yml"/
+    And the output should match /Please edit ".*.config.heroku.yml" with your application's settings./
+  
+  Scenario: heroku:create_config with an EDITOR set in the environment
+    When I run `rake EDITOR=echo --trace heroku:create_config`
+    And the output should match /Copied example config to ".*.config.heroku.yml"/
+    And the output should match /^echo .*.config.heroku.yml$/

data/features/extended-config.feature

@@ -1,6 +1,6 @@
 Feature: Extended config
 
-  Scenario: Config information can be pulled from a separate git repository
+  Background:
     Given I run `rails new heroku_san_test -O`
     And I cd to "heroku_san_test"
     And I overwrite "Gemfile" with:
@@ -8,6 +8,7 @@ Feature: Extended config
       source :rubygems
       gem 'heroku_san', :path => '../../../.'
       """
+  Scenario: Config information can be pulled from a separate git repository
     Given a file named "config/heroku.yml" with:
       """
       config_repo: 'file:///<%= File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', 'features', 'data', 'test-config') %>'
@@ -19,19 +20,12 @@ Feature: Extended config
         app: awesomeapp-demo
       """
 
-    When I run `rake all heroku:config:list:local`
+    When I run `rake --trace all heroku:config:list:local`
 
     Then the output should contain "production TEST_REMOTE: 'hello_world'"
     And the output should contain "staging TEST_REMOTE: 'goodbye_world'"
 
   Scenario: Config information can be listed
-    Given I run `rails new heroku_san_test -O`
-    And I cd to "heroku_san_test"
-    And I overwrite "Gemfile" with:
-      """
-      source :rubygems
-      gem 'heroku_san', :path => '../../../.'
-      """
     Given a file named "config/heroku.yml" with:
       """
       production:
@@ -46,19 +40,12 @@ Feature: Extended config
         app: awesomeapp-demo
       """
 
-    When I run `rake all heroku:config:list:local`
+    When I run `rake --trace all heroku:config:list:local`
 
     Then the output should contain "production TEST_LOCAL: 'hello_world'"
     And  the output should contain "staging TEST_LOCAL: 'goodbye_world'"
 
   Scenario: Config information can be merged between local and remote
-    Given I run `rails new heroku_san_test -O`
-    And I cd to "heroku_san_test"
-    And I overwrite "Gemfile" with:
-      """
-      source :rubygems
-      gem 'heroku_san', :path => '../../../.'
-      """
     Given a file named "config/heroku.yml" with:
       """
       config_repo: 'file:///<%= File.join(File.expand_path(File.dirname(__FILE__)), '..', '..', '..', 'features', 'data', 'test-config') %>'
@@ -73,7 +60,7 @@ Feature: Extended config
           TEST_REMOTE: 'overridden_by_remote'
       """
 
-    When I run `rake all heroku:config:list:local`
+    When I run `rake --trace all heroku:config:list:local`
 
     Then the output should contain "production TEST_LOCAL: 'hello_world'"
     And the output should contain "production TEST_REMOTE: 'hello_world'"

data/features/remote.feature

@@ -0,0 +1,57 @@
+@announce @slow_process
+Feature: Works with Heroku
+
+  Background:
+    Given I run `git clone git://github.com/kmayer/heroku_san_demo.git`
+    And I cd to "heroku_san_demo"
+    And I run `bundle install`
+
+  Scenario: Remote commands
+    When I run `rake demo deploy`
+    Then the output should match /(http:.*-demo.heroku.com deployed to Heroku)|(Everything up-to-date)/
+
+    When I run `rake demo heroku:maintenance_on`
+    Then the output should contain "Maintenance mode enabled."
+    
+    When I run `rake demo restart`
+    Then the output should contain "Restarting processes... done"
+
+    When I run `rake demo heroku:maintenance_off`
+    Then the output should contain "Maintenance mode disabled."
+
+    When I run `rake demo heroku:rake[db:seed]`
+    Then I run `curl -s http://heroku-san-demo-demo.heroku.com/droids.text`
+    And the output should contain "C3PO, Marvin, R2D2, Robby"
+    
+    When I run `rake demo logs`
+    Then the output should contain "Starting process with command `rake db:seed`"
+
+    When I run `git co staging`
+    And I run `rake deploy`
+    Then the output should contain "Defaulting to 'staging' as it matches the current branch"
+    Then the output should match /(http:.*-staging.heroku.com deployed to Heroku)|(Everything up-to-date)/
+    When I run `curl -s http://heroku-san-demo-staging.heroku.com`
+    And the output should contain "Ruby on Rails: Welcome aboard"
+
+    When I run `rake production deploy:force`
+    Then the output should match /^git update-ref refs.heroku_san.deploy \w{40}$/
+    # Runs a before_deploy
+    # Runs an after_deploy
+    # Adds a collaborator
+
+# Given I run `rake heroku:create_config`
+    
+#    When I run `rake demo heroku:create`
+#    Then the output should contain "somthing about the created app"
+#      $ rake all heroku:create
+#      heroku create heroku-san-demo-demo
+#      Creating heroku-san-demo-demo.... done, stack is bamboo-mri-1.9.2
+#      http://heroku-san-demo-demo.heroku.com/ | git@heroku.com:heroku-san-demo-demo.git
+#      Git remote heroku added
+#      heroku create heroku-san-demo-production
+#      Creating heroku-san-demo-production... done, stack is bamboo-mri-1.9.2
+#      http://heroku-san-demo-production.heroku.com/ | git@heroku.com:heroku-san-demo-production.git
+#      heroku create heroku-san-demo-staging
+#      Creating heroku-san-demo-staging... done, stack is bamboo-mri-1.9.2
+#      http://heroku-san-demo-staging.heroku.com/ | git@heroku.com:heroku-san-demo-staging.git
+

data/features/support/env.rb

@@ -6,3 +6,12 @@ require 'aruba/cucumber'
 unless File.readable? File.join(File.dirname(__FILE__), '..', 'data', 'test-config', 'config.yml')
   `git submodule init && git submodule update`
 end
+
+Before do
+  @aruba_timeout_seconds = 15
+end
+  
+Before('@slow_process') do
+  @aruba_timeout_seconds = 60  
+  # @aruba_io_wait_seconds = 15
+end

data/heroku_san.gemspec

@@ -1,16 +1,16 @@
 # -*- encoding: utf-8 -*-
+require File.join(File.dirname(__FILE__), 'lib/heroku_san/version')
 
 Gem::Specification.new do |s|
   s.name = %q{heroku_san}
-
-  s.version = "1.3.0"
-  s.date = %q{2011-11-07}
+  s.version = HerokuSan::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Elijah Miller", "Glenn Roberts", "Ryan Ahearn"]
+  
+  s.authors = ["Elijah Miller", "Glenn Roberts", "Ryan Ahearn", "Ken Mayer"]
   s.description = %q{Manage multiple Heroku instances/apps for a single Rails app using Rake}
   s.email = %q{elijah.miller@gmail.com}
-  s.homepage = %q{http://github.com/glennr/heroku_san}
+  s.homepage = %q{http://github.com/fastestforward/heroku_san}
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
@@ -24,9 +24,11 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ['>= 2'])
       s.add_runtime_dependency(%q<heroku>, ['>= 2'])
-      s.add_development_dependency(%q<rails>, ['>= 3'])
+      s.add_runtime_dependency(%q<rake>)
       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.0'])
     else
       s.add_dependency(%q<rails>, ['>= 2'])
       s.add_dependency(%q<heroku>, ['>= 2'])

data/lib/git.rb

@@ -0,0 +1,39 @@
+require 'rake'
+require 'rake/dsl_definition'
+
+module Git
+  include Rake::DSL
+  
+  def git_clone(repos, dir)
+    sh "git clone #{repos} #{dir}"
+  end
+  
+  def git_active_branch
+    %x{git branch}.split("\n").select { |b| b =~ /^\*/ }.first.split(" ").last.strip
+  end
+  
+  def git_push(commit, repo, options = [])
+    commit ||= "HEAD"
+    options ||= []
+    begin
+      sh "git update-ref refs/heroku_san/deploy #{commit}"
+      sh "git push #{repo} #{options.join(' ')} refs/heroku_san/deploy:refs/heads/master"
+    ensure
+      sh "git update-ref -d refs/heroku_san/deploy"
+    end
+  end
+  
+  def git_tag(glob)
+    return nil if glob.nil?
+    %x{git tag -l '#{glob}'}.split("\n").last
+  end
+  
+  def git_rev_parse(ref)
+    return nil if ref.nil?
+    %x{git rev-parse #{ref}}.split("\n").first
+  end
+  
+  def git_parsed_tag(tag)
+    git_rev_parse(git_tag(tag))
+  end
+end

data/lib/heroku_san/project.rb

@@ -0,0 +1,111 @@
+module HerokuSan
+  class Project
+    attr_reader :config_file
+  
+    include Git
+    
+    def initialize(config_file)
+      @apps = []
+      @config_file = config_file
+      @app_settings = {}
+      config = parse(@config_file)
+      config.each do |stage, settings|
+        @app_settings[stage] = HerokuSan::Stage.new(stage, settings)
+      end
+    end
+
+    def create_config
+      template = File.expand_path(File.join(File.dirname(__FILE__), '../templates', 'heroku.example.yml'))
+      if File.exists?(@config_file)
+        false
+      else
+        FileUtils.cp(template, @config_file)
+        true
+      end
+    end
+  
+    def all
+      @app_settings.keys
+    end
+  
+    def [](stage)
+      @app_settings[stage]
+    end
+  
+    def <<(*app)
+      app.flatten.each do |a|
+        @apps << a if all.include?(a)
+      end
+      self
+    end
+  
+    def apps
+      if !@apps.empty?
+        @apps
+      else
+        case all.size
+        when 1
+          $stdout.puts "Defaulting to #{all.first.inspect} since only one app is defined"
+          all
+        else
+          active_branch = self.git_active_branch
+          all.select do |app| 
+            app == active_branch and ($stdout.puts("Defaulting to '#{app}' as it matches the current branch") || true)
+          end
+        end
+      end
+    end
+  
+    def each_app
+      raise NoApps if apps.empty?
+      apps.each do |stage|
+        yield(self[stage])
+      end
+    end
+    
+  private
+    
+    def parse_yaml(config_file)
+      if File.exists?(config_file)
+        if defined?(ERB)
+          YAML.load(ERB.new(File.read(config_file)).result)
+        else
+          YAML.load_file(config_file)
+        end
+      else
+        {}
+      end
+    end
+  
+    def parse(config_file)
+      app_settings = parse_yaml(config_file)
+    
+      # support heroku_san format
+      if app_settings.has_key? 'apps'
+        app_settings = app_settings['apps']
+        app_settings.each_pair do |stage, app_name|
+          app_settings[stage] = {'app' => app_name}
+        end
+      end
+    
+      # load external config
+      if (config_repo = app_settings.delete('config_repo'))
+        require 'tmpdir'
+        tmp_config_dir = Dir.mktmpdir
+        tmp_config_file = File.join tmp_config_dir, 'config.yml'
+        git_clone(config_repo, tmp_config_dir)
+        extra_config = parse_yaml(tmp_config_file)
+      else
+        extra_config = {}
+      end
+    
+      # make sure each app has a 'config' section & merge w/extra
+      app_settings.keys.each do |name|
+        app_settings[name]['config'] ||= {}
+        app_settings[name]['config'].merge!(extra_config[name]) if extra_config[name]
+      end  
+    
+      app_settings  
+    end
+  end
+end

data/lib/heroku_san/stage.rb

@@ -0,0 +1,78 @@
+module HerokuSan
+  class Stage
+    attr_reader :name
+    
+    def initialize(stage, options = {})
+      @name = stage
+      @options = options
+    end
+    
+    def app
+      @options['app']
+    end
+    
+    def repo
+      @options['repo'] ||= "git@heroku.com:#{app}.git"
+    end
+    
+    def stack
+      @options['stack'] ||= %x"heroku stack --app #{app}".split("\n").select { |b| b =~ /^\* / }.first.gsub(/^\* /, '')
+    end
+    
+    def tag
+      @options['tag']
+    end
+    
+    def config
+      @options['config'] ||= {}
+    end
+    
+    def run(command, args = nil)
+      if stack =~ /cedar/
+        sh_heroku "run #{command} #{args}"
+      else
+        sh_heroku "run:#{command} #{args}"
+      end
+    end
+    
+    def migrate
+      run 'rake', 'db:migrate'
+      sh_heroku "restart"
+    end
+
+    def maintenance(action)
+      raise ArgumentError, "Action #{action.inspect} must be one of (:on, :off)", caller if ![:on, :off].include?(action)
+      sh_heroku "maintenance:#{action}"
+    end
+    
+    def create
+      sh "heroku apps:create #{app}" + (@options['stack'] ? " --stack #{@options['stack']}" : '')
+    end
+
+    def sharing_add(email)
+      sh_heroku "sharing:add #{email.chomp}"
+    end
+  
+    def sharing_remove(email)
+      sh_heroku "sharing:remove #{email.chomp}"
+    end
+  
+    def long_config
+      sh_heroku 'config --long'
+    end
+
+    def restart
+      sh_heroku 'restart'
+    end
+  
+    def logs
+      sh_heroku 'logs'
+    end
+    
+  private
+  
+    def sh_heroku command
+      sh "heroku #{command} --app #{app}"
+    end
+  end
+end

data/lib/heroku_san/version.rb

@@ -0,0 +1,3 @@
+module HerokuSan
+  VERSION = "2.0.rc.1"
+end

data/lib/heroku_san.rb

@@ -1 +1,9 @@
-require 'heroku_san/railtie.rb' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+require 'railtie' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+require 'git'
+require 'heroku_san/stage'
+require 'heroku_san/project'
+
+module HerokuSan
+  class NoApps < StandardError; end
+  class Deprecated < StandardError; end
+end

data/lib/{heroku_san/railtie.rb → railtie.rb}

@@ -4,7 +4,7 @@ require 'rails'
 module HerokuSan
   class Railtie < Rails::Railtie
     rake_tasks do
-      load 'heroku_san/tasks.rb'
+      load 'tasks.rb'
     end
   end
 end

data/lib/tasks/heroku.rake

@@ -1 +1 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'heroku_san', 'tasks'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'tasks'))