vagrant-guests-clearlinux 1.0.14 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7da2e19f3a6d02f4e42e5d90221000c9ba6bddac07ad0bc35304f6de205a48ba
-  data.tar.gz: 82274e24f25ac380531a9b42898c5a97092190acebc0ec47f0e6927e62c456dd
+  metadata.gz: 609fd9b88b16df3d55a99e9f56da98347b77bb1df3dde71fa8f3c288bb3a98a4
+  data.tar.gz: f2c777e1a75a20009fb1613366e31593e60a45475228e41f14dd68a02e82f81a
 SHA512:
-  metadata.gz: 376fb9fdbf38a3e8df7fdc49a9e02fa2bc9fcb7160a7626e8c24cf7f3a53152522c1c113b1eb752540fca5de6e2dc0b9292b068ff744fdf7dd641b640857bca2
-  data.tar.gz: 844f5ff7ac26cd7e9a585c9e08642bb150f2b9afff9c538e72c96c3e062697d857bc09df06253603f61e792d260afbffc033dea1e28395dda1f6b149a8540e38
+  metadata.gz: 0e4fcf59185f259a778552b53f98950e8f1c0cab64b14cc56b91e8496db4e89775fcffd782f0e75c0747516516107ceb673a17aacda1812b40541a32a67656a5
+  data.tar.gz: 70cacaae979289b26cbe36caee9dfa2fd4a901a887ed7a26042a587edbe452024908737dff8b267d6108c45a1018ec7e3dbddc2272bd4692e2a1cb5a351ed9ec

data/Dockerfile

@@ -0,0 +1,8 @@
+FROM ruby:2.5
+
+# throw errors if Gemfile has been modified since Gemfile.lock
+RUN bundle config --global frozen 1
+
+WORKDIR /usr/src/app
+
+

data/Gemfile

@@ -6,6 +6,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git', :tag => 'v2.2.1'
+  gem 'vagrant', :git => 'https://github.com/hashicorp/vagrant.git', :tag => 'v2.2.3'
   gem 'coveralls', require: true
 end

data/Makefile

@@ -0,0 +1,32 @@
+.DEFAULT_GOAL := help
+
+.PHONY: check-version help push local-install
+
+PLUGIN := vagrant-guests-clearlinux
+
+help:
+	@echo "available 'make' targets:"
+	@echo
+	@grep -E "^.*:.*?## .*$$" $(MAKEFILE_LIST) | \
+		grep -vE "(grep|BEGIN)" | awk \
+		'BEGIN {FS = ":.*?## "}; {printf "\t\033[36m%-30s\033[0m %s\n", $$1, $$2}' | \
+		VERSION=$(VERSION) envsubst
+	@echo
+
+check-version:
+ifndef VERSION
+	$(error VERSION is undefined)
+endif
+
+build: ## builds gem inside a docker container
+	docker run -it --rm --name gem-builder -v "$${PWD}":/usr/src/myapp \
+		-w /usr/src/myapp ruby:2.5 bash -c "bundle install; bundle exec rake build"
+
+push: pkg/$(PLUGIN)-${VERSION}.gem ## pushes gem to rubygems.org
+	gem push pkg/$(PLUGIN)-${VERSION}.gem
+
+pkg/$(PLUGIN)-${VERSION}.gem: check-version build
+
+local-install: pkg/$(PLUGIN)-${VERSION}.gem ## installs plugin locally for testing
+	vagrant plugin uninstall $(PLUGIN)
+	vagrant plugin install pkg/$(PLUGIN)-${VERSION}.gem

data/README.md

@@ -1,6 +1,7 @@
 # vagrant-guests-clearlinux
 
-This is a [Vagrant](http://www.vagrantup.com/) [plugin](http://docs.vagrantup.com/v2/plugins/index.html)
+This is a [Vagrant](http://www.vagrantup.com/)
+[plugin](http://docs.vagrantup.com/v2/plugins/index.html)
 that adds [Clear Linux](https://clearlinux.org) guest support.
 Once it gets feature complete and rock solid work will start
 in order to get its functionality merged in upstream Vagrant.
@@ -11,28 +12,40 @@ in order to get its functionality merged in upstream Vagrant.
 $ vagrant plugin install vagrant-guests-clearlinux
 ```
 
+## Updading
+
+```
+$ vagrant plugin update vagrant-guests-clearlinux
+```
+
 ## Development
-To build and install the plugin directly from this repo:
+
+To build, install or modify the plugin directly from this repository:
+
+> NOTE: commands bellow assume you have a working docker environment.
 
 ```
-$ bundle install
-$ bundle exec rake build
-$ vagrant plugin install pkg/vagrant-guests-clearlinux-1.0.14.gem
+$ make build
+$ make local-install VERSION=...
 ```
 
+where `VERSION` is whatever is being set in `lib/vagrant-guests-clearlinux/version.rb`
+
 You can run RSpec with:
 
 ```
 $ bundle install
 $ bundle exec rake
 ```
+
 ## Compatible Vagrant boxes
 
 You can find matching Vagrant boxes on [here](https://app.vagrantup.com/AntonioMeireles/boxes/ClearLinux).
 
 ## Acknowledgments
 
-This is a refactoring based on early works of [Fabio Rapposelli](https://github.com/frapposelli) on
+This started based on early work of [Fabio Rapposelli](https://github.com/frapposelli) on
 [vagrant-guests-photon](https://github.com/vmware/vagrant-guests-photon) and
-[Alex Sorkin](https://github.com/alexsorkin) on [vagrant-guests-innovitable](https://github.com/alexsorkin/vagrant-guests-innovitable).
+[Alex Sorkin](https://github.com/alexsorkin) on
+[vagrant-guests-innovitable](https://github.com/alexsorkin/vagrant-guests-innovitable)
 

data/lib/vagrant-guests-clearlinux/cap/configure_networks.rb

@@ -12,29 +12,18 @@ IPAddr.class_eval do
   end
 end
 
-STATIC_NETWORK = <<EOF.freeze
+VAGRANT_NETWORK = <<EOF.freeze
 #VAGRANT-BEGIN
 # The contents below were automatically generated by Vagrant. Do not modify.
 [Match]
 Name=%s
 
 [Network]
-Address=%s
+DHCP=%s
 %s
 #VAGRANT-END
 EOF
 
-DHCP_NETWORK = <<EOF.freeze
-#VAGRANT-BEGIN
-# The contents below were automatically generated by Vagrant. Do not modify.
-[Match]
-Name=%s
-
-[Network]
-DHCP=ipv4
-#VAGRANT-END
-EOF
-
 module VagrantPlugins
   module GuestClearLinux
     module Cap
@@ -57,15 +46,16 @@ module VagrantPlugins
             unit_name = format('50-vagrant-%s.network', device)
 
             if network[:type] == :static
+              leased = "no"
               cidr = IPAddr.new(network[:netmask]).to_cidr
-              address = "#{network[:ip]}/#{cidr}"
-              gateway = ""
-              gateway = "Gateway=#{network[:gateway]}" if network[:gateway]
-              unit_file = format(STATIC_NETWORK, device, address, gateway)
+              body = "Address=#{network[:ip]}/#{cidr}"
+              body += "\nGateway=#{network[:gateway]}" if network[:gateway]
             elsif network[:type] == :dhcp
-              unit_file = format(DHCP_NETWORK, device)
+              leased = "yes"
+              body = ""
             end
 
+            unit_file = format(VAGRANT_NETWORK, device, leased, body)
             temp = Tempfile.new('vagrant')
             temp.binmode
             temp.write(unit_file)

data/lib/vagrant-guests-clearlinux/cap/rsync.rb

@@ -0,0 +1,16 @@
+module VagrantPlugins
+  module GuestClearLinux
+    module Cap
+      class RSync
+        def self.rsync_installed(machine)
+          machine.communicate.test("test -f /usr/bin/rsync")
+        end
+
+        def self.rsync_install(machine)
+          # until it is available as a pundle...
+          machine.communicate.sudo("swupd bundle-add network-basic")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-guests-clearlinux/plugin.rb

@@ -33,6 +33,16 @@ module VagrantPlugins
         require_relative 'cap/nfs_client'
         Cap::NFS
       end
+
+      guest_capability(:clearlinux, :rsync_install) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
+
+      guest_capability(:clearlinux, :rsync_installed) do
+        require_relative "cap/rsync"
+        Cap::RSync
+      end
     end
   end
 end

data/lib/vagrant-guests-clearlinux/version.rb

@@ -4,6 +4,6 @@
 module VagrantPlugins
   # Set version for vagrant-guests-clearlinux gem.
   module GuestClearLinux
-    VERSION = '1.0.14'
+    VERSION = '1.0.16'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-guests-clearlinux
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.16
 platform: ruby
 authors:
 - António Meireles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,14 +105,17 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- Dockerfile
 - Gemfile
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
 - lib/vagrant-guests-clearlinux.rb
 - lib/vagrant-guests-clearlinux/cap/change_host_name.rb
 - lib/vagrant-guests-clearlinux/cap/configure_networks.rb
 - lib/vagrant-guests-clearlinux/cap/nfs_client.rb
+- lib/vagrant-guests-clearlinux/cap/rsync.rb
 - lib/vagrant-guests-clearlinux/guest.rb
 - lib/vagrant-guests-clearlinux/plugin.rb
 - lib/vagrant-guests-clearlinux/version.rb
@@ -141,8 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Clear Linux Guest Plugin for Vagrant