heroku_builder 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e664bec8e4de6657ab2d62b84e6eb2d848c3b469
-  data.tar.gz: a8aa0f35d53a9b14d52b6bdd5493f87733f3ec3a
+  metadata.gz: ff37f31cd4b0b4a614874c42e13e662969afae90
+  data.tar.gz: aaaab60a07f9056f537c5a3af0e1341b24a97adb
 SHA512:
-  metadata.gz: 283e5e40dcd3ee6ec43e692ea53bd06c587d491c6068b0dbb4ba1a2fac3158447b66ae9c4a2d84bc4516551b7195cb3a7957a98e0225595150f2475be0970db7
-  data.tar.gz: 35ea3e3cf41ed6163fc2f8ed16f6dceb3dbe00d5b6825f924d9438d1047d6cf3f8ea226a7552142b851206e5816ab61c6da041b4ccc0c9b045fe14d99813bbde
+  metadata.gz: 0f37aa12b4873769b0a712909c72d675645a524cd1329bd5992e39e2769de28adc5e645643174a9a5477223beb8d753300199f6f28cb828e8a6ddff731dd4a33
+  data.tar.gz: 078f977a07db1a639b5f9b890a4158c4954e4455f16e959de6730f5f94448f42fad81891387059caf53026e9bad98ea911413d7e936a128fb3818b2223c0fd8c

data/README.md

