Open Build Service

rubygem-ygg_provisioner.spec Changed

ygg_provisioner-1.4.1.gem/data/README Deleted

ygg_provisioner-1.4.1.gem/checksums.yaml.gz -> ygg_provisioner-1.5.1.gem/checksums.yaml.gz Changed

ygg_provisioner-1.4.1.gem/data/lib/ygg/provisioner/model.rb -> ygg_provisioner-1.5.1.gem/data/lib/ygg/provisioner/model.rb Changed

@@ -8,19 +8,18 @@
 # License:: You can redistribute it and/or modify it under the terms of the LICENSE file.
 #
 
-require 'kyotocabinet'
+require 'rufus/tokyo'
 require 'ygg/provisioner/tools'
 require 'ygg/provisioner/file_switcher'
 
 module Ygg
 module Provisioner
 
-class Model < OpenStruct
+class Model
 
   class Error < StandardError ; end
   class DataError < Error ; end
   class ProcessError < Error ; end
-  class DatabaseError < Error ; end
 
   extend Tools
   include Tools
@@ -31,37 +30,45 @@
   class_attribute :config
   class_attribute :worker
 
-  class_attribute :state_persistant_keys
-  self.state_persistant_keys =  
-
   class_attribute :db_path
 
   attr_accessor :plog
-  attr_accessor :config_persistant_keys
-
-  def initialize(config)
 
-    super(*)
+  attr_accessor :cfg
 
-    self.cfg = agentcfg
+  # Config
+  attr_accessor :uuid # All models are supposed to have at least the uuid
 
+  def initialize(config = nil)
     if config:cfg
-      # We are being de-serialized
-      update_config(config:cfg)
-      update_state(config:state)
+      self.cfg = config:cfg
+      deserialize_config(config:cfg) if config:cfg
+      deserialize_state(config:state) if config:state
     else
-      update_config(config)
+      self.cfg = config
+      deserialize_config(config)
     end
   end
 
-  def update_config(config)
-    self.config_persistant_keys = config.keys.map(&:to_sym)
-    self.config_persistant_keys -= self.state_persistant_keys
-    config.each { |k,v| send("#{k}=", v) if self.config_persistant_keys.include?(k.to_sym) }
+  def deserialize_config(config)
+    config.each { |k,v| send("#{k}=", v) rescue nil }
   end
 
-  def update_state(state)
-    state.each { |k,v| send("#{k}=", v) if self.state_persistant_keys.include?(k.to_sym) }
+  def deserialize_state(state)
+    state.each { |k,v| send("#{k}=", v) }
+  end
+
+  def serialize_config
+    cfg
+  end
+
+  def serialize_state
+    {}
+  end
+
+  def update(data, opts = {})
+    self.cfg = data
+    data.each { |k,v| send("#{k}=", v) rescue nil }
   end
 
   def save!
@@ -70,9 +77,9 @@
 
   def serialize
    {
-    :cfg => self.marshal_dump.select { |k,v| config_persistant_keys.include?(k.to_sym) },
-    :state => self.marshal_dump.select { |k,v| state_persistant_keys.include?(k.to_sym) },
     :_type => self.class.name,
+    :cfg => serialize_config,
+    :state => serialize_state,
    }
   end
 
@@ -89,26 +96,20 @@
     if @@open_store
       yield @@open_store
     else
-      db = KyotoCabinet::DB::new
-      if db.open(db_path, KyotoCabinet::DB::OWRITER | KyotoCabinet::DB::OCREATE)
+      Rufus::Tokyo::Cabinet.open(db_path) do |store|
         begin
-          @@open_store = db
-          yield db
+          @@open_store = store
+          yield store
         ensure
-          unless db.close
-            raise DatabaseError.new("Cannot close database #{db_path}: #{db.error}")
-          end
           @@open_store = nil
         end
-      else
-        raise DatabaseError.new("Cannot open database #{db_path}: #{db.error}")
       end
     end
   end
 
   def self.save(model)
     with_open_store do |store|
-      storemodel.id = Marshal.dump(model.serialize)
+      storemodel.uuid = Marshal.dump(model.serialize)
     end
 
     model
@@ -123,7 +124,7 @@
 
   def self.each
     with_open_store do |store|
-      store.each do |obj_id,obj|
+      store.each do |obj_uuid,obj|
         begin
           obj = new_from_serialized(Marshal.load(obj))
 
@@ -131,16 +132,16 @@
 
 #        rescue
 #          # Ignore corrupted obj data
-#          # plog.warn "Site #{obj_id} configuration is corrupted"
+#          # plog.warn "Site #{obj_uuid} configuration is corrupted"
         end
       end
     end
   end
 
