vagrant-vmck 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 946e9083729b16d5cced66a3245f91792b4c3df9c65aefd54d56d66afa770744
-  data.tar.gz: a5b096ae4a356ba21aad5d3e4c42f3e97e01aa437408c8f09bab4c1c820ebf30
+  metadata.gz: ecdb3027a337a29f3c9d4644ca274acb66139ac7c74c3256ff4cba5bed846bd5
+  data.tar.gz: 931e3c8ba91c1d93eb80a3ee2629ff1cb3e473938536d363010dce12749bd306
 SHA512:
-  metadata.gz: '0009bbd31115a4f64d7f9c3057211c971457b86dff5d3d8f641ad1049552ccff6beb801bfed993800660cd7170823c3b729250fe1d59cf43a6f3a8cfddd7e244'
-  data.tar.gz: aac475c79a795ca4ee5bda6a4c6208f401aa42e83aca7c0c0fcbdb2bcac19e45ee85b5d0dedc88e3c65bf4962130d9368cd70dc34d07c83cfe4081e422f94ad2
+  metadata.gz: de86055dd4f8b3635eece5aee100c9a5316c671aa1d515ac119c25728d0e6232028ab846088ad064ab01cd24c6f5c8549db6eb578a72ebd92f9bdb6eb09ed63a
+  data.tar.gz: df624f1b8763657ce3295d414a1478a639cb259b35e90581121bba7db89f14498200eb1ffed77c93c98e31bdc8732241a6e2008efa99eeac82337a29208efad1

data/.drone.yml

@@ -71,6 +71,9 @@ steps:
   when:
     event:
     - push
+    branch:
+      exclude:
+      - dependabot/*
 
 - name: docker push autotag + latest
   image: plugins/docker

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 curl jq\
+ && apt-get install -yq wget git procps kmod rsync ruby-dev curl \
+ && wget https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux32 -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/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/lib/vagrant-vmck/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Vmck
-    VERSION = "0.3.2"
+    VERSION = "0.4.1"
   end
 end

data/submission/launch.sh

@@ -13,18 +13,19 @@ chmod +x script.sh
 vagrant up
 (
 set +e
-vagrant ssh -- 'cd /vagrant; ./script.sh' 1> result.out 2> result.err
+vagrant ssh -- 'cd /vagrant; ./script.sh' &> result.out
 echo $? > result.exit_code
 )
 
 exit_code=$(cat result.exit_code)
-stdout="$(base64 result.out)"
-stderr="$(base64 result.err)"
-
-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"
+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", "~> 12.3"
+  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.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Alex Morega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 description: Enables Vagrant to use Vmck jobs.
 email:
 - alex@grep.ro