kite 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f1a513472a04acc53ee1bd6fa965ddcac37e8d31fe486bd56c7434386af3bb6
-  data.tar.gz: ebf56c8b89476f5cdee1b4fb38efa8fe2bfc0696bb83c4e079d3e52092f2164a
+  metadata.gz: ce668dcff72a31fec89244639d06f41cb92d6210d904077982282f10a6d39f67
+  data.tar.gz: cfca7d98a7654c1c6fb3697b34621994de3832c9fe091c679c9fb7a6bd933f92
 SHA512:
-  metadata.gz: 522d67f1d44de572bcfe76681e958f24b432e6803689efe409d09cd04885e65a92293b0184faed27b16f5d7e95d3274b86b6cceaaa409d653fb95c0448eea0f5
-  data.tar.gz: 81abc278f8edbaa17d1f1c91518d5fa68bf78d89f06a3a1aaa5f52152c026fbc52ba33a030f5d6b830a1783741c4b851953a04a3159e4ab7dbc77ba1aaa676cd
+  metadata.gz: d16e609a4ef22244c79a23fed8852e631e8ccd0cc4dfadaefe4aec6cd3ed82932c0369f02798ab79e1d366629d0625dd344eac606fa65793eeb28dbd37af2d84
+  data.tar.gz: d3af22b47cbb0761285ed6c3df2a0cc9ba75032239f3ee88436fd0805fcd5c5eafc9ba2d8f3bf9800b696fd6fde5765c2f2efe4958ac22c1c01154a363b0cb99

data/lib/kite/module.rb

@@ -4,26 +4,29 @@ module Kite
 
     method_option :env, type: :string, desc: "Environment", required: true, default: ENV['KITE_ENV']
     desc 'init https://github.com/foo/bar-module', 'Initialize a kite module and render its vars.module.yml'
-    def init(uri)
-      @uri  = uri
-      @name = uri.gsub(/(.*:|.git)/, '').split('/').last
-      @path = "modules/#{@name}"
+    def init(path)
       @env  = options[:env]
+      @path = path
+      @name = path.gsub(/(.*:|.git)/, '').split('/').last
 
-      say "Cloning the #{@name} module"
-      clone_module
+      unless File.exist? path
+        @uri  = path
+        @path = "modules/#{@name}"
+
+        say "Cloning the module"
+        clone_module
+        say "Use git submodule add #{@path} to be able to commit this module as a submodule", :yellow
+      end
 
-      say "Rendering vars"
       render_vars
 
-      say "Use git submodule add #{@path} to be able to commit this module as a submodule", :yellow
       say "Rendered successfully, please fill out config/environments/#{@env}/vars.#{@name}.yml with correct values", :green
     end
 
     method_option :env, type: :string, desc: "Environment", required: true, default: ENV['KITE_ENV']
     desc 'render PATH', 'Render kite module files using vars.*module*.yml'
     def render(path)
-      @path  = path
+      @path  = File.expand_path(path)
       @name  = @path.split('/').last
       @env   = options[:env]
       @vars  = load_vars
@@ -45,9 +48,9 @@ module Kite
           if overwrite.downcase == 'y'
             remove_dir @path
             Git.clone(@uri, @path)
-            say "Successfully cloned the fresh version!", :green
+            say "Successfully cloned the fresh #{@name}!", :green
           else
-            say "Keeping the current module"
+            say "Keeping the current module version"
           end
         else
           Git.clone(@uri, @path)
@@ -59,7 +62,7 @@ module Kite
       end
 
       def render_templates
-        directory "#{ENV['PWD']}/modules/#{@name}/templates", ".", mode: :preserve
+        directory "#{@path}/templates", ".", mode: :preserve
         chmod     "bin", 0755
       end
 
@@ -68,7 +71,7 @@ module Kite
       end
 
       def manifest
-        YAML.load(File.open("modules/#{@name}/manifest.yml"))
+        YAML.load(File.open("#{@path}/manifest.yml"))
       end
     end
 

data/lib/kite/terraform.rb

@@ -19,6 +19,7 @@ module Kite
 
     def load_env
       load_vars
+      load_cloud
       @vars.each do |var, val|
         key = "TF_VAR_#{var}"
         ENV[key] = val
@@ -33,9 +34,15 @@ module Kite
       YAML.load(File.read('config/cloud.yml'))[@env_name]
     end
 
+    def load_cloud
+      cloud.each do |k, v|
+        (v.is_a? Hash) ? @vars.merge!(v) : @vars[k] = v
+      end
+    end
+
     def load_vars
-      vars_files = Dir["config/environments/#{@env_name}/vars.*.yml"]
       @vars = Hash.new
+      vars_files = Dir["config/environments/#{@env_name}/vars.*.yml"]
       vars_files.each do |f|
         tf_vars = YAML.load(File.read(f))['terraform']
         @vars.merge!(tf_vars) unless tf_vars.nil?

data/lib/kite/version.rb

@@ -1,3 +1,3 @@
 module Kite
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/tpl/skel/config/cloud.yml

@@ -1,11 +1,12 @@
 default: &default
-  region: "us-east1" # Note that region formats differ between AWS and GCP
-  zone: "us-east1-a"
+  # Note that region formats differ between AWS and GCP
+  region:             "europe-west4"
+  zone:               "europe-west4-c"
   gcp:
-    project: "hc-public"
-    service_account: "~/safe/hc-public/terraform.json"
-    bucket_name: "kite-state-helios-devel"
+    project:          "helios-devel"
+    service_account:  "~/safe/helios-devel.json"
+    bucket_name:      "kite-state-helios-devel"
   aws:
-    access_key: "********************"
-    secret_key: "****************************************"
-    bucket_name: "kite-state-helios-devel"
+    access_key:       "********************"
+    secret_key:       "****************************************"
+    bucket_name:      "kite-state-helios-devel"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kite
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Louis Bellet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor