vagrant-vagga 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d217e70c8f93017eb98b1e7c2aaca20b688ba790
-  data.tar.gz: 1a681a7683cee0a2e7576366f779c6cc285426e9
+  metadata.gz: 5c0cce004a18939ac4c3076e7b67ee59aa95e718
+  data.tar.gz: 9d767104f53e02203edf97df71408cbb799f45ff
 SHA512:
-  metadata.gz: e8f500f1e1b7a144d258dd13b820f3a58ecd9a0b9c037f2f39c51b4850cf6606480318bb8b7a7e36db2c4a05f72dd47340b8cf2a9a79aae91deb2101fdc0edeb
-  data.tar.gz: a585f000298a404d0379306f54d0b6ce83adbad2e63cc8188d5aab5167cdd89afb10ed6d618207739d57025f3bb3c3eaa3bf05e44f7178d86568db21c6ca02c0
+  metadata.gz: 438e374d531ac42289189e4d034889b5960ab285ef6eaf28d0c1747bc4f0e1dfa6af65db3d0a366de6c484ffc9cd6216d53f6782fff8163b8e3ce00439532c37
+  data.tar.gz: f64a545df625c62072fb7f34febbd7a304eee914adb2eefe3e88999930ce72372e16531ef430c2633b7f09f5941c4ae88b74f5f05437988088611222bd5b7b12

data/Vagrantfile

@@ -1,6 +1,13 @@
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
 Vagrant.configure(2) do |config|
+  #config.vm.box = "hashicorp/precise64"
   config.vm.box = "ubuntu/trusty64"
+
   config.vagga.install = true
+  config.vagga.testing = false
 
   config.vm.provision :vagga
+  if Vagrant.has_plugin?("vagrant-vbguest")
+    config.vbguest.auto_update = false
+  end
 end

data/lib/vagrant-vagga/config.rb

@@ -3,15 +3,18 @@ require "vagrant"
 
 module VagrantPlugins
   module Vagga
-    class Config < Vagrant.plugin("2", :config)
+    class Config < Vagrant.plugin(2, :config)
       attr_accessor :install
+      attr_accessor :testing
 
       def initialize
         @install = UNSET_VALUE
+        @testing = UNSET_VALUE
       end
 
       def finalize!
         @install = false if @install == UNSET_VALUE
+        @testing = false if @testing == UNSET_VALUE
       end
     end
   end

data/lib/vagrant-vagga/provisioner.rb

@@ -24,7 +24,12 @@ module VagrantPlugins
           @machine.communicate.upload(setup_script_path.to_s, setup_script_destination)
           @machine.communicate.sudo("chmod +x %s" % setup_script_destination)
 
-          setup_call = @machine.communicate.sudo("%s" % [setup_script_destination]) do |type, data|
+          if @machine.config.vagga.testing
+            repository = "vagga-testing"
+          else
+            repository = "vagga"
+          end
+          setup_call = @machine.communicate.sudo("%s %s" % [setup_script_destination, repository]) do |type, data|
             @machine.env.ui.info(data.rstrip)
           end
         end

data/lib/vagrant-vagga/setup_vagga.sh

@@ -2,26 +2,28 @@ if which vagga &> /dev/null; then
     echo "Vagga is already installed"
     exit 0
 fi
-
+REPO=$1
 
 if [ -f /etc/lsb-release ]; then
     # install uidmap in Ubuntu
-    apt-get -qq install -y --force-yes uidmap
+    if ! apt-get -qq install -y --force-yes uidmap
+    then
+        # install uidmap manually on ubuntu 12.04
+        wget http://gr.archive.ubuntu.com/ubuntu/pool/main/s/shadow/uidmap_4.1.5.1-1ubuntu9_amd64.deb
+        dpkg -i uidmap_4.1.5.1-1ubuntu9_amd64.deb
+    fi
 fi
 
+echo "deb http://ubuntu.zerogw.com $REPO main" | sudo tee /etc/apt/sources.list.d/vagga.list
 
-
-VAGGA_VERSION=$(curl -s http://files.zerogw.com/vagga/latest.html | sed -e 's/<[^>]*>//g' -e 's/vagga-//g' -e 's/.tar.xz//g')
-echo "Latest Vagga version is $VAGGA_VERSION, installing..."
-
-cd /tmp
-curl -s "http://files.zerogw.com/vagga/vagga-${VAGGA_VERSION}.tar.xz" | tar -xJ
-cd vagga
-export PREFIX=/usr
-bash install.sh
+apt-get update
+apt-get install vagga -y --force-yes
 
 mkdir -p ~vagrant/.vagga
 
+echo "vagrant:100000:65536" > /etc/subuid
+echo "vagrant:100000:65536" > /etc/subgid
+
 cat > ~vagrant/.vagga/settings.yaml << EOF
 storage-dir: "/home/vagrant/"
 EOF

data/lib/vagrant-vagga/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Vagga
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vagga
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Roman Rader
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin to install vagga in the box