vagrant-soa 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ddf4c189d3007118c7c28eec41cc5cec3fa3078
-  data.tar.gz: 1383801f3598b670d6430ae266394f3956b8e1c8
+  metadata.gz: e48d84deea10c569b26e383ddb52ad82e5077fce
+  data.tar.gz: 72d979ee82cfdba577b655c785ba9733f41f1ab3
 SHA512:
-  metadata.gz: b5f84a4bb90fc147cbdf6637f637c50ab86031ac9e893daca726954d34042dd815308a9e05f58ee94d343cf03bc2058c7b7a650d6105681b1e962357391e8429
-  data.tar.gz: d8cbc4d7c706679d5c4ef531c1a0afa3472121c3c29135ca71d4a4988059b257abc8a6f72856f7959f751dc7f3ab36981fca7a388f158878f04327c48176b9ec
+  metadata.gz: 33d35e5aa666c09202d263dcee5a32ec973137bc504cb7fbd143a0ea34fc356f14ff046ee2200821a879b0528beae0c471a43cf1e83564c51322714716431700
+  data.tar.gz: 393826d5aa7d56910ddbfe8d6c7a162565fec2d506f18d0d0c6b34796cee280e6a51c9f2b7508cc5aca3bcb03b933728a2e534b4ac2c84f542664ad2d94dc015

data/Vagrantfile

@@ -6,13 +6,19 @@ Vagrant.configure('2') do |config|
   config.vm.box = 'precise64'
   config.vm.box_url = 'http://files.vagrantup.com/precise64.box'
 
+  local_work_dir = File.expand_path('./work')
+  vagrant_work_dir = '/home/vagrant/work'
+  config.vm.synced_folder local_work_dir, vagrant_work_dir
+
+  config.soa.local_work_dir = local_work_dir
+  config.soa.vagrant_work_dir = vagrant_work_dir
   config.soa.services = {
     'example_service' => {
-      'puppet_path' => 'services/example_service/puppet',
+      'puppet_path' => 'work/services/example_service/puppet',
       'github_url' => 'git@github.com:eventbrite/vagrant-soa.git'
     },
     'local_service' => {
-      'local_path' => './services/local_service',
+      'local_path' => 'services/local_service',
     },
   }
 

data/lib/vagrant-soa/actions/install_services.rb

@@ -165,26 +165,27 @@ module VagrantPlugins
 
         def symlink_local_service(service, config)
           target_directory = File.join @install_dir, service
-          # make sure the repo is checked out
-          if File.directory? target_directory
-            @env[:ui].info "Local Service: #{service} is already symlinked"
-          else
-            FileUtils.symlink File.expand_path(config['local_path']), target_directory
-            @env[:ui].info "Symlinking local service: #{service} to #{target_directory}"
-          end
+          FileUtils.symlink File.expand_path(config['local_path'], @soa.vagrant_work_dir), target_directory, :force => true
+          @env[:ui].info "Symlinking local service: #{service} to #{target_directory}"
           return target_directory
         end
 
         # To install a service we clone the service repo and add the puppet
         # path to @puppet_module_registry.puppet_module_paths.
         def install_service(service, config)
-          if config.has_key? 'local_path'
+          if config.has_key?('local_path')
+            if not @soa.local_work_dir and not @soa.vagrant_work_dir
+              @env[:ui].error "You must specify 'config.soa.local_work_dir' and 'config.soa.vagrant_work_dir' to setup a local service"
+              return
+            end
             target_directory = symlink_local_service(service, config)
+            puppet_directory = File.expand_path(config['local_path'], @soa.local_work_dir)
           else
             target_directory = clone_service_repo(service, config)
+            puppet_directory = target_directory
           end
           puppet_path = config.fetch('puppet_path', 'puppet')
-          full_path = File.join(target_directory, puppet_path)
+          full_path = File.join(puppet_directory, puppet_path)
           register_service_home_fact(service, config)
           @puppet_module_registry.register_module_path(service, full_path)
         end

data/lib/vagrant-soa/config.rb

@@ -3,15 +3,21 @@ module VagrantPlugins
     class Config < Vagrant.plugin(2, :config)
       attr_accessor :services
       attr_accessor :github_base
+      attr_accessor :local_work_dir
+      attr_accessor :vagrant_work_dir
 
       def initialize
         @services = UNSET_VALUE
         @github_base = UNSET_VALUE
+        @local_work_dir = UNSET_VALUE
+        @vagrant_work_dir = UNSET_VALUE
       end
 
       def finalize!
         @services = nil if @services == UNSET_VALUE
         @github_base = nil if @github_base == UNSET_VALUE
+        @local_work_dir = @local_work_dir == UNSET_VALUE ? nil : File.expand_path(@local_work_dir)
+        @vagrant_work_dir = @vagrant_work_dir == UNSET_VALUE ? nil : File.expand_path(@vagrant_work_dir)
       end
 
       def validate(machine)
@@ -28,6 +34,12 @@ module VagrantPlugins
           end
         end
 
+        if @local_work_dir
+          if not File.directory?(@local_work_dir)
+            errors << "Specified 'local_work_dir' does not exist: #{@local_work_dir}"
+          end
+        end
+
         return { 'soa' => errors }
       end
 

data/lib/vagrant-soa/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Soa
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-soa
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Michael Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,9 +63,9 @@ files:
 - pkg/vagrant-soa-0.2.0.gem
 - pkg/vagrant-soa-0.2.1.gem
 - pkg/vagrant-soa-0.3.0.gem
-- services/example_service/puppet/example_service/manifests/init.pp
-- services/local_service/puppet/local_service/manifests/init.pp
 - vagrant-soa.gemspec
+- work/services/example_service/puppet/example_service/manifests/init.pp
+- work/services/local_service/puppet/local_service/manifests/init.pp
 homepage: ''
 licenses:
 - MIT