TerraformDevKit 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d32288f9fba4deacb22f30271ddcff2b5a115992
-  data.tar.gz: f47b6be1a752293da1e7efb3de395c0812ca88a6
+  metadata.gz: 03871ccc5d65b7a7563ab9aef556ea126c8e9c88
+  data.tar.gz: 8f7f6ad94c285ff7340d725fc60510bc5d5ac65b
 SHA512:
-  metadata.gz: 45718a1746814caf2ed05d43e528a37fc09e4e1a94dc286f1881292b820252d2e2d39789a670eb593b398fd1cdf2bd7c953312bc1470e8c2ba01dd0a9b5593ef
-  data.tar.gz: 68a923d769b5bb21faf46c68432cf288afc4558f217bb393d266d30a6a3e2261349e872dcd2426b2a34e953c2f704e30f5bb70a36a9f1be5a3e2b5acbb4c9c76
+  metadata.gz: bac5b976127e46c5d7c570798d7589caf413f7ce5a73e857e23ecae1b407eff162aa9a49303a4c36ff3192de5b1c30e26459b3867375d68d5b6b6e6e3cc6139f
+  data.tar.gz: c6478f25739d5ecfa3ed710208f0f5ec105ea7c2438d3b94b17298f9449253f1af6c2080733be61f88117cb2781d078070129a3bef9f8104acdcf18f8102fa96

data/TerraformDevKit.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'webmock', '~> 3.0.1'
 
   spec.add_runtime_dependency 'aws-sdk', '~> 2.9.37'
   spec.add_runtime_dependency 'rubyzip', '~> 1.2.1'

data/exe/wait_for_url

@@ -1,32 +1,17 @@
 #!/usr/bin/env ruby
 
-require 'open-uri'
-require 'openssl'
+require 'TerraformDevKit'
 
-# Interval between retries (in seconds)
-INTERVAL_LENGTH = 5.0
+TDK = TerraformDevKit
 
-# Maximum amount of time to keep retrying (in seconds)
-MAX_TIME_TO_RETRY = 300.0
-
-if ARGV.length != 1
-  puts 'USAGE: wait_for_url <url>'
+if ARGV.length != 2
+  puts 'USAGE: wait_for_url <url> <retries>'
   exit
 end
 
 url = ARGV[0]
-retries = (MAX_TIME_TO_RETRY / INTERVAL_LENGTH).ceil
+retries = ARGV[1].to_i
 
-begin
-  puts "Fetching #{url}"
-  open(url, ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE, redirect: false)
-rescue OpenURI::HTTPError => error
-  response = error.io
-  puts "Response status code: #{response.status[0]}"
-  unless (retries -= 1).zero? || response.status[0] != '500'
-    sleep(INTERVAL_LENGTH)
-    retry
-  end
-rescue OpenURI::HTTPRedirect => error
-  puts "Redirect to: #{error.uri}"
+TDK.with_retry(retries) do
+  TDK::Request.new(url).execute(raise_on_codes: ['500'])
 end

data/lib/TerraformDevKit.rb

@@ -4,6 +4,8 @@ require 'TerraformDevKit/command'
 require 'TerraformDevKit/config'
 require 'TerraformDevKit/dynamodb'
 require 'TerraformDevKit/os'
+require 'TerraformDevKit/request'
+require 'TerraformDevKit/retry'
 require 'TerraformDevKit/terraform_env_manager'
 require 'TerraformDevKit/terraform_installer'
 require 'TerraformDevKit/terraform_log_filter'

data/lib/TerraformDevKit/command.rb

@@ -21,7 +21,6 @@ module TerraformDevKit
         thread.join
         stdout_thread.join
         input_thread.terminate unless close_stdin
-
         raise "Error running command #{cmd}" unless thread.value.success?
       end
 

data/lib/TerraformDevKit/request.rb

@@ -0,0 +1,28 @@
+require 'open-uri'
+require 'openssl'
+
+module TerraformDevKit
+  class Request
+    def initialize(url, query_strings: [], headers: {})
+      @url = url
+      @query_strings = query_strings
+      @headers = headers
+    end
+
+    def execute(raise_on_codes: [])
+      url = URI.parse(@url)
+      url.query = URI.encode_www_form(@query_strings) unless @query_strings.empty?
+      puts "Fetching #{url}"
+      options = {
+        redirect: false,
+        ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE
+      }
+      options.merge!(@headers)
+      open(url, options)
+    rescue OpenURI::HTTPError => error
+      response = error.io
+      raise if raise_on_codes.include?(response.status[0])
+      response
+    end
+  end
+end

data/lib/TerraformDevKit/retry.rb

@@ -0,0 +1,11 @@
+module TerraformDevKit
+  def self.with_retry(retry_count, sleep_time: 1)
+    yield
+  rescue
+    unless (retry_count -= 1).zero?
+      sleep(sleep_time)
+      retry
+    end
+    raise
+  end
+end

data/lib/TerraformDevKit/version.rb

@@ -1,3 +1,3 @@
 module TerraformDevKit
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: TerraformDevKit
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Victor Jimenez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,8 @@ files:
 - lib/TerraformDevKit/download.rb
 - lib/TerraformDevKit/dynamodb.rb
 - lib/TerraformDevKit/os.rb
+- lib/TerraformDevKit/request.rb
+- lib/TerraformDevKit/retry.rb
 - lib/TerraformDevKit/terraform_env_manager.rb
 - lib/TerraformDevKit/terraform_installer.rb
 - lib/TerraformDevKit/terraform_log_filter.rb