kontena-plugin-vagrant 0.2.0.pre1 → 0.2.0.pre2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTc0YThjZGFlYmE5Y2VkOTdjZDlkMmUxNzhiMWUzMWIzNDliMWY1MQ==
+    ZDQzN2Q5NjA0YTY4YzAyYTdhN2U0OGE0ZWNmMzlmOTE2YTNmNWMyYQ==
   data.tar.gz: !binary |-
-    MGE2NmM1N2ZkMzkwOTk3MmUxMDk5ZGQxNDg3MmUyOTIzYzMyNjM0OQ==
+    ZGY0YWY4NmYwYmNhMWUyMWRlNmRiNWQ5Yjc3NjcwYWE2ZmJhNTFhZA==
 SHA512:
   metadata.gz: !binary |-
-    ZDk3OTEwNWZkNzRiMGNiNDYxZDA4YmU5NDg4MmFhMmYyMzg1ODUxZTc1ZDNl
-    YzFjZmE4MTY0MzRlM2U1Zjc1ZGMwMDIzZWE2MDE5NmVkODJkMjAyMzExMzY0
-    ZDJiYzZiNTI2MWJmNjhiNjk3MzllMGFjZjNkZjZjZTc5ZTFjYzQ=
+    MDgzOWNiZWNmOTYyMGMyYjU2ZTAzMTE0MmExMDJhYmNkMmUxNDMxZjZhOGNk
+    N2ZhZmFmODgzYjQ0MWViYjUyMjNkZGU2NDQ2ODJjYTM1MzE4NjcxMTI3NGE5
+    NTJlMDc3NjIyMWM4ZWYwNDJjNmEyODc3YjUwYjVhOWM4OTQ1OTQ=
   data.tar.gz: !binary |-
-    MzBjODY2NmJkZmI4NTViNmY5ZmRlOTIyOTZlN2VmZjMyMDgwNDI5ZTA3Y2M5
-    ZGFiZjhlNzVlYTViMDQxNjllZGQzZDE5MTZiZjYzM2JhMWU4ZmE3YTZiZGM3
-    OTgwMmQ3NzcyZDYwMzAyYjI1OGZhMGE5MmU4MzFlNzgyYjAwNGQ=
+    Nzg0MDY4NGU5ZTU4MjU5YmQ1ZWI2NTFkYWZkNzg4MmM0NzNhYTcwNjM5NmYz
+    YmJhNWNiZWE1Y2NkYThiMzE5N2MzOGM2ZDE0NmM3NmQ3Mjg1OWQxNzRiZjFi
+    YzU4NjRhMDZiNTY5MTdkNzBlNTYxZTlkMGI2Njg5MTY5YWU5MGU=

data/.travis.yml

@@ -4,10 +4,15 @@ rvm:
   - 2.1.8
   - 2.2.3
   - 2.3.1
+before_install:
+  - rvm @global do gem uninstall bundler -a -x
+  - rvm @global do gem install bundler -v 1.12.5
+cache:
+  directories:
+  - vendor/
 env:
   - secure: "AKXU+TV7xK0tZdtKq7ONJyLrrJfBNaPDMLvARHYPQlgHc0LDCaYSC3r+RZwIWMNBWYrAsT0A4wmLviUXex1gPvIJ9ej9bhUE0ch6xnFP1LUQG7UF1HjregG6zZqrPuxJ7fqJx3dATy2vV13BiIUmjkxRKeN76fQI/ISIkDhv2GHLGp8uuRxKBmxKFCX0azYzNOZtz8vSSF5iWmRbHjbc6XEP6s3OwkSU1FUCvXh5o+mVxA+yHufCoZnCZbGsw1Y+0+l/kIq+dypJrHBGrvu6xH5zJDddtwcJ9TS1Q4W7+XUTag5MrLDYlLoSBKDSXUkeGZ9Pv7fRhw0FZssOy8mBWVvM2Np2r7/p5yWqCoKQ9rvnhy1xAMVpwA6BzKzp47UV8DeSXywABO8rqtFDfimrh2FWViiEkLbMTH8YtykD1+OB6HLr/qPwogtBHAKdPhW3vHV4SM7+QzIUVHzzxYZES5lZGHiYZ9HGp4cGNtBQ0dwoCO11zeAVJXasjXzzBCn/TtlFAgS+xsephygk8YGzNvUBSwiMAd7vPt1ikm5R9RN4Vp8WEC0QyTNNVvG+Z8fuYC8x2KR16TYKOBFcYfBVMdDtoDJX45gIVxjGiLa9Dm2SCbyyeovI8o+6ryjSaSPE23ajxP7Xxx9nQXRGn14MyxDLndxpiZIMDoc18On+t9E="
