kite 1.0.10 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae6d1e9376c8edcf74e30027c1f56d47e6b76f72c67e5350e03a4d734f1fd1a1
-  data.tar.gz: 5c6422da9834fe7d836faf6776d4aebfa51f92672aff4b48c964b8c6f45b962b
+  metadata.gz: 4316889b3af724fb89854fb09d9364d9277dc0f89019349c102e4c4a48e026ac
+  data.tar.gz: 2ae90c0b44278e9cfe22e5b8b44cf85ff2a0df04f2aa8c04b6aaefd7988c9949
 SHA512:
-  metadata.gz: 359dc979574e1eb9022121663e6bd0bb5e64bce5b9c0e7bbd2e13997a043dbbb1dabbdb397f437df1d7cff6d7892a63d5d5aff4dfe21b8b71b3b2fd0919bbbe6
-  data.tar.gz: 48f6a76936e0f1b22fdf02e3568a32bb53cfff4dbe3d3c42f1fddbe85a1af9e782352114d2cc12956df4ae9a2b272aaec1832a5b765544a7acfa8b85f8723ab6
+  metadata.gz: 588c4228e6ee3fa02fd8800b3d202aa21ca64c97aa4f72a5f0fb932fa015b72d10f7ddef41869d70049ca64c498bb6730c0b42af097f90df2fe1b23c3dfdcb7b
+  data.tar.gz: dfc062783a611b3bad533912483975fdbc2f3a19dbcc319b12cc09e2eb2c3bbc5a2cbedde7a317514c513b00a918b00c50a2e4393df7cb9b23f158b8cf9fd437

data/.gitignore

@@ -12,3 +12,5 @@
 .rspec_status
 
 *.gem
+
+.idea

data/ci/bump.rb

@@ -199,9 +199,7 @@ bump &&= ENV["TRAVIS_TAG"].to_s.empty?
 bump &&= !tagged_commits_mapping.key?(ENV["TRAVIS_COMMIT"])
 
 if bump
-  if ENV["TRAVIS_BRANCH"] == "master"
-    bump_from_master_branch
-  else
+  if ENV["TRAVIS_BRANCH"] != "master"
     bump_from_version_specific_branch(ENV["TRAVIS_BRANCH"])
   end
 end

data/lib/kite.rb

@@ -12,5 +12,6 @@ require 'kite/base'
 require 'kite/generate'
 require 'kite/module'
 require 'kite/terraform'
+require 'kite/configuration'
 require 'kite/core'
 require 'kite/cloud'

data/lib/kite/base.rb

@@ -3,6 +3,10 @@ class Kite::Base < Thor
 
   include Thor::Actions
 
+  def self.exit_on_failure?
+    true
+  end
+
   def self.source_root
     File.expand_path(File.join(File.dirname(__FILE__), "../../tpl"))
   end

data/lib/kite/configuration.rb

@@ -0,0 +1,25 @@
+module Kite
+  class Configuration < Base
+    include Kite::Helpers
+
+    method_option :env, type: :string, desc: "Environment", required: true, default: ENV['KITE_ENV']
+    desc 'get QUERY', 'Returns value for specified QUERY'
+    def get(query)
+      @env = options[:env]
+      @path = cloud_path
+      vars_paths = Dir[@path + "/config/environments/#{@env}/vars.*"]
+
+      vars_paths.each do |vars_path|
+        @res = YAML::load_file(vars_path)
+        query.split('.').each { |k| @res = @res[k] }
+        break unless @res.nil?
+      end
+
+      if @res.nil?
+        raise Kite::Error, "Invalid query: \"#{query}\""
+      else
+        puts @res
+      end
+    end
+  end
+end

data/lib/kite/core.rb

@@ -13,10 +13,13 @@ module Kite
     desc "generate", "Generate IaC from configuration"
     subcommand "generate", Kite::Generate
 
-    desc 'module', 'Use kite modules with environments'
+    desc "module", "Use kite modules with environments"
     subcommand "module", Kite::Module
 
-    desc 'terraform', 'Run Terraform-related commands with environment variables loaded from module vars'
+    desc "configuration", "Get configs of current environment"
+    subcommand "configuration", Kite::Configuration
+
+    desc "terraform", "Run Terraform-related commands with environment variables loaded from module vars"
     method_option :env, type: :string, desc: "Environment", required: true, default: ENV['KITE_ENV']
     def terraform(command, *args)
       Kernel.exit Kite::Terraform.new(self, options).run(command, *args)

data/lib/kite/helpers.rb

@@ -4,6 +4,22 @@ module Kite::Helpers
     raise Kite::Error, 'The config/cloud.yml is not filled out!' unless config.find { |key, hash| hash.find { |k, v| v.nil? } }.nil?
   end
 
+  def cloud_valid?(path)
+    valid = Dir.children(path).include? 'config'
+    valid &&= Dir.children(path + '/config').include? 'cloud.yml'
+
+    valid
+  end
+
+  def cloud_path
+    Dir.pwd.tap do |path|
+      until cloud_valid? path
+        raise Kite::Error, "Invalid path: \"#{Dir.pwd}\"" if path == "/"
+        path = File.dirname(path)
+      end
+    end
+  end
+
   # Parse config/cloud.yml, returning the output hash
   def parse_cloud_config(env = nil)
     cloud_config = YAML.load(File.read('config/cloud.yml'))
@@ -17,4 +33,12 @@ module Kite::Helpers
     end
     return cloud_config
   end
+
+  def run!(command, config = {})
+    run(command)
+
+    if $?.exitstatus != 0
+      raise Thor::Error.new("command failed: #{ command }")
+    end
+  end
 end

data/lib/kite/module.rb

@@ -3,30 +3,38 @@ module Kite
     include Kite::Helpers
 
     method_option :env,     type: :string, desc: "Environment", required: true, default: ENV['KITE_ENV']
-    method_option :version, type: :string, desc: "Version", required: false
+    method_option :version, type: :string, desc: "Version", aliases: '-v', required: false
+    method_option :method,  type: :string, desc: "Module import method", enum: %w{copy submodule}, default: "submodule"
     desc 'init https://github.com/foo/bar-module', 'Initialize a kite module and render its vars.module.yml'
     def init(path)
-      @env     = options[:env]
-      @path    = path
-      @name    = path.gsub(/(.*:|.git)/, '').split('/').last
-      @cloud   = parse_cloud_config(@env)
-      @version = options[:version]
-
-      unless File.exist? path
-        @uri  = path
-        @path = "modules/#{@name}"
-
-        clone_module
-        unless @version.nil?
-          checkout_version
+      @env = options[:env]
+      @module_name = path.gsub(/(.*:|.git)/, '').split('/').last
+      @module_path = "modules/#{ @module_name }"
+
+      if File.exist?(@module_path)
+        overwrite = ask "#{ @module_path } already exists! Overwrite? (y/N)"
+        if overwrite.downcase == 'y'
+          say "Remove existing files"
+          remove_dir(@module_path)
+        else
+          say "Skipping module init"
+          return
         end
-
-        say "Use git submodule add #{@path} to be able to commit this module as a submodule", :yellow
       end
 
-      render_vars
+      case options[:method]
+      when"submodule"
+        clone_module(path, @module_path, options[:version])
+      when "copy"
+        FileUtils.mkdir_p("modules")
+        FileUtils.cp_r(path, @module_path)
+      else
+        raise "Unsupported method #{ method }"
+      end
 
-      say "Rendered successfully, please fill out config/environments/#{@env}/vars.#{@name}.yml with correct values", :green
+      @cloud = parse_cloud_config(@env)
+      vars_output = render_vars(@module_name, @module_path)
+      say "Rendered successfully #{ vars_output }, please edit this file with correct values", :green
     end
 
     method_option :env, type: :string, desc: "Environment", required: true, default: ENV['KITE_ENV']
@@ -47,39 +55,24 @@ module Kite
         @env
       end
 
-      def clone_module
+      def clone_module(uri, path, version)
         say "Cloning the module"
-
-        if File.exist? @path
-          overwrite = ask "#{@path} already contains a module! Overwrite? (y/N)"
-
-          if overwrite.downcase == 'y'
-            remove_dir @path
-            Git.clone(@uri, @path)
-            say "Successfully cloned the fresh #{@name}!", :green
-          else
-            say "Keeping the current module revision"
+        run! "git submodule add #{ uri } #{ path }"
+        run! "git submodule init"
+        run! "git submodule update"
+        unless version.to_s.empty?
+          Dir.chdir(path) do
+            run! "git checkout #{ version }"
           end
-        else
-          Git.clone(@uri, @path)
-        end
-      end
-
-      def checkout_version
-        module_git = Git.open(@path)
-
-        say "Switching to #{@version}"
-        if @version =~ /\d+\.\d+\.\d+/ && module_git.tags.any? { |t| t.name == @version }
-          module_git.checkout("tags/#{@version}")
-        elsif module_git.is_remote_branch? @version
-          module_git.checkout("origin/#{@version}")
-        else
-          say "#{@version} tag/branch was not found in the module, keeping the current one", :red
+          run! "git add #{ path }"
         end
+        say "Successfully init #{ path }!", :green
       end
 
-      def render_vars
-        create_file "config/environments/#{@env}/vars.#{@name}.yml", YAML.dump(manifest['variables'])
+      def render_vars(module_name, module_path)
+        output_file = "config/environments/#{ @env }/vars.#{ module_name }.yml"
+        create_file output_file, YAML.dump(manifest(module_path)['variables'])
+        output_file
       end
 
       def render_templates
@@ -91,8 +84,8 @@ module Kite
         YAML.load(File.open("config/environments/#{@env}/vars.#{@name}.yml"))
       end
 
-      def manifest
-        YAML.load(ERB.new(File.read("#{@path}/manifest.yml.tt")).result(binding))
+      def manifest(module_path)
+        YAML.load(ERB.new(File.read("#{module_path}/manifest.yml.tt")).result(binding))
       end
     end
 

data/lib/kite/version.rb

@@ -1,3 +1,3 @@
 module Kite
-  VERSION = '1.0.10'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kite
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.1
 platform: ruby
 authors:
 - Louis Bellet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -158,6 +158,7 @@ files:
 - lib/kite.rb
 - lib/kite/base.rb
 - lib/kite/cloud.rb
+- lib/kite/configuration.rb
 - lib/kite/core.rb
 - lib/kite/error.rb
 - lib/kite/generate.rb
@@ -217,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Command line tool for devops scaffolding.