factor-connector-heroku 0.0.5 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fa5851cbe41f45aaeb29902318205322e125af3f
+  data.tar.gz: 65f193a417647d229ead15366361f3e91a7d3358
+SHA512:
+  metadata.gz: 62c0b2367fdc90f03c60f252816597585ec6373a95ca65f22d3d51b69c6cc9761443490be5e2b7718a0f2e5d8ff0c67ec720dac3e0942c04f455c0c1555b4c31
+  data.tar.gz: b00fa9a375854731e3a000bd39929dfc33ada13331c913a6368b15688f48af60957a8daa5bb04adf37e534a29b0a09fb272f64961f8bcd7c694011ba264cdd8f

data/lib/factor/connector/heroku.rb

@@ -1,14 +1,5 @@
 require 'factor-connector-api'
-require 'json'
-require 'rest-client'
-require 'heroku-api'
-require 'anvil'
-require 'anvil/engine'
-require 'uri'
-require 'zip'
-require 'tmpdir'
-require 'open-uri'
-require 'tempfile'
+require 'platform-api'
 
 Factor::Connector.service 'heroku' do
   action 'deploy' do |params|
@@ -21,92 +12,40 @@ Factor::Connector.service 'heroku' do
     fail 'No app specified. Where am I supposed to deploy it?' unless app
     fail 'You need to activate Heroku on the services page' unless api_key
 
-    def release(api_key, app, description, slug_url)
-      payload = {
-        description: description,
-        slug_url: slug_url
-      }
+    heroku = PlatformAPI.connect_oauth(api_key)
 
-      options = {
-        'User-Agent'       => 'heroku-push-cli/0.7-ALPHA',
-        'X-Ruby-Version'   => RUBY_VERSION,
-        'X-Ruby-Platform'  => RUBY_PLATFORM,
-        :content_type => :json,
-        :accept => :json
-      }
-
-      release_uri = "https://:#{api_key}@cisaurus.heroku.com/v1/apps/#{app}/release"
-
-      response = RestClient.post release_uri, JSON.generate(payload), options
-      while response.code == 202
-        release_status_uri = "https://:#{api_key}@cisaurus.heroku.com/#{response.headers[:location]}"
-        response = RestClient.get release_status_uri, options
-        sleep(1)
-      end
-      JSON.parse response
-    end
-
-    info 'Getting the resource files from previous step'
+    info "Creating a build"
     begin
-      source = Tempfile.new('source')
-      source.write open(content).read
-      source.rewind
+      build = heroku.build.create(app, {source_blob:{url:content}})
     rescue => ex
-      fail 'Internal error: failed to get resource files', exception: ex
+      fail "Build failed: #{ex.message}"
     end
 
-    info 'Unzipping file'
-    begin
-      temp_dir = Dir.mktmpdir
-      Zip::ZipFile.open(source) do |zip_file|
-        zip_file.each do |f|
-          f_path = File.join(temp_dir, f.name)
-          FileUtils.mkdir_p(File.dirname(f_path))
-          zip_file.extract(f, f_path) unless File.exist?(f_path)
-        end
-      end
-
-      if File.directory?(temp_dir)
-        dir_list = Dir.glob("#{temp_dir}/*")
-        temp_dir = dir_list[0] if dir_list.length == 1
-      end
-    rescue => ex
-      fail 'Unzip failed', exception: ex
-    end
+    build_id = build['id']
+    fail "Build failed: no build_id found" unless build_id
 
-    info "Building the buildpack using Heroku's Anvil service"
+    info "Waiting on build to complete"
     begin
-      Anvil.append_agent '(heroku-push)'
-      Anvil.headers['X-Heroku-App']  = app
-
       begin
-        capture = StringIO.new
-        old_std = $stdout
-        $stdout = capture
-
-        slug_url = Anvil::Engine.build(temp_dir)
-        begin
-          $stdout.string.split("\n").each do |line|
-            info line
-          end
-        rescue
-          warn "Build completed but couldn't pull up results of build."
-        end
-      ensure
-        $stdout = old_std
-      end
+        build_info  = heroku.build.info(app,build_id)
+        sleep 1
+      end while build_info['status']=='pending'
     rescue => ex
-      fail 'Build failed', exception:ex
+      fail "Failed to get info while waiting: #{ex.message}"
     end
 
-    info 'Pushing buildpack to Heroku'
-    begin
-      release = release(api_key, app, "Pushed by #{user}", slug_url)
-      info "Release `#{release['release']}` complete"
+    fail "Build completed with status '#{build_info['status']}'" unless build_info['status']=='succeeded'
+    slug_id = build_info['slug']['id'] if build_info['slug'] && build_info['slug']['id']
 
-      action_callback release
+    fail "Build completed, but couldn't identify slug_id" unless slug_id
+
+    info "Releasing code..."
+    begin
+      release = heroku.release.create(app, slug:slug_id)
     rescue => ex
-      fail "Upload failed: #{ex.message}", exception: ex
+      fail "Failed to release the code: #{ex.message}"
     end
+
+    action_callback release
   end
 end

metadata

@@ -1,112 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: factor-connector-heroku
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: heroku-anvil-factor
+  name: platform-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
-- !ruby/object:Gem::Dependency
-  name: heroku-api
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.19
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.19
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.2
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.6
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: factor-connector-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3b
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3b
+        version: 0.0.13
 description: 
 email:
 - maciej@factor.io
@@ -117,26 +48,25 @@ files:
 - lib/factor/connector/heroku.rb
 homepage: https://factor.io
 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.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Heroku Factor.io Connector
 test_files: []