eternity 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 319437ad396ef5f306feb9578edf4a890dc2ecfc
-  data.tar.gz: e2ae5f04b986d60ab7a5fdcd26fe3c7614f0c1a7
+  metadata.gz: d3c5b9f3dd98ebf47e906a3ea8a97213bbbe22e3
+  data.tar.gz: 3b22572ec87e97029cb40cac6d7fed5cd284b584
 SHA512:
-  metadata.gz: c95bcefe396e0751d1165ae01b69d7500b277c2ab48228c82fda06f5bae0de1c7b651c02852c9b3b9035d8c68521c05f2ba071e47576507861d0ed8c4976656f
-  data.tar.gz: b1082bb669fedc219e0a82326ecbb8298e70cc0365393935cf49384c1f92533342c1af44891cdb100687d1b6ffc29da32107fe5784474b2080ca59fdfb6b158a
+  metadata.gz: 9e95c9952cf6ee5b3915a31dfc84cb470a5631a8250474a68db32ead4bfd0e3aaff4a79abc03503400317d3e6dab0955325d70ae1a5c784f9035ecb2857cc79d
+  data.tar.gz: 8a54e838947cb958fedbd20be7fcc1e4ca162b6098a3636963093f0f1eada3c43fa5dbc788be9e6211080ae99235fa497932ae1bf4a544e066ec19396f61283e

data/.ruby-version

@@ -1 +1 @@
-ruby 2.1
+ruby 2.1.0

data/lib/eternity.rb

@@ -48,7 +48,6 @@ module Eternity
 end
 
 require_relative 'eternity/version'
-require_relative 'eternity/log'
 require_relative 'eternity/blob'
 require_relative 'eternity/repository'
 require_relative 'eternity/object_tracker'

data/lib/eternity/patch.rb

@@ -74,7 +74,7 @@ module Eternity
 
 
     class Merge
-      extend Log
+      
       include Common
 
       def merged?
@@ -95,12 +95,11 @@ module Eternity
         Delta.merge [revert_delta, target_delta, remaining_delta], base_index
       end
 
-      log :calculate_delta
     end
 
 
     class Diff
-      extend Log
+
       include Common
 
       private
@@ -109,7 +108,6 @@ module Eternity
         Delta.merge [revert_delta, target_delta], base_index
       end
 
-      log :calculate_delta
     end
 
   end

data/lib/eternity/repository.rb

@@ -1,8 +1,6 @@
 module Eternity
   class Repository
 
-    extend Log
-
     attr_reader :name, :id, :branches
     
     def initialize(name, options={})
@@ -77,6 +75,8 @@ module Eternity
       raise "Can't checkout with uncommitted changes" if changes?
 
       locker.lock! :checkout do
+        Eternity.logger.info(self.class) { "Checkout #{name} (#{options.map { |k,v| "#{k}: #{v}" }.join(', ')})" }
+        
         original_commit = current_commit
 
         commit_id, branch = extract_commit_and_branch options
@@ -113,6 +113,9 @@ module Eternity
 
     def push!
       raise "Can't push without commit" unless current_commit?
+
+      Eternity.logger.info(self.class) { "Push #{name} (#{current_commit.id})" }
+
       Branch[current_branch] = current_commit.id
     end
 
@@ -122,6 +125,8 @@ module Eternity
 
       target_commit = Branch[current_branch]
 
+      Eternity.logger.info(self.class) { "Pull #{name} (#{target_commit.id})" }
+
       if current_commit == target_commit || current_commit.fast_forward?(target_commit)
         {}
       elsif target_commit.fast_forward?(current_commit)
@@ -133,6 +138,8 @@ module Eternity
 
     def revert
       locker.lock! :revert do
+        Eternity.logger.info(self.class) { "Revert #{name}" }
+
         current_commit.with_index do |index|
           Delta.revert(delta, index).tap { tracker.revert }
         end
@@ -164,13 +171,13 @@ module Eternity
       self.delta = dump['delta']
     end
 
-    [:delta, :delta=, :commit, :pull, :push, :checkout, :merge, :revert, :destroy, :dump].each { |m| log m }
-
     private
 
     attr_reader :tracker, :current, :locker
 
     def commit!(options)
+      Eternity.logger.info(self.class) { "Commit #{name} (author: #{options[:author]}, message: #{options[:message]})" }
+
       changes = delta
       options[:parents] ||= [current_commit.id]
       options[:delta]   ||= write_delta changes
@@ -186,6 +193,8 @@ module Eternity
 
     def merge!(target_commit)
       locker.lock! :merge do
+        Eternity.logger.info(self.class) { "Merge #{name} (#{target_commit.short_id} into #{current_commit.short_id})" }
+
         patch = Patch.merge current_commit, target_commit
 
         raise 'Already merged' if patch.merged?

data/lib/eternity/version.rb

@@ -1,3 +1,3 @@
 module Eternity
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eternity
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
@@ -204,7 +204,6 @@ files:
 - lib/eternity/conflict_resolver.rb
 - lib/eternity/delta.rb
 - lib/eternity/index.rb
-- lib/eternity/log.rb
 - lib/eternity/object_tracker.rb
 - lib/eternity/patch.rb
 - lib/eternity/repository.rb
@@ -249,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Distributed database version control system

data/lib/eternity/log.rb

@@ -1,22 +0,0 @@
-module Eternity
-  module Log
-
-    private
-
-    def log(method)
-      original_method = "__#{method}_without_log__"
-
-      alias_method original_method, method
-
-      define_method method do |*args, &block|
-        Eternity.logger.info(self.class.name) { "#{method} (Start)" }
-        result = send original_method, *args, &block
-        Eternity.logger.info(self.class.name) { "#{method} (End)" }
-        result
-      end
-
-      private original_method
-    end
-
-  end
-end