dpl 2.0.0.alpha.2 → 2.0.0.alpha.5

data/lib/dpl/providers/puppetforge.rb

@@ -12,6 +12,8 @@ module Dpl
       gem 'puppet', '~> 5.5.14', require: 'puppet/face'
       gem 'puppet-blacksmith', '~> 3.3.1', require: 'puppet_blacksmith'
 
+      env :puppetforge
+
       opt '--username NAME', 'Puppet Forge user name', required: true, alias: :user
       opt '--password PASS', 'Puppet Forge password', required: true, secret: true
       opt '--url URL', 'Puppet Forge URL to deploy to', default: 'https://forgeapi.puppetlabs.com/'

data/lib/dpl/providers/pypi.rb

@@ -13,6 +13,8 @@ module Dpl
 
       VERSION = /\A\d+(?:\.\d+)*\z/
 
+      env :pypi
+
       opt '--username NAME', 'PyPI Username', required: true, alias: :user
       opt '--password PASS', 'PyPI Password', required: true, secret: true
       opt '--server SERVER', 'Release to a different index', default: 'https://upload.pypi.org/legacy/'

data/lib/dpl/providers/releases.rb

@@ -13,14 +13,16 @@ module Dpl
       gem 'mime-types', '~> 3.2.2'
       gem 'public_suffix', '~> 3.0.3'
 
-      required :api_key, [:user, :password]
+      env :github, :releases
 
-      opt '--api_key TOKEN', 'GitHub oauth token (needs public_repo or repo permission)', secret: true
+      required :token, [:username, :password]
+
+      opt '--token TOKEN', 'GitHub oauth token (needs public_repo or repo permission)', secret: true, alias: :api_key
       opt '--username LOGIN', 'GitHub login name', alias: :user
       opt '--password PASS', 'GitHub password', secret: true
       opt '--repo SLUG', 'GitHub repo slug', default: :repo_slug
-      opt '--file FILE', 'File to release to GitHub', required: true, type: :array
-      opt '--file_glob', 'Interpret files as globs'
+      opt '--file GLOB', 'File or glob to release to GitHub', default: '*', type: :array
+      opt '--file_glob', 'Interpret files as globs', default: true
       opt '--overwrite', 'Overwrite files with the same name'
       opt '--prerelease', 'Identify the release as a prerelease'
       opt '--release_number NUM', 'Release number (overide automatic release detection)'
@@ -30,7 +32,7 @@ module Dpl
       opt '--tag_name TAG', 'Git tag from which to create the release'
       opt '--target_commitish STR', 'Commitish value that determines where the Git tag is created from'
       opt '--name NAME', 'Name for the release'
-      # should this have --github_url, like Pages does?
+      # should this have --url, like Pages does?
 
       needs :git
 
@@ -189,7 +191,7 @@ module Dpl
       end
 
       def creds
-        username && password ? { login: username, password: password } : { access_token: api_key }
+        username && password ? { login: username, password: password } : { access_token: token }
       end
 
       def files

data/lib/dpl/providers/rubygems.rb

@@ -9,7 +9,9 @@ module Dpl
 
       gem 'gems', '~> 1.1.1'
 
-      required :api_key, [:user, :password]
+      env :rubygems
+
+      required :api_key, [:username, :password]
 
       opt '--api_key KEY', 'Rubygems api key', secret: true
       opt '--username USER', 'Rubygems user name', alias: :user

data/lib/dpl/providers/s3.rb

@@ -17,7 +17,7 @@ module Dpl
       gem 'aws-sdk-s3', '~> 1.0'
       gem 'mime-types', '~> 3.2.2'
 
-      env :aws
+      env :aws, :s3
       config '~/.aws/credentials', '~/.aws/config', prefix: 'aws'
 
       opt '--access_key_id ID', 'AWS access key id', required: true, secret: true
