nsync 0.0.2 → 0.0.3

data/Rakefile

@@ -45,3 +45,17 @@ end
 
 require 'yard'
 YARD::Rake::YardocTask.new
+
+require 'metric_fu'
+MetricFu::Configuration.run do |config|
+  config.metrics -= [:rcov, :saikuro]
+  config.graphs -= [:rcov, :saikuro]
+end
+
+class MetricFu::Template
+  def file_url(name, line)
+    @commit ||= `git rev-parse --verify HEAD`.chomp
+    "http://github.com/schleyfox/nsync/blob/#{@commit}/#{name}#{(line)? "#L#{line}" : ""}"
+  end
+end
+

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/nsync/active_record/producer/methods.rb

@@ -3,9 +3,7 @@ module Nsync
     module Producer
       module InstanceMethods
         def self.included(base)
-          puts "foo"
           base.class_eval do
-            p base
             after_save :nsync_write
             before_destroy :nsync_destroy
           end

data/lib/nsync/consumer.rb

@@ -101,14 +101,17 @@ module Nsync
 
         if config.ordering
           config.ordering.each do |klass|
-            begin
-              klass = klass.constantize
+            klass = begin
+                klass.constantize
+              rescue NameError => e
+                config.log.warn("[NSYNC] Could not find class '#{klass}' from ordering; skipping")
+                false
+              end
+            if klass
               changes = changeset[klass]
               if changes
                 apply_changes_for_class(klass, changes)
               end
-            rescue NameError
-              config.log.warn("[NSYNC] Could not find class '#{klass}' from ordering; skipping")
             end
           end
         else
@@ -164,6 +167,7 @@ module Nsync
     # @param [Class] klass
     # @param [Proc] l
     def after_class_finished(klass, l)
+      config.log.info("[NSYNC] Added callback to run after class '#{klass}'")
       @after_class_finished_queues[klass] ||= []
       @after_class_finished_queues[klass] << l
     end
@@ -184,10 +188,17 @@ module Nsync
     #
     # @param [Proc] l
     def after_finished(l)
+      config.log.info("[NSYNC] Added callback to run at the end of the update")
       @after_finished_queue ||= []
       @after_finished_queue << l
     end
 
+    # Lists the configured data remotes in the repo
+    def remotes
+      repo.git.remote({:v => true}).split("\n").map do |line|
+        line.split(/\s+/)
+      end
+    end
     protected
     def get_or_create_repo
       if config.local? || File.exists?(config.repo_path)
@@ -245,11 +256,13 @@ module Nsync
     end
 
     def clear_queues
+      config.log.info("[NSYNC] Callback queues cleared")
       @after_class_finished_queues = {}
       @after_finished_queue = []
     end
 
     def run_after_class_finished(klass)
+      config.log.info("[NSYNC] Running callbacks for after class '#{klass}'")
       queue = @after_class_finished_queues[klass]
       if queue
         queue.each do |l|
@@ -259,6 +272,7 @@ module Nsync
     end
 
     def run_after_finished
+      config.log.info("[NSYNC] Running callbacks for the end of the update")
       if @after_finished_queue
         @after_finished_queue.each do |l|
           l.call

data/nsync.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nsync}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hughes"]
-  s.date = %q{2010-12-06}
+  s.date = %q{2011-01-05}
   s.description = %q{Nsync is designed to allow you to have a separate data
   processing app with its own data processing optimized database and a consumer
   app with its own database, while keeping the data as in sync as you want it.}

data/test/helper.rb

@@ -6,6 +6,15 @@ require 'mocha'
 require 'shoulda'
 require 'redgreen'
 
+#hack for Mac OS X
+if File.directory?("/private/tmp")
+  TMP_DIR = "/private/tmp"
+elsif File.directory?("/tmp")
+  TMP_DIR = "/tmp"
+else
+  raise "Couldn't find a valid tmp dir"
+end
+
 require File.join(File.dirname(__FILE__), "repo")
 require File.join(File.dirname(__FILE__), "classes")
 

data/test/nsync_config_test.rb

@@ -73,7 +73,7 @@ class NsyncConfigTest < Test::Unit::TestCase
 
   context "Lock" do
     setup do
-      @lock_file = "/private/tmp/nsync_test_#{Process.pid}.lock"
+      @lock_file = "#{TMP_DIR}/nsync_test_#{Process.pid}.lock"
       FileUtils.rm @lock_file, :force => true
       Nsync.config.lock_file = @lock_file
     end

data/test/nsync_consumer_test.rb

@@ -4,7 +4,7 @@ class NsyncConsumerTest < Test::Unit::TestCase
   def setup
     Nsync.reset_config
     #Grit.debug = true
-    @lock_file = "/private/tmp/nsync_test_#{Process.pid}.lock"
+    @lock_file = "#{TMP_DIR}/nsync_test_#{Process.pid}.lock"
     FileUtils.rm @lock_file, :force => true
     Nsync.config.lock_file = @lock_file
 
@@ -42,7 +42,7 @@ class NsyncConsumerTest < Test::Unit::TestCase
 
       context "that doesn't exist" do
         setup do
-          @repo_path = "/private/tmp/nsync_non_existent_test_repo"
+          @repo_path = "#{TMP_DIR}/nsync_non_existent_test_repo"
           FileUtils.rm_rf @repo_path
   
           Nsync.config.repo_path = @repo_path
@@ -71,8 +71,8 @@ class NsyncConsumerTest < Test::Unit::TestCase
     context "for a remote repo" do
       context "where the origin does not exist" do
         setup do
