heroku_feature_deployments 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4bf3c314ea47250e5ba0bd8b4d4d53c8765a29c
-  data.tar.gz: bc269b76e11989532cf58549212e31c341780ac3
+  metadata.gz: 165d736d7cde071a603fe78b93b9fdba7984e3ff
+  data.tar.gz: 0413433e420dca5aa2ecf0660f64d4f4ccd77dea
 SHA512:
-  metadata.gz: d9280fdec3907042fcc4dc0e3b58abc6e6eedb2b49022471c3c1f8886b8c744976a2b02ea91e795a9bca2f87fa0cc541341cb8c6f3b12dedee4ee1fff85a3cd2
-  data.tar.gz: e2d435eed744625b95889948bfca4ecbb23d907175e7caf1bf7a0ebce27114a1771f5460def1ace2646ab24492b0fe7300a46cf464995a12cf60deea0657936f
+  metadata.gz: bcc28da513377950068e88b413b5f15ae9e5bcf85f69ceda28f45d5cea0150d8bb309fa033642258343492cffe87773528bdbe8ae3e07b86843c9cbbf81fbb71
+  data.tar.gz: 8904efc4fc869b811884c850653b20fc2a0c187b98d51f2e9f10a5ac7e749eef7bf295531a958a2b2c889266fa5c0eb9896ce9c043138f3299f0067a69376a29

data/README.md

@@ -1,12 +1,14 @@
-# HerokuFeatureDeployments
+# Heroku Feature Deployments
 
-TODO: Write a gem description
+A very simple gem to automate deployment of the current git branch to Heroku,
+configure DNS, notify PivotalTracker, etc. For more information, [see this blog
+post](http://mattbeedle.name/posts/deploy-feature-branches-to-heroku-with-heroku-feature-deployments/)
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'heroku_feature_deployments'
+    gem 'heroku_feature_deployments', group: :development
 
 And then execute:
 
@@ -16,9 +18,88 @@ Or install it yourself as:
 
     $ gem install heroku_feature_deployments
 
+Outside of Rails you must include the rake tasks manually in your Rakefile
+
+```ruby
+load 'tasks/heroku_feature_deployments.rake'
+```
+
+## Configuration
+
+```ruby
+HerokuFeatureDeployments.configure do |config|
+  # Heroku Configuration
+  config.heroku_api_key = ENV['HEROKU_API_KEY']
+
+  # List of all Heroku addons required
+  config.addons = [
+    'memcachier:dev', 'sendgrid:starter', 'redistogo:nano'
+  ]
+
+  # These environment variables will be added to heroku
+  config.env_vars = {
+    S3_BUCKET_NAME: 'my-bucket',
+    RACK_ENV: 'staging'
+  }
+
+  # Prefix all heroku app names with this, to avoid name collisions
+  config.namespace = 'a-namespace'
+
+  # Ths name of the heroku account you are using you are using
+  # (https://github.com/ddollar/heroku-accounts)
+  config.heroku_account_name = 'account-name'
+
+  # The region to deploy the app in (eu/us)
+  config.region = 'eu'
+
+  # An array of collaborator email addresses
+  config.collaborators = [
+    'matt@gmail.com', 'another@gmail.com'
+  ]
+
+  # DNS configuration
+  config.dnsimple_username = ENV['DNSIMPLE_USERNAME']
+  config.dnsimple_api_key = ENV['DNSIMPLE_API_KEY']
+
+
+  # GitHub Configuration
+  config.github_token = ENV['GITHUB_TOKEN']
+  # The name of the GitHub repository ('heroku_feature_deployments') for example
+  config.github_repo = 'github project name'
+
+
+  # Pivotal Tracker Configuration
+  config.pivotal_tracker_api_key = ENV['PIVOTAL_TRACKER_API_KEY']
+  config.pivotal_tracker_project_id = ENV['PIVOTAL_TRACKER_PROJECT_ID']
+
+
+  # Other
+  config.logger = Rails.logger # Defaults to STDOUT
+end if defined?(HerokuFeatureDeployments)
+```
+
 ## Usage
 
-TODO: Write usage instructions here
+First make sure that you are on the branch that you want to deploy
+```bash
+git checkout branch-name
+```
+
+Then deploy it!
+```bash
+rake hfd:deploy PIVOTAL_TICKET_ID=pivotal ticket ID here
+```
+
+Or alternatively, if this feature does not have a ticket in pivotal:
+```bash
+rake hfd:deploy
+```
+
+Later, when you are finished with it, then you can tear everything down with:
+```bash
+rake hfd:undeploy
+```
+Again, make sure that you are on the branch that you want to tear down!
 
 ## Contributing
 

data/heroku_feature_deployments.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency('heroku-api')
   gem.add_runtime_dependency('dnsimple-ruby')
-  gem.add_runtime_dependency('github_api')
+  gem.add_runtime_dependency('octokit')
 
   gem.add_development_dependency('rspec')
   gem.add_development_dependency('vcr')

data/lib/heroku_feature_deployments.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'heroku-api'
 require 'dnsimple'
-require 'github_api'
+require 'octokit'
 require 'heroku_feature_deployments/configuration'
 require 'heroku_feature_deployments/deployer'
 require 'heroku_feature_deployments/pull_request_creator'

data/lib/heroku_feature_deployments/deployer.rb

@@ -32,12 +32,7 @@ module HerokuFeatureDeployments
         add_environment_variables
         push_code
         create_db
-        wait_for_process_to_finish 'rake db:create'
-        migrate_db
-        wait_for_process_to_finish 'rake db:migrate'
-        seed_db
-        wait_for_process_to_finish 'rake db:seed'
-        # add_pivotal_comment if @pivotal_ticket_id
+        add_pivotal_comment if @pivotal_ticket_id
         create_pull_request
       end
 
@@ -99,15 +94,15 @@ module HerokuFeatureDeployments
       config.logger.info 'Pull request already exists.'
     end
 
-#     def add_pivotal_comment
-#       PivotalTracker::Project.all
-#       project = PivotalTracker::Project.find(config.pivotal_tracker_project_id)
-#       project.stories.find(@pivotal_tracker_id).tap do |story|
-#         story.notes.create(
-#           text: "location: http://#{@app_name}.#{config.domain}"
-#         )
-#       end
-#     end
+    def add_pivotal_comment
+      PivotalTracker::Project.all
+      project = PivotalTracker::Project.find(config.pivotal_tracker_project_id)
+      project.stories.find(@pivotal_tracker_id).tap do |story|
+       story.notes.create(
+          text: "location: http://#{@app_name}.#{config.domain}"
+      )
+      end
+    end
 
     def get_branch_name
       `git branch`.split("\n").select {|s| s =~ /\*/ }.first.gsub(/\*/, '').
@@ -115,8 +110,8 @@ module HerokuFeatureDeployments
     end
 
     def create_db
-      config.logger.info "Creating database"
-      heroku.post_ps(@full_app_name, 'rake db:create')
+      config.logger.info "Creating, migrating and seeding database"
+      heroku.post_ps(@full_app_name, 'rake db:create db:migrate db:seed')
     end
 
     def migrate_db
@@ -124,11 +119,6 @@ module HerokuFeatureDeployments
       heroku.post_ps(@full_app_name, 'rake db:migrate')
     end
 
-    def seed_db
-      config.logger.info "Seeding database"
-      heroku.post_ps(@full_app_name, 'rake db:seed')
-    end
-
     def push_code
       run_command "git push #{@remote_name} #{@branch_name}:master"
     end

data/lib/heroku_feature_deployments/pull_request_creator.rb

@@ -8,14 +8,19 @@ module HerokuFeatureDeployments
     end
 
     def create
-      github = Github.new(
-        oauth_token: HerokuFeatureDeployments.configuration.github_token
+      client.create_pull_request(
+        HerokuFeatureDeployments.configuration.github_repo,
+        'master', @branch_name, title, body
       )
+    rescue Octokit::UnprocessableEntity => e
+      config.logger "An error occurred when creating the pull request: #{e.message}"
+    end
 
-      github.pull_requests.create(
-        'geeland',
-        HerokuFeatureDeployments.configuration.github_repo,
-        title: title, body: body, head: @branch_name, base: 'master'
+    private
+
+    def client
+      @client ||= Octokit::Client.new(
+        access_token: HerokuFeatureDeployments.configuration.github_token
       )
     end
 

data/lib/heroku_feature_deployments/version.rb

@@ -1,3 +1,3 @@
 module HerokuFeatureDeployments
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: heroku_feature_deployments
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dnsimple-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: github_api
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Gem to deploy the current git branch to a new app on heroku
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,17 +109,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Gem to deploy the current git branch to a new app on heroku