kontena-plugin-vagrant 0.1.2 → 0.2.0.pre1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDU5MzU3OGMzOGRiODNlNmExMzFlMDg2MmUwNjYzYWQxMzM1OGY1NQ==
+    YTc0YThjZGFlYmE5Y2VkOTdjZDlkMmUxNzhiMWUzMWIzNDliMWY1MQ==
   data.tar.gz: !binary |-
-    ZDJhMzRiOWUzNTM0MWI4NzE5MDQ5NDE2ZDQ0MDM2N2FkZmIyNTk1Yg==
+    MGE2NmM1N2ZkMzkwOTk3MmUxMDk5ZGQxNDg3MmUyOTIzYzMyNjM0OQ==
 SHA512:
   metadata.gz: !binary |-
-    ODZiYTFkOTZjZWI0OGJlM2IzYmQ2OWZhMmI0YzVhMzZhMmY0YmY1MDk4MThh
-    M2RjZDhjZmQxZGEzMjZiN2QyZGFiMTNlNTJkOWRjZDNjODNhMDAwMWU5NGNh
-    N2Y5OWI1OWQzNzJmYTgzMjU2YjJiNDc2ZGQwZWZkOWNiZGM1OTI=
+    ZDk3OTEwNWZkNzRiMGNiNDYxZDA4YmU5NDg4MmFhMmYyMzg1ODUxZTc1ZDNl
+    YzFjZmE4MTY0MzRlM2U1Zjc1ZGMwMDIzZWE2MDE5NmVkODJkMjAyMzExMzY0
+    ZDJiYzZiNTI2MWJmNjhiNjk3MzllMGFjZjNkZjZjZTc5ZTFjYzQ=
   data.tar.gz: !binary |-
-    ZTIyMzQwZjBlMDI4MWMzMmEyZjc3NjUwMTU1MzZmMTJlZDI1NzdjNDcwZTI1
-    MDJhM2Y1Mzk2MWQ3ZWQ0YThkYWIwODU5OGZlNDkzMmFiNTA1ZWMzOGY5ZjFi
-    ZmI4MTI5MjFmZTg4MzkyNDkzMzhiNzVlNDI4YzNmMjkxMGIwOWM=
+    MzBjODY2NmJkZmI4NTViNmY5ZmRlOTIyOTZlN2VmZjMyMDgwNDI5ZTA3Y2M5
+    ZGFiZjhlNzVlYTViMDQxNjllZGQzZDE5MTZiZjYzM2JhMWU4ZmE3YTZiZGM3
+    OTgwMmQ3NzcyZDYwMzAyYjI1OGZhMGE5MmU4MzFlNzgyYjAwNGQ=

data/Gemfile

@@ -4,8 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem "kontena-cli", "~> 0.15.0.rc1"
+  gem "kontena-cli", "~> 0.16.0.pre2"
   gem "listen", "~> 3.0.8"
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", tag: "v1.8.4"
   gem "rspec"
 end

data/kontena-plugin-vagrant.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'kontena-cli', '>= 0.15.0.rc1'
+  spec.add_runtime_dependency 'kontena-cli', '>= 0.16.0.pre2'
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
 end

data/lib/kontena/machine/vagrant/Vagrantfile.master.rb.erb

@@ -69,7 +69,8 @@ coreos:
             --link kontena-server-mongo:mongodb \
             -e MONGODB_URI=mongodb://mongodb:27017/kontena_server \
             -e VAULT_KEY=${KONTENA_VAULT_KEY} -e VAULT_IV=${KONTENA_VAULT_IV} \
-            <% if auth_server %>-e AUTH_API_URL=<%= auth_server %><% end %> \
+            <% if server_name %>-e KONTENA_SERVER_NAME=<%= server_name %><% end %> \
+            <% if initial_admin_code %>-e KONTENA_INITIAL_ADMIN_CODE=<%= initial_admin_code %><% end %> \
             -p 8080:9292 \
             kontena/server:${KONTENA_VERSION}
         ExecStop=/usr/bin/docker stop kontena-server-api

data/lib/kontena/machine/vagrant/master_destroyer.rb

@@ -5,6 +5,8 @@ module Kontena
     module Vagrant
       class MasterDestroyer
 
+        include Kontena::Cli::ShellSpinner
+
         attr_reader :client, :api_client
 
         # @param [Kontena::Client] api_client Kontena api client
@@ -15,7 +17,7 @@ module Kontena
         def run!
           vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
           Dir.chdir(vagrant_path) do
-            ShellSpinner "Terminating Kontena Master from Vagrant " do
+            spinner "Terminating Kontena Master from Vagrant " do
               Open3.popen2('vagrant destroy -f') do |stdin, output, wait|
                 while o = output.gets
                   puts o if ENV['DEBUG']

data/lib/kontena/machine/vagrant/master_provisioner.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
-require 'shell-spinner'
 
 module Kontena
   module Machine
@@ -9,6 +8,7 @@ module Kontena
       class MasterProvisioner
         include RandomName
         include Kontena::Machine::Common
+        include Kontena::Cli::ShellSpinner
 
         API_URL = 'http://192.168.66.100:8080'
         attr_reader :client
@@ -21,9 +21,9 @@ module Kontena
           name = generate_name
           version = opts[:version]
           memory = opts[:memory] || 1024
-          auth_server = opts[:auth_server]
           vault_secret = opts[:vault_secret]
           vault_iv = opts[:vault_iv]
+          initial_admin_code = opts[:initial_admin_code]
           vagrant_path = "#{Dir.home}/.kontena/vagrant_master/"
           if Dir.exist?(vagrant_path)
             puts "Oops... cannot create Kontena Master because installation path already exists."
@@ -36,10 +36,11 @@ module Kontena
           cloudinit_template = File.join(__dir__ , '/cloudinit.yml')
           vars = {
             name: name,
+            server_name: name.sub('kontena-master-', ''),
             version: version,
             memory: memory,
-            auth_server: auth_server,
             vault_secret: vault_secret,
+            initial_admin_code: initial_admin_code,
             vault_iv: vault_iv,
             cloudinit: "#{vagrant_path}/cloudinit.yml"
           }
@@ -48,19 +49,28 @@ module Kontena
           File.write("#{vagrant_path}/Vagrantfile", vagrant_data)
           File.write("#{vagrant_path}/cloudinit.yml", cloudinit)
           Dir.chdir(vagrant_path) do
-            ShellSpinner "Creating Vagrant machine #{name.colorize(:cyan)} " do
+            spinner "Creating Vagrant machine #{name.colorize(:cyan)} " do
               Open3.popen2("vagrant up") do |stdin, output, wait|
                 while o = output.gets
                   print o if ENV['DEBUG']
                 end
               end
             end
-            ShellSpinner "Waiting for #{name.colorize(:cyan)} to start " do
-              sleep 1 until master_running?
-            end
-            puts "Kontena Master is now running at #{API_URL}"
-            puts "Use #{"kontena login --name #{name.sub('kontena-master-', '')} #{API_URL}".colorize(:light_black)} to complete Kontena Master setup"
           end
+
+          spinner "Waiting for #{name.colorize(:cyan)} to start " do
+            sleep 1 until master_running?
+          end
+
+          puts
+          puts "Kontena Master is now running at #{API_URL}".colorize(:green)
+          puts
+
+          {
+            name: name.sub('kontena-master-', ''),
+            public_ip: API_URL.split('//').last,
+            code: opts[:initial_admin_code]
+          }
         end
 
         def erb(template, vars)

data/lib/kontena/machine/vagrant/node_destroyer.rb

@@ -5,6 +5,7 @@ module Kontena
     module Vagrant
       class NodeDestroyer
         include RandomName
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :api_client
 
@@ -16,7 +17,7 @@ module Kontena
         def run!(grid, name)
           vagrant_path = "#{Dir.home}/.kontena/#{grid}/#{name}"
           Dir.chdir(vagrant_path) do