-  def self.find(id)
+  def self.find(uuid)
     obj = nil
     with_open_store do |store|
-      obj = storeid
+      obj = storeuuid
       raise NotFound if !obj
       obj = new_from_serialized(Marshal.load(obj))
     end
@@ -148,12 +149,12 @@
     obj
   end
 
-  def self.delete(id)
+  def self.delete(uuid)
     obj = nil
     with_open_store do |store|
-      obj = storeid
+      obj = storeuuid
       raise NotFound if !obj
-      store.delete id
+      store.delete uuid
     end
   end
 
@@ -172,14 +173,14 @@
     good_count = 0
 
     with_open_store do |store|
-      store.each do |obj_id,obj_marshalled|
+      store.each do |obj_uuid,obj_marshalled|
         begin
           obj_unmarshalled = nil
 
           begin
             obj_unmarshalled = Marshal.load(obj_marshalled)
           rescue Exception => e
-            corrupted_objsobj_id = { :reason => 'Unmarshal failed', :data => Base64.encode64(obj_marshalled) }
+            corrupted_objsobj_uuid = { :reason => 'Unmarshal failed', :data => Base64.encode64(obj_marshalled) }
             raise
           end
 
@@ -187,7 +188,7 @@
           begin
             obj = new_from_serialized(obj_unmarshalled)
           rescue Exception => e
-            corrupted_objsobj_id = {
+            corrupted_objsobj_uuid = {
               :reason => "Loading failed: #{e.to_s}",
               :data => obj_unmarshalled
             }

ygg_provisioner-1.4.1.gem/data/lib/ygg/provisioner/task.rb -> ygg_provisioner-1.5.1.gem/data/lib/ygg/provisioner/task.rb Changed

@@ -27,7 +27,7 @@
 
   def log(level, msg)
     @text << msg + "\n"
-    @other_log.send level, msg
+    @other_log.info msg
   end
 
   def debug(msg) ; log :debug, msg ; end
@@ -135,6 +135,7 @@
 
   def execute(opts = {}, &block)
     op = self.class.operationsoperation
+    errback = opts:errback || Proc.new { yield nil }
 
     report_started(op.supports_percent ? { :percent => 0 } : {}) do
       @fiber = Fiber.new do
@@ -148,14 +149,14 @@
           end
         rescue PermanentFailure => e
           plog.error e.message
-          report_event(:PERMANENT_FAILURE, plog.text) { yield nil }
+          report_event(:PERMANENT_FAILURE, plog.text) { errback.call(e) }
         rescue TemporaryFailure, PublishError => e
           plog.error e.message
-          report_event(:TEMPORARY_FAILURE, plog.text) { yield nil }
+          report_event(:TEMPORARY_FAILURE, plog.text) { errback.call(e) }
         rescue Exception => e
           log.exception e
           plog.error e.message
-          report_event(:TEMPORARY_FAILURE, plog.text) { yield nil }
+          report_event(:TEMPORARY_FAILURE, plog.text) { errback.call(e) }
         else
           report_event(:COMPLETED, plog.text, result_data) { yield result_data }
         end

ygg_provisioner-1.4.1.gem/data/lib/ygg/provisioner/tools.rb -> ygg_provisioner-1.5.1.gem/data/lib/ygg/provisioner/tools.rb Changed

ygg_provisioner-1.4.1.gem/data/lib/ygg/provisioner/version.rb -> ygg_provisioner-1.5.1.gem/data/lib/ygg/provisioner/version.rb Changed

ygg_provisioner-1.4.1.gem/data/lib/ygg/provisioner/worker.rb -> ygg_provisioner-1.5.1.gem/data/lib/ygg/provisioner/worker.rb Changed

ygg_provisioner-1.4.1.gem/data/ygg_provisioner.gemspec -> ygg_provisioner-1.5.1.gem/data/ygg_provisioner.gemspec Changed

ygg_provisioner-1.4.1.gem/metadata.gz -> ygg_provisioner-1.5.1.gem/metadata.gz Changed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ygg_provisioner
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Daniele Orlandi
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tomte-agents
@@ -25,35 +25,35 @@
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: kyotocabinet
+  name: rufus-tokyo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.0.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
-  name: publisher
+  name: vihai-publisher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -75,7 +75,6 @@
 files:
 - ".gitignore"
 - Gemfile
-- README
 - Rakefile
 - lib/tomte/agents/skel_provisioner.rb
 - lib/ygg/provisioner.rb
@@ -107,8 +106,10 @@
     - !ruby/object:Gem::Version
       version: '0'
 requirements: 
-rubygems_version: 3.1.2
+rubyforge_project: ygg_provisioner
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provisioner base classes and helpers
 test_files: 
+has_rdoc:

Changes of Revision 3