vagrant-mos 0.8.83 → 0.8.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e594224be6917e4e46e6aa414b38d863195c1b3
-  data.tar.gz: 96dfa51f7e102a4cbf12a112dfd174c9f058cd37
+  metadata.gz: 641d12917317f2c12b3505ed1b77838bc1761ab6
+  data.tar.gz: b349513e0bef223892c7fb449c0c39f90c50d764
 SHA512:
-  metadata.gz: 53a335d98f501c129023ff8149dfa743c6009511fd656df2f89ef3446d72d698b0603b7fb42ce83e80aaf8326b5d3683154c19525c7b8e37990107fa7f02e091
-  data.tar.gz: c6311faee37e9c402987e133f19263a841369a97dae13d915f34b088745a7a586c8e5442d3b3648bd9816ae6f59e7c0c70b37cd436a5587115f7e146354fd5d2
+  metadata.gz: 735e13bb2668743cda4c79c020bb386de221a076b1fba6bc395511efdd26d663b62139d3e95499fa1bcf05eb2f43fd7ebcd7d1da9ba95a9561411b44eec9efdd
+  data.tar.gz: 5eb29360dd5134d8517f3384963ae268330d33ccb22f28b1c14826d659506283c586939caa629474ea3fb800b29868860bd17736a8809eb009ccd132272d4a30

data/lib/vagrant-mos/action.rb

@@ -115,6 +115,7 @@ module VagrantPlugins
 
       def self.action_prepare_boot
         Vagrant::Action::Builder.new.tap do |b|
+          b.use SetName
           b.use Provision
           b.use SyncedFolders
           b.use WarnNetworks
@@ -176,6 +177,7 @@ module VagrantPlugins
       autoload :ConnectMOS, action_root.join("connect_mos")
       autoload :IsCreated, action_root.join("is_created")
       autoload :IsStopped, action_root.join("is_stopped")
+      autoload :SetName, action_root.join("set_name")
       autoload :MessageAlreadyCreated, action_root.join("message_already_created")
       autoload :MessageNotCreated, action_root.join("message_not_created")
       autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")

data/lib/vagrant-mos/action/set_name.rb

@@ -0,0 +1,55 @@
+require "log4r"
+
+module VagrantPlugins
+  module MOS
+    module Action
+      class SetName
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant::action::vm::setname")
+          @app = app
+        end
+
+        def call(env)
+          name = env[:machine].provider_config.name
+
+          # If we already set the name before, then don't do anything
+          sentinel = env[:machine].data_dir.join("action_set_name")
+          if !name && sentinel.file?
+            @logger.info("Default name was already set before, not doing it again.")
+            return @app.call(env)
+          end
+
+          # If no name was manually set, then use a default
+          if !name
+            prefix = "#{env[:root_path].basename.to_s}_#{env[:machine].name}"
+            prefix.gsub!(/[^-a-z0-9_]/i, "")
+
+            # milliseconds + random number suffix to allow for simultaneous
+            # `vagrant up` of the same box in different dirs
+            name = prefix + "_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
+          end
+
+          ## Verify the name is not taken
+          #vms = env[:machine].provider.driver.read_vms
+          #raise Vagrant::Errors::VMNameExists, name: name if \
+          #  vms.key?(name) && vms[name] != env[:machine].id
+          #
+          #if vms.key?(name)
+          #  @logger.info("Not setting the name because our name is already set.")
+          #else
+          #  env[:ui].info(I18n.t(
+          #    "vagrant.actions.vm.set_name.setting_name", name: name))
+          #  env[:machine].provider.driver.set_name(name)
+          #end
+
+          # Create the sentinel
+          sentinel.open("w") do |f|
+            f.write(Time.now.to_i.to_s)
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.8.83'
+    VERSION = '0.8.84'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.8.83
+  version: 0.8.84
 platform: ruby
 authors:
 - yangcs2009
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -121,6 +121,7 @@ files:
 - lib/vagrant-mos/action/read_ssh_info.rb
 - lib/vagrant-mos/action/read_state.rb
 - lib/vagrant-mos/action/run_instance.rb
+- lib/vagrant-mos/action/set_name.rb
 - lib/vagrant-mos/action/start_instance.rb
 - lib/vagrant-mos/action/stop_instance.rb
 - lib/vagrant-mos/action/terminate_instance.rb