vagrant-vmck 0.2.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 702e962985deff117d960b6ab57a2a4ac0050902
-  data.tar.gz: a23724d365f4d744a291762a6a9a51effb070b36
+SHA256:
+  metadata.gz: 82d621045e2fc2b556bcacaa6fc5a55aca78109566f9ffaeedb27ec82640d3c3
+  data.tar.gz: e1a349611a010f24749e6e656f4f354c51ed0689135f4743171a4665078612f2
 SHA512:
-  metadata.gz: 0eab0cbd1c8dda52425372fac1ed3ea63609ca515592a33b630dba634afbba2d3d16f5855120b389ac3ba5d29276c3d58b57310d7c084f3c87d45da638d0b057
-  data.tar.gz: 4e6df24ec7a661e36e3475e973b438365f18fc437114b00a672a4749c81743616588fac97e0937262ae62bcd18119ecf5139da4f2d01755894be7150906b2425
+  metadata.gz: ac952fc7c5845af3bf8a2961e7e561db9fec0fdb1ec58dc2928a26695c42da8dc7d51e799dd95f01ce896966e5bfe72316f0e6a9358c1431a243a922ebabdcd2
+  data.tar.gz: 143dc9e194e9ca8d4c4effe52d2d062af97a1bfbf943fa9bbd4a6c4eb78cf3f8f8df2f08f3655fee58e65008826bed23473d69d7eb8cacd195c231bbfb0b1a3f

data/.drone.yml

@@ -71,6 +71,9 @@ steps:
   when:
     event:
     - push