-            ShellSpinner "Terminating Vagrant machine #{name.colorize(:cyan)} " do
+            spinner "Terminating Vagrant machine #{name.colorize(:cyan)} " do
               Open3.popen2('vagrant destroy -f') do |stdin, output, wait|
                 while o = output.gets
                   puts o if ENV['DEBUG']
@@ -29,7 +30,7 @@ module Kontena
           end
           node = api_client.get("grids/#{grid}/nodes")['nodes'].find{|n| n['name'] == name}
           if node
-            ShellSpinner "Removing node #{name.colorize(:cyan)} from grid #{grid.colorize(:cyan)} " do
+            spinner "Removing node #{name.colorize(:cyan)} from grid #{grid.colorize(:cyan)} " do
               api_client.delete("grids/#{grid}/nodes/#{name}")
             end
           end

data/lib/kontena/machine/vagrant/node_provisioner.rb

@@ -1,13 +1,13 @@
 require 'fileutils'
 require 'erb'
 require 'open3'
-require 'shell-spinner'
 
 module Kontena
   module Machine
     module Vagrant
       class NodeProvisioner
         include RandomName
+        include Kontena::Cli::ShellSpinner
 
         attr_reader :client, :api_client
 
@@ -43,15 +43,15 @@ module Kontena
           File.write("#{vagrant_path}/cloudinit.yml", cloudinit)
           node = nil
           Dir.chdir(vagrant_path) do
-            ShellSpinner "Creating Vagrant machine #{name.colorize(:cyan)} " do
+            spinner "Creating Vagrant machine #{name.colorize(:cyan)} " do
               Open3.popen2('vagrant up') do |stdin, output, wait|
                 while o = output.gets
                   print o if ENV['DEBUG']
                 end
               end
             end
-            ShellSpinner "Waiting for node #{name.colorize(:cyan)} join to grid #{grid.colorize(:cyan)} " do
-              sleep 1 until node = node_exists_in_grid?(grid, name)
+            spinner "Waiting for node #{name.colorize(:cyan)} join to grid #{grid.colorize(:cyan)} " do
+              sleep 1 until node_exists_in_grid?(grid, name)
             end
           end
           set_labels(

data/lib/kontena/plugin/vagrant/master/create_command.rb

@@ -5,18 +5,18 @@ module Kontena::Plugin::Vagrant::Master
 
     option "--memory", "MEMORY", "How much memory node has", default: '512'
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
-    option "--auth-provider-url", "AUTH_PROVIDER_URL", "Define authentication provider url"
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault"
+    option "--name", "NAME", "Set Master name"
 
     def execute
       require_relative '../../../machine/vagrant'
       provisioner.run!(
         memory: memory,
         version: version,
-        auth_server: auth_provider_url,
         vault_secret: vault_secret || SecureRandom.hex(24),
-        vault_iv: vault_iv || SecureRandom.hex(24)
+        vault_iv: vault_iv || SecureRandom.hex(24),
+        initial_admin_code: SecureRandom.hex(16)
       )
     end
 

data/lib/kontena/plugin/vagrant/master/restart_command.rb

@@ -1,6 +1,7 @@
 module Kontena::Plugin::Vagrant::Master
   class RestartCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::ShellSpinner
 
     def execute
       require_relative '../../../machine/vagrant'
@@ -8,7 +9,7 @@ module Kontena::Plugin::Vagrant::Master
       vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
       abort("Cannot find Vagrant kontena-master".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        ShellSpinner "Restarting Vagrant kontena-master " do
+        spinner "Restarting Vagrant kontena-master " do
           Open3.popen2('vagrant reload') do |stdin, output, wait|
             while o = output.gets
               print o if ENV['DEBUG']

data/lib/kontena/plugin/vagrant/master/start_command.rb

@@ -1,6 +1,7 @@
 module Kontena::Plugin::Vagrant::Master
   class StartCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::ShellSpinner
 
     def execute
       require_relative '../../../machine/vagrant'
@@ -8,7 +9,7 @@ module Kontena::Plugin::Vagrant::Master
       vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
       abort("Cannot find Vagrant node kontena-master".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        ShellSpinner "Starting Vagrant machine kontena-master " do
+        spinner "Starting Vagrant machine kontena-master " do
           Open3.popen2('vagrant up') do |stdin, output, wait|
             while o = output.gets
               print o if ENV['DEBUG']

data/lib/kontena/plugin/vagrant/master/stop_command.rb

@@ -1,6 +1,7 @@
 module Kontena::Plugin::Vagrant::Master
   class StopCommand < Kontena::Command
     include Kontena::Cli::Common
+    include Kontena::Cli::ShellSpinner
 
     def execute
       require_relative '../../../machine/vagrant'
@@ -8,7 +9,7 @@ module Kontena::Plugin::Vagrant::Master
       vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
       abort("Cannot find Vagrant kontena-master".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        ShellSpinner "Stopping Vagrant kontena-master " do
+        spinner "Stopping Vagrant kontena-master " do
           Open3.popen2('vagrant halt') do |stdin, output, wait|
             while o = output.gets
               print o if ENV['DEBUG']

data/lib/kontena/plugin/vagrant/nodes/restart_command.rb

@@ -2,6 +2,7 @@ module Kontena::Plugin::Vagrant::Nodes
   class RestartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::ShellSpinner
 
     parameter "NAME", "Node name"
 
@@ -10,12 +11,11 @@ module Kontena::Plugin::Vagrant::Nodes
       require_current_grid
 
       require_relative '../../../machine/vagrant'
-      require 'shell-spinner'
 
       vagrant_path = "#{Dir.home}/.kontena/#{current_grid}/#{name}"
       abort("Cannot find Vagrant node #{name}".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        ShellSpinner "Restarting Vagrant machine #{name.colorize(:cyan)} " do
+        spinner "Restarting Vagrant machine #{name.colorize(:cyan)} " do
           Open3.popen2('vagrant reload') do |stdin, output, wait|
             while o = output.gets
               print o if ENV['DEBUG']

data/lib/kontena/plugin/vagrant/nodes/start_command.rb

@@ -2,6 +2,7 @@ module Kontena::Plugin::Vagrant::Nodes
   class StartCommand < Kontena::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::ShellSpinner
 
     parameter "NAME", "Node name"
 
@@ -14,7 +15,7 @@ module Kontena::Plugin::Vagrant::Nodes
       vagrant_path = "#{Dir.home}/.kontena/#{current_grid}/#{name}"
       abort("Cannot find Vagrant node #{name}".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-        ShellSpinner "Starting Vagrant machine #{name.colorize(:cyan)} " do
+        spinner "Starting Vagrant machine #{name.colorize(:cyan)} " do
           Open3.popen2('vagrant up') do |stdin, output, wait|
             while o = output.gets
               print o if ENV['DEBUG']

data/lib/kontena/plugin/vagrant/nodes/stop_command.rb

@@ -2,6 +2,7 @@ module Kontena::Plugin::Vagrant::Nodes
   class StopCommand < Clamp::Command
     include Kontena::Cli::Common
     include Kontena::Cli::GridOptions
+    include Kontena::Cli::ShellSpinner
 
     parameter "NAME", "Node name"
 
@@ -14,7 +15,7 @@ module Kontena::Plugin::Vagrant::Nodes
       vagrant_path = "#{Dir.home}/.kontena/#{current_grid}/#{name}"
       abort("Cannot find Vagrant node #{name}".colorize(:red)) unless Dir.exist?(vagrant_path)
       Dir.chdir(vagrant_path) do
-          ShellSpinner "Stopping Vagrant machine #{name.colorize(:cyan)} " do
+          spinner "Stopping Vagrant machine #{name.colorize(:cyan)} " do
             Open3.popen2('vagrant halt') do |stdin, output, wait|
               while o = output.gets
                 print o if ENV['DEBUG']

data/lib/kontena/plugin/vagrant.rb

@@ -1,7 +1,7 @@
 module Kontena
   module Plugin
     module Vagrant
-      VERSION = "0.1.2"
+      VERSION = "0.2.0.pre1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0.rc1
+        version: 0.16.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.15.0.rc1
+        version: 0.16.0.pre2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -109,9 +109,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5