Centralize local dataset directory creation

[refs #26]
vagrant-smartos · Jun 19, 2015 · eec4871 · eec4871
1 parent 13d80a4
commit eec4871
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/lib/vagrant/smartos/zones/commands/dataset.rb b/lib/vagrant/smartos/zones/commands/dataset.rb
@@ -39,7 +39,6 @@ def host
           end
 
           def create(zonename, dataset)
-            setup_local_directory
             with_zone(zonename) do |zone|
               ui.info(I18n.t('vagrant.smartos.zones.commands.dataset.create', uuid: zone.uuid, dataset: dataset))
               Models::Dataset.create(dataset, zone)
@@ -82,12 +81,6 @@ def with_zone(name)
             ui.warn(I18n.t('vagrant.smartos.zones.warning.zone_not_found',
                            name: name), prefix: false)
           end
-
-          def setup_local_directory
-            home_path = @env.respond_to?(:home_path) ? @env.home_path : @env[:home_path]
-            image_path = home_path.join('smartos', 'datasets')
-            FileUtils.mkdir_p(image_path)
-          end
         end
       end
     end

diff --git a/lib/vagrant/smartos/zones/models/dataset.rb b/lib/vagrant/smartos/zones/models/dataset.rb
@@ -1,4 +1,5 @@
 require 'vagrant/smartos/zones/models/snapshot'
+require 'vagrant/smartos/zones/util/datasets'
 require 'vagrant/smartos/zones/util/global_zone/helper'
 
 module Vagrant
@@ -21,6 +22,7 @@ def self.create(name, zone)
           end
 
           def create
+            Zones::Util::Dataset.new(machine.env).setup_smartos_directories
             create_dataset
             download
           end

diff --git a/lib/vagrant/smartos/zones/util/datasets.rb b/lib/vagrant/smartos/zones/util/datasets.rb
@@ -8,15 +8,13 @@ class Datasets
           def initialize(env, machine = nil)
             @env = env
             @machine = machine
-            setup_smartos_directories
           end
 
           def list
+            setup_smartos_directories
             ui.info(datasets.join("\n"), prefix: false)
           end
 
-          protected
-
           def setup_smartos_directories
             env.setup_home_path if env.respond_to?(:setup_home_path)
             FileUtils.mkdir_p(dataset_dir)
@@ -33,7 +31,7 @@ def home_path
           end
 
           def datasets
-            Dir[dataset_dir.join('*')].map do |f|
+            Dir[dataset_dir.join('*.zfs.bz2')].map do |f|
               File.basename(f, '.zfs.bz2')
             end.sort
           end