heroku-headless 0.2.0 → 0.2.1

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - ruby-head
+  - 2.0.0
+  - 1.9.3
+  - jruby-head
+  - jruby-19mode
+

data/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://secure.travis-ci.org/moredip/heroku-headless.png?branch=master)](http://travis-ci.org/moredip/heroku-headless)
+[![Dependency Status](https://gemnasium.com/moredip/heroku-headless.png?travis)](https://gemnasium.com/moredip/heroku-headless)
+[![Code Climate](https://codeclimate.com/github/moredip/heroku-headless.png)](https://codeclimate.com/github/moredip/heroku-headless)
+
 # HerokuHeadless
 
 ## What?
@@ -19,3 +23,65 @@ And then execute:
 Or install it yourself as:
 
     $ gem install heroku-headless
+
+## How do I use this?
+It's as simple as
+```ruby
+require 'heroku-headless'
+HerokuHeadless::Deployer.deploy( 'your-app-name' )
+```
+
+### Use it with pre- and post-commands:
+
+```ruby
+require 'heroku-headless'
+
+  app_name = 'my-heroku-app-name'
+  remote_name = 'herokuheadless'
+
+  puts "deploying to heroku app #{app_name}"
+  remote_name = "headlessheroku"
+  HerokuHeadless.configure do | config |
+    config.post_deploy_commands = ['rake db:migrate']
+    config.pre_deploy_git_commands = [
+      "git remote -v",
+      "git checkout master",
+      "git commit -am  \"changes from headless deploy\" ",
+      "git remote add #{remote_name} git@heroku.com:#{app_name}.git",
+      "git fetch #{remote_name}",
+      "git merge -m \"merged by automatic deploy\" #{remote_name}/master"]
+  end
+
+  result = HerokuHeadless::Deployer.deploy( app_name )
+  puts "successfully deployed to #{app_name}" if result
+  exit result ? 0 : 1
+
+```
+
+### Restart processes after deployment and post-commands:
+
+```ruby
+require 'heroku-headless'
+
+  app_name = 'my-heroku-app-name'
+  remote_name = 'herokuheadless'
+
+  puts "deploying to heroku app #{app_name}"
+  remote_name = "headlessheroku"
+  HerokuHeadless.configure do | config |
+    config.post_deploy_commands = ['rake db:migrate']
+    config.restart_processes = true
+  end
+
+  result = HerokuHeadless::Deployer.deploy( app_name )
+  puts "successfully deployed to #{app_name}" if result
+  exit result ? 0 : 1
+
+```
+
+
+## Tell me more!
+
+[Deploying To Heroku From CI](http://blog.thepete.net/blog/2013/01/21/deploying-to-heroku-from-ci)
+
+[Deploying to Heroku From CI - the Gory Details](http://blog.thepete.net/blog/2013/01/22/deploying-to-heroku-from-ci-the-gory-details/)

data/Rakefile

@@ -3,7 +3,9 @@ require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:integration) do | spec |
+  spec.pattern = 'integration/**/*_spec.rb'
+end
 
+task :default => [:spec, :integration]
 task :build => :spec
-
-task :default => :spec

data/heroku-headless.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency "heroku-api"
   gem.add_runtime_dependency "rendezvous"
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "pry"
 end

data/integration/configuration_spec.rb

@@ -0,0 +1,10 @@
+require 'rspec'
+require 'heroku-headless'
+# Do not include spec_helper, because it has a HerokuHeadless.configure block
+
+describe 'HerokuHeadless' do
+  it "should have a default configuration" do
+    HerokuHeadless.configuration = nil
+    HerokuHeadless.configuration.mock_mode.should == false
+  end
+end

data/lib/heroku-headless.rb

@@ -1,30 +1,38 @@
 require "heroku-headless/version"
 
 require "heroku-headless/documents_actions"
-require "heroku-headless/creates_uuids"
+require "heroku-headless/creates_uids"
 require "heroku-headless/talks_to_heroku"
 
 require "heroku-headless/deployer"
 
 module HerokuHeadless
   class << self
-    attr_accessor :configuration
+    attr_writer :configuration
   end
 
   def self.configure
-    self.configuration ||= Configuration.new
     yield(configuration)
   end
 
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
   def self.heroku
     @@heroku ||= Heroku::API.new(:mock => HerokuHeadless.configuration.mock_mode)
   end
 
   class Configuration
-    attr_accessor :mock_mode, :post_deploy_commands
+    attr_accessor :mock_mode, :pre_deploy_git_commands, :post_deploy_commands,
+      :force_push, :restart_processes
 
     def initialize
+      @pre_deploy_git_commands = []
       @post_deploy_commands = []
+      @force_push ||= false
+      @mock_mode ||= false
+      @restart_processes ||= false
     end
   end
-end
+end

data/lib/heroku-headless/creates_uids.rb

@@ -0,0 +1,10 @@
+require 'securerandom'
+
+module HerokuHeadless
+  module CreatesUIDs
+    def generate_uid
+      SecureRandom.hex(16).downcase
+    end
+    module_function :generate_uid
+  end
+end

data/lib/heroku-headless/deployer.rb

@@ -8,7 +8,7 @@ module HerokuHeadless
     include TalksToHeroku
 
     def self.deploy(app_name)
-      new(app_name,CreatesUUIDs.generate_lowercase_uuid).deploy
+      new(app_name,CreatesUIDs.generate_uid).deploy
     end
 
     def initialize( app_name, uid )
@@ -19,14 +19,17 @@ module HerokuHeadless
     def deploy
       prep_temp_dir
       setup_ssh_key
-      do_action('push git to heroku'){ push_head_to_app }
-      do_action('post_deploy_hooks'){ run_post_deploy_hooks }
-
+      result = do_action('push git to heroku'){ push_head_to_app }
+      result = result && do_action('post_deploy_hooks'){ run_post_deploy_hooks }
+      if HerokuHeadless.configuration.restart_processes
+        result = result && do_action('restart_processes'){ restart_processes }
+      end
+      result
     ensure
       cleanup
     end
 
-    private 
+    private
 
     def prep_temp_dir
       @tmpdir = Pathname.new( Dir.tmpdir ).join('heroku-deployer').join(@uid)
@@ -66,13 +69,14 @@ module HerokuHeadless
     def add_ssh_key
       heroku.post_key(public_ssh_key)
     end
-    
+
     def remove_ssh_key
       heroku.delete_key(ssh_key_name)
     end
 
     def push_head_to_app
       setup_custom_git_ssh
+      run_pre_deploy_git_commands
       push_git
     end
 
@@ -87,7 +91,23 @@ module HerokuHeadless
     end
 
     def push_git
-      system( {'GIT_SSH'=>custom_git_ssh_path.to_s}, "git push git@heroku.com:#{@app_name}.git HEAD:master" )
+      system( {'GIT_SSH'=>custom_git_ssh_path.to_s}, git_push_command )
+    end
+
+    def git_push_command
+      cmd = "git push "
+      cmd << "-f " if HerokuHeadless.configuration.force_push
+      cmd << "git@heroku.com:#{@app_name}.git HEAD:master"
+    end
+
+    def run_pre_deploy_git_commands
+      HerokuHeadless.configuration.pre_deploy_git_commands.each do | command |
+        do_action( command ) { run_git_command(command) }
+      end
+    end
+    def run_git_command(command)
+      result = system( {'GIT_SSH'=>custom_git_ssh_path.to_s}, command )
+      result
     end
 
     def run_post_deploy_hooks
@@ -96,6 +116,11 @@ module HerokuHeadless
       end
     end
 
+    def restart_processes
+      response = heroku.post_ps_restart(@app_name)
+      response.body == "ok"
+    end
+
     def run_command(cmd)
       data = heroku.post_ps(@app_name, cmd, :attach => true).body
       rendezvous_url = data['rendezvous_url']

data/lib/heroku-headless/disposable_deployer.rb

@@ -26,13 +26,13 @@ module HerokuHeadless
     end
 
     def create_app
-      app_name = "disposable-#{deploy_uuid}"[0,30]
+      app_name = "disposable-#{deploy_uid}"[0,30]
       heroku.post_app( name: app_name )
       @app_name = app_name
     end
 
     def deploy_app
-      Deployer.new(@app_name,deploy_uuid).deploy
+      Deployer.new(@app_name,deploy_uid).deploy
     end
 
     def cleanup
@@ -47,8 +47,8 @@ module HerokuHeadless
       heroku.delete_app( @app_name ) if @app_name
     end
 
-    def deploy_uuid
-      @deploy_uuid ||= CreatesUUIDs.generate_lowercase_uuid
+    def deploy_uid
+      @deploy_uid ||= CreatesUIDs.generate_uid
     end
   end
 end

data/lib/heroku-headless/documents_actions.rb

@@ -2,8 +2,9 @@ module HerokuHeadless
   module DocumentsActions
     def do_action(description)
       print "  " + description + " ..."
-      yield
+      result = yield
       puts " DONE"
+      result
     end
   end
 end

data/lib/heroku-headless/version.rb

@@ -1,3 +1,3 @@
 module HerokuHeadless
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/deploy_spec.rb

@@ -4,16 +4,16 @@ describe 'HerokuHeadless' do
   let(:heroku) { HerokuHeadless.heroku }
 
   it "should fail to deploy a missing app" do
-    HerokuHeadless::Deployer.deploy('missing_app')
-    $?.exitstatus.should_not eq 0
+    result = HerokuHeadless::Deployer.deploy('missing_app')
+    result.should be_false
   end
 
   it "should successfully deploy an existing app" do
     heroku.post_app(:name => 'existing_app')
     # Creating an app on heroku actually isn't enough to make the git push pass!
-    HerokuHeadless::Deployer.any_instance.should_receive(:push_git)
-    HerokuHeadless::Deployer.deploy('existing_app')
-    $?.exitstatus.should eq 0
+    HerokuHeadless::Deployer.any_instance.should_receive(:push_git).and_return(true)
+    result = HerokuHeadless::Deployer.deploy('existing_app')
+    result.should be_true
   end
 
   it "should call post-deploy actions" do
@@ -26,11 +26,69 @@ describe 'HerokuHeadless' do
       ]
     end
 
-    HerokuHeadless::Deployer.any_instance.should_receive(:push_git)
+    HerokuHeadless::Deployer.any_instance.should_receive(:push_git).and_return(true)
     HerokuHeadless::Deployer.any_instance.should_receive(:run_command).with('echo hello')
     HerokuHeadless::Deployer.any_instance.should_receive(:run_command).with('echo success')
 
-    HerokuHeadless::Deployer.deploy('app_with_db')
-    $?.exitstatus.should eq 0
+    result = HerokuHeadless::Deployer.deploy('app_with_db')
+    result.should be_true
   end
-end
+
+  it "should restart the app if configured" do
+    heroku.post_app(:name => 'app_with_restart')
+
+    HerokuHeadless.configure do | config |
+      config.restart_processes = true
+    end
+
+    HerokuHeadless::Deployer.any_instance.should_receive(:push_git).and_return(true)
+    HerokuHeadless::Deployer.any_instance.should_receive(:restart_processes).and_call_original
+
+    result = HerokuHeadless::Deployer.deploy('app_with_restart')
+    result.should be_true
+  end
+
+  context "forced pushs" do
+    let(:headless) { HerokuHeadless::Deployer.new("forced_app", HerokuHeadless::CreatesUIDs.generate_uid) }
+    subject { headless.send(:git_push_command) }
+
+    context "enabled forced push" do
+      before do
+        HerokuHeadless.configure do | config |
+          config.force_push = true
+        end
+      end
+      it {should eq "git push -f git@heroku.com:forced_app.git HEAD:master"}
+    end
+
+    context "disabled forced push" do
+      before do
+        HerokuHeadless.configure do | config |
+          config.force_push = false
+        end
+      end
+      it {should eq "git push git@heroku.com:forced_app.git HEAD:master"}
+    end
+  end
+
+  it "should run the git pre-deploy commands" do
+    @app_name = 'app_with_configuration_changes'
+    heroku.post_app(:name => @app_name)
+    HerokuHeadless.configure do | config |
+      config.pre_deploy_git_commands = [
+        "git checkout master",
+        "git remote add heroku git@heroku.com:#{@app_name}.git"
+      ]
+    end
+
+    HerokuHeadless::Deployer.any_instance.should_receive(:push_git).and_return(true)
+    HerokuHeadless::Deployer.any_instance.should_receive(:run_git_command).with("git checkout master")
+    HerokuHeadless::Deployer.any_instance.should_receive(:run_git_command).with("git remote add heroku git@heroku.com:#{@app_name}.git")
+
+    result = HerokuHeadless::Deployer.deploy(@app_name)
+    result.should be_true
+
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-headless
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -83,13 +99,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - heroku-headless.gemspec
+- integration/configuration_spec.rb
 - lib/heroku-headless.rb
-- lib/heroku-headless/creates_uuids.rb
+- lib/heroku-headless/creates_uids.rb
 - lib/heroku-headless/deployer.rb
 - lib/heroku-headless/disposable_app_deleter.rb
 - lib/heroku-headless/disposable_deployer.rb
@@ -110,15 +128,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3232932552037509403
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3232932552037509403
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Heroku's workflow is geared towards pushing to a heroku app from a dev workstation.

data/lib/heroku-headless/creates_uuids.rb

@@ -1,8 +0,0 @@
-module HerokuHeadless
-  module CreatesUUIDs
-    def generate_lowercase_uuid
-      `uuidgen`.chomp.downcase
-    end
-    module_function :generate_lowercase_uuid
-  end
-end