-cache: bundler
-script: bundle install && bundle exec rspec spec/
+script: bundle install --path vendor/bundle && bundle exec rspec spec/
 deploy:
   provider: rubygems
   api_key: $GEM_TOKEN

data/Gemfile

@@ -7,4 +7,5 @@ group :development do
   gem "kontena-cli", "~> 0.16.0.pre2"
   gem "listen", "~> 3.0.8"
   gem "rspec"
+  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", tag: "v1.8.4"
 end

data/kontena-plugin-vagrant.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'kontena-cli', '>= 0.16.0.pre2'
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
 end

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

@@ -69,8 +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 server_name %>-e KONTENA_SERVER_NAME=<%= server_name %><% end %> \
-            <% if initial_admin_code %>-e KONTENA_INITIAL_ADMIN_CODE=<%= initial_admin_code %><% end %> \
+            <% if server_name %>-e SERVER_NAME=<%= server_name %><% end %> \
+            <% if initial_admin_code %>-e INITIAL_ADMIN_CODE=<%= initial_admin_code %><% end %> \
             -p 8080:9292 \
             kontena/server:${KONTENA_VERSION}
         ExecStop=/usr/bin/docker stop kontena-server-api
@@ -90,7 +90,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   config.vm.define "<%= name %>" do |docker|
-    docker.vm.box = "coreos-stable"
+    docker.vm.box = "coreos-<%= coreos_channel %>"
     docker.vm.box_url = "http://stable.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json"
     docker.vm.network "private_network", ip: "192.168.66.100"
     docker.vm.hostname = "<%= name %>"

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

@@ -15,7 +15,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   config.vm.define "<%= name %>" do |docker|
-    docker.vm.box = "coreos-stable"
+    docker.vm.box = "coreos-<%= coreos_channel %>"
     docker.vm.box_url = "http://stable.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json"
     docker.vm.network "private_network", type: "dhcp"
     docker.vm.hostname = "<%= name %>"

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

@@ -7,13 +7,6 @@ module Kontena
 
         include Kontena::Cli::ShellSpinner
 
-        attr_reader :client, :api_client
-
-        # @param [Kontena::Client] api_client Kontena api client
-        def initialize(api_client)
-          @api_client = api_client
-        end
-
         def run!
           vagrant_path = "#{Dir.home}/.kontena/vagrant_master"
           Dir.chdir(vagrant_path) do

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

@@ -8,6 +8,7 @@ module Kontena
       class MasterProvisioner
         include RandomName
         include Kontena::Machine::Common
+        include Kontena::Cli::Common
         include Kontena::Cli::ShellSpinner
 
         API_URL = 'http://192.168.66.100:8080'
@@ -24,6 +25,7 @@ module Kontena
           vault_secret = opts[:vault_secret]
           vault_iv = opts[:vault_iv]
           initial_admin_code = opts[:initial_admin_code]
+          coreos_channel = opts[:coreos_channel]
           vagrant_path = "#{Dir.home}/.kontena/vagrant_master/"
           if Dir.exist?(vagrant_path)
             puts "Oops... cannot create Kontena Master because installation path already exists."
@@ -42,6 +44,7 @@ module Kontena
             vault_secret: vault_secret,
             initial_admin_code: initial_admin_code,
             vault_iv: vault_iv,
+            coreos_channel: coreos_channel,
             cloudinit: "#{vagrant_path}/cloudinit.yml"
           }
           vagrant_data = erb(File.read(template), vars)
@@ -61,10 +64,7 @@ module Kontena
           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
+          vspinner "Kontena Master is now running at #{API_URL}"
 
           {
             name: name.sub('kontena-master-', ''),

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

@@ -35,6 +35,7 @@ module Kontena
             memory: opts[:memory] || 1024,
             master_uri: opts[:master_uri],
             grid_token: opts[:grid_token],
+            coreos_channel: opts[:coreos_channel],
             cloudinit: "#{vagrant_path}/cloudinit.yml"
           }
           vagrant_data = erb(File.read(template), vars)
@@ -51,7 +52,7 @@ module Kontena
               end
             end
             spinner "Waiting for node #{name.colorize(:cyan)} join to grid #{grid.colorize(:cyan)} " do
