dpl 2.0.2.beta.1 → 2.0.3.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 127fc473613182a3add84607059a5777f8633d040caec51221a7254b54929f5f
-  data.tar.gz: 7e2c0c5289b78f4512f38a96faf80f10a0b202b5a61f9baa5b4e344f9548bf0b
+  metadata.gz: 9d618f4c1fa2c6225c69987b5349d56a4fa28b8eb911bbee5aba93e0a10c2a83
+  data.tar.gz: 7483c4425320d9bb22971f67366c630dc1dd2aa27ab6aee1cdbbd0b11ad97d55
 SHA512:
-  metadata.gz: 3a5c62bc3fc3e01a49b8181970d9b6e587ac596ec88e7d5f228f86578979be5cb6377261d1e323ed1b029744cc2ab805847ddf8a899a625ddd849d1678e4ea47
-  data.tar.gz: 10d95dd4a423d3ad94006f0e233cc37dcbff15ca2d27f9827f5c52223e9cdfb4b008f5672dbfa755b047fcdad40bd6d3133ff483536e518c642ac5a4c66c8a66
+  metadata.gz: 1945bb20863999e620675325ff5681e73624540652423cd91b2194bf01077a385ba026aeb1b5436674d2d1970f078ffdb0ea862a6b5c308029729293e5a7091b
+  data.tar.gz: 898ae8f27890100e81bb55af3d409c0e72a0068e1082ca8ed99512f98b4057f82398e3e5e3713cb457a8fed14ac44e412917a80f49548d81bb6f34772a2bd9aa

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## dpl v2.0.3-beta.1 (2022-03-15)
+
+* Deprecate support for Ruby 2.2
+
 ## dpl v2.0.2-beta.1 (2020-09-15)
 
 * Add AWS ECR support

data/Gemfile

@@ -2,7 +2,7 @@ $: << 'lib'
 require 'dpl/support/gems'
 
 source 'https://rubygems.org'
-ruby '>= 2.2'
+ruby '>= 2.3'
 
 gemspec name: 'dpl'
 # gem 'cl', path: '../../cl'

data/Gemfile.lock

@@ -1,48 +1,48 @@
 PATH
   remote: .
   specs:
-    dpl (2.0.0.beta.3)
+    dpl (2.0.3.beta.1)
       cl (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    awesome_print (1.8.0)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.365.0)
