This repository was archived by the owner on Feb 12, 2022. It is now read-only.

shebang breaks the executable on systems with {rbenv,rvm}-managed rubies #1211

Open

berdario wants to merge 91 commits into heroku:master from berdario:master

.travis.yml

-Original file line number
+Diff line change
@@ -1,22 +1,24 @@
+    language: ruby
+    rvm:
+      - 1.8.7
+      - 1.9.2
+      - 1.9.3
+      - 2.0.0
+      - 2.1.2
+    cache: bundler
     before_script:
       - git config --global user.email "bot@heroku.com"
       - git config --global user.name "Heroku Bot (Travis CI)"
-    bundler_args: --without development
-    language: ruby
+    script: bundle exec rspec spec --color --format documentation
     notifications:
       email: false
-      webhooks:
-        on_success: always
-        on_failure: always
-        urls:
-          - http://dx-helper.herokuapp.com/travis
-    rvm:
-      - 1.8.7
-      - 1.9.2
-      - 1.9.3
-    script: bundle exec rspec -bfs spec
+    deploy:
+      provider: rubygems
+      on:
+        tags: true
+      api_key:
+        secure: ALsBCGGvdAiIEJR9zTzxumcgCaS5eqOs7Oee7e4SiDgHrT/DRSsFJBtNp9mJvQvHzW3FqSFZU7NO6tSRkwHGdGGw7pf/emjZ2ua0exuyCQ3LaCJBdwSQXl0GTMhhaMCCd2NYWJ+Fa3Q9jWWAdCfV8rqz5AX4ZG6fi3C2uubppVs=

CHANGELOG

-Original file line number
+Diff line change
@@ -1,3 +1,46 @@
+.11.1 2014-09-12
+    =================
+    Attempt to push ~/.ssh/id_rsa SSH key instead of any one key
+    Always prompt for uploading SSH keys
+.10.6 2014-09-04
+    =================
+    Added ssh-keygen shim for Windows
+.10.5 2014-08-27
+    =================
+    Ocra support for building standalone heroku-ocra.exe
+.10.4 2014-08-22
+    =================
+    Upgraded excon to 0.39.5
+.10.3 2014-08-21
+    =================
+    Fixed minor issue with recording fork source
+.10.2 2014-08-21
+    =================
+    Removed lazy-loading of heroku-api and rest_client (was swallowing errors)
+    Fail fast for issue with pgbackups:transfer
+    Removed price tier from info
+    Help info for two factor topic
+    Send deploy type and source metadata for forks
+.10.1 2014-08-14
+    =================
+    No changes, just verifying new release code is in order
+.10.0 2014-08-14
+    =================
+    Fixed beta releases
+    Upgrade heroku-api and excon
+.9.7 2014-08-12
+    ================
+    Bring 2fa:disable back
+    Several pg and pgbackups command improvements
 .9.4 2014-07-21
     ================
     Actually fix a bug where setting HEROKU_API_KEY would cause failures
@@ Expand Down @@

Gemfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -3,21 +3,14 @@ source "https://rubygems.org" @@
     gemspec
     group :development, :test do
-      gem "rake",  ">= 0.8.7"
-      gem "rr",    "~> 1.0.2"
-    end
-    group :development do
+      gem "rake"
+      gem "rr"
       gem "aws-s3"
-      gem "fpm"
-      gem "rubyzip"
-    end
-    group :test do
+      gem "mime-types", "< 2.0"
       gem "fakefs"
-      gem "jruby-openssl", :platform => :jruby
       gem "json"
-      gem "rspec", ">= 2.0"
-      gem "sqlite3"
+      gem "rspec"
       gem "webmock"
+      gem "coveralls", :require => false
+      gem "ocra", :require => false
     end

