github_heroku_deployer 0.2.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: 2e112b6159eb9fd1c9249c5757b688ab330ddec9
+  data.tar.gz: 0d92b301adf5d354f0a694a0ea56ded4c1dbbe12
+SHA512:
+  metadata.gz: fd7dca8afa4d96332cf5073fcef7fc58def6afb68d0159e183977d2787a569926965dce04d0563b50e4bb0923cedb5db37c952023fe445b13753e3023c186fe4
+  data.tar.gz: 3cafa0b7b9f22c9612fcfb47cc08bdd03614b26d2b070d0782936dd1d6ca73c5adec9f2134abb2d80fedead7ef2484b54a2be2e14db72b45c2fc86e82a745127

data/.travis.yml

@@ -1,4 +1,10 @@
 language: ruby
 rvm:
-  - "1.9.3"
-script: bundle exec rspec spec
+  - 1.9.3
+script: bundle exec rspec
+notifications:
+  campfire:
+    rooms:
+      secure: UwsCEilVpBakyB+/A84lOS0Gp7KsNEZOGOXdWuS4M0L2BtmHYEYzO5DM3KrQuBmeCPoBQKfZRGGmAAXoHIinD+ziRczfknzL8lesAFcEVLs9ZMwtTdkk3FyCyOWcNu+Q6Iw5s9bz8Jpuz9u2iIC1knyAePhWSH76zg9R0DZrYmI=
+    on_success: change
+    on_failure: always

data/github_heroku_deployer.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/github_heroku_deployer/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "github_heroku_deployer"
   gem.version       = GithubHerokuDeployer::VERSION
-  gem.authors       = ["Jessica Lynn Suttles"]
+  gem.authors       = ["Jessica Lynn Suttles", "Michael Mitchell"]
   gem.email         = ["jlsuttles@gmail.com"]
   gem.description   = %q{Deploys Github repos to Heroku}
   gem.summary       = %q{Deploys public and private Github repos to Heroku}
@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "heroku-api", "~> 0.3.5"
+  gem.add_dependency "platform-api", "~> 0.2"
   gem.add_dependency "git", "~> 1.2.5"
   gem.add_dependency "git-ssh-wrapper", "~> 0.1.0"
 
@@ -23,5 +24,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec", "~> 2.11.0"
   gem.add_development_dependency "guard-rspec", "~> 2.1.0"
   gem.add_development_dependency "rb-fsevent", "~> 0.9.2"
-  gem.add_development_dependency "debugger", "~> 1.2.1"
 end

data/lib/github_heroku_deployer/heroku.rb

@@ -1,4 +1,5 @@
 require "heroku-api"
+require "platform-api"
 
 module GithubHerokuDeployer
   class Heroku
@@ -6,12 +7,14 @@ module GithubHerokuDeployer
     def initialize(options)
       @heroku_api_key = options[:heroku_api_key]
       @heroku_app_name = options[:heroku_app_name]
+      @heroku_organization_name = options[:heroku_organization_name]
     end
 
     def heroku
       @heroku ||= ::Heroku::API.new(api_key: @heroku_api_key)
     end
 
+
     def app
       @app ||= find_or_create_app
     end
@@ -27,7 +30,7 @@ module GithubHerokuDeployer
     end
 
     def create_app
-      heroku.post_app(name: @heroku_app_name)
+      heroku_platform_api.organization_app.create(platform_api_options)
     end
 
     def restart_app
@@ -61,5 +64,17 @@ module GithubHerokuDeployer
     # def add_deployhooks_http(url)
     #   add_addon("deployhooks:http", url: url)
     # end
+
+    private
+
+    def platform_api_options
+      { name: @heroku_app_name,
+        organization: @heroku_organization_name }
+    end
+
+    def heroku_platform_api
+      @heroku_platform_api ||= ::PlatformAPI.connect_oauth(@heroku_api_key)
+    end
   end
 end
+

data/lib/github_heroku_deployer/version.rb

@@ -1,3 +1,3 @@
 module GithubHerokuDeployer
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/lib/github_heroku_deployer/heroku_spec.rb

@@ -1,15 +1,29 @@
 require 'spec_helper'
 require 'github_heroku_deployer/heroku'
+require 'platform-api'
 
 describe GithubHerokuDeployer::Heroku do
   context "#find_or_create" do
+    before do
+      PlatformAPI.stub(:connect_oauth)
+    end
+
     it "creates app if it does not find it" do
       heroku = GithubHerokuDeployer::Heroku.new(
+        heroku_organization_name: "test-org",
         heroku_api_key: "asdfghjkl",
         heroku_app_name: "asdfghjkl")
-      heroku.stub("find_app").and_raise(::Heroku::API::Errors::NotFound.new("", ""))
-      heroku.stub("create_app").and_return true
-      heroku.find_or_create_app.should be true
+      response = mock(body: 'error')
+      heroku.stub("find_app").and_raise(::Heroku::API::Errors::NotFound.new('',response))
+
+      organization_app = double(:organization_app, create: "created")
+      platform_api = double(:mock, :organization_app => organization_app)
+      PlatformAPI.stub(:connect_oauth).and_return(platform_api)
+
+      organization_app.should_receive(:create).with(hash_including(organization: "test-org"))
+
+      heroku.find_or_create_app
     end
   end
 end
+

data/spec/lib/github_heroku_deployer_spec.rb

@@ -104,6 +104,18 @@ describe GithubHerokuDeployer do
         override.should_not equal GithubHerokuDeployer.configuration[:github_repo]
         @deployer.deploy(github_repo: override).should be true
       end
+
+      context "passing an organization" do
+        before do
+          GithubHerokuDeployer::Heroku.any_instance.stub(:new)
+          GithubHerokuDeployer::Git.any_instance.stub(:push_app_to_heroku)
+        end
+        it "accepts organization option" do
+          GithubHerokuDeployer.should_receive(:heroku_find_or_create_app).with(hash_including(organization: "test-org"))
+          GithubHerokuDeployer.deploy({organization: "test-org"})
+        end
+      end
     end
   end
 end
+

data/spec/spec_helper.rb

@@ -5,7 +5,17 @@ require 'rubygems'
 require 'rspec'
 require 'rspec/autorun'
 
-
 RSpec.configure do |config|
   config.order = "random"
 end
+
+ENV['GITHUB_REPO']="git@github.com:G5/static-sinatra-prototype.git"
+ENV['HEROKU_API_KEY']="heroku_api_key"
+ENV['HEROKU_APP_NAME']="static-sinatra-prototype"
+ENV['HEROKU_REPO']="git@heroku.com:static-sinatra-prototype.git"
+ENV['HEROKU_USERNAME']="heroku_username"
+ENV['ID_RSA']="id_rsa"
+ENV['PRIVATE_GITHUB_REPO']="git@github.com:g5search/g5-client-location.git"
+ENV['PUBLIC_GITHUB_REPO']="git@github.com:G5/static-sinatra-prototype.git"
+ENV['REPO_DIR']="foo"
+

metadata

@@ -1,20 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: github_heroku_deployer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Jessica Lynn Suttles
+- Michael Mitchell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2014-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: heroku-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,15 +21,27 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.5
+- !ruby/object:Gem::Dependency
+  name: platform-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +49,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +56,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: git-ssh-wrapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +63,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +84,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +91,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +98,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +105,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +112,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,27 +119,10 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.1
 description: Deploys Github repos to Heroku
 email:
 - jlsuttles@gmail.com
@@ -167,27 +151,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/G5/github_heroku_deployer
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Deploys public and private Github repos to Heroku
 test_files:
 - spec/lib/github_heroku_deployer/configuration_spec.rb