-              sleep 1 until node_exists_in_grid?(grid, name)
+              sleep 1 until node = node_exists_in_grid?(grid, name)
             end
           end
           set_labels(

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

@@ -2,24 +2,41 @@ require 'securerandom'
 
 module Kontena::Plugin::Vagrant::Master
   class CreateCommand < Kontena::Command
+    include Kontena::Cli::Common
 
-    option "--memory", "MEMORY", "How much memory node has", default: '512'
+    option "--name", "[NAME]", "Set master name"
+    option "--memory", "MEMORY", "How much memory node has"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
     option "--vault-secret", "VAULT_SECRET", "Secret key for Vault"
     option "--vault-iv", "VAULT_IV", "Initialization vector for Vault"
     option "--name", "NAME", "Set Master name"
+    option "--coreos-channel", "CHANNEL", "CoreOS release channel", default: 'stable'
 
     def execute
       require_relative '../../../machine/vagrant'
+      mem = ask_instance_memory
       provisioner.run!(
-        memory: memory,
+        memory: mem,
         version: version,
         vault_secret: vault_secret || SecureRandom.hex(24),
         vault_iv: vault_iv || SecureRandom.hex(24),
-        initial_admin_code: SecureRandom.hex(16)
+        initial_admin_code: SecureRandom.hex(16),
+        coreos_channel: coreos_channel
       )
     end
 
+    def ask_instance_memory
+      if self.memory.nil?
+        prompt.select("Choose a size") do |menu|
+          %w(512 1024 2048).each do |mem|
+            menu.choice "#{mem}MB", mem
+          end
+        end
+      else
+        self.memory
+      end
+    end
+
     def provisioner
       Kontena::Machine::Vagrant::MasterProvisioner.new
     end

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

@@ -5,17 +5,9 @@ module Kontena::Plugin::Vagrant::Master
     option '--force', :flag, 'Force remove', default: false, attribute_name: :forced
 
     def execute
-      require_api_url
-
       confirm unless forced?
-
       require_relative '../../../machine/vagrant'
-      destroyer = destroyer(client(require_token))
-      destroyer.run!
-    end
-
-    def destroyer(client)
-      Kontena::Machine::Vagrant::MasterDestroyer.new(client)
+      Kontena::Machine::Vagrant::MasterDestroyer.new.run!
     end
   end
 end

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

@@ -4,19 +4,23 @@ module Kontena::Plugin::Vagrant::Nodes
     include Kontena::Cli::GridOptions
 
     parameter "[NAME]", "Node name"
-    option "--instances", "AMOUNT", "How many nodes will be created", default: '1'
-    option "--memory", "MEMORY", "How much memory node has", default: '1024'
+    option "--instances", "AMOUNT", "How many nodes will be created"
+    option "--memory", "MEMORY", "How much memory node has"
     option "--version", "VERSION", "Define installed Kontena version", default: 'latest'
+    option "--coreos-channel", "CHANNEL", "CoreOS release channel", default: 'stable'
 
     def execute
       api_url = require_api_url
       require_current_grid
 
+      instance_count = ask_instances
+      instance_memory = ask_instance_memory
+
       require_relative '../../../machine/vagrant'
 
       grid = fetch_grid
       provisioner = provisioner(client(require_token))
-      instances.to_i.times do |i|
+      instance_count.to_i.times do |i|
         provisioner.run!(
           master_uri: api_url,
           grid_token: grid['token'],
@@ -24,11 +28,32 @@ module Kontena::Plugin::Vagrant::Nodes
           name: name,
           instance_number: i + 1,
           memory: memory,
-          version: version
+          version: version,
+          coreos_channel: coreos_channel
         )
       end
     end
 
+    def ask_instances
+      if self.instances.nil?
+        prompt.ask("How many nodes?: ", default: 1, in: '1..10')
+      else
+        self.instances
+      end
+    end
+
+    def ask_instance_memory
+      if self.memory.nil?
+        prompt.select("Choose a size ") do |menu|
+          %w(1024 2048 4096).each do |mem|
+            menu.choice "#{mem}MB", mem
+          end
+        end
+      else
+        self.memory
+      end
+    end
+
     # @param [Kontena::Client] client
     def provisioner(client)
       Kontena::Machine::Vagrant::NodeProvisioner.new(client)

data/lib/kontena/plugin/vagrant.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kontena-plugin-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
+  version: 0.2.0.pre2
 platform: ruby
 authors:
 - Kontena, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kontena-cli
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement