vagrant-foodtaster-server 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -27,25 +27,26 @@ class VagrantFoodtasterServer
27
27
  end
28
28
 
29
29
  def prepare_vm(vm_name)
30
- vm = get_vm(vm_name)
31
-
32
- if vm.state.id.to_s != 'running'
33
- chef_run_list = get_chef_solo_run_list(vm)
34
- provision_types = [:shell, :puppet]
30
+ unless vm_prepared?(vm_name)
31
+ vm = get_vm(vm_name)
32
+ sahara = sahara_for(vm)
35
33
 
36
- unless chef_run_list.empty?
37
- provision_types << :chef_solo
38
- end
34
+ if vm.state.id.to_s != 'running'
35
+ chef_run_list = get_chef_solo_run_list(vm)
36
+ provision_types = [:shell, :puppet]
39
37
 
40
- vm.action(:up,
41
- provision_types: provision_types,
42
- provision_enabled: true)
43
- end
38
+ unless chef_run_list.empty?
39
+ provision_types << :chef_solo
40
+ end
44
41
 
45
- sahara = sahara_for(vm)
42
+ vm.action(:up,
43
+ provision_types: provision_types,
44
+ provision_enabled: true)
45
+ end
46
46
 
47
- unless sahara.is_snapshot_mode_on?
48
- sahara.on
47
+ unless sahara.is_snapshot_mode_on?
48
+ sahara.on
49
+ end
49
50
  end
50
51
  end
51
52
 
@@ -65,6 +66,13 @@ class VagrantFoodtasterServer
65
66
  @env.machine_names.include?(vm_name)
66
67
  end
67
68
 
69
+ def vm_prepared?(vm_name)
70
+ vm = get_vm(vm_name)
71
+ sahara = sahara_for(vm)
72
+
73
+ vm.state.id.to_s == 'running' && sahara.is_snapshot_mode_on?
74
+ end
75
+
68
76
  def run_chef_on_vm(vm_name, current_run_config)
69
77
  vm = get_vm(vm_name)
70
78
 
@@ -1,3 +1,3 @@
1
1
  class VagrantFoodtasterServer
2
- VERSION = "0.0.5"
2
+ VERSION = "0.0.6"
3
3
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: vagrant-foodtaster-server
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.0.5
5
+ version: 0.0.6
6
6
  platform: ruby
7
7
  authors:
8
8
  - Mike Lapshin