dpl 1.8.19.travis.1646.3 → 1.8.19.travis.1647.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDY0YmVkNGI2OGE5ZDlkMGFlNGJjZWFhZjVhMjQ3NDU2ZmVhZWZkMg==
+    MmJlODY4ZDdjMmU5ZGRjYzZkZmFhY2ZjNzhmMTlhZmJmMjc4NDY4Yw==
   data.tar.gz: !binary |-
-    YWJkMzRmM2Y5NDBkN2YxOGVjNWRmZDY2ZGJhOWU5ODg3YTY4OTljOA==
+    MWMzZjQyNGMyODI0MzI4NTk0Mjg4ZGM3OGUxNmZhZmJhNDAwYWIyZg==
 SHA512:
   metadata.gz: !binary |-
-    YWI5MTEzZDEwNDMyYjYxZjgxOWZjYjAzYzViNGQyZjNkMjNkNTM0MmRiYWE1
-    NTE2ODNkYmNmM2E0NDAzYzRhODkzNDRhYmY5YWYxMmJhZDMyZjNlNTE4Mzkz
-    NzY3NTNjMDAxNDM1ZGY1ODY4NzQ3ZTEwNWVmOTI4Y2E2YmU3ZDQ=
+    MWRiMDFkZmQ4OWNhYzc4ZmVjYTQ2MmMyZGQxN2U4NTU0MWNhNjU2OWQ1ZTQ5
+    YzUzN2RhMGVjZWY5MTcwOGZhZjNmYzI2NWNkNzMwZDJmM2E1OGViM2RmYWJh
+    ODQ0MjdlMDA3M2Y2ZjAzNmZmOTA4ZDZhNDQ3MzdmYTE1MTI4ZTE=
   data.tar.gz: !binary |-
-    MzZhNWIxYWFlNzNjZWVmYzU0YWY4N2QyYzVkOWFmNGJmM2QyMzBiZmJiZGFh
-    YWFkNjM0NWRjYWRiODY5MDFmZGQ0YmFiNjU1N2VkNzNhNWZkNzE0NGQ3MTM3
-    Y2NjMWM0ZjcwN2M1MjEzMTBmNmYxZGE4NDM2MzY5ZGYxNThhM2Q=
+    NmM0NTEzYjc3MDRiN2VkNTQxMmZhZjMzODMxYmM3ZmJkZWIyMDllOGU1MGFk
+    MzUyOWYxZDc5YTFiMDMyMmE1MTUxNTcyNmQ0MjFkNGQ1MGU2N2JhZGU3MWE3
+    MTA4YzczMDdhMzYxMzBmY2NhOGE5ZjdmNDAwNDRhYjdkZTgxNjI=

data/Gemfile

@@ -45,7 +45,6 @@ end
 
 group :cloud_files do
   gem 'fog-google', '< 0.1.1', platforms: :mri_19
-  gem 'fog-profitbricks', '< 2.0', platforms: :mri_19
   gem 'fog'
 end
 

data/README.md

@@ -52,7 +52,7 @@ Dpl supports the following providers:
 
 Dpl is published to rubygems.
 
-* Dpl requires ruby with a version greater than 1.9.3
+* Dpl requires ruby with a version greater than 1.8.7
 * To install: `gem install dpl`
 
 ## Usage:
@@ -69,18 +69,18 @@ Running dpl in a terminal that saves history is insecure as your password/api ke
 
 #### Options:
 * **api-key**: Heroku API Key
-* **strategy[git/anvil]**: Deployment strategy for Dpl. Defaults to anvil.
+* **strategy**: Deployment strategy for Dpl. Defaults to `api`. Other options are `git`, `git ssh`, and `git deploykey`.
 * **app**: Heroku app name. Defaults to the name of your git repo.
 * **username**: heroku username. Not necessary if api-key is used. Requires git strategy.
 * **password**: heroku password. Not necessary if api-key is used. Requires git strategy.
 
