vagrant-vmck 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 149034e449df45700dff46c992c1a527f2e07fb03a7107b93fc884309cd97de0
-  data.tar.gz: 1f43c2f7db3e9b6da7d317ea48945851b67d9b587d16d1a9f83996be5e714283
+  metadata.gz: a03f29802506d5a3e46a606c3540a81ac6d3f7f0ff072b172d050372c99ef91b
+  data.tar.gz: 436c41e088e7bb39ba1823de8ca4a6a333c7be8c8ae0bdaea1ca2ed099e884b7
 SHA512:
-  metadata.gz: 1f6499622e5dd56fb30be7c36695061a608d0fb5203f880e404c9a01bd5f05da7b63e08d751b153252de788343dc862e846493cd696e0142783e64a68ad0b446
-  data.tar.gz: 8905eefe833046c7a4e4819032d3dabfcbcb704489afae8e0375c10bf1ea04d93397308e1caf3695de23cd37551fefdd1b967dddbe5456030d51ea6ce5d4791b
+  metadata.gz: b321bd0e0101a82955e238dffa0793b0e72b92e4fe2596148435a8ecacfec012ab642741006dddbda030abbd93e83af5a1d1f3c5a109c9e5dcb9371c8194a3db
+  data.tar.gz: a959b5e810e7b81d1e9f597c4cb8766d377440085ece0041e5612403cba3acb44e671edeb597a9fef9ef0e3ad38a378cc13af8c09cb0326151478c7e3b567460

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/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
 

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.3.0"
+    VERSION = "0.3.1"
   end
 end

data/submission/Vagrantfile

@@ -6,9 +6,7 @@ Vagrant.configure("2") do |config|
     end
 
     config.nfs.functional = false
-    config.vm.provision 'shell', inline: 'mv /vagrant/submission.zip .; \
-                                            unzip submission.zip; \
-                                            chown -R vagrant:vagrant .'
+
     config.vm.provider :vmck do |vmck|
         vmck.vmck_url = ENV['VMCK_URL']
     end

data/submission/launch.sh

@@ -4,16 +4,27 @@ cd "$( dirname "${BASH_SOURCE[0]}" )"
 
 trap "vagrant destroy -f" EXIT
 
-curl "${ARCHIVE_URL}" -o submission.zip
-curl "${SCRIPT_URL}" -o checker.sh
+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
-vagrant ssh -- < checker.sh > result.out
+(
+set +e
+vagrant ssh -- 'cd /vagrant; ./script.sh' 1> result.out 2> result.err
+echo $? > result.exit_code
+)
+
+exit_code=$(cat result.exit_code)
+stdout="$(base64 result.out)"
+stderr="$(base64 result.err)"
 
-data="$(base64 result.out)"
-JSON_STRING=$(jq -n \
-                 --arg tok "$SUBMISSION_ID" \
-                 --arg out "$data" \
-                 '{token: $tok, output: $out,}')
-curl -X POST "${INTERFACE_ADDRESS}/done/" -d "$JSON_STRING" \
+RESULT_JSON=$(jq -n \
+                 --arg out "$stdout" \
+                 --arg err "$stderr" \
+                 --arg code $exit_code \
+                 '{stdout: $out, stderr: $err, exit_code: $code,}')
+curl -X POST "${VMCK_CALLBACK_URL}" -d "$RESULT_JSON" \
      --header "Content-Type: application/json"

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", "~> 12.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmck
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Alex Morega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-10-14 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: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 description: Enables Vagrant to use Vmck jobs.
 email:
 - alex@grep.ro