terragov 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87f96c82addb19f7bef1a8cfe8d13f6ae8e4934a
-  data.tar.gz: 4e3c853e0546749ba0d540b47914362ab866bf65
+  metadata.gz: 8eeeed1f01e2992de5ea9148713142c55d55a4ed
+  data.tar.gz: 7f226cfef4d9be1f52c84395a80dbcf30ebf4038
 SHA512:
-  metadata.gz: a2d28c592c38238cb6d3276771689fa5079727f9f95505a82de7be36a5281eab71617cac21c7dc88a89c0e26896f1995612dc4086a7e79646eb17f1d9d2d2e62
-  data.tar.gz: 189846a9f1ed46f1c790b5b5ca79725d46b85ac166467c45aad8566a2e5e6d0f818dc5110fd01bfbf905710e2cd5fb4254f94c5d5ac0035f91e72f9aba627067
+  metadata.gz: 52f00a1308725247148750c67bab42f4daef588c7e0d6e8716420403734d56deb8cd0eff66166162cb5fd874fe60458f02780953e65a9f10d0edb69ea5abaa09
+  data.tar.gz: 9dc2c6a7cf98f0bb0b15c5f8a53f7900bd3541bfbbc85a04ea727ca650cb712b57f5de65412a835c0f2e4b1868d61f55e27ca438f5b162ed0ad1cfe97e01adcf

data/lib/terragov/cli.rb

@@ -52,94 +52,76 @@ module Terragov
 
     end
 
-    def load_config_file
-      if $config_file || ENV['TERRAGOV_CONFIG_FILE']
-        file = $config_file || ENV['TERRAGOV_CONFIG_FILE']
-        $values = YAML.load_file(File.expand_path(file))
-        return $values
-      else
-        return false
-      end
-    end
-
     def data_dir
-      error_message = "Must provided the data directory. See --help for details"
-      if $data_dir
-        return File.expand_path($data_dir)
-      elsif ENV['TERRAGOV_DATA_DIR']
-        return File.expand_path(ENV['TERRAGOV_DATA_DIR'])
-      elsif load_config_file
-        return File.expand_path(load_config_file['data_dir'])
-      else
-        abort(error_message)
-      end
+      return $data_dir ? $data_dir : false
     end
 
     def environment
-      error_message = "Must set AWS environment. Use --help for details"
-      if $environment
-        return $environment
-      elsif ENV['TERRAGOV_ENVIRONMENT']
-        return ENV['TERRAGOV_ENVIRONMENT']
-      elsif load_config_file
-        return load_config_file['environment']
-      else
-        abort(error_message)
-      end
+      return $environment ? $environment : false
     end
 
     def project
-      error_message = "Must set AWS project. Use --help for details"
-
-      if $project
-        return $project
-      elsif ENV['TERRAGOV_PROJECT']
-        return ENV['TERRAGOV_PROJECT']
-      elsif load_config_file
-        return load_config_file['project']
-      else
-        abort(error_message)
-      end
+      return $project ? $project : false
     end
 
     def repo_dir
-
-      if $repo_dir
-        return File.expand_path($repo_dir)
-      elsif ENV['TERRAGOV_REPO_DIR']
-        return File.expand_path(ENV['TERRAGOV_REPO_DIR'])
-      elsif load_config_file
-        return File.expand_path(load_config_file['repo_dir'])
-      else
-        return File.expand_path('.')
-      end
+      return $repo_dir ? $repo_dir : false
     end
 
     def stack
-      error_message = "Must set AWS stackname. Use --help for details"
-
-      if $stack
-        return $stack
-      elsif ENV['TERRAGOV_STACK']
-        return ENV['TERRAGOV_STACK']
-      elsif load_config_file
-        return load_config_file['stack']
-      else
-        abort(error_message)
-      end
+      return $stack ? $stack : false
     end
 
     def extra
       return $extra if $extra
     end
 
+    def load_config_file
+      if $config_file || ENV['TERRAGOV_CONFIG_FILE']
+        file = $config_file || ENV['TERRAGOV_CONFIG_FILE']
+        $values = YAML.load_file(File.expand_path(file))
+        return $values
+      end
+    end
+
+    def config(option, file=false)
+      env_var = "TERRAGOV_#{option.upcase}"
+      error_message = "Must set #{option}. Use --help for details."
+      #require 'pry'; binding.pry
+      if public_send(option)
+        if file
+          return File.expand_path(public_send(option))
+        else
+          return public_send(option)
+        end
+      elsif ENV[env_var]
+        if file
+          return File.expand_path(ENV[env_var])
+        else
+          return ENV[env_var]
+        end
+      elsif !load_config_file.nil?
+        unless load_config_file[option].nil?
+          if file
+            return File.expand_path(load_config_file[option])
+          else
+            return load_config_file[option]
+          end
+        else
+          abort(error_message)
+        end
+      else
+        abort(error_message)
+      end
+    end
+
     def cmd_options
       cmd_options_hash = {
-        "environment" => environment,
-        "data_dir"    => data_dir,
-        "project"     => project,
-        "stack"       => stack,
-        "repo_dir"    => repo_dir,
+        "environment" => config('environment'),
+        "data_dir"    => config('data_dir', true),
+        "project"     => config('project'),
+        "stack"       => config('stack'),
+        "repo_dir"    => config('repo_dir', true),
         "extra"       => extra,
       }
       return cmd_options_hash

data/lib/terragov/version.rb

@@ -1,3 +1,3 @@
 module Terragov
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/terragov.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/surminus/terragov"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '>= 2.2.2'
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terragov
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Laura Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Wrapper for GOV.UK Terraform deployments.