+    branch:
+      exclude:
+      - dependabot/*
 
 - name: docker push autotag + latest
   image: plugins/docker
@@ -81,17 +84,3 @@ steps:
       from_secret: docker_username
     password:
       from_secret: docker_password
-
----
-kind: secret
-name: docker_username
-get:
-  path: liquid/ci/drone.docker
-  name: username
-
----
-kind: secret
-name: docker_password
-get:
-  path: liquid/ci/drone.docker
-  name: password

data/.github/workflows/gempush.yml

@@ -0,0 +1,29 @@
+name: Ruby Gem
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby 2.6
+      uses: actions/setup-ruby@v1
+      with:
+        version: 2.6.x
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_AUTH_TOKEN}}

data/.gitignore

@@ -1,5 +1,3 @@
 /.bundle/
 /Gemfile.lock
 .vagrant
-Vagrantfile
-!example_box/Vagrantfile

data/Dockerfile

@@ -7,7 +7,9 @@ ADD . .
 
 RUN set -e \
  && apt-get update -q \
- && apt-get install -yq wget git procps kmod rsync ruby-dev \
+ && apt-get install -yq wget git procps kmod rsync ruby-dev curl \
+ && wget https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -O /usr/bin/jq \
+ && chmod +x /usr/bin/jq \
  && wget https://releases.hashicorp.com/vagrant/2.2.4/vagrant_2.2.4_x86_64.deb \
  && dpkg -i vagrant_2.2.4_x86_64.deb \
  && rm vagrant_2.2.4_x86_64.deb \

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 group :development do
   gem 'vagrant', tag: 'v2.2.4', git: 'https://github.com/hashicorp/vagrant.git'
+  gem 'vagrant-env'
 end
 
 group :plugins do

data/Readme.md

@@ -28,13 +28,30 @@ The vmck provider is also packaged as a docker image:
 ./examples/docker.sh --dev --env VMCK_URL=http://10.66.60.1:9995
 ```
 
+
+## Development
+
+You can test the code using `bundle exec`:
+
+```shell
+export VMCK_URL=http://localhost:10000
+export VMCK_NAME="example"
+export VAGRANT_CWD=examples/box
+
+bundle install
+bundle exec vagrant up
+```
+
+
 ## Release
+
 1. Update `lib/vagrant-vmck/version.rb` and commit
 2. `git tag v1.2.3; git push --tags`
-3. `gem install gem-release; gem release`
-4. `docker build . --tag vmck/vagrant-vmck:1.2.3 --no-cache`
-5. `docker build . --tag vmck/vagrant-vmck` (should reuse the previous build)
-6. `docker push vmck/vagrant-vmck`
+
+The [gempush workflow](.github/workflows/gempush.yml) takes care of the rest,
+see it work away in the [actions
+tab](https://github.com/vmck/vagrant-vmck/actions).
+
 
 ## License
 

data/examples/box/.gitignore

@@ -0,0 +1 @@
+/.env

data/examples/box/Vagrantfile

@@ -0,0 +1,28 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  if Vagrant.has_plugin?("vagrant-env")
+    config.env.enable
+  end
+
+  config.vm.box = "base"
+  config.nfs.functional = false
+  config.smb.functional = false
+
+  config.vm.provision 'hello', type: 'shell', inline: "
+    set -x
+    echo hello world
+  "
+
+  config.vm.provider :vmck do |vmck|
+    vmck.image_path = 'imgbuild-master.qcow2.tar.gz'
+    vmck.vmck_url = ENV['VMCK_URL']
+    vmck.memory = 512
+    vmck.cpus = 1
+    vmck.restrict_network = false
+    vmck.storage = ENV['VMCK_STORAGE']
+    vmck.name = ENV['VMCK_NAME']
+  end
+
+end

data/examples/install.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+set -ex
+vagrant plugin install vagrant-vmck vagrant-env

data/lib/vagrant-vmck/action/create.rb

@@ -14,15 +14,22 @@ module VagrantPlugins
         def call(env)
           client = env[:vmck]
 
-          env[:ui].info("Vmck starting job ...")
-          options = {
-            'cpus': env[:machine].provider_config.cpus,
-            'memory': env[:machine].provider_config.memory,
-            'image_path': env[:machine].provider_config.image_path,
-            'storage': env[:machine].provider_config.storage,
-            'name': env[:machine].provider_config.name,
-          }
-          id = client.create(options)['id'].to_s
+          if ENV['VMCK_JOB_ID'].nil?
+            env[:ui].info("Vmck starting job ...")
+            options = {
+              'cpus': env[:machine].provider_config.cpus,
+              'memory': env[:machine].provider_config.memory,
+              'image_path': env[:machine].provider_config.image_path,
+              'storage': env[:machine].provider_config.storage,
+              'name': env[:machine].provider_config.name,
+              'restrict_network': env[:machine].provider_config.restrict_network,
+            }
+            id = client.create(options)['id'].to_s
+          else
+            id = ENV['VMCK_JOB_ID']
+            env[:ui].info("Vmck using existing job #{id}")
+          end
+
           env[:machine].id = id
 
           env[:ui].info("Vmck waiting for job #{id} to be ready ...")

data/lib/vagrant-vmck/client.rb

@@ -1,3 +1,4 @@
+require 'log4r'
 require 'faraday'
 require 'json'
 
@@ -6,7 +7,7 @@ module VagrantPlugins
     class Client
 
       def initialize(url)
-        @logger = Log4r::Logger.new('vmck::client')
+        @logger = Log4r::Logger.new("vagrant_vmck::client")
         @client = Faraday.new({ :url => url })
       end
 
@@ -17,6 +18,7 @@ module VagrantPlugins
           req.url(path)
           if data
             req.headers['Content-Type'] = 'application/json'
+            @logger.info "Request body: #{data}"
             req.body = JSON.generate(data)
           end
         end

data/lib/vagrant-vmck/config.rb

@@ -8,6 +8,7 @@ module VagrantPlugins
       attr_accessor :image_path
       attr_accessor :storage
       attr_accessor :name
+      attr_accessor :restrict_network
 
       def initialize
         @vmck_url = UNSET_VALUE
@@ -17,6 +18,7 @@ module VagrantPlugins
         @image_path = UNSET_VALUE
         @storage = UNSET_VALUE
         @name = UNSET_VALUE
+        @restrict_network = UNSET_VALUE
       end
 
       def finalize!
@@ -27,6 +29,7 @@ module VagrantPlugins
         @image_path = 'imgbuild-master.qcow2.tar.gz' if @image_path == UNSET_VALUE
         @storage = nil if @storage == UNSET_VALUE
         @name = 'default' if @name == UNSET_VALUE
+        @restrict_network = false if @restrict_network == UNSET_VALUE
       end
 
     end

data/lib/vagrant-vmck/plugin.rb

@@ -9,10 +9,32 @@ module VagrantPlugins
       end
 
       provider :vmck  do
+        setup_logging
+
         require_relative 'provider'
         Provider
       end
-    end
 
+      def self.setup_logging
+        require "log4r"
+
+        level = nil
+        begin
+          level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
+        rescue NameError
+          level = nil
+        end
+
+        level = nil if !level.is_a?(Integer)
+
+        if level
+          logger = Log4r::Logger.new("vagrant_vmck")
+          logger.outputters = Log4r::Outputter.stderr
+          logger.level = level
+          logger = nil
+        end
+      end
+
+    end
   end
 end

data/lib/vagrant-vmck/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Vmck
-    VERSION = "0.2.1"
+    VERSION = "0.4.2"
   end
 end

data/submission/Vagrantfile

@@ -0,0 +1,13 @@
+Vagrant.configure("2") do |config|
+    config.vm.box = 'base'
+
+    if Vagrant.has_plugin?('vagrant-env')
+        config.env.enable
+    end
+
+    config.nfs.functional = false
+
+    config.vm.provider :vmck do |vmck|
+        vmck.vmck_url = ENV['VMCK_URL']
+    end
+end

data/submission/launch.sh

@@ -0,0 +1,31 @@
+#!/bin/bash -ex
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
+trap "vagrant destroy -f" EXIT
+
+curl "${VMCK_ARCHIVE_URL}" -o archive.zip
+curl "${VMCK_SCRIPT_URL}" -o script.sh
+curl "${VMCK_ARTIFACT_URL}" -o artifact.zip
+
+chmod +x script.sh
+
+vagrant up
+(
+set +e
+vagrant ssh -- 'cd /vagrant; ./script.sh' &> result.out
+echo $? > result.exit_code
+)
+
+exit_code=$(cat result.exit_code)
+base64 result.out > stdout.tmp
+cat stdout.tmp | tr -d '\n' > stdout
+
+jq -n \
+    --rawfile out stdout \
+    --arg code $exit_code \
+    '{stdout: $out, exit_code: $code,}' > out.json
+
+curl -X POST "${VMCK_CALLBACK_URL}" -d @out.json \
+     --header "Content-Type: application/json" \
+     --retry 20 --retry-connrefused

data/vagrant-vmck.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "log4r"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmck
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Alex Morega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2020-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 description: Enables Vagrant to use Vmck jobs.
 email:
 - alex@grep.ro
@@ -88,13 +88,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".drone.yml"
+- ".github/workflows/gempush.yml"
 - ".gitignore"
 - Dockerfile
 - Gemfile
 - LICENSE.txt
 - Readme.md
+- examples/box/.gitignore
 - examples/box/Vagrantfile
 - examples/docker.sh
+- examples/install.sh
 - lib/vagrant-vmck.rb
 - lib/vagrant-vmck/action.rb
 - lib/vagrant-vmck/action/connect_vmck.rb
@@ -107,6 +110,8 @@ files:
 - lib/vagrant-vmck/provider.rb
 - lib/vagrant-vmck/version.rb
 - run-test.sh
+- submission/Vagrantfile
+- submission/launch.sh
 - vagrant-vmck.gemspec
 homepage: https://github.com/mgax/vagrant-vmck
 licenses:
@@ -127,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Vagrant provider plugin for Vmck.