yle_tf 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89780c316c7e6aba53458bb71b37b8c050b41eca
-  data.tar.gz: '068f7d640747c7b3fb4d36d3e31878425dc3078a'
+SHA256:
+  metadata.gz: 95dbeb71fae7b996332d0392c7e1c0710e8cfce4898be87574817308626ca9cf
+  data.tar.gz: 90b6c63351a1e30f6bee26825274cbca0aaeb8d5cd05d1a256bef8f9d8408c81
 SHA512:
-  metadata.gz: 55746eb13356d123a2d29db472425230f4bf1de9a41de21ab09ce2372b19c6b9be72ec97444ed3f7ab801a4e52335462ad933d328e58b10f183888a29bee0a48
-  data.tar.gz: 4161e0d3d3a127eed59e3266604b08ff069a6c52e97e90614568464213dab3636f9a05c29d5de67fbcc986ad310609a561838133a75fa2d263239794bfb0ed53
+  metadata.gz: 7a00736661dba53738ab1c44ac48f990264c955c0747c50795a01c893bf9ac1e69da9c82e66a62edbe0a3464d0c42a6ceb84e1f41a40da98e22a15231c7e54cb
+  data.tar.gz: a97abc8c99fb34b8db0881ef3c972f706a03667759aeca420b38dda4f3c549724b0125f3909ff9b77346d1e4119f99ec07e208820a1acfc38cfbe87714cff6ae

data/bin/tf

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+# Catch Ctrl+C to avoid stack traces
+Signal.trap('INT') { abort }
+
 require 'bundler/setup' if File.exist?(File.expand_path('../../Gemfile', __FILE__))
 require 'yle_tf/cli'
 

data/lib/yle_tf/action/terraform_init.rb

@@ -7,6 +7,13 @@ require 'yle_tf/version_requirement'
 class YleTf
   module Action
     class TerraformInit
+      TF_CMD_ARGS = %w[-input=false -no-color].freeze
+
+      TF_CMD_OPTS = {
+        env: { 'TF_IN_AUTOMATION' => 'true' }, # Reduces some output
+        stdout: :debug                         # Hide the output to the debug level
+      }.freeze
+
       def initialize(app)
         @app = app
       end
@@ -30,20 +37,18 @@ class YleTf
       def init_pre_0_9(backend)
         cli_args = backend.cli_args
         if cli_args
-          YleTf::System.cmd('terraform', 'remote', 'config',
-                            '-no-color', *cli_args,
-                            stdout: :debug)
+          YleTf::System.cmd('terraform', 'remote', 'config', *TF_CMD_ARGS, *cli_args, TF_CMD_OPTS)
         end
 
         Logger.debug('Fetching Terraform modules')
-        YleTf::System.cmd('terraform', 'get', '-no-color', stdout: :debug)
+        YleTf::System.cmd('terraform', 'get', *TF_CMD_ARGS, TF_CMD_OPTS)
       end
 
       def init(backend)
         Logger.debug('Generating the backend configuration')
         backend.generate_config do
           Logger.debug('Initializing Terraform')
-          YleTf::System.cmd('terraform', 'init', '-no-color', stdout: :debug)
+          YleTf::System.cmd('terraform', 'init', *TF_CMD_ARGS, TF_CMD_OPTS)
         end
       end
 

data/lib/yle_tf/action/verify_tf_env.rb

@@ -12,9 +12,7 @@ class YleTf
         config = env[:config]
         all_envs = VarsFile.list_all_envs(config)
 
-        if all_envs.empty?
-          raise Error, "No Terraform vars files found in '#{VarsFile::ENV_DIR}/'"
-        end
+        raise(Error, "No Terraform vars files found in '#{VarsFile::ENV_DIR}/'") if all_envs.empty?
 
         if !all_envs.include?(config.tf_env)
           raise Error, "Terraform vars file not found for the '#{config.tf_env}' " \

data/lib/yle_tf/cli.rb

@@ -68,6 +68,8 @@ class YleTf
       self.debug = true if @tf_options[:debug]
       YleTf::Logger.color = false if @tf_options[:no_color]
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/BlockLength, Metrics/MethodLength
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
     # Returns `Symbol` for the arg, e.g. `"--foo-bar"` -> `:foo_bar`
     def key(arg)

data/lib/yle_tf/plugin/action_hook.rb

@@ -8,15 +8,11 @@ class YleTf
       end
 
       def before(existing, new, *args, &block)
-        if actions.include?(existing)
-          actions.insert_before(existing, new, *args, &block)
-        end
+        actions.insert_before(existing, new, *args, &block) if actions.include?(existing)
       end
 
       def after(existing, new, *args, &block)
-        if actions.include?(existing)
-          actions.insert_after(existing, new, *args, &block)
-        end
+        actions.insert_after(existing, new, *args, &block) if actions.include?(existing)
       end
     end
   end

data/lib/yle_tf/system/io_handlers.rb

@@ -78,13 +78,7 @@ class YleTf
       def self.io_input(source)
         lambda do |target, *|
           Thread.new do
-            begin
-              while (data = source.readpartial(BLOCK_SIZE))
-                target.write(data)
-              end
-            ensure
-              target.close_write
-            end
+            copy_data(source, target, close_target: true)
           end
         end
       end
@@ -94,12 +88,21 @@ class YleTf
       def self.io_output(target)
         lambda do |source, *|
           Thread.new do
-            while (data = source.readpartial(BLOCK_SIZE))
-              target.write(data)
-            end
+            copy_data(source, target)
           end
         end
       end
+
+      # Reads all data from the source IO and writes it to the target IO
+      def self.copy_data(source, target, **opts)
+        while (data = source.readpartial(BLOCK_SIZE))
+          target.write(data)
+        end
+      rescue EOFError # rubocop:disable Lint/HandleExceptions
+        # All read
+      ensure
+        target.close_write if opts[:close_target]
+      end
     end
   end
 end

data/lib/yle_tf/version.rb

@@ -1,3 +1,3 @@
 class YleTf
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/yle_tf_plugins/commands/help/command.rb

@@ -32,6 +32,7 @@ module YleTfPlugins
           o.separator terraform_help
         end
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
       def error?(env)
         env[:tf_env] == 'error'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yle_tf
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Yleisradio
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Tooling for Terraform