Gemfile.lock

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,84 +1,89 @@
  
    PATH

      remote: .

      specs:

        heroku (3.9.4)

          heroku-api (= 0.3.17)

        heroku (3.11.1)

          heroku-api (~> 0.3.19)

          launchy (>= 0.3.2)

          netrc (~> 0.7.7)

          rest-client (~> 1.6.1)

          rubyzip

          rest-client (= 1.6.7)

          rubyzip (= 0.9.9)

    GEM

      remote: https://rubygems.org/

      specs:

        addressable (2.3.2)

        arr-pm (0.0.7)

          cabin (> 0)

        addressable (2.3.6)

        aws-s3 (0.6.3)

          builder

          mime-types

          xml-simple

        backports (2.3.0)

        builder (3.1.4)

        cabin (0.4.4)

          json

        clamp (0.5.0)

        crack (0.3.2)

        diff-lcs (1.1.3)

        excon (0.38.0)

        fakefs (0.4.2)

        fpm (0.4.6)

          arr-pm (~> 0.0.7)

          backports (= 2.3.0)

          cabin (~> 0.4.3)

          clamp

          json

        heroku-api (0.3.17)

          excon (~> 0.27)

          multi_json (~> 1.8.2)

        json (1.7.7)

        builder (3.2.2)

        coveralls (0.7.1)

          multi_json (~> 1.3)

          rest-client

          simplecov (>= 0.7)

          term-ansicolor

          thor

        crack (0.4.2)

          safe_yaml (~> 1.0.0)

        diff-lcs (1.2.5)

        docile (1.1.5)

        excon (0.39.5)

        fakefs (0.5.2)

        heroku-api (0.3.19)

          excon (~> 0.38)

          multi_json (~> 1.8)

        json (1.8.1)

        launchy (2.4.2)

          addressable (~> 2.3)

        mime-types (1.21)

        multi_json (1.8.4)

        mime-types (1.25.1)

        multi_json (1.10.1)

        netrc (0.7.7)

        rake (10.0.3)

        rdoc (4.1.1)

          json (~> 1.4)

        rest-client (1.6.8)

          mime-types (~> 1.16)

          rdoc (>= 2.4.2)

        rr (1.0.4)

        rspec (2.12.0)

          rspec-core (~> 2.12.0)

          rspec-expectations (~> 2.12.0)

          rspec-mocks (~> 2.12.0)

        rspec-core (2.12.2)

        rspec-expectations (2.12.1)

          diff-lcs (~> 1.1.3)

        rspec-mocks (2.12.2)

        ocra (1.3.2)

        rake (10.3.2)

        rest-client (1.6.7)

          mime-types (>= 1.16)

        rr (1.1.2)

        rspec (3.0.0)

          rspec-core (~> 3.0.0)

          rspec-expectations (~> 3.0.0)

          rspec-mocks (~> 3.0.0)

        rspec-core (3.0.4)

          rspec-support (~> 3.0.0)

        rspec-expectations (3.0.4)

          diff-lcs (>= 1.2.0, < 2.0)

          rspec-support (~> 3.0.0)

        rspec-mocks (3.0.4)

          rspec-support (~> 3.0.0)

        rspec-support (3.0.4)

        rubyzip (0.9.9)

        sqlite3 (1.3.7)

        sqlite3 (1.3.7-x86-mingw32)

        webmock (1.9.0)

          addressable (>= 2.2.7)

          crack (>= 0.1.7)

        xml-simple (1.1.2)

        safe_yaml (1.0.3)

        simplecov (0.9.0)

          docile (~> 1.1.0)

          multi_json

          simplecov-html (~> 0.8.0)

        simplecov-html (0.8.0)

        term-ansicolor (1.3.0)

          tins (~> 1.0)

        thor (0.19.1)

        tins (1.3.2)

        webmock (1.18.0)

          addressable (>= 2.3.6)

          crack (>= 0.3.2)

        xml-simple (1.1.4)

    PLATFORMS

      ruby

      x86-mingw32

    DEPENDENCIES

      aws-s3

      coveralls

      fakefs

      fpm

      heroku!

      jruby-openssl

      json

      rake (>= 0.8.7)

      rr (~> 1.0.2)

      rspec (>= 2.0)

      rubyzip

      sqlite3

      mime-types (< 2.0)

      ocra

      rake

      rr

      rspec

      webmock

README.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,8 +7,10 @@ For more about Heroku see <http://heroku.com>. @@
     To get started see <http://devcenter.heroku.com/articles/quickstart>
