dpl 2.0.3.beta.4 → 2.0.3.beta.5

data/lib/dpl/providers/chef_supermarket.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class ChefSupermarket < Provider
@@ -8,17 +10,17 @@ module Dpl
 
       full_name 'Chef Supermarket'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
-      gem 'chef', '~> 12.0', require: %w(
+      gem 'chef', '~> 18', require: %w[
         chef/cookbook/cookbook_version_loader
-        chef/cookbook_site_streaming_uploader
         chef/cookbook_uploader
-      )
+      ]
+
       gem 'json'
-      gem 'mime-types', '~> 3.2.2'
+      gem 'mime-types', '~> 3.4.1'
       gem 'net-telnet', '~> 0.1.0' if ruby_pre?('2.3')
       gem 'rack'
 
@@ -30,12 +32,12 @@ module Dpl
       opt '--client_key KEY',     'Client API key file name', default: 'client.pem'
       opt '--dir DIR',            'Directory containing the cookbook', default: '.'
 
-      URL = "https://supermarket.chef.io/api/v1/cookbooks"
+      URL = 'https://supermarket.chef.io/api/v1/cookbooks'
 
-      msgs validate:       'Validating cookbook',
-           upload:         'Uploading cookbook %{name} to %{url}',
-           missing_file:   'Missing file: %s',
-           unknown_error:  'Unknown error while sharing cookbook: %s',
+      msgs validate: 'Validating cookbook',
+           upload: 'Uploading cookbook %{name} to %{url}',
+           missing_file: 'Missing file: %s',
+           unknown_error: 'Unknown error while sharing cookbook: %s',
            version_exists: 'The same version of this cookbook already exists on the Opscode Cookbook Site.'
 
       def setup
@@ -56,75 +58,75 @@ module Dpl
 
       private
 
-        def upload
-          res = Chef::CookbookSiteStreamingUploader.post(URL, user_id, client_key, params)
-          handle_error(res.body) if res.code.to_i != 201
-        end
-
-        def params
-          { cookbook: json(category: category), tarball: tarball }
-        end
-
-        def tarball
-          shell "tar -czf /tmp/#{name}.tgz -C #{build_dir} ."
-          shell "tar -tvf /tmp/#{name}.tgz"
-          open "/tmp/#{name}.tgz"
-        end
-
-        def name
-          @name ||= name_from_json || name_from_rb || error(:missing_file, 'metadata.json or metadata.rb')
-        end
-
-        def name_from_json
-          JSON.load(read('metadata.json'))['name'] if file?('metadata.json')
-        end
-
-        def name_from_rb
-          Chef::Cookbook::Metadata.new.from_file('metadata.rb') if file?('metadata.rb')
-        end
-
-        def cookbook
-          @cookbook ||= loader.cookbook_version
-        end
-
-        def loader
-          Chef::Cookbook::CookbookVersionLoader.new('.').tap(&:load!)
-        end
-
-        def uploader
-          Chef::CookbookUploader.new(cookbook)
-        end
-
-        def build_dir
-          @build_dir ||= Chef::CookbookSiteStreamingUploader.create_build_dir(cookbook)
-        end
-
-        def validate_file(path)
-          error :missing_file, path unless file?(path)
-        end
-
-        def url
-          URL
-        end
-
-        def handle_error(res)
-          res = JSON.parse(res)
-          unknown_error(res) unless res['error_messages']
-          version_exists if res['error_messages'][0].include?('Version already exists')
-          error "#{res['error_messages'][0]}"
-        end
-
-        def unknown_error(msg)
-          error :unknown_error, msg
-        end
-
-        def version_exists
-          error :version_exists
-        end
-
-        def json(obj)
-          JSON.dump(obj)
-        end
+      def upload
+        res = Chef::Knife::Core::CookbookSiteStreamingUploader.post(URL, user_id, client_key, params)
+        handle_error(res.body) if res.code.to_i != 201
+      end
+
+      def params
+        { cookbook: json(category: category), tarball: tarball}
+      end
+
+      def tarball
+        shell "tar -czf /tmp/#{name}.tgz -C #{build_dir} ."
+        shell "tar -tvf /tmp/#{name}.tgz"
+        open "/tmp/#{name}.tgz"
+      end
+
+      def name
+        @name ||= name_from_json || name_from_rb || error(:missing_file, 'metadata.json or metadata.rb')
+      end
+
+      def name_from_json
+        JSON.parse(read('metadata.json'))['name'] if file?('metadata.json')
+      end
+
+      def name_from_rb
+        Chef::Cookbook::Metadata.new.from_file('metadata.rb') if file?('metadata.rb')
+      end
+
+      def cookbook
+        @cookbook ||= loader.cookbook_version
+      end
+
+      def loader
+        Chef::Cookbook::CookbookVersionLoader.new('.').tap(&:load!)
+      end
+
+      def uploader
+        Chef::CookbookUploader.new(cookbook)
+      end
+
+      def build_dir
+        @build_dir ||= Chef::Knife::Core::CookbookSiteStreamingUploader.create_build_dir(cookbook)
+      end
+
+      def validate_file(path)
+        error :missing_file, path unless file?(path)
+      end
+
+      def url
+        URL
+      end
+
+      def handle_error(res)
+        res = JSON.parse(res)
+        unknown_error(res) unless res['error_messages']
+        version_exists if res['error_messages'][0].include?('Version already exists')
+        error (res['error_messages'][0]).to_s
+      end
+
+      def unknown_error(msg)
+        error :unknown_error, msg
+      end
+
+      def version_exists
+        error :version_exists
+      end
+
+      def json(obj)
+        JSON.dump(obj)
+      end
     end
   end
 end

data/lib/dpl/providers/cloud66.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Cloud66 < Provider
@@ -5,9 +7,9 @@ module Dpl
 
       status :alpha
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :cloud66
 
@@ -22,23 +24,23 @@ module Dpl
 
       private
 
-        def client
-          Net::HTTP.new(uri.host, uri.port).tap do |client|
-            client.use_ssl = use_ssl?
-          end
+      def client
+        Net::HTTP.new(uri.host, uri.port).tap do |client|
+          client.use_ssl = use_ssl?
         end
+      end
 
-        def request
-          Net::HTTP::Post.new(uri.path)
-        end
+      def request
+        Net::HTTP::Post.new(uri.path)
+      end
 
-        def uri
-          @uri ||= URI.parse(redeployment_hook)
-        end
+      def uri
+        @uri ||= URI.parse(redeployment_hook)
+      end
 
-        def use_ssl?
-          uri.scheme.downcase == 'https'
-        end
+      def use_ssl?
+        uri.scheme.downcase == 'https'
+      end
     end
   end
 end

data/lib/dpl/providers/cloudfiles.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Cloudfiles < Provider
@@ -7,19 +9,19 @@ module Dpl
 
       full_name 'Cloud Files'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
-      gem 'nokogiri', '< 1.10'
-      gem 'fog-core', '= 2.1.0', require: 'fog/core'
-      gem 'fog-rackspace', '~> 0.1.6', require: 'fog/rackspace'
+      gem 'nokogiri', '~> 1.15'
+      gem 'fog-core', '~> 2.3', require: 'fog/core'
+      gem 'fog-rackspace', '~> 0.1.6', git: 'https://github.com/travis-oss/fog-rackspace', require: 'fog/rackspace'
 
       env :cloudfiles
 
       opt '--username USER',  'Rackspace username', required: true
       opt '--api_key KEY',    'Rackspace API key', required: true, secret: true
-      opt '--region REGION',  'Cloudfiles region', required: true, enum: %w(ord dfw syd iad hkg)
+      opt '--region REGION',  'Cloudfiles region', required: true, enum: %w[ord dfw syd iad hkg]
       opt '--container NAME', 'Name of the container that files will be uploaded to', required: true
       opt '--glob GLOB',      'Paths to upload', default: '**/*'
       opt '--dot_match',      'Upload hidden files starting a dot'