-#### Git vs Anvil Deploy:
-* Anvil will run the [buildpack](https://devcenter.heroku.com/articles/buildpacks) compilation step on the Travis CI VM, whereas the Git strategy will run it on a Heroku dyno, which provides the same environment the application will then run under and might be slightly faster.
+#### API vs Git vs Anvil Deploy:
+* API deploy will tar up the current directory (minus the git repo) and send it to Heroku.
+* Git deploy will send the contents of the git repo only, so may not contain any local changes.
+* Anvil deploys are no longer supported since Heroku shut down the Anvil service.
 * The Git strategy allows using *user* and *password* instead of *api-key*.
 * When using Git, Heroku might send you an email for every deploy, as it adds a temporary SSH key to your account.
 
-As a rule of thumb, you should switch to the Git strategy if you run into issues with Anvil or if you're using the [user-env-compile](https://devcenter.heroku.com/articles/labs-user-env-compile) plugin.
-
 #### Examples:
 
     dpl --provider=heroku --api-key=`heroku auth:token`
@@ -316,7 +316,6 @@ For authentication you can also use Travis CI secure environment variable:
 * **bucket**: S3 Bucket.
 * **region**: S3 Region. Defaults to us-east-1.
 * **upload-dir**: S3 directory to upload to. Defaults to root directory.
-* **storage-class**: S3 storage class to upload as. Defaults to "STANDARD". Other values are "STANDARD_IA" or "REDUCED_REDUNDANCY". Details can be found [here](https://aws.amazon.com/s3/storage-classes/).
 * **local-dir**: Local directory to upload from. Can be set from a global perspective (~/travis/build) or relative perspective (build) Defaults to project root.
 * **detect-encoding**: Set HTTP header `Content-Encoding` for files compressed with `gzip` and `compress` utilities. Defaults to not set.
 * **cache_control**: Set HTTP header `Cache-Control` to suggest that the browser cache the file. Defaults to `no-cache`. Valid options are `no-cache`, `no-store`, `max-age=<seconds>`,`s-maxage=<seconds>` `no-transform`, `public`, `private`.

data/lib/dpl/provider/atlas.rb

@@ -16,15 +16,14 @@ module DPL
             chmod +x $HOME/bin/gimme
           fi
 
-          if [ -z $GOPATH ]; then
-            export GOPATH="$HOME/gopath"
-          else
-            export GOPATH="$HOME/gopath:$GOPATH"
-          fi
-          eval "$(gimme 1.6)" &> /dev/null
+          export GOPATH="$HOME/gopath:$GOPATH"
+          eval "$(gimme 1.4.2)" &>/dev/null
 
           go get #{ATLAS_UPLOAD_CLI_GO_REMOTE}
-          cp $HOME/gopath/bin/atlas-upload-cli $HOME/bin/atlas-upload
+          pushd $HOME/gopath/src/#{ATLAS_UPLOAD_CLI_GO_REMOTE} &>/dev/null
+          make &>/dev/null
+          cp bin/atlas-upload $HOME/bin/atlas-upload
+          popd &>/dev/null
         fi
       EOF
 
@@ -60,9 +59,7 @@ module DPL
       private
 
       def install_atlas_upload
-        without_git_http_user_agent do
-          context.shell ATLAS_UPLOAD_INSTALL_SCRIPT
-        end
+        context.shell ATLAS_UPLOAD_INSTALL_SCRIPT
       end
 
       def assert_app_present!
@@ -96,13 +93,6 @@ module DPL
       def atlas_app
         @atlas_app ||= options.fetch(:app).to_s
       end
-
-      def without_git_http_user_agent(&block)
-        git_http_user_agent = ENV.delete("GIT_HTTP_USER_AGENT")
-        yield
-        ENV["GIT_HTTP_USER_AGENT"] = git_http_user_agent
-      end
-
     end
   end
 end

data/lib/dpl/provider/cloud_files.rb

@@ -5,7 +5,8 @@ module DPL
     class CloudFiles < Provider
       requires 'net-ssh',    load: 'net/ssh',    version: '~> 2.9.2' # Anything higher requires Ruby 2.x
       requires 'mime-types', load: 'mime/types', version: '~> 2.6.2' # Anything higher requires Ruby 2.x
-      requires 'fog-rackspace', load: 'fog/rackspace'
+      requires 'fog-google', load: 'fog/google', version: '< 0.1.1'  # Anything higher requires Ruby 2.x
+      requires 'fog', version: '< 1.35.0' # Anything higher requires fog-google 0.1.1 and up, which, in turn, requires Ruby 2.x
       experimental 'Rackspace Cloud Files'
 
       def needs_key?

data/lib/dpl/provider/s3.rb

@@ -50,7 +50,6 @@ module DPL
             opts[:cache_control] = get_option_value_by_filename(options[:cache_control], filename) if options[:cache_control]
             opts[:acl]           = options[:acl].gsub(/_/, '-') if options[:acl]
             opts[:expires]       = get_option_value_by_filename(options[:expires], filename) if options[:expires]
-            opts[:storage_class] = options[:storage_class] if options[:storage_class]
             unless File.directory?(filename)
               log "uploading #{filename.inspect} with #{opts.inspect}"
               result = api.bucket(option(:bucket)).object(upload_path(filename)).upload_file(filename, opts)

data/spec/provider/s3_spec.rb

@@ -127,13 +127,6 @@ describe DPL::Provider::S3 do
       provider.push_app
     end
 
-    example "Sets Storage Class" do
-      provider.options.update(:storage_class => "STANDARD_AI")
-      expect(Dir).to receive(:glob).and_yield(__FILE__)
-      expect_any_instance_of(Aws::S3::Object).to receive(:upload_file).with(anything(), hash_including(:storage_class => "STANDARD_AI"))
-      provider.push_app
-    end
-
     example "Sets Website Index Document" do
       provider.options.update(:index_document_suffix => "test/index.html")
       expect(Dir).to receive(:glob).and_yield(__FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.19.travis.1646.3
+  version: 1.8.19.travis.1647.3
 platform: ruby
 authors:
 - Konstantin Haase