-    [![Build Status](https://secure.travis-ci.org/heroku/heroku.png)](http://travis-ci.org/heroku/heroku)
-    [![Dependency Status](https://gemnasium.com/heroku/heroku.png)](https://gemnasium.com/heroku/heroku)
+    [![Build Status](https://travis-ci.org/heroku/heroku.svg?branch=master)](https://travis-ci.org/heroku/heroku)
+    [![Build status](https://ci.appveyor.com/api/projects/status/kv0r2s5eyckpanhr/branch/master)](https://ci.appveyor.com/project/dickeyxxx/heroku/branch/master)
+    [![Coverage Status](https://img.shields.io/coveralls/heroku/heroku.svg)](https://coveralls.io/r/heroku/heroku?branch=master)
+    [![Dependency Status](https://gemnasium.com/heroku/heroku.svg)](https://gemnasium.com/heroku/heroku)
     Setup
     -----
@@ Expand Down @@

Rakefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -172,7 +172,7 @@ CHANGELOG @@
     end
     desc("Release the latest version")
-    task "release" => ["gem:release", "tgz:release", "zip:release", "manifest:update"] do
+    task "release" => ["tgz:release", "zip:release", "manifest:update"] do
       puts("Released v#{version}")
     end
@@ Expand Down @@

appveyor.yml

-Original file line number
+Diff line change
@@ -0,0 +1,16 @@
+    version: "{build}"
+    branches:
+      only:
+        - master
+    clone_depth: 1
+    install:
+      - ruby --version
+      - bundle install -j4
+    build_script:
+      - ocra bin\heroku-ocra data\cacert.pem
+    test_script:
+      - heroku-ocra.exe help
+      - heroku-ocra.exe status
+    artifacts:
+      - path: heroku-ocra.exe
+        name: heroku-ocra.exe

bin/heroku

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    #!/usr/bin/env ruby
+    #!/usr/bin/ruby
     # encoding: UTF-8
     # resolve bin path, ignoring symlinks
@@ Expand Down @@

bin/heroku-ocra

-Original file line number
+Diff line change
@@ -0,0 +1,21 @@
+    #!/usr/bin/env ruby
+    # encoding: UTF-8
+    # resolve bin path, ignoring symlinks
+    require "pathname"
+    bin_file = Pathname.new(__FILE__).realpath
+    # add self to libpath
+    $:.unshift File.expand_path("../../lib", bin_file)
+    require "heroku/updater"
+    Heroku::Updater.disable("`heroku update` is only available from Heroku Toolbelt.\nDownload and install from https://toolbelt.heroku.com")
+    # start up the CLI
+    require "heroku/cli"
+    Heroku.user_agent = "heroku-ocra/#{Heroku::VERSION} (#{RUBY_PLATFORM}) ruby/#{RUBY_VERSION}"
+    Heroku::CLI.start(*ARGV)
+    # require other dependencies ocra needs to include
+    require 'Win32API'
+    MultiJson.load('{"foo": "bar"}') # preps multi_json

dist/manifest.rake

-Original file line number
+Diff line change
@@ -1,4 +1,6 @@
     task "manifest:update" do
+      abort "Manifest should never contain betas." if beta?
       tempdir do |dir|
         File.open("VERSION", "w") do |file|
           file.puts version
@@ Expand Down @@

dist/zip.rake

-Original file line number
+Diff line change
@@ Expand Up / @@ -36,5 +36,5 @@ task "zip:release" => %w( zip:build zip:sign ) do |t| @@
       store pkg("heroku-#{version}.zip"), "heroku-client/heroku-client-beta.zip" if beta?
       store pkg("heroku-#{version}.zip"), "heroku-client/heroku-client.zip" unless beta?
-      sh "heroku config:add UPDATE_HASH=#{zip_signature} -a toolbelt"
+      sh "heroku config:add UPDATE_HASH=#{zip_signature} -a toolbelt" unless beta?
     end

heroku.gemspec

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -20,9 +20,9 @@ Gem::Specification.new do |gem|
  
      gem.files = %x{ git ls-files }.split("\n").select { |d| d =~ %r{^(License|README|bin/|data/|ext/|lib/|spec/|test/)} }

      gem.add_dependency "heroku-api",     "= 0.3.17"

      gem.add_dependency "heroku-api",     "~> 0.3.19"

      gem.add_dependency "launchy",        ">= 0.3.2"

      gem.add_dependency "netrc",          "~> 0.7.7"

      gem.add_dependency "rest-client",    "~> 1.6.1"

      gem.add_dependency "rubyzip"

      gem.add_dependency "rest-client",    "= 1.6.7"

      gem.add_dependency "rubyzip",        "= 0.9.9"

    end

lib/heroku/api/releases_v3.rb

-Original file line number
+Diff line change
@@ Expand Up / @@ -11,15 +11,20 @@ def get_releases_v3(app, range=nil) @@
           )
         end
-        def post_release_v3(app, slug_id, description=nil)
+        def post_release_v3(app, slug_id, opts={})
+          headers = {
+            'Accept'       => 'application/vnd.heroku+json; version=3',
+            'Content-Type' => 'application/json'
+          }
+          headers.merge!('Heroku-Deploy-Type' => opts[:deploy_type]) if opts[:deploy_type]
+          headers.merge!('Heroku-Deploy-Source' => opts[:deploy_source]) if opts[:deploy_source]
           body = { 'slug' => slug_id }
-          body.merge!('description' => description) if description
+          body.merge!('description' => opts[:description]) if opts[:description]
           request(
             :expects  => 201,
-            :headers  => {
-              'Accept'       => 'application/vnd.heroku+json; version=3',
-              'Content-Type' => 'application/json'
-            },
+            :headers  => headers,
             :method   => :post,
             :path     => "/apps/#{app}/releases",
             :body     => Heroku::Helpers.json_encode(body)
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

shebang breaks the executable on systems with {rbenv,rvm}-managed rubies #1211

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

shebang breaks the executable on systems with {rbenv,rvm}-managed rubies #1211

Are you sure you want to change the base?

Uh oh!

shebang breaks the executable on systems with {rbenv,rvm}-managed rubies #1211

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!