@@ -26,19 +26,19 @@ module Dpl
       opt '--region REGION', 'S3 region', default: 'us-east-1'
       opt '--endpoint URL', 'S3 endpoint'
       opt '--upload_dir DIR', 'S3 directory to upload to'
-      opt '--storage_class CLASS', 'S3 storage class to upload as', default: 'STANDARD', enum: %w(STANDARD STANDARD_IA REDUCED_REDUNDANCY)
-      opt '--server_side_encryption', 'Use S3 Server Side Encryption (SSE-AES256)'
       opt '--local_dir DIR', 'Local directory to upload from', default: '.', example: '~/travis/build (absolute path) or ./build (relative path)'
+      opt '--dot_match', 'Upload hidden files starting with a dot'
+      opt '--acl ACL', 'Access control for the uploaded objects', default: 'private', enum: %w(private public_read public_read_write authenticated_read bucket_owner_read bucket_owner_full_control)
       opt '--detect_encoding', 'HTTP header Content-Encoding for files compressed with gzip and compress utilities'
       opt '--cache_control STR', 'HTTP header Cache-Control to suggest that the browser cache the file', type: :array, default: 'no-cache', enum: [/^no-cache.*/, /^no-store.*/, /^max-age=\d+.*/, /^s-maxage=\d+.*/, /^no-transform/, /^public/, /^private/], note: 'accepts mapping values to globs', eg: 'public: *.css,*.js'
       opt '--expires DATE', 'Date and time that the cached object expires', type: :array, format: /^"?\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} .+"?.*$/, note: 'accepts mapping values to globs', eg: '2020-01-01 00:00:00 UTC: *.css,*.js'
-      opt '--acl ACL', 'Access control for the uploaded objects', default: 'private', enum: %w(private public_read public_read_write authenticated_read bucket_owner_read bucket_owner_full_control)
-      opt '--dot_match', 'Upload hidden files starting with a dot'
-      opt '--index_document_suffix SUFFIX', 'Index document suffix of a S3 website'
       opt '--default_text_charset CHARSET', 'Default character set to append to the content-type of text files'
-      opt '--max_threads NUM', 'The number of threads to use for S3 file uploads', default: 5, max: 15, type: :integer
+      opt '--storage_class CLASS', 'S3 storage class to upload as', default: 'STANDARD', enum: %w(STANDARD STANDARD_IA REDUCED_REDUNDANCY)
+      opt '--server_side_encryption', 'Use S3 Server Side Encryption (SSE-AES256)'
+      opt '--index_document_suffix SUFFIX', 'Index document suffix of a S3 website'
       opt '--overwrite', 'Whether or not to overwrite existing files', default: true
       opt '--force_path_style', 'Whether to force keeping the bucket name on the path'
+      opt '--max_threads NUM', 'The number of threads to use for S3 file uploads', default: 5, max: 15, type: :integer
       opt '--verbose', 'Be verbose about uploading files'
       # how come there is no glob or file option?
 

data/lib/dpl/providers/scalingo.rb

@@ -7,6 +7,8 @@ module Dpl
         tbd
       str
 
+      env :scalingo
+
       required :api_token, [:username, :password]
 
       opt '--app APP', default: :repo_name

data/lib/dpl/providers/testfairy.rb

@@ -16,6 +16,8 @@ module Dpl
       gem 'json'
       gem 'multipart-post', '~> 2.0.0', require: 'net/http/post/multipart'
 
+      env :testfairy
+
       opt '--api_key KEY', 'TestFairy API key', required: true, secret: true
       opt '--app_file FILE', 'Path to the app file that will be generated after the build (APK/IPA)', required: true
       opt '--symbols_file FILE', 'Path to the symbols file'

data/lib/dpl/providers/transifex.rb

@@ -11,6 +11,8 @@ module Dpl
 
       required :api_token, [:username, :password]
 
+      env :transifex
+
       opt '--api_token TOKEN', 'Transifex API token', secret: true
       opt '--username NAME',   'Transifex username'
       opt '--password PASS',   'Transifex password', secret: true

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module Dpl
-  VERSION = '2.0.0.alpha.2'
+  VERSION = '2.0.0.alpha.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.2
+  version: 2.0.0.alpha.5
 platform: ruby
 authors:
 - Konstantin Haase
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cl
@@ -63,6 +63,7 @@ files:
 - bin/dpl
 - lib/dpl.rb
 - lib/dpl/assets/atlas/install
+- lib/dpl/assets/convox/install
 - lib/dpl/assets/dpl/README.erb.md
 - lib/dpl/assets/dpl/git_ssh
 - lib/dpl/assets/git/detect_private_key
@@ -80,6 +81,7 @@ files:
 - lib/dpl/helper/interpolate.rb
 - lib/dpl/helper/memoize.rb
 - lib/dpl/helper/squiggle.rb
+- lib/dpl/helper/wrap.rb
 - lib/dpl/helper/zip.rb
 - lib/dpl/provider.rb
 - lib/dpl/provider/dsl.rb
@@ -87,7 +89,6 @@ files:
 - lib/dpl/provider/status.rb
 - lib/dpl/providers.rb
 - lib/dpl/providers/anynines.rb
-- lib/dpl/providers/atlas.rb
 - lib/dpl/providers/azure_web_apps.rb
 - lib/dpl/providers/bintray.rb
 - lib/dpl/providers/bluemixcloudfoundry.rb
@@ -96,14 +97,17 @@ files:
 - lib/dpl/providers/chef_supermarket.rb
 - lib/dpl/providers/cloud66.rb
 - lib/dpl/providers/cloudfiles.rb
+- lib/dpl/providers/cloudformation.rb
 - lib/dpl/providers/cloudfoundry.rb
 - lib/dpl/providers/codedeploy.rb
+- lib/dpl/providers/convox.rb
 - lib/dpl/providers/datica.rb
 - lib/dpl/providers/elasticbeanstalk.rb
 - lib/dpl/providers/engineyard.rb
 - lib/dpl/providers/firebase.rb
 - lib/dpl/providers/gae.rb
 - lib/dpl/providers/gcs.rb
+- lib/dpl/providers/gleis.rb
 - lib/dpl/providers/hackage.rb
 - lib/dpl/providers/hephy.rb
 - lib/dpl/providers/heroku.rb

data/lib/dpl/providers/atlas.rb

@@ -1,49 +0,0 @@
-module Dpl
-  module Providers
-    class Atlas < Provider
-      status :alpha
-
-      description sq(<<-str)
-        tbd
-      str
-
-      opt '--app APP',       'The Atlas application to upload to', required: true
-      opt '--token TOKEN',   'The Atlas API token', required: true, secret: true
-      opt '--paths PATH',    'Files or directories to upload', type: :array, default: ['.']
-      opt '--address ADDR',  'The address of the Atlas server'
-      opt '--include GLOB',  'Glob pattern of files or directories to include', type: :array
-      opt '--exclude GLOB',  'Glob pattern of files or directories to exclude', type: :array
-      opt '--metadata DATA', 'Arbitrary key=value (string) metadata to be sent with the upload', type: :array
-      opt '--vcs',           'Get lists of files to exclude and include from a VCS (Git, Mercurial or SVN)'
-      opt '--args ARGS',     'Args to pass to the atlas-upload CLI'
-      opt '--debug',         'Turn on debug output'
-
-      cmds upload: 'atlas-upload %{args} %{app} %{path}'
-
-      def setup
-        ENV['ATLAS_TOKEN'] = token
-      end
-
-      def install
-        script :install
-      end
-
-      def deploy
-        paths.each { |path| upload(path) }
-      end
-
-      private
-
-        def upload(path)
-          shell :upload, path: path
-          # shell ['atlas-upload', args, app, path].compact.join(' ')
-        end
-
-        ARGS = %i(address exclude include metadata vcs debug)
-
-        def args
-          super || opts_for(ARGS, prefix: '-')
-        end
-    end
-  end
-end