nsync 0.3.0 → 0.4.0

data/Rakefile

@@ -5,8 +5,6 @@ gem "schleyfox-grit", ">= 2.3.0.1"
 require 'grit'
 
 require 'jeweler'
-$:.unshift(".")
-require 'jeweler_monkey_patch'
       
     
 Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/nsync/producer.rb

@@ -36,7 +36,9 @@ module Nsync
     #
     # @param [String] filename path in the working tree to write to
     # @param [Hash] hash a hash that can be converted to json to be written
-    def write_file(filename, hash)
+    # @param [Boolean] add tells whether to git add the file.  
+    #   This is for internal bookkeeping files only
+    def write_file(filename, hash, add=false)
       config.cd do
         dir = File.dirname(filename)
         unless [".", "/"].include?(dir) || File.directory?(dir)
@@ -46,7 +48,7 @@ module Nsync
         File.open(File.join(config.repo_path, filename), "w") do |f|
           f.write( (hash.is_a?(Hash))? hash.to_json : hash )
         end
-        repo.add(File.join(config.repo_path, filename))
+        repo.add(File.join(config.repo_path, filename)) if add
         config.log.info("[NSYNC] Updated file '#{filename}'")
       end
       true
@@ -59,7 +61,8 @@ module Nsync
     end
 
     def latest_changes
-      diff = repo.git.native('diff', {:full_index => true, :cached => true})
+      diff = repo.git.native('diff', {:full_index => true})
+      diff += diff_untracked_files
 
       if diff =~ /diff --git a/
         diff = diff.sub(/.*?(diff --git a)/m, '\1')
@@ -71,11 +74,42 @@ module Nsync
       changeset_from_diffs(diffs)
     end
 
+    # gets untracked files into the diff output
+    # hack from http://stackoverflow.com/questions/855767/can-i-use-git-diff-on-untracked-files
+    def diff_untracked_files
+      response, err = repo.git.sh(<<-CMD)
+        git --git-dir='#{repo.git.git_dir}' ls-files -d --others --exclude-standard  |
+          while read -r i; do git --git-dir='#{repo.git.git_dir}' diff  -- /dev/null "$i"; done
+      CMD
+      response
+    end
+
+
     # Commits and pushes the current changeset
-    def commit(message="Friendly data update")
+    #
+    # By default all changes in working dir are committed.
+    #
+    # Alternatively, specific changes can be specified in the 
+    # which_changes parameter.  The format for this is {"klass" => [id,...]}
+    def commit(message="Friendly data update", which_changes=:all)
       config.lock do
         config.cd do
-          repo.commit_all(message)
+          
+          files_to_commit = []
+          latest_changes.each do |klass, changes|
+            which_of_class = which_changes[klass.to_s] if which_changes.is_a?(Hash)
+            changes.each do |change|
+              if which_changes == :all || 
+                (which_of_class && which_of_class.include?(change.id))
+
+                files_to_commit << 
+                  File.join(config.repo_path, diff_path(change.diff))
+              end
+            end
+          end
+          repo.git.update_index({:add => true, :remove => true}, '--', *files_to_commit)
+
+          repo.commit_index(message)
           config.log.info("[NSYNC] Committed '#{message}' to repo")
         end
       end
@@ -122,7 +156,7 @@ module Nsync
 
       config.lock do
         self.repo = Grit::Repo.init(config.repo_path)
-        write_file(".gitignore", "")
+        write_file(".gitignore", "", true)
       end
       commit("Initial Commit")
     end
@@ -134,7 +168,7 @@ module Nsync
       
       # refinement to allow the producer to consume itself
       if classes.empty?
-        classes = [CoreExtensions.constantize(producer_class_name)].compact
+        classes = [(CoreExtensions.constantize(producer_class_name) rescue nil)].compact
       end
       [classes, id]
     end

data/nsync.gemspec

@@ -1,6 +1,6 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
@@ -9,52 +9,51 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hughes"]
-  s.date = %q{2011-06-30}
+  s.date = %q{2011-10-28}
   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.}
   s.email = %q{ben@pixelmachine.org}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "jeweler_monkey_patch.rb",
