fastly-deploy 1.0.110 → 1.0.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 443248833c9d3bb99994838f8439c3f6a87f89c7
-  data.tar.gz: 710511dce4c39157a80f41c9db1eee8a8072f059
+  metadata.gz: 8334964829245084bc2a5bbab65c1f16cce82359
+  data.tar.gz: 1e389ac41af678b43986374f0a79efd8351e8799
 SHA512:
-  metadata.gz: 6db21357b083c1014bfbf3f571b572380f0eaa360d99b50dfda1c67019106ef632623ddc113b91ec6a94a86b98b83fbb7f4013e9ca91e9c8a1fa86d5351a90d6
-  data.tar.gz: 7ae52ab828aed5c4b6b1183d2408f8ba773c273a40cb0964d2c5c9f4b31c2d9a624d01b9f298bd0d8ce4c9a378001d4a82f79a4cb08920493280ce29e0a703cf
+  metadata.gz: 296ba01b4844b1f2b5c5f1ff022b8e2a525d2e461d06760e1f77e75223f9507838e97e58ce6e24c98c7182ab4247c944882d7f634c52511b91b78f78e52ccf64
+  data.tar.gz: 6894e3a66e59e24aa37406f21e6ad71bdcce897e1aed96080a4796436faa86c158b756a48b3758796f040409a44cbcca546f7cd43bd67ae6f6062bcaf0cb5a3f

data/bin/fastly-deploy

@@ -7,21 +7,21 @@ require 'optparse'
 def deploy(argv)
   options = {}
   optparse = OptionParser.new do |opts|
-    opts.banner = "Usage: fastly-deploy [options]"
-    opts.on("-k", "--api-key API_KEY", "Fastly API Key") do |api_key|
+    opts.banner = 'Usage: fastly-deploy [options]'
+    opts.on('-k', '--api-key API_KEY', 'Fastly API Key') do |api_key|
       options[:api_key] = api_key
     end
-    opts.on("-s", "--service-id SERVICE_ID", "Service ID") do |service_id|
+    opts.on('-s', '--service-id SERVICE_ID', 'Service ID') do |service_id|
       options[:service_id] = service_id
     end
-    opts.on("-v", "--vcl-path FILE", "VCL Path") do |vcl_path|
+    opts.on('-v', '--vcl-path FILE', 'VCL Path') do |vcl_path|
       options[:vcl_path] = vcl_path
     end
-    opts.on("-i", "--vcl-includes INCLUDES_DIR", "Includes Directory") do |includes_dir|
+    opts.on('-i', '--vcl-includes INCLUDES_DIR', 'Includes Directory') do |includes_dir|
       options[:includes_dir] = includes_dir
     end
     options[:purge_all] = false
-    opts.on("-p", "--purge-all", "Purge All") do |purge_all|
+    opts.on('-p', '--purge-all', 'Purge All') do
       options[:purge_all] = true
     end
     opts.on('-h', '--help', 'Display this screen') do
@@ -31,9 +31,7 @@ def deploy(argv)
   end
   optparse.parse! argv
 
-  if options[:api_key].nil? ||
-     options[:service_id].nil? ||
-     options[:vcl_path].nil? then
+  if options[:api_key].nil? || options[:service_id].nil? || options[:vcl_path].nil?
     puts optparse
     exit 1
   end
@@ -46,11 +44,10 @@ def deploy(argv)
              options[:vcl_path],
              options[:purge_all],
              includes
-  return options[:api_key]
+
+  options[:api_key]
 end
 
-# This is only run when run as a script. The FILE bit stops it 
+# This is only run when run as a script. The FILE bit stops it
 # from being run during the tests
-if __FILE__ == $0
-  deploy ARGV
-end
+deploy ARGV if __FILE__ == $PROGRAM_NAME

data/lib/detect_includes.rb

@@ -1,7 +1,7 @@
 def get_includes(main_vcl_path, includes_dir)
   includes_found = []
   get_includes_for_vcl main_vcl_path, includes_dir, includes_found
-  return includes_found
+  includes_found
 end
 
 def get_includes_for_vcl(vcl_path, includes_dir, includes_found)
@@ -17,7 +17,7 @@ end
 def get_includes_directly_in_vcl(vcl_path, includes_dir)
   # Using '$' for line ending is os dependent and fails w/windows line endings on linux
   include_pattern = /^include "(.*)";?[\r\n]+/
-  return File.readlines(vcl_path).select { |line| include_pattern.match(line) }
-            .map{ |line| include_pattern.match(line)[1] }
-            .map{ |vcl_file_name| File.join(includes_dir, vcl_file_name + ".vcl")}
+  File.readlines(vcl_path).select { |line| include_pattern.match(line) }
+      .map { |line| include_pattern.match(line)[1] }
+      .map { |vcl_file_name| File.join(includes_dir, vcl_file_name + '.vcl') }
 end

data/lib/methods.rb

@@ -3,79 +3,78 @@ require 'net/http'
 require 'colorize'
 
 def deploy_vcl(api_key, service_id, vcl_path, purge_all, include_files)
