vagrant-mongodb 0.0.1 → 0.0.2

data/lib/vagrant-mongodb/actions/replset_initiate.rb

@@ -15,16 +15,17 @@ module VagrantPlugins
         def call(env)
           @app.call(env)
 
-          # check if the current machine is a member of a replica set
+          # check if the current machine is a member of a replica set and the
+          # replica set has not already been initiated
           @logger.info "Checking if '#{@machine.name}' is part of a replica set..."
           rs = get_replset(@machine.name) if @config
-          return if !rs
+          return if !rs or already_initiated?(rs)
 
           # ensure all members are available before initiating replica set
           if all_members_available?(rs)
             env[:ui].info @translator.t('initiate', { :name => rs.name })
             command = "mongo --eval 'printjson(rs.initiate(#{generate_json(rs)}))'"
-            env[:machine].communicate.execute(command) do |type, data|
+            @machine.communicate.execute(command) do |type, data|
               raise Errors::ReplSetInitiateError if data =~ /"ok" : 0/
             end
           end
@@ -92,6 +93,19 @@ module VagrantPlugins
 
           ip || machine.ssh_info[:host]
         end
+
+        # check if the replica set has already been initiated
+        def already_initiated?(rs)
+          @logger.info "Checking if '#{rs.name}' has already been initiated..."
+          command = "mongo --eval 'printjson(rs.status())'"
+          begin
+            @machine.communicate.execute(command) do |type, data|
+              return true if data =~ /"ok" : 1/
+            end
+          rescue Vagrant::Errors::VagrantError
+          end
+          false
+        end
       end
     end
   end

data/lib/vagrant-mongodb/config.rb

@@ -20,9 +20,12 @@ module VagrantPlugins
       end
 
       def replset(name, &block)
-        rs = ReplSet.new(name)
+        rs = @replsets.find { |r| r.name == name.to_sym }
+        if !rs
+          rs = ReplSet.new(name)
+          @replsets << rs
+        end
         block.call(rs)
-        @replsets << rs
       end
 
       class ReplSet
@@ -30,12 +33,17 @@ module VagrantPlugins
         attr_reader :members
 
         def initialize(name)
-          @name = name
+          @name = name.to_sym
           @members = []
         end
 
         def member(name, options = {})
-          @members << options.merge({ :_id => @members.size, :host => name})
+          member = @members.find { |m| m[:host] == name.to_sym }
+          if member
+            member.merge(options)
+          else
+            @members << options.merge({ :_id => @members.size, :host => name.to_sym })
+          end
         end
       end
     end

data/lib/vagrant-mongodb/plugin.rb

@@ -9,17 +9,20 @@ module VagrantPlugins
         This plugin manages a MongoDb replica set.
       DESC
 
+      def self.replset_initiate(hook)
+        setup_logging
+        setup_i18n
+        hook.before(Vagrant::Action::Builtin::Provision, Actions::ReplSetInitiate)
+      end
+
       config(:mongodb) do
         require_relative 'config'
         Config
       end
 
       # initiate replica set after machine provisioning
-      action_hook(:replset_initiate, :machine_action_up) do |hook|
-        setup_logging
-        setup_i18n
-        hook.before(Vagrant::Action::Builtin::Provision, Actions::ReplSetInitiate)
-      end
+      action_hook(:replset_initiate, :machine_action_provision, &method(:replset_initiate))
+      action_hook(:replset_initiate, :machine_action_up, &method(:replset_initiate))
 
       def self.setup_i18n
         I18n.load_path << File.expand_path(

data/lib/vagrant-mongodb/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MongoDb
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/test/Vagrantfile

@@ -8,7 +8,7 @@ Vagrant.configure('2') do |config|
   config.mongodb.replset :rs0 do |rs|
     rs.member :server1, :priority => 1
     rs.member :server2, :priority => 2
-    rs.member :server3, :priority => 1
+    rs.member :server3
   end
 
   script = <<-SCRIPT
@@ -20,14 +20,14 @@ Vagrant.configure('2') do |config|
   config.vm.provision :shell, :inline => script
 
   config.vm.define :server1 do |server|
-    server.vm.network :private_network, :ip => '10.0.5.2'
+    server.vm.network :private_network, :ip => '10.10.5.2'
   end
 
   config.vm.define :server2 do |server|
-    server.vm.network :private_network, :ip => '10.0.5.3'
+    server.vm.network :private_network, :ip => '10.10.5.3'
   end
 
   config.vm.define :server3 do |server|
-    server.vm.network :private_network, :ip => '10.0.5.4'
+    server.vm.network :private_network, :ip => '10.10.5.4'
   end
 end

data/test/test.sh

@@ -6,6 +6,7 @@ cd test
 vagrant up
 sleep 30
 vagrant ssh server1 -c 'mongo --eval "printjson(rs.status())"'
+vagrant provision
 vagrant destroy -f
 
 cd ..

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mongodb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant plugin that manages a MongoDb replicaset
 email: