vagrant-confucius 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc8d2b866473dd21763e2c1d85d52c1fd3b57ce8
-  data.tar.gz: f05904042dd070f1b4b080067cb632657122b75d
+  metadata.gz: d13f743a0214cb5ae6fd46c88a82c62253a17692
+  data.tar.gz: 9bf107d109c834b820545e63bea27ba7266115ff
 SHA512:
-  metadata.gz: d769c722f23d5e1ef092ffa72fde614d95a29408091474ae1a6c0a1168082c0ddc25a68f79a6c811db5b23372e8d04ead2747a034eb386c0db10d6c6923706ce
-  data.tar.gz: b9444ab9e7927b0d0e351faa3fea7312ed55fcb8f24321eceba154f6db4e850f3b4e2d9a9e6e8af1e7e7603a3d1827c84e9219202f0658160a1a4d54a7132ee6
+  metadata.gz: 08d2ad2e8bf54e5a1e5f2bac40a86fb0f54b1cee84f8aea56d1f10a48076c6b70e99bef58a2d21a8c3831d3d8f0f46dc2310e98a6e3c40de8ddb297d854d0a82
+  data.tar.gz: 921e08dd7371940ab65456897e2df1c9a2a9fad9cf406aece938695f08a10b127b9f29f1ba4a1f35683c98e467d5a854c7de0e0c1ded0c92af54140bb8286475

data/lib/vagrant/confucius/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Confucius
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/vagrant/confucius.rb

@@ -1,6 +1,6 @@
 # vim: set ai ft=ruby ts=2 sw=2 et!:
 require "vagrant/confucius/version"
-
+#
 class ::Hash
   def deep_merge(second)
     merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
@@ -18,52 +18,22 @@ class ::Hash
   end
 end
 
-# Supplement String type with sha sha256 checksum
-class ::String
-  def sha256()
-    sha = Digest::SHA256.new
-    sha << self.to_s
-    return sha.hexdigest
-  end
-end
-
-# options (with box defaults and default profiles)
-# profiles
-# profiles' defaults
-# user overrides
-#
-
 module Confucius
 
   def self.load!()
     global_options_file = '.confucius.yaml'
     global_boxes_folder = 'boxes'
     user_overrides_file = 'overrides'
-    profile = Profile.new(global_options_file, global_boxes_folder, user_overrides_file)
-    return profile.getOverridenProfiles()
+
+    return Profile.new(global_options_file, global_boxes_folder, user_overrides_file).getOverridenProfiles()
   end
 
   class Profile
     require 'yaml'
-    require 'digest'
-    require 'diskcached'
     #require 'pp'
 
     attr_reader :basedir, :config, :configFile, :overrideFile, :profiles, :boxes_folder
 
-    def checksum_dir(dir)
-      sha = Digest::SHA256.new
-      files = Dir["#{dir}/**/*"].select {|f| File.file? f }
-      for file in files
-        sha << File.mtime(file).to_s
-      end
-      return sha.hexdigest
-    end
-
-    def checksum_file(file)
-      return Digest::SHA256.file(file).hexdigest
-    end
-
     def initialize(global_options_file, global_boxes_folder, user_overrides_file)
 
       @basedir = Vagrant::Environment.new().root_path
@@ -71,56 +41,11 @@ module Confucius
       @boxes_folder = File.join(@basedir, global_boxes_folder)
       @overridesFile = File.join(@basedir, user_overrides_file)
 
-      @diskcache = Diskcached.new('/tmp/cache', 86400, autogc=true)
-
-      begin
-        config_checksum = self.checksum_file(@configFile)
-        @config = @diskcache.get(config_checksum)
-        #puts 'config was cached'
-      rescue Diskcached::NotFound
-        #puts 'config is rebuilt'
-        @config = self.load_file(@configFile)
-        invalidate_cache = @diskcache.set(config_checksum, @config)
-      end
-
-      begin
-        overrides_checksum = self.checksum_file(@overridesFile)
-        @override = @diskcache.get(overrides_checksum)
-        #puts 'overrides was cached'
-      rescue Diskcached::NotFound
-        #puts 'overrides is rebuilt'
-        @override = self.load_file(@overridesFile)
-        invalidate_cache = @diskcache.set(overrides_checksum, @override)
-      end
-
-      begin
-        globalOverriden_checksum = "#{config_checksum}#{overrides_checksum}".sha256()
-        @globalOverriden = @diskcache.get(globalOverriden_checksum)
-        #puts 'globalOverriden was cached'
-      rescue Diskcached::NotFound
-        #puts 'globalOverriden is rebuilt'
-        @globalOverriden = self.conf_override(@config, @override)
-        invalidate_cache = @diskcache.set(globalOverriden_checksum, @globalOverriden)
-      end
-
-      begin
-        boxes_folder_checksum = self.checksum_dir(@boxes_folder)
-        @profiles = @diskcache.get(boxes_folder_checksum)
-        #puts 'boxes_folder was cached'
-      rescue Diskcached::NotFound
-        #puts 'boxes_folder is rebuilt'
-        @profiles = self.loadProfiles()
-        invalidate_cache = @diskcache.set(boxes_folder_checksum, @profiles)
-      end
-
-      # Let's invalidate the whole thing if not ok
-      if invalidate_cache
-        #puts 'invalidate_cache'
-        @diskcache.delete('overriden')
-      end
-      @overriden = @diskcache.cache('overriden') do
-        conf_override(@globalOverriden, @profiles)
-      end
+      @config = self.load_file(@configFile)
+      @override = self.load_file(@overridesFile)
+      @globalOverriden = self.conf_override(@config, @override)
+      @profiles = self.loadProfiles()
+      @overriden = conf_override(@globalOverriden, @profiles)
     end
 
     def getOverridenProfiles()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-confucius
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kronos Technologies Inc.