zeta 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f89983d6e8c1a86caa18dd2c70c7232feed564e4
-  data.tar.gz: 9425b22e845e2072fe48e643992d06a41ecfa451
+  metadata.gz: ca59a735f784f683a952d7fe7953f30846ffb918
+  data.tar.gz: 79985b345c3e01768d3a57c9b56bcedbf009ad35
 SHA512:
-  metadata.gz: b8b6f95426950ccd197785bb59fbc2698f424e85d2f9db831a8a44e9b70d95f6ef0ebe7b66ba30db8702398e9b4a63812289b60227019412575ea7fca8781ef6
-  data.tar.gz: 6d45ff3c39f792fd99a9b1375aaab85f167e4fad300b45a7c53c3b3eaec23846ac6e8347ae55f78625ba6f5b2c3be87eb395891bb0fc2a1bec0bda9e326117aa
+  metadata.gz: 29b5a0005763dc552f3888733482a59713c84998a173c5a7e8a00e605f635d8deb97c92a5c81a4b6d1f47f3393e141c39da3005963fc72f4c9435fd3c83c7bc8
+  data.tar.gz: 397479ef539c33bc8308a72b8fe6d6dcfc332e65b239e4974dffc541920362d890882edb1673a535ba29157eac78bb1fde587535b87b8382a1b4f89024296772

data/CHANGELOG.markdown

@@ -1,3 +1,6 @@
+# 0.12.4
+- More conservative locking
+
 # 0.12.3
 - Force rspec examples (in RSpec integration of zeta, not its own tests) to run in order
 

data/lib/zeta.rb

@@ -6,6 +6,24 @@ class Zeta
   include Zeta::Instance
   MUTEX = Mutex.new
 
+  def self.instance
+    return @instance if @instance
+    MUTEX.synchronize do
+      unless @instance
+        # Create a Zeta instance
+        @instance = new(verbose: true)
+
+        # Copy the current service's specifications to cache dir
+        @instance.update_own_contracts
+
+        # Convert current service's specifications so published and
+        # consumed objects of this service can be validated at
+        # runtime
+        @instance.convert_all!
+      end
+    end
+  end
+
   # Not using the SingleForwardable module here so that, when
   # somebody tries to figure out how Zeta works by looking at
   # its methods, they don't get confused.
@@ -13,21 +31,7 @@ class Zeta
   methods.each do |method|
     define_singleton_method method do |*args|
       send_args = [method, args].flatten.compact
-      MUTEX.synchronize do
-        unless @singleton
-          # Create a Zeta singleton
-          @singleton = new(verbose: true)
-
-          # Copy the current service's specifications to cache dir
-          @singleton.update_own_contracts
-
-          # Convert current service's specifications so published and
-          # consumed objects of this service can be validated at
-          # runtime
-          @singleton.infrastructure.convert_all!
-        end
-        @singleton.send(*send_args)
-      end
+      instance.send(*send_args)
     end
   end
 end

data/lib/zeta/instance.rb

@@ -11,13 +11,13 @@ class Zeta
     attr_reader :config
 
     def initialize(options = {})
-      @mutex = Mutex.new
+      @lock = Monitor.new
       @options = options
     end
 
     def update_contracts
-      i = infrastructure
-      @mutex.synchronize do
+      @lock.synchronize do
+        i = infrastructure
         clear_cache
         puts "Updating #{cache_dir}" if verbose?
         update_other_contracts
@@ -28,20 +28,21 @@ class Zeta
     end
 
     def convert_all!
-      i = infrastructure
-      @mutex.synchronize do
-        i.convert_all!
+      @lock.synchronize do
+        infrastructure.convert_all!
       end
     end
 
     def update_own_contracts
-      contract_files.each do |file|
-        source_file = File.join(config[:contracts_path], file)
-        target_file = File.join(cache_dir, config[:service_name], file)
-        FileUtils.mkdir_p(File.join(cache_dir, config[:service_name]))
-        puts "cp #{source_file} #{target_file}" if verbose?
-        FileUtils.rm_f(target_file)
-        FileUtils.cp(source_file, target_file) if File.exists?(source_file)
+      @lock.synchronize do
+        contract_files.each do |file|
+          source_file = File.join(config[:contracts_path], file)
+          target_file = File.join(cache_dir, config[:service_name], file)
+          FileUtils.mkdir_p(File.join(cache_dir, config[:service_name]))
+          puts "cp #{source_file} #{target_file}" if verbose?
+          FileUtils.rm_f(target_file)
+          FileUtils.cp(source_file, target_file) if File.exists?(source_file)
+        end
       end
     end
 
@@ -55,7 +56,7 @@ class Zeta
     end
 
     def infrastructure
-      @mutex.synchronize do
+      @lock.synchronize do
         return @infrastructure if @infrastructure
         @infrastructure = Lacerda::Infrastructure.new(data_dir: cache_dir, verbose: verbose?)
         @infrastructure
@@ -79,24 +80,29 @@ class Zeta
     end
 
     def cache_dir
+      @lock.synchronize do
         return @cache_dir if @cache_dir
         full_path = File.expand_path(config[:contracts_cache_path])
         FileUtils.mkdir_p(full_path)
         @cache_dir = full_path
+      end
     end
 
     def clear_cache
-      # I'm afraid of FileUtils.rm_rf so I'll just delete all relevant files
-      # and then rmdir all empty directories.
-      Dir[File.join(cache_dir, "**/*.mson")].each{|f| FileUtils.rm(f) }
-      Dir[File.join(cache_dir, "**/*.json")].each{|f| FileUtils.rm(f) }
-      Dir[File.join(cache_dir, '*')].each do |d|
-        next unless File.directory?(d)
-        FileUtils.rmdir(d) rescue nil
+      @lock.synchronize do
+        # I'm afraid of FileUtils.rm_rf so I'll just delete all relevant files
+        # and then rmdir all empty directories.
+        Dir[File.join(cache_dir, "**/*.mson")].each{|f| FileUtils.rm(f) }
+        Dir[File.join(cache_dir, "**/*.json")].each{|f| FileUtils.rm(f) }
+        Dir[File.join(cache_dir, '*')].each do |d|
+          next unless File.directory?(d)
+          FileUtils.rmdir(d) rescue nil
+        end
       end
     end
 
     def config
+      @lock.synchronize do
         return @config if @config
         full_config = YAML.load_file(config_file).with_indifferent_access
         env_config  = full_config[env]
@@ -109,6 +115,7 @@ class Zeta
         end
 
         @config = env_config
+      end
     end
 
     def validate_object_to_publish!(type, data)

data/lib/zeta/version.rb

@@ -1,3 +1,3 @@
 class Zeta
-  VERSION = "0.12.3"
+  VERSION = "0.12.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zeta
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Jannis Hermanns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Collects and validates the publish/consume contracts of your infrastructure