-
-  login_opts = { :api_key => api_key }
+  login_opts = { api_key: api_key }
   fastly = Fastly.new(login_opts)
   service = fastly.get_service(service_id)
 
-  active_version = service.versions.find{|ver| ver.active?}
+  active_version = service.versions.find(&:active?)
   puts "Active Version: #{active_version.number}"
-  domain = fastly.list_domains(:service_id => service.id,
-                               :version => active_version.number).first
+  domain = fastly.list_domains(service_id: service.id,
+                               version: active_version.number).first
   puts "Domain Name: #{domain.name}"
 
   new_version = active_version.clone
   puts "New Version: #{new_version.number}"
 
-  fastly.list_vcls(:service_id => service.id, 
-                   :version => new_version.number)
-        .each { |vcl| vcl.delete! }
+  fastly.list_vcls(service_id: service.id,
+                   version: new_version.number)
+        .each(&:delete!)
 
   can_verify_deployment = upload_main_vcl new_version, vcl_path, service_id
 
-  if include_files != nil 
-    include_files.each do | include_file |
-      upload_include_vcl new_version, include_file, service_id 
+  unless include_files.nil?
+    include_files.each do |include_file|
+      upload_include_vcl new_version, include_file, service_id
     end
-  end 
+  end
+
+  puts 'Validating...'
 
-  puts "Validating..."
-  
   validate(new_version)
 
-  puts "Activating..."
+  puts 'Activating...'
   new_version.activate!
 
-  if can_verify_deployment then
-    print "Waiting for changes to take effect."
+  if can_verify_deployment
+    print 'Waiting for changes to take effect.'
     attempts = 1
     deployed_vcl_version_number = 0
 
-    while attempts < 150 && deployed_vcl_version_number != new_version.number.to_s do
+    while attempts < 150 && deployed_vcl_version_number != new_version.number.to_s
       sleep 2
       url = URI.parse("http://#{domain.name}.global.prod.fastly.net/vcl_version")
       req = Net::HTTP::Get.new(url.to_s)
-      res = Net::HTTP.start(url.host, url.port) {|http|
+      res = Net::HTTP.start(url.host, url.port) do |http|
         http.request(req)
-      }
+      end
       deployed_vcl_version_number = res.body
-      print "."
+      print '.'
       attempts += 1
     end
-    puts "done."
+    puts 'done.'
 
-    if deployed_vcl_version_number != new_version.number.to_s then
+    if deployed_vcl_version_number != new_version.number.to_s
       STDERR.puts "Verify failed. /vcl_version returned [#{deployed_vcl_version_number}].".red
       exit 1
     end
   end
 
-  if purge_all then
-    puts "Purging all..."
+  if purge_all
+    puts 'Purging all...'
     service.purge_all
   end
-  puts "Deployment complete.".green
+  puts 'Deployment complete.'.green
 end
 
 def upload_main_vcl(version, vcl_path, service_id)
-  vcl_name = File.basename(vcl_path, ".vcl")
+  vcl_name = File.basename(vcl_path, '.vcl')
   can_verify_deployment = upload_vcl version, vcl_path, vcl_name, service_id
   version.vcl(vcl_name).set_main!
-  return can_verify_deployment
+  can_verify_deployment
 end
 
 def upload_include_vcl(version, vcl_path, service_id)
-  vcl_name = File.basename(vcl_path, ".vcl")
+  vcl_name = File.basename(vcl_path, '.vcl')
   upload_vcl version, vcl_path, vcl_name, service_id
 end
 
@@ -87,8 +86,8 @@ def upload_vcl(version, vcl_path, name, service_id)
   puts "Uploading #{name}"
   version.upload_vcl name, vcl_contents_with_deploy_injection
 
-  return vcl_contents_with_deploy_injection != vcl_contents_with_service_id_injection
-end  
+  vcl_contents_with_deploy_injection != vcl_contents_with_service_id_injection
+end
 
 def inject_deploy_verify_code(vcl, version_num)
   deploy_recv_vcl = <<-END
@@ -111,19 +110,16 @@ def inject_deploy_verify_code(vcl, version_num)
   END
 
   vcl.gsub(/#7D_DEPLOY recv/, deploy_recv_vcl)
-    .gsub(/#7D_DEPLOY error/, deploy_error_vcl)
+     .gsub(/#7D_DEPLOY error/, deploy_error_vcl)
 end
 
 def inject_service_id(vcl_contents, service_id)
-  vcl_contents.gsub(/#7D_FASTLY_SERVICE_ID/, service_id) 
-end  
+  vcl_contents.gsub(/#7D_FASTLY_SERVICE_ID/, service_id)
+end
 
 def validate(version)
   path = version.class.get_path(version.service_id, version.number)
   response = version.fetcher.client.get("#{path}/validate")
-  status = response["status"]
-  if status!= "ok"
-    raise response["msg"]
-  end
+  status = response['status']
+  raise response['msg'] if status != 'ok'
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly-deploy
 version: !ruby/object:Gem::Version
-  version: 1.0.110
+  version: 1.0.111
 platform: ruby
 authors:
 - 7digital
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.41'
 description: Automated deploys for Fastly vcl configs. Also supports splitting up
   configs via include statements.
 email: developers@7digital.com