-     "lib/nsync.rb",
-     "lib/nsync/active_record/consumer/methods.rb",
-     "lib/nsync/active_record/methods.rb",
-     "lib/nsync/active_record/producer/methods.rb",
-     "lib/nsync/class_methods.rb",
-     "lib/nsync/config.rb",
-     "lib/nsync/consumer.rb",
-     "lib/nsync/core_extensions.rb",
-     "lib/nsync/git_version_manager.rb",
-     "lib/nsync/producer.rb",
-     "lib/nsync/producer/methods.rb",
-     "nsync.gemspec"
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "jeweler_monkey_patch.rb",
+    "lib/nsync.rb",
+    "lib/nsync/active_record/consumer/methods.rb",
+    "lib/nsync/active_record/methods.rb",
+    "lib/nsync/active_record/producer/methods.rb",
+    "lib/nsync/class_methods.rb",
+    "lib/nsync/config.rb",
+    "lib/nsync/consumer.rb",
+    "lib/nsync/core_extensions.rb",
+    "lib/nsync/git_version_manager.rb",
+    "lib/nsync/producer.rb",
+    "lib/nsync/producer/methods.rb",
+    "nsync.gemspec",
+    "test/active_record_test.rb",
+    "test/classes.rb",
+    "test/helper.rb",
+    "test/nsync_config_test.rb",
+    "test/nsync_consumer_test.rb",
+    "test/nsync_producer_test.rb",
+    "test/repo.rb"
   ]
   s.homepage = %q{http://github.com/schleyfox/nsync}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.1}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Keep your data processors and apps in sync}
-  s.test_files = [
-    "test/active_record_test.rb",
-     "test/classes.rb",
-     "test/helper.rb",
-     "test/nsync_config_test.rb",
-     "test/nsync_consumer_test.rb",
-     "test/nsync_producer_test.rb",
-     "test/repo.rb"
-  ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<schleyfox-grit>, [">= 2.3.0.1"])
       s.add_runtime_dependency(%q<schleyfox-lockfile>, [">= 1.0.0"])
@@ -75,3 +74,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mocha>, [">= 0"])
   end
 end
+

data/test/nsync_producer_test.rb

@@ -32,7 +32,7 @@ class NsyncProducerTest < Test::Unit::TestCase
 
       should "initialize it and make a base commit" do
         Grit::Repo.expects(:init).with(@repo_path).once
-        Nsync::Producer.any_instance.expects(:write_file).with(".gitignore", "").once
+        Nsync::Producer.any_instance.expects(:write_file).with(".gitignore", "", true).once
         Nsync::Producer.any_instance.expects(:commit).returns(true).once
         Nsync::Producer.new
       end
@@ -74,9 +74,8 @@ class NsyncProducerTest < Test::Unit::TestCase
       end
 
       should "write the file to disk, add it to the index, but not commit" do
-        @producer.repo.expects(:add).with(File.join(@repo.repo_path, @file)).once
         @producer.expects(:commit).never
-        @producer.repo.expects(:commit_all).never
+        @producer.repo.expects(:commit_index).never
         @producer.write_file(@file, @hash)
 
         assert_equal JSON.load(File.read(File.join(@repo.repo_path, @file))),  @hash
@@ -92,7 +91,6 @@ class NsyncProducerTest < Test::Unit::TestCase
 
       should "behave just like a create" do
         new_hash = {"id" => 1, "val" => "Kaboom"}
-        @producer.repo.expects(:add).with(File.join(@repo.repo_path, @file)).once
         @producer.expects(:commit).never
         @producer.write_file(@file, new_hash)
 
@@ -121,7 +119,8 @@ class NsyncProducerTest < Test::Unit::TestCase
 
     should "commit all changes as well as push" do
       @msg = "Test Update"
-      @producer.repo.expects(:commit_all).with(@msg).once
+      @producer.repo.git.expects(:update_index).once
+      @producer.repo.expects(:commit_index).with(@msg).once
       @producer.expects(:push).once
       @producer.commit(@msg)
     end
@@ -256,6 +255,11 @@ class NsyncProducerTest < Test::Unit::TestCase
 
       assert_equal 4, @repo.commits.size
       assert_equal 4, @remote_repo.commits.size
+
+      @producer.write_file("nsync_test_bar/5.json", {:id => 5, :val => "Changed"})
+      @producer.write_file("nsync_test_bar/6.json", {:id => 6, :val => "Added file"})
+      @repo.git.expects(:update_index).with({:add => true, :remove => true}, '--', File.join(@repo_path, 'nsync_test_bar/6.json')).once
+      @producer.commit("Partial commit", {'NsyncTestBar' => ['6']})
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: nsync
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ben Hughes
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -04:00
+date: 2011-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -36,11 +33,9 @@ dependencies:
   name: schleyfox-grit
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 117
         segments: 
         - 2
         - 3
@@ -53,11 +48,9 @@ dependencies:
   name: schleyfox-lockfile
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -69,11 +62,9 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -83,11 +74,9 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -140,35 +129,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Keep your data processors and apps in sync
-test_files: 
-- test/active_record_test.rb
-- test/classes.rb
-- test/helper.rb
-- test/nsync_config_test.rb
-- test/nsync_consumer_test.rb
-- test/nsync_producer_test.rb
-- test/repo.rb
+test_files: []
+