@@ -12,7 +12,7 @@ Treating configuration as code allows for peer review, versioning, and a histori
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your Rails application's Gemfile:
 
 ```ruby
 gem 'heroku_builder'
@@ -44,7 +44,6 @@ When you open `config/heroku.yml`, you'll see something like this:
 staging:
   app:
     name: my-heroku-app-name-staging
-    git_repo: git@github.com:foo/my-heroku-app-name
     git_branch: staging
   config_vars: []
   addons: []
@@ -55,7 +54,6 @@ staging:
 production:
   app:
     name: my-heroku-app-name
-    git_repo: git@github.com:foo/my-heroku-app-name
     git_branch: master
   config_vars: []
   addons: []
@@ -76,7 +74,6 @@ Would apply the configuration for the `staging` environment.
 
 The `app` sections provides settings particular to the application.
 * `name` - the Heroku application name.  The application will be created unless it already exists on Heroku.
-* `git_repo` - the repository the project code is kept in.  Code will be checked out from this repository as part of the deploy process, so you'll need at least read permission on the repo to deploy code to Heroku.
 * `git_branch` - the branch of the `git_repo` repo that you wish to deploy from.
 
 The `config_vars` setting allows you to set Config Vars for a particular environment.  These can be applied as follows:
@@ -145,20 +142,28 @@ HEROKU_API_KEY=xxxxxxxx-xxxx-xxxx-xxxxxxxxxxxxxxxxx rake builder:staging:apply
 
 ### Running Rake Tasks
 
-Heroku Builder currently has two actions: `apply` and `deploy`.  Apply will:
+Heroku Builder currently has two actions: `apply` and `deploy`.
 
-* Create the application, if it has not been created
-* Set Config-vars (if there are changes)
-* Deploy code (if there are changes)
-* Configure Add-ons (if there are changes)
-* Configure Resources (if there are changes)
+#### Apply
 
-As `apply` only adds or updates when your `heroku.yml` file has changes, it's safe to always use `apply` to deploy code.  Alternatively, you can just run the `deploy` portion.  Deploy will:
+`$ rake builder:staging:apply`
 
-* Switch to the branch for that environment
-* Pull down any remote changes
-* Create a remote for Heroku, if the remote is not present
-* Push to that remote
+1. Creates the application, if it has not been created
+2. Sets Config-vars (if there are changes)
+3. Deploys code (if there are changes)
+4. Configures Add-ons (if there are changes)
+5. Configures Resources (if there are changes)
+
+As `apply` only adds or updates when your `heroku.yml` file has changes, it's safe to always use `apply` to deploy code.  Alternatively, you can just run the `deploy` portion.
+
+#### Deploy
+
+`$ rake builder:staging:deploy`
+
+1. Switches to the branch for that environment
+2. Pulls down any remote changes
+3. Creates a remote for Heroku, if the remote is not present
+4. Pushes to that remote
 
 The environments defined in your `heroku.yml` file provide scope for the Heroku Builder rake tasks.  If you have the following:
 
@@ -185,7 +190,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/heroku_builder. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/jvanderhoof/heroku_builder. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
 
 ## License

data/heroku_builder.gemspec

@@ -38,4 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'vcr', '~> 2.9.3'
   spec.add_development_dependency 'simplecov', '~> 0.10'
   spec.add_development_dependency 'dotenv'
+  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'pry'
 end

data/lib/heroku_builder.rb

@@ -1,12 +1,13 @@
 require 'platform-api'
 require 'git'
+require 'hashdiff'
 
 require 'heroku_builder/version'
 require 'heroku_builder/base'
 require 'heroku_builder/service'
 require 'heroku_builder/app'
-require 'heroku_builder/env_vars'
-require 'heroku_builder/add_ons'
+require 'heroku_builder/env_var'
+require 'heroku_builder/add_on'
 require 'heroku_builder/deployment'
 require 'heroku_builder/resource'
 

data/lib/heroku_builder/{add_ons.rb → add_on.rb}

@@ -1,12 +1,12 @@
 # Add Ons
 module HerokuBuilder
-  class AddOns < Base
-    def addons(name)
+  class AddOn < Base
+    def addon_list(name)
       conn.addon.list_by_app(name)
     end
 
     def addon_exists?(name, addon_name)
-      conn.addon.list_by_app(name).any? do |a|
+      addon_list(name).any? do |a|
         # names appear to be stored in two different locations depending on the type
         (!addon_name.include?(':') && a['addon_service']['name'] == addon_name) ||
           a['plan']['name'] == addon_name
@@ -16,7 +16,6 @@ module HerokuBuilder
     def set_addons(name, addons)
       addons.each do |addon|
         unless addon_exists?(name, addon)
-          puts "... adding #{addon}"
           conn.addon.create(name, 'plan' => addon)
         end
       end

data/lib/heroku_builder/app.rb

@@ -5,12 +5,16 @@ module HerokuBuilder
     end
 
     def find_or_create_app(name)
-      return if app_exists?(name)
-      conn.app.create(name: name, region: 'us', stack: 'cedar')
+      return app(name) if app_exists?(name)
+      conn.app.create('name' => name, 'region' => 'us', 'stack' => 'cedar-14')
     end
 
     def app(name)
-      @app ||= conn.app.info(name)
+      if app_exists?(name)
+        conn.app.info(name)
+      else
+        {}
+      end
     end
   end
 end

data/lib/heroku_builder/deployment.rb

@@ -2,12 +2,12 @@
 module HerokuBuilder
   class Deployment < Base
     def remote_exists?(branch)
-      git.remotes.detect { |remote| remote.name == branch }.nil?
+      git.remotes.any? { |remote| remote.name == branch }
     end
 
     def push(name, branch, environment)
       remote_branch = "heroku-#{environment}"
-      if remote_exists?(remote_branch)
+      unless remote_exists?(remote_branch)
         git.add_remote(remote_branch, App.new.app(name)['git_url'])
       end
       git.push(remote_branch, "#{branch}:master", force: true)

data/lib/heroku_builder/{env_vars.rb → env_var.rb}

@@ -1,7 +1,7 @@
 # ENV variables
 module HerokuBuilder
-  class EnvVars < Base
-    def config_vars(name)
+  class EnvVar < Base
+    def get_config_vars(name)
       @config_vars ||= conn.config_var.info(name)
     end
 
@@ -21,7 +21,7 @@ module HerokuBuilder
     end
 
     def config_env_changes(name, config_vars)
-      diff_config_vars(config_vars(name), config_vars)
+      diff_config_vars(get_config_vars(name), config_vars)
     end
   end
 end

data/lib/heroku_builder/service.rb

@@ -14,7 +14,7 @@ module HerokuBuilder
 
     def self.update_env_vars(name, environment)
       env_vars = config_from_environment(environment)['config_vars']
-      EnvVars.new.set_config_vars(name, env_vars)
+      EnvVar.new.set_config_vars(name, env_vars)
     end
 
     def self.run_deployment(name, environment)
@@ -24,7 +24,7 @@ module HerokuBuilder
 
     def self.update_addons(name, environment)
       addons = config_from_environment(environment)['addons']
-      AddOns.new.set_addons(name, addons)
+      AddOn.new.set_addons(name, addons)
     end
 
     def self.update_resources(name, environment)

data/lib/heroku_builder/version.rb

@@ -1,3 +1,3 @@
 module HerokuBuilder
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/lib/tasks/heroku_builder.rake

@@ -18,11 +18,6 @@ namespace :builder do
           HerokuBuilder::Service.deploy(env)
         end
 
-        # task :plan do
-        #   changes('backstage').each do |change|
-        #     puts change
-        #   end
-        # end
       end
     end
   end
@@ -37,10 +32,11 @@ namespace :builder do
     env_config = {
       'app' => {
         'name' => 'my-heroku-app-name',
-        'git_repo' =>  'git@github.com:foo/my-heroku-app-name',
-        'git_branch' =>  'master'
+        'git_branch' =>  'master',
       },
-      'config_vars' =>  [],
+      'config_vars' =>  [
+        'BUILDPACK_URL' => 'https://github.com/ddollar/heroku-buildpack-multi.git'
+      ],
       'addons' =>  [],
       'resources' =>  {
         'web' =>  {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku_builder
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jason Vanderhoof
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: platform-api
@@ -136,6 +136,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  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: pry
+  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: 'Heroku Builder allows for straight forward configuration of your multi
   (or single) stage Heroku application as well as dead simple deployment.  It uses
   a YAML configuration to manage a multi-environment configuration, including: configuration
@@ -158,11 +186,11 @@ files:
 - bin/setup
 - heroku_builder.gemspec
 - lib/heroku_builder.rb
-- lib/heroku_builder/add_ons.rb
+- lib/heroku_builder/add_on.rb
 - lib/heroku_builder/app.rb
 - lib/heroku_builder/base.rb
 - lib/heroku_builder/deployment.rb
-- lib/heroku_builder/env_vars.rb
+- lib/heroku_builder/env_var.rb
 - lib/heroku_builder/resource.rb
 - lib/heroku_builder/service.rb
 - lib/heroku_builder/version.rb