kite 1.0.6 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bafcba5f92cf0a9a3c54b6a2b9584de41fcfb3d96ac61c4dd52bca331f162eb
-  data.tar.gz: 33595861bc5169202cf792823a93462c082e5d889f84454063f62028f42bdb4d
+  metadata.gz: ae6d1e9376c8edcf74e30027c1f56d47e6b76f72c67e5350e03a4d734f1fd1a1
+  data.tar.gz: 5c6422da9834fe7d836faf6776d4aebfa51f92672aff4b48c964b8c6f45b962b
 SHA512:
-  metadata.gz: 38f218a1d34984f5e7309f501a7e1a8222b3eb88fdc074de3c7cead49a80a6b1ca8cf5939ddeb6bc8478117cff77a76801a8647c3dd7f2ae753dc7af98afc536
-  data.tar.gz: 993670b0ec2524bf275206f3845a5865d448d334418a2aae522aa79841e23a882eed0e7798cf9dd80f31da7d8b4adf1caed0c1c3ccae68dc9456ae4720d196a1
+  metadata.gz: 359dc979574e1eb9022121663e6bd0bb5e64bce5b9c0e7bbd2e13997a043dbbb1dabbdb397f437df1d7cff6d7892a63d5d5aff4dfe21b8b71b3b2fd0919bbbe6
+  data.tar.gz: 48f6a76936e0f1b22fdf02e3568a32bb53cfff4dbe3d3c42f1fddbe85a1af9e782352114d2cc12956df4ae9a2b272aaec1832a5b765544a7acfa8b85f8723ab6

data/Dockerfile

@@ -1,6 +1,8 @@
 FROM ruby:2.4-stretch
 
-RUN apt-get update && apt-get install -y zip curl wget
+RUN apt-get update && \
+    apt-get upgrade -qqy && \
+    apt-get install -y zip curl wget vim
 
 ARG TERRAFORM_VERSION=0.11.6
 ARG BOSH_VERSION=2.0.48
@@ -8,8 +10,8 @@ ARG GCLOUD_VERSION=196.0.0
 
 # Install Terraform
 RUN curl -Ls https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -o terraform.zip \
-    && unzip terraform -d /usr/bin/terraform \
-    && chmod +x /usr/bin/terraform \
+    && unzip terraform.zip \
+    && mv terraform /usr/local/bin/terraform \
     && rm -f terraform.zip
 
 # Install BOSH v2

data/lib/kite/core.rb

@@ -19,7 +19,7 @@ module Kite
     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)
-      Kite::Terraform.new(self, options).run(command, *args)
+      Kernel.exit Kite::Terraform.new(self, options).run(command, *args)
     end
 
     desc "version", "Return kite version"

data/lib/kite/generate.rb

@@ -42,7 +42,7 @@ module Kite
         append_to_file 'config/cloud.yml', "\n#{name}:\n  <<: *default\n"
       end
 
-      @cloud = parse_cloud_config[name]
+      @cloud = parse_cloud_config(name)
       @env_name = name
 
       directory("#{options[:provider]}/environment", "config/environments/#{name}")

data/lib/kite/helpers.rb

@@ -5,10 +5,16 @@ module Kite::Helpers
   end
 
   # Parse config/cloud.yml, returning the output hash
-  def parse_cloud_config
+  def parse_cloud_config(env = nil)
     cloud_config = YAML.load(File.read('config/cloud.yml'))
     check_cloud_config(cloud_config)
 
-    cloud_config
+    if env
+      unless cloud_config[env]
+        fail "Environement `#{env}` missing in config/cloud.yml"
+      end
+      return cloud_config[env]
+    end
+    return cloud_config
   end
 end

data/lib/kite/module.rb

@@ -9,7 +9,7 @@ module Kite
       @env     = options[:env]
       @path    = path
       @name    = path.gsub(/(.*:|.git)/, '').split('/').last
-      @cloud   = parse_cloud_config[@env]
+      @cloud   = parse_cloud_config(@env)
       @version = options[:version]
 
       unless File.exist? path
@@ -36,7 +36,7 @@ module Kite
       @name  = @path.split('/').last
       @env   = options[:env]
       @vars  = load_vars
-      @cloud = parse_cloud_config[@env]
+      @cloud = parse_cloud_config(@env)
 
       say "Rendering files"
       render_templates

data/lib/kite/terraform.rb

@@ -7,6 +7,7 @@ module Kite
     end
 
     def run(command, *args)
+      exit_status = 0
       STDERR.puts "Loading env"
       load_env
       script = "terraform #{command} #{args.join " "}"
@@ -14,7 +15,9 @@ module Kite
 
       Dir.chdir("config/environments/#{@env_name}") do
         system(script)
+        exit_status =  $?.exitstatus
       end
+      exit_status
     end
 
     def load_env

data/lib/kite/version.rb

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

data/tpl/skel/Rakefile.tt

@@ -0,0 +1,7 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake
+
+ENV['KITE_ENV'] ||= 'development'
+
+Dir.glob('lib/tasks/*.rake').each do |task|
+  load task
+end

data/tpl/skel/lib/tasks/git.rake

@@ -0,0 +1,26 @@
+
+def for_each_submodule &block
+  status = %x{git submodule status}
+  status.each {|line| yield line.split()[1] }
+end
+
+def for_each_submodule_dir &block
+  for_each_submodule { |dir| Dir.chdir(dir) { yield dir } }
+end
+
+def get_branch(status = `git status`)
+  branch = nil
+  if match = Regexp.new("^# On branch (.*)").match(status)
+    branch = match[1]
+  end
+end
+
+namespace :git do
+
+  desc "Update submodules"
+  task :update do
+    %x{git submodule init}
+    %x{git submodule update}
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kite
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.10
 platform: ruby
 authors:
 - Louis Bellet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -191,9 +191,11 @@ files:
 - tpl/service/docs/service.md
 - tpl/skel/Gemfile.tt
 - tpl/skel/README.md.tt
+- tpl/skel/Rakefile.tt
 - tpl/skel/bin/kite
 - tpl/skel/config/cloud.yml
 - tpl/skel/lib/tasks/.keep
+- tpl/skel/lib/tasks/git.rake
 - tpl/skel/log/.keep
 - tpl/skel/tmp/.keep
 homepage: http://www.heliostech.fr
@@ -215,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Command line tool for devops scaffolding.