kite 1.1.3 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b68a454d1819a62cf4485584e512f022e9f5a3c6f67994c41ccb991b2014a8
-  data.tar.gz: 6dbd778bf35cbe790ba6d6da0ec31ec9953365b07dd177f7234a4480056491ae
+  metadata.gz: b57b038adb6c2dc84511d0167202a739ae202ae6a10884bf61f971f76c45593c
+  data.tar.gz: 96c517233944c174fbf1ca0826a42cae45bdce6ae54a359358a5ad5c9820a6af
 SHA512:
-  metadata.gz: f2ea924514d9ba3c3e6add04b6c47ec02856bfa89200c9b550b066bc791cd8c5eda1f8454d4dba977032a8f961579a4b448bef3987ebd663c88849082852e46e
-  data.tar.gz: dc1fad1056cd84f88d8999216e927265bf68e71e1319fe62c642c4a0660f869f258445097a3d6e476aa760888635c1e20a906e909be4a231c033e6e320a56e4e
+  metadata.gz: bf0236f08a80cfffed00177f188990b9d989fbfb4c4cbd9b8f040fb1f82e5f361be114a1f80d846eff58eeba9e70160b23442b383a5ac3285978f328ea4d460e
+  data.tar.gz: ffee938aaf0ec3af6924f86c293d5c89fe8dcfd397226ef2cc356984fad16e6a527a848a6d986a377f958c710b3622ce558d19f0c2c409c56eb581fd85aa4f0c

data/.drone.yml

@@ -0,0 +1,25 @@
+kind: pipeline
+name: default
+
+steps:
+- name: Run rspec
+  image: ruby:2.5.3
+  commands:
+    - bundle
+    - bundle exec rspec
+  when:
+   event:
+    - pull_request
+
+- name: Bump and Tag
+  image: ruby:2.5.3
+  environment:
+    GITHUB_API_KEY:
+      from_secret: kite_bot_key
+  commands:
+    - ruby ci/bump.rb
+  when:
+    event:
+      - push
+    branch:
+      - 1-1-stable

data/ci/bump.rb

@@ -1,14 +1,14 @@
-require "rubygems/version"
-require "net/http"
-require "json"
-require "uri"
+require 'rubygems/version'
+require 'net/http'
+require 'json'
+require 'uri'
 
 #
 # Returns bot's username in GitHub.
 #
 # @return [String]
 def bot_username
-  ENV.fetch("BOT_USERNAME", "kite-bot")
+  ENV.fetch('BOT_USERNAME', 'kite-bot')
 end
 
 #
@@ -16,7 +16,7 @@ end
 #
 # @return [String]
 def bot_name
-  ENV.fetch("BOT_NAME", "Kite Bot")
+  ENV.fetch('BOT_NAME', 'Kite Bot')
 end
 
 #
@@ -24,7 +24,7 @@ end
 #
 # @return [String]
 def bot_email
-  ENV.fetch("BOT_EMAIL", "kite-bot@heliostech.fr")
+  ENV.fetch('BOT_EMAIL', 'kite-bot@rubykube.io')
 end
 
 #
@@ -32,7 +32,7 @@ end
 #
 # @return [String]
 def repository_slug
-  ENV.fetch("REPOSITORY_SLUG", "rubykube/kite")
+  ENV.fetch('REPOSITORY_SLUG', 'rubykube/kite')
 end
 
 #
@@ -61,7 +61,7 @@ def bump_from_master_branch
   return if linked_branch
 
   # Increment patch version number, tag, and push.
-  candidate_version = Gem::Version.new(latest_version.segments.dup.tap { |s| s[2] += 1 }.join("."))
+  candidate_version = Gem::Version.new(latest_version.segments.dup.tap { |s| s[2] += 1 }.join('.'))
   tag_n_push(candidate_version.to_s, name: 'master') unless versions.include?(candidate_version)
 end
 
@@ -86,7 +86,7 @@ def bump_from_version_specific_branch(name)
   return unless latest_version
 
   # Increment patch version number, tag, and push.
-  candidate_version = Gem::Version.new(latest_version.segments.dup.tap { |s| s[2] += 1 }.join("."))
+  candidate_version = Gem::Version.new(latest_version.segments.dup.tap { |s| s[2] += 1 }.join('.'))
   tag_n_push(candidate_version.to_s, branch) unless versions.include?(candidate_version)
 end
 
@@ -97,7 +97,7 @@ end
 #
 # @param tag [String]
 def tag_n_push(tag, branch)
-  File.open "lib/kite/version.rb", "w" do |f|
+  File.open 'lib/kite/version.rb', 'w' do |f|
     f.write <<-RUBY
 module Kite
   VERSION = '#{tag}'
@@ -108,20 +108,20 @@ end
   [
     %( git config --global user.email "#{bot_email}" ),
     %( git config --global user.name "#{bot_name}" ),
-    %( git remote add authenticated-origin https://#{bot_username}:#{ENV.fetch("GITHUB_API_KEY")}@github.com/#{repository_slug} ),
+    %( git remote add authenticated-origin https://#{bot_username}:#{ENV.fetch('GITHUB_API_KEY')}@github.com/#{repository_slug} ),
     %( git checkout -b release ),
     %( git add lib/kite/version.rb ),
     %( git commit -m "[ci skip] Bump #{tag}." ),
     %( git push authenticated-origin release:#{branch.fetch(:name)} ),
-    %( git tag v#{tag} -a -m "Automatically generated tag from TravisCI build #{ENV.fetch("TRAVIS_BUILD_NUMBER")}." ),
-    %( git push authenticated-origin v#{tag} )
+    %( git tag #{tag} -a -m "Automatically generated tag from the Drone CI build #{ENV.fetch('DRONE_BUILD_NUMBER')}." ),
+    %( git push authenticated-origin #{tag} )
   ].each do |command|
-    command.strip!
-    unless Kernel.system(command)
-      # Prevent GitHub API key from being published.
-      command.gsub!(ENV["GITHUB_API_KEY"], "(secret)")
-      raise %(Command "#{command}" exited with status #{$?.exitstatus || "(unavailable)"}.)
-    end
+      command.strip!
+      unless Kernel.system(command)
+        # Prevent GitHub API key from being published.
+        command.gsub!(ENV['GITHUB_API_KEY'], '(secret)')
+        raise %(Command "#{command}" exited with status #{$?.exitstatus || '(unavailable)'}.)
+      end
   end
 end
 
@@ -131,7 +131,7 @@ end
 # @return [Array<Gem::Version>]
 def versions
   @versions ||= github_api_authenticated_get("/repos/#{repository_slug}/tags").map do |x|
-    Gem::Version.new(x.fetch("name")[/\d+\.\d+\.\d+/])
+    Gem::Version.new(x.fetch('name')[/\d+\.\d+\.\d+/])
   end.sort
 end
 
@@ -142,7 +142,7 @@ end
 #   Key is commit's SHA-1 hash, value is instance of Gem::Version.
 def tagged_commits_mapping
   @commits ||= github_api_authenticated_get("/repos/#{repository_slug}/tags").each_with_object({}) do |x, memo|
-    memo[x.fetch("commit").fetch("sha")] = Gem::Version.new(x.fetch("name")[/\d+\.\d+\.\d+/])
+    memo[x.fetch('commit').fetch('sha')] = Gem::Version.new(x.fetch('name')[/\d+\.\d+\.\d+/])
   end
 end
 
@@ -153,8 +153,8 @@ end
 #   Array of hashes each containing "name" & "version" keys.
 def version_specific_branches
   @branches ||= github_api_authenticated_get("/repos/#{repository_slug}/branches").map do |x|
-    if x.fetch("name") =~ /\A(\d)-(\d)-\w+\z/
-      { name: x["name"], version: Gem::Version.new($1 + "." + $2) }
+    if x.fetch('name') =~ /\A(\d)-(\d)-\w+\z/
+      { name: x['name'], version: Gem::Version.new($1 + '.' + $2) }
     end
   end.compact
 end
@@ -166,9 +166,9 @@ end
 #   Request path.
 # @return [Hash]
 def github_api_authenticated_get(path)
-  http         = Net::HTTP.new("api.github.com", 443)
+  http         = Net::HTTP.new('api.github.com', 443)
   http.use_ssl = true
-  response     = http.get path, "Authorization" => %[token #{ENV.fetch("GITHUB_API_KEY")}]
+  response     = http.get path, 'Authorization' => %[token #{ENV.fetch('GITHUB_API_KEY')}]
   if response.code.to_i == 200
     JSON.load(response.body)
   else
@@ -185,21 +185,4 @@ def generic_semver?(version)
   version.segments.count == 3 && version.segments.all? { |segment| segment.match?(/\A[0-9]+\z/) }
 end
 
-# Build must not run on a fork.
-bump   = ENV["TRAVIS_REPO_SLUG"] == repository_slug
-# Skip PRs.
-bump &&= ENV["TRAVIS_PULL_REQUEST"] == "false"
-# Build must run on branch.
-bump &&= !ENV["TRAVIS_BRANCH"].to_s.empty?
-# GitHub API key must be available.
-bump &&= !ENV["GITHUB_API_KEY"].to_s.empty?
-# Build must not run on tag.
-bump &&= ENV["TRAVIS_TAG"].to_s.empty?
-# Ensure this commit is not tagged.
-bump &&= !tagged_commits_mapping.key?(ENV["TRAVIS_COMMIT"])
-
-if bump
-  if ENV["TRAVIS_BRANCH"] != "master"
-    bump_from_version_specific_branch(ENV["TRAVIS_BRANCH"])
-  end
-end
+bump_from_version_specific_branch(ENV.fetch('DRONE_BRANCH'))

data/kite.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor"
   spec.add_dependency "git"
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 1.16"
+  spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "rspec", "~> 3.7"
   spec.add_development_dependency "git"
   spec.add_development_dependency "simplecov"

data/lib/kite/version.rb

@@ -1,3 +1,3 @@
 module Kite
-  VERSION = '1.1.3'
+  VERSION = '1.1.7'
 end

data/tpl/skel/README.md.tt

@@ -1,4 +1,113 @@
-## Generate a new cloud
+# Kite
+
+[![Gem Version](https://badge.fury.io/rb/kite.svg)](https://badge.fury.io/rb/kite)
+[![license](https://img.shields.io/github/license/rubykube/kite.svg)](https://github.com/rubykube/kite/blob/master/LICENSE.md)
+
+[![Build Status](https://travis-ci.org/rubykube/kite.svg?branch=master)](https://travis-ci.org/rubykube/kite)
+[![codecov](https://codecov.io/gh/rubykube/kite/branch/master/graph/badge.svg)](https://codecov.io/gh/rubykube/kite)
+
+Kite is a CLI for scaffolding and managing devops modules
+The main purpose is templating of various tools for devops around terraform, bosh, ansible.
+Currently Kite supports modular stacks(Kite modules) on both AWS and GCP.
+
+We plan in adding community stack using a simple template repository structure.
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'kite'
 ```
-kite generate cloud --provider=<CLOUD_PROVIDER>
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install kite
+
+## Usage
+
+To start using kite for bootstraping your infrastructure
+follow the steps below.
+[Note] Most kite commands can be referred by their first letter(for example `kite generate environment test` is the same as `kite g e test`)
+
+### Create your Infrastructure as Code base repository
+
+Create a new kite project using:
+
 ```
+$ kite new PROJECT_NAME
+```
+
+### Generate an environment(e.g. development/test/production)
+
+Kite environments are separated workspaces with their own credentials, variables and modules.
+
+Generate an environment
+
+```
+$ kite generate environment *env_name* --provider=aws|gcp
+```
+
+If you want to change the credentials for an environment, edit `config/cloud.yml` and regenerate environment with the same command.
+
+Now the environment should be generated at `config/environments/*env_name*`
+
+### Add a module to your environment
+
+To add a Kite module to your environment, you should first initialize it.
+It's recommended to use specific module versions/tags(master branch would be used by default):
+
+```
+  kite module init https://url.for/your/module --env *env_name* --version *x.y.z/x-y-stable*
+```
+
+This should clone module's source files into `modules/*module_name*` and create a `vars.*module_name*.yml` file with all variables needed by the module.
+
+Fill in `vars.*module_name*.yml` with correct values and render the module:
+
+```
+  kite module render modules/*module_name* --env *env_name*
+```
+
+### Apply Terraform configuration from the environment
+
+Set your default gcloud credentials using
+
+```
+  gcloud auth application-default login
+```
+
+```
+  kite terraform init
+  kite terraform apply --env *env_name*
+```
+
+## Getting help
+
+To list all Kite commands, use
+
+```shell
+$> kite help
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+### Concourse Resource
+
+To use resource scripts locally, set env variable `is_devel` to `true`, e.h.:
+
+```sh
+$ ruby -Ilib ./bin/concourse/in
+```
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/rubykube/kite.

data/tpl/skel/Rakefile.tt

@@ -1,6 +1,8 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake
 
-ENV['KITE_ENV'] ||= 'development'
+ENV['KITE_ENV'] ||= 'test'
+
+@cloud = YAML.load_file('config/cloud.yml')[ENV['KITE_ENV']]
 
 Dir.glob('lib/tasks/*.rake').each do |task|
   load task

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kite
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.7
 platform: ruby
 authors:
 - Louis Bellet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -42,28 +42,28 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -130,10 +130,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".drone.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
@@ -217,8 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Command line tool for devops scaffolding.

data/.travis.yml

@@ -1,16 +0,0 @@
-dist: trusty
-
-sudo: required
-
-language: ruby
-
-cache: bundler
-
-
-before_install: gem install bundler -v 1.14.6
-
-env:
-  COVERAGE: true
-
-# Execute all of the commands which need to be executed after the build passed.
-after_success: ruby ci/bump.rb