-    aws-sdk-cloudformation (1.42.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    awesome_print (1.9.2)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.547.0)
+    aws-sdk-cloudformation (1.64.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.35.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-codedeploy (1.47.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.105.0)
+    aws-sdk-core (3.125.3)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ecr (1.37.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ecr (1.52.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-elasticbeanstalk (1.49.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.37.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.53.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.49.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-lambda (1.77.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-opsworks (1.28.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-opsworks (1.39.0)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.79.1)
-      aws-sdk-core (~> 3, >= 3.104.3)
+    aws-sdk-s3 (1.111.1)
+      aws-sdk-core (~> 3, >= 3.125.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     belafonte (0.5.0)
       optionally
@@ -93,6 +93,7 @@ GEM
       regstry (~> 1.0.3)
     coderay (1.1.3)
     colorize (0.8.1)
+    concurrent-ruby (1.1.10)
     cookiejar (0.3.3)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
@@ -100,10 +101,11 @@ GEM
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.4.4)
-    docile (1.3.2)
+    crack (0.4.5)
+      rexml
+    deep_merge (1.2.2)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     em-http-request (1.1.7)
@@ -117,7 +119,7 @@ GEM
     erubis (2.7.0)
     escape (0.0.4)
     eventmachine (1.2.7)
-    excon (0.76.0)
+    excon (0.90.0)
     ey-core (3.5.0)
       addressable
       awesome_print
@@ -144,7 +146,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    fast_gettext (1.1.2)
+    fast_gettext (1.8.0)
     faye (1.4.0)
       cookiejar (>= 0.3.0)
       em-http-request (>= 1.1.6)
@@ -153,12 +155,12 @@ GEM
       multi_json (>= 1.0.0)
       rack (>= 1.0.0)
       websocket-driver (>= 0.5.1)
-    faye-websocket (0.11.0)
+    faye-websocket (0.11.1)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    ffi (1.13.1)
-    ffi-yajl (2.3.4)
-      libyajl2 (~> 1.2)
+    ffi (1.15.5)
+    ffi-yajl (2.4.0)
+      libyajl2 (>= 1.2)
     fog-core (2.1.0)
       builder
       excon (~> 0.58)
@@ -172,10 +174,10 @@ GEM
       fog-json (>= 1.0)
       fog-xml (>= 0.1)
       ipaddress (>= 0.8)
-    fog-xml (0.1.3)
+    fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.2.5)
+    formatador (0.3.0)
     fuzzyurl (0.9.0)
     gems (1.1.1)
       json
@@ -184,24 +186,26 @@ GEM
       thor (~> 0.20.0)
     hashdiff (1.0.1)
     hashie (3.6.0)
-    hiera (3.6.0)
+    hiera (3.8.0)
     highline (1.7.10)
+    hocon (1.3.1)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.8.0)
+    httpclient (2.8.3)
     iniparse (1.5.0)
     ipaddress (0.8.3)
-    jmespath (1.4.0)
+    jmespath (1.5.0)
     json (1.8.6)
     json_pure (1.8.6)
-    libyajl2 (1.2.0)
+    libyajl2 (2.1.0)
     locale (2.1.3)
     method_source (1.0.0)
     mime (0.4.4)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0512)
+    mime-types-data (3.2022.0105)
     mini_portile2 (2.4.0)
     mixlib-archive (0.4.20)
       mixlib-log
@@ -242,7 +246,7 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    oj (3.10.14)
+    oj (3.13.11)
     oj_mimic_json (1.0.1)
     optionally (0.0.3)
     packagecloud-ruby (1.0.8)
@@ -251,21 +255,27 @@ GEM
       mime (~> 0.4)
       multi_json (~> 1.0)
     pathspec (0.2.1)
-    plist (3.5.0)
+    plist (3.6.0)
     proxifier (1.0.3)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (3.0.3)
-    puppet (5.5.21)
-      facter (> 2.0.1, < 4)
-      fast_gettext (~> 1.1.2)
+    puppet (6.26.0)
+      concurrent-ruby (~> 1.0)
+      deep_merge (~> 1.0)
+      facter (> 2.0.1, < 5)
+      fast_gettext (~> 1.1)
       hiera (>= 3.2.1, < 4)
+      httpclient (~> 2.8)
       locale (~> 2.1)
       multi_json (~> 1.10)
-    puppet-blacksmith (3.3.1)
-      puppet (>= 2.7.16)
-      rest-client
+      puppet-resource_api (~> 1.5)
+      semantic_puppet (~> 1.0)
+    puppet-blacksmith (4.1.2)
+      rest-client (~> 2.0)
+    puppet-resource_api (1.8.14)
+      hocon (>= 1.0)
     rack (2.2.3)
     rake (12.3.3)
     regstry (1.0.15)
@@ -275,31 +285,32 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
+      rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.9.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubyzip (1.2.4)
-    safe_yaml (1.0.5)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    serverspec (2.41.5)
+    semantic_puppet (1.0.4)
+    serverspec (2.41.8)
       multi_json
       rspec (~> 3.0)
       rspec-its
@@ -310,7 +321,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    specinfra (2.82.19)
+    specinfra (2.83.1)
       net-scp
       net-ssh (>= 2.7)
       net-telnet (= 0.1.1)
@@ -323,18 +334,18 @@ GEM
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.20.3)
-    tins (1.25.0)
+    tins (1.31.0)
       sync
-    tomlrb (1.3.0)
+    tomlrb (2.0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8)
     uuidtools (2.1.5)
-    webmock (3.8.3)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wmi-lite (1.0.5)
@@ -369,8 +380,8 @@ DEPENDENCIES
   packagecloud-ruby (~> 1.0.8)
   pathspec (~> 0.2.1)
   public_suffix (~> 3.0.3)
-  puppet (~> 5.5.14)
-  puppet-blacksmith (~> 3.3.1)
+  puppet (~> 6.26.0)
+  puppet-blacksmith (~> 4.1.2)
   rack
   rake (~> 12.3)
   rendezvous (~> 0.1.3)
@@ -379,7 +390,7 @@ DEPENDENCIES
   webmock
 
 RUBY VERSION
-   ruby 2.4.9p362
+   ruby 2.6.3p62
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -29,7 +29,7 @@ please do not hesitate to get in touch, and we'll help you [add it](#contributin
 
 ## Requirements
 
-Dpl requires Ruby 2.2 or later.
+Dpl requires Ruby 2.3 or later.
 
 Depending on the deployment target dpl might require additional runtimes (e.g.
 Go, Node.js, or Python) to be installed. It also might require sudo access in
@@ -117,9 +117,9 @@ Dpl supports the following providers:
   * [Engineyard](#engineyard)
   * [Firebase](#firebase)
   * [Flynn](#flynn)
-  * [Git (push)](#git-push-)
+  * [Git (push)](#git-push)
   * [GitHub Pages](#github-pages)
-  * [GitHub Pages (API)](#github-pages-api-)
+  * [GitHub Pages (API)](#github-pages-api)
   * [GitHub Releases](#github-releases)
   * [Gleis](#gleis)
   * [Google App Engine](#google-app-engine)

data/lib/dpl/assets/dpl/README.erb.md

@@ -29,7 +29,7 @@ please do not hesitate to get in touch, and we'll help you [add it](#contributin
 
 ## Requirements
 
-Dpl requires Ruby 2.2 or later.
+Dpl requires Ruby 2.3 or later.
 
 Depending on the deployment target dpl might require additional runtimes (e.g.
 Go, Node.js, or Python) to be installed. It also might require sudo access in
@@ -96,7 +96,7 @@ the following maturity levels, according to the given criteria:
 Dpl supports the following providers:
 
 <% providers.each do |key, name| -%>
-  * <%= "[#{name}](##{name.gsub(/\W+/, '-').downcase})" %>
+  * <%= "[#{name}](##{name.split(/\W+/).compact.join('-').downcase})" %>
 <% end -%>
 
 <% providers.each do |key, name|%>

data/lib/dpl/cli.rb

@@ -36,7 +36,7 @@ module Dpl
     # Tainting is being used for automatically obfuscating values for secure
     # options, so we want to untaint all incoming args here.
     def untaint(args)
-      args.map(&:dup).each(&:untaint)
+      args.map(&:dup).each(&:whitelist)
     end
 
     def with_cmd_opts(args, cmds)

data/lib/dpl/helper/interpolate.rb

@@ -66,7 +66,7 @@ module Dpl
     # the string to a standard length of 20 characters. N depends on the
     # length of the original string.
     def obfuscate(str, opts = {})
-      return str if opts[:secure] || !str.tainted?
+      return str if opts[:secure] || !str.blacklisted?
       keep = (str.length / (4.0 + str.length / 5).round).round
       keep = 1 if keep == 0
       str[0, keep] + '*' * (20 - keep)
@@ -90,17 +90,24 @@ module Dpl
 
       def interpolate(str)
         str = str % args if args.is_a?(Array) && args.any?
-        str.to_s.gsub(PATTERN) { normalize(lookup($1.to_sym)) }
+        @blacklist_result = false
+        str = str.to_s.gsub(PATTERN) do
+          @blacklist_result = true
+          normalize(lookup($1.to_sym))
+        end
+        @blacklist_result || (args.is_a?(Array) && args.any? { |arg| arg.is_a?(String) && arg.blacklisted? }) ? str.blacklist : str
       end
 
       def obfuscate(str)
         secrets(str).inject(str) do |str, secret|
+          secret = secret.dup if secret.frozen?
+          secret.blacklist if str.blacklisted?
           str.gsub(secret, super(secret))
         end
       end
 
       def secrets(str)
-        return [] unless str.is_a?(String) && str.tainted?
+        return [] unless str.is_a?(String) && str.blacklisted?
         opts = obj.class.opts.select(&:secret?)
         secrets = opts.map { |opt| obj.opts[opt.name] }.compact
         secrets.select { |secret| str.include?(secret) }
@@ -110,7 +117,7 @@ module Dpl
         obj.is_a?(Array) ? obj.join(' ') : obj.to_s
       end
 
-      def lookup(key)
+      def lookup(key)        
         if vars? && !var?(key)
           UNKNOWN % key
         elsif mod = modifier(key)

data/lib/dpl/providers/boxfuse.rb

@@ -20,7 +20,7 @@ module Dpl
       opt '--config_file FILE', alias: :configfile, deprecated: :configfile
       opt '--extra_args ARGS'
 
-      URL = 'https://files.boxfuse.com/com/boxfuse/client/boxfuse-commandline/latest/boxfuse-commandline-latest-linux-x64.tar.gz'
+      URL = 'https://files.boxfuse.com/com/boxfuse/client/boxfuse-commandline/1.33.0.1460/boxfuse-commandline-1.33.0.1460-linux-x64.tar.gz'
 
       cmds install: 'curl -L %{URL} | tar xz',
            deploy:  'boxfuse/boxfuse run %{deploy_opts}'

data/lib/dpl/providers/gcs.rb

@@ -33,7 +33,7 @@ module Dpl
       opt '--cache_control HEADER', 'HTTP header Cache-Control to suggest that the browser cache the file.', see: 'https://cloud.google.com/storage/docs/xml-api/reference-headers#cachecontrol'
       opt '--glob GLOB', default: '**/*'
 
-      cmds install:   'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --path-update false --usage-reporting false --command-completion false',
+      cmds install:   'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --quiet --path-update false --usage-reporting false --command-completion false',
            login_key: 'gcloud auth activate-service-account --key-file=%{key_file}',
            rsync:     'gsutil %{gs_opts} rsync %{rsync_opts} %{glob} %{target}',
            copy:      'gsutil %{gs_opts} cp %{copy_opts} -r %{source} %{target}'

data/lib/dpl/providers/netlify.rb

@@ -9,6 +9,8 @@ module Dpl
         tbd
       str
 
+      node_js '>= 12.0.0'
+
       npm 'netlify-cli', 'netlify'
 
       env :netlify

data/lib/dpl/providers/puppetforge.rb

@@ -11,8 +11,8 @@ module Dpl
         tbd
       str
 
-      gem 'puppet', '~> 5.5.14', require: 'puppet/face'
-      gem 'puppet-blacksmith', '~> 3.3.1', require: 'puppet_blacksmith'
+      gem 'puppet', '~> 6.26.0', require: 'puppet/face'
+      gem 'puppet-blacksmith', '~> 4.1.2', require: 'puppet_blacksmith'
 
       env :puppetforge
 

data/lib/dpl/providers/rubygems.rb

@@ -70,13 +70,13 @@ module Dpl
 
         def build
           Dir[gemspec_glob].each do |gemspec|
-            shell :gem_build, gemspec: gemspec.untaint
+            shell :gem_build, gemspec: gemspec.whitelist
           end
         end
 
         def push
           Dir["#{gem}-*.gem"].each do |file|
-            info :gem_push, gem: file.untaint
+            info :gem_push, gem: file.whitelist
             info Gems.push(File.new(file), *[host].compact)
           end
         end

data/lib/dpl/string_ext.rb

@@ -0,0 +1,21 @@
+class String
+  def whitelist
+    @is_whitelisted = true
+
+    self
+  end
+
+  def whitelisted?
+    @is_whitelisted
+  end
+
+  def blacklist
+    @is_whitelisted = false
+
+    self
+  end
+
+  def blacklisted?
+    @is_whitelisted.nil? ? false : !@is_whitelisted
+  end
+end

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module Dpl
-  VERSION = '2.0.2.beta.1'
+  VERSION = '2.0.3.beta.1'
 end

data/lib/dpl.rb

@@ -2,6 +2,7 @@ require 'dpl/cli'
 require 'dpl/ctx'
 require 'dpl/provider'
 require 'dpl/version'
+require 'dpl/string_ext'
 
 module Dpl
   class Error < StandardError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 2.0.2.beta.1
+  version: 2.0.3.beta.1
 platform: ruby
 authors:
 - Konstantin Haase
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cl
@@ -140,6 +140,7 @@ files:
 - lib/dpl/providers/surge.rb
 - lib/dpl/providers/testfairy.rb
 - lib/dpl/providers/transifex.rb
+- lib/dpl/string_ext.rb
 - lib/dpl/support/aws_sdk_patch.rb
 - lib/dpl/support/gems.rb
 - lib/dpl/support/gstore_patch.rb
@@ -157,14 +158,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Dpl runs deployments at Travis CI