You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by lu...@redhat.com on 2013/02/18 23:56:28 UTC

A couple fixes related to initializers

There was a typo in the mock initializer, and the Rakefile needed updating

[PATCH 1/2] * lib/initializers/mock_initialize.rb: fix typo

Posted by lu...@redhat.com.
From: David Lutterkort <lu...@redhat.com>

We did not create MOCK_STORAGE_DIR when it was missing
---
 server/lib/initializers/mock_initialize.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/lib/initializers/mock_initialize.rb b/server/lib/initializers/mock_initialize.rb
index c8c24e9..3575a38 100644
--- a/server/lib/initializers/mock_initialize.rb
+++ b/server/lib/initializers/mock_initialize.rb
@@ -11,5 +11,6 @@ BASE_STORAGE_DIR = File.join('/', 'var', 'tmp', "deltacloud-#{ENV['USER']}")
 #
 MOCK_STORAGE_DIR = ENV['DELTACLOUD_MOCK_STORAGE'] || File.join(BASE_STORAGE_DIR, 'mock')
 
-FileUtils.mkpath(BASE_STORAGE_DIR, :mode => 0750) unless File.directory?(BASE_STORAGE_DIR)
-FileUtils.mkpath(BASE_STORAGE_DIR, :mode => 0750) unless File.directory?(MOCK_STORAGE_DIR)
+[BASE_STORAGE_DIR, MOCK_STORAGE_DIR].each do |p|
+  FileUtils.mkpath(p, :mode => 0750) unless File.directory?(p)
+end
-- 
1.8.1.2


Re: A couple fixes related to initializers

Posted by Michal Fojtik <mf...@redhat.com>.
On 02/18, lutter@redhat.com wrote:
> 
> There was a typo in the mock initializer, and the Rakefile needed updating

ACK to serie.

  -- Michal

-- 
Michal Fojtik <mf...@redhat.com>
Deltacloud API, CloudForms

[PATCH 2/2] * Rakefile (mock:fixtures): fix tasks to work with new layout/initializers

Posted by lu...@redhat.com.
From: David Lutterkort <lu...@redhat.com>

---
 server/Rakefile | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/server/Rakefile b/server/Rakefile
index 41bd2c1..48fd9f6 100644
--- a/server/Rakefile
+++ b/server/Rakefile
@@ -46,40 +46,36 @@ Gem::PackageTask.new(spec) do |pkg|
   pkg.need_tar = true
 end
 
+# Not meant for enduser consumption; make sure we run our initializers
+task :initialize do
+  require_relative 'lib/initialize.rb'
+end
+
 namespace :mock do
   namespace :fixtures do
     desc "Setup Mock driver fixtures"
-    task 'setup' do
-      if ENV["DELTACLOUD_MOCK_STORAGE"]
-        storage_root = ENV["DELTACLOUD_MOCK_STORAGE"]
-      elsif ENV["USER"]
-        storage_root = File::join("/var/tmp", "deltacloud-mock-#{ENV["USER"]}")
-      else
-        raise "Please set either the DELTACLOUD_MOCK_STORAGE or USER environment variable"
-      end
-      data = Dir::glob(File::join(File::dirname(__FILE__), "lib", "deltacloud", "drivers", "mock", "data", "*"))
-      FileUtils::mkdir_p(storage_root, :verbose => true)
-      FileUtils::cp_r(data, storage_root, :verbose => true)
+    task 'setup' => :initialize do
+      srcdir = File::join(File::dirname(__FILE__), "lib", "deltacloud", "drivers", "mock", "data")
+      data = Dir::glob(File::join(srcdir, "*"))
+      srcdir.gsub!(/^#{ENV["PWD"]}/, ".").gsub!(/^#{ENV["HOME"]}/, "~")
+      puts "Copy mock data to #{MOCK_STORAGE_DIR}"
+      puts "  (from #{srcdir})"
+      FileUtils::cp_r(data, MOCK_STORAGE_DIR, :verbose => false)
     end
 
     desc "Remove Mock driver fixtures"
-    task 'clean' do
-      if ENV["DELTACLOUD_MOCK_STORAGE"]
-        storage_root = ENV["DELTACLOUD_MOCK_STORAGE"]
-      elsif ENV["USER"]
-        storage_root = File::join("/var/tmp", "deltacloud-mock-#{ENV["USER"]}")
-      else
-        raise "Please set either the DELTACLOUD_MOCK_STORAGE or USER environment variable"
-      end
-      FileUtils::rm_rf(storage_root, :verbose => true)
+    task 'clean' => :initialize do
+      puts "Remove mock data in #{MOCK_STORAGE_DIR}"
+      files = Dir::glob(File::join(MOCK_STORAGE_DIR, "*"))
+      FileUtils::rm_rf(files, :verbose => false)
     end
 
     desc "Reset Mock driver fixtures"
-    task 'reset' do
-      Rake::Task["mock:fixtures:clean"].reenable
-      Rake::Task["mock:fixtures:clean"].invoke
-      Rake::Task["mock:fixtures:setup"].reenable
-      Rake::Task["mock:fixtures:setup"].invoke
+    task 'reset' => :initialize do
+      ["mock:fixtures:clean", "mock:fixtures:setup"].each do |t|
+        Rake::Task[t].reenable
+        Rake::Task[t].invoke
+      end
     end
 
   end
-- 
1.8.1.2