vagrant-vagga 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef48114719597d97cd52206f7a0722207f19404
-  data.tar.gz: e422a94443f7ccbd1522d5b544952d0df5203ccd
+  metadata.gz: d217e70c8f93017eb98b1e7c2aaca20b688ba790
+  data.tar.gz: 1a681a7683cee0a2e7576366f779c6cc285426e9
 SHA512:
-  metadata.gz: 39d53670ec383ef2a54c2856637b50ff1dd9a6a77212c1222362ec5485f8fa078fbd7c09d594e940cebf2ffcfd26cce81bed44b77d7a6075a3dba800d4a1997b
-  data.tar.gz: d20830a5fbc5dd7f834da2a35ca31abfffbc4537955a33a7874563b749a7b79bfac707b40aa3a98c4331842038f73b4600e08ede15f4d9d4dd2522b829a7c7ff
+  metadata.gz: e8f500f1e1b7a144d258dd13b820f3a58ecd9a0b9c037f2f39c51b4850cf6606480318bb8b7a7e36db2c4a05f72dd47340b8cf2a9a79aae91deb2101fdc0edeb
+  data.tar.gz: a585f000298a404d0379306f54d0b6ce83adbad2e63cc8188d5aab5167cdd89afb10ed6d618207739d57025f3bb3c3eaa3bf05e44f7178d86568db21c6ca02c0

data/README.md

@@ -18,6 +18,7 @@ Install gem to vagrant:
  3. Install vagrant-vagga plugin
  4. You're awesome!
 
+Example project: https://github.com/rrader/vagrant-vagga/tree/master/example
 
 ## Usage
 
@@ -38,9 +39,8 @@ end
 Your working directory with Vagrantfile should also contain vagga.yaml, which is implied by plugin logic.
 
 ```shell
-$ vagrant up
-... # after it's done
 $ vagrant vagga
+[... long output spinning up the VM (only first time)]
 Available commands:
     run                 Run app
     setup               Setup application

data/example/Vagrantfile

@@ -7,4 +7,6 @@ Vagrant.configure("2") do |config|
   config.vm.provision :vagga
 
   config.vm.network :forwarded_port, guest: 5000, host: 5000, auto_correct: false
+
+  config.vm.box_check_update = false
 end

data/lib/vagrant-vagga/command.rb

@@ -10,23 +10,20 @@ module VagrantPlugins
 
       def execute
         args = @argv.join(' ')
-        vagga_command = "vagga #{args}"
-        # Workaround for ERROR:vagga::wrapper: Error executing _build: Error symlinking storage: Permission denied (os error 13)
-        vagga_command = "sudo #{vagga_command}"
-        command = "cd /vagrant; #{vagga_command}"
+        vagga_command = "/tmp/exec_vagga.sh #{args}"
 
         with_target_vms(nil, single_target: true) do |vm|
-          @logger.info("Executing vagga command on remote machine: #{command}")
+          vm.action(:up)
+
+          @logger.info("Executing vagga command on remote machine: #{vagga_command}")
           ssh_opts = {extra_args: ['-q']} # make it quiet
-          env = vm.action(:ssh_run, ssh_run_command: command, ssh_opts: ssh_opts)
+          env = vm.action(:ssh_run, ssh_run_command: vagga_command, ssh_opts: ssh_opts)
 
           status = env[:ssh_run_exit_status] || 0
           return status
         end
       end
 
-
-
     end
   end
 end

data/lib/vagrant-vagga/exec_vagga.sh

@@ -0,0 +1,10 @@
+cd /vagrant
+
+HOST_DIR=/vagrant/.vagga
+GUEST_DIR=~vagrant/project/.vagga
+
+test -d $HOST_DIR || mkdir $HOST_DIR
+test -d $GUEST_DIR || mkdir -p $GUEST_DIR
+mountpoint -q /vagrant/.vagga || sudo mount --bind $GUEST_DIR $HOST_DIR
+
+vagga $@

data/lib/vagrant-vagga/provisioner.rb

@@ -10,6 +10,7 @@ module VagrantPlugins
 
       def provision
         setup_vagga
+        setup_exec_script
       end
 
       def setup_vagga
@@ -29,6 +30,13 @@ module VagrantPlugins
         end
       end
 
+      def setup_exec_script
+        setup_script_destination = "/tmp/exec_vagga.sh"
+        setup_script_path = Pathname.new("../exec_vagga.sh").expand_path(__FILE__)
+        @machine.communicate.upload(setup_script_path.to_s, setup_script_destination)
+        @machine.communicate.sudo("chmod +x %s" % setup_script_destination)
+      end
+
     end
   end
 end

data/lib/vagrant-vagga/setup_vagga.sh

@@ -11,7 +11,7 @@ fi
 
 
 
-VAGGA_VERSION=$(curl -s http://files.zerogw.com/vagga/latest-testing.html | sed -e 's/<[^>]*>//g' -e 's/vagga-//g' -e 's/.tar.xz//g')
+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

data/lib/vagrant-vagga/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vagga
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Roman Rader
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,7 @@ files:
 - lib/vagrant-vagga.rb
 - lib/vagrant-vagga/command.rb
 - lib/vagrant-vagga/config.rb
+- lib/vagrant-vagga/exec_vagga.sh
 - lib/vagrant-vagga/plugin.rb
 - lib/vagrant-vagga/provisioner.rb
 - lib/vagrant-vagga/setup_vagga.sh
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Vagrant plugin to install vagga in the box