-          @repo_url = "/private/tmp/nsync_non_existent_test_repo"
-          @repo_path = "/private/tmp/nsync_non_existent_test_repo_consumer.git"
+          @repo_url = "#{TMP_DIR}/nsync_non_existent_test_repo"
+          @repo_path = "#{TMP_DIR}/nsync_non_existent_test_repo_consumer.git"
           FileUtils.rm_rf @repo_url
           FileUtils.rm_rf @repo_path
 
@@ -87,23 +87,33 @@ class NsyncConsumerTest < Test::Unit::TestCase
         end
       end
 
-      context "where the origin does exist" do
-        setup do
-          @repo = TestRepo.new
-          FileUtils.rm_rf @repo.bare_consumer_repo_path
-
-          Nsync.config.repo_url = @repo.repo_path
-          Nsync.config.repo_path = @repo.bare_consumer_repo_path
+      [['local disk', nil], 
+        ['github', 'git://github.com/schleyfox/test_repo.git']].each do |name, url|
 
-          @consumer = Nsync::Consumer.new
-        end
-
-        should "assign repo to a new bare repo" do
-          assert @consumer.repo.is_a? Grit::Repo
-          assert @consumer.repo.bare
+        context "where the origin does exist on #{name}" do
+          setup do
+            @repo = TestRepo.new
+            FileUtils.rm_rf @repo.bare_consumer_repo_path
+  
+            Nsync.config.repo_url = url || @repo.repo_path
+            Nsync.config.repo_path = @repo.bare_consumer_repo_path
+  
+            @consumer = Nsync::Consumer.new
+          end
+  
+          should "assign repo to a new bare repo" do
+            assert @consumer.repo.is_a? Grit::Repo
+            assert @consumer.repo.bare
+          end
+  
+          should "set the origin remote" do
+            origin = @consumer.remotes.detect{|r| r[0] == "origin" && r[2] == "(fetch)" }
+            assert origin
+            assert_equal Nsync.config.repo_url, origin[1]
+          end
         end
-      end
-    end  
+      end  
+    end
   end
 
   context "Updating the Consumer side" do
@@ -147,21 +157,55 @@ class NsyncConsumerTest < Test::Unit::TestCase
       end
 
       context "with ordering" do
-        setup do
-          changeset = {NsyncTestFoo => ["changes"], NsyncTestBar => ["changes"]}
-
-          order = states('order').starts_as('bar')
+        context "the changes" do
+          setup do
+            changeset = {NsyncTestFoo => ["changes"], NsyncTestBar => ["changes"]}
+  
+            order = states('order').starts_as('bar')
+  
+            Nsync.config.ordering = ["NsyncTestBar", "NsyncTestFoo"]
+            @consumer.repo.expects(:diff).returns(:diffs).once
+            @consumer.expects(:changeset_from_diffs).with(:diffs).returns(changeset).once
+  
+            @consumer.expects(:apply_changes_for_class).when(order.is('bar')).with(NsyncTestBar, ["changes"]).then(order.is('foo')).once
+            @consumer.expects(:apply_changes_for_class).when(order.is('foo')).with(NsyncTestFoo, ["changes"]).then(order.is('final')).once
+          end
+  
+          should "execute in specified order" do
+            @consumer.update
+          end
+        end
 
-          Nsync.config.ordering = ["NsyncTestBar", "NsyncTestFoo"]
-          @consumer.repo.expects(:diff).returns(:diffs).once
-          @consumer.expects(:changeset_from_diffs).with(:diffs).returns(changeset).once
+        context "when the class in ordering is not found" do
+          setup do
+            Nsync.config.ordering = ["NsyncTestBlahBlah"]
+            @consumer.repo.expects(:diff).returns(:diffs).once
+            @consumer.expects(:changeset_from_diffs).with(:diffs).returns({}).once
+            @consumer.expects(:apply_changes_for_class).never
+          end
 
-          @consumer.expects(:apply_changes_for_class).when(order.is('bar')).with(NsyncTestBar, ["changes"]).then(order.is('foo')).once
-          @consumer.expects(:apply_changes_for_class).when(order.is('foo')).with(NsyncTestFoo, ["changes"]).then(order.is('final')).once
+          should "not error out" do
+            assert_nothing_raised do
+              @consumer.update
+            end
+          end
         end
 
-        should "execute in specified order" do
-          @consumer.update
+        context "when a NameError occurs for something other than the class" do
+          setup do
+            changeset = {NsyncTestFoo => ["changes"], NsyncTestBar => ["changes"]}
+            Nsync.config.ordering = ["NsyncTestBar", "NsyncTestFoo"]
+            @consumer.repo.expects(:diff).returns(:diffs).once
+            @consumer.expects(:changeset_from_diffs).with(:diffs).returns(changeset).once
+            @consumer.expects(:apply_changes_for_class).
+              raises(NoMethodError, "undefined method `foo' for nil:NilClass")
+          end
+
+          should "raise the error" do
+            assert_raise NoMethodError do
+              @consumer.update
+            end
+          end
         end
       end
 

data/test/nsync_producer_test.rb

@@ -4,7 +4,7 @@ class NsyncProducerTest < Test::Unit::TestCase
   def setup
     #Grit.debug = true
     Nsync.reset_config
-    @lock_file = "/private/tmp/nsync_test_#{Process.pid}.lock"
+    @lock_file = "#{TMP_DIR}/nsync_test_#{Process.pid}.lock"
     FileUtils.rm @lock_file, :force => true
     Nsync.config.lock_file = @lock_file
   end

data/test/repo.rb

@@ -23,7 +23,7 @@ class TestRepo
   end
 
   def self.repo_path
-    "/private/tmp/nsync_test_repo_#{Process.pid}"
+    "#{TMP_DIR}/nsync_test_repo_#{Process.pid}"
   end
 
   def bare_consumer_repo_path

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ben Hughes
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 -05:00
+date: 2011-01-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency