active_git 0.0.3 → 0.0.4

data/lib/active_git/synchronizer.rb

@@ -1,54 +1,54 @@
-module ActiveGit
-  class Synchronizer
-
-    def self.synchronize(*events)
-      batch = self.new
-
-      Array(events).flatten.each do |event|
-        event.synchronize batch
-      end
-
-      batch.run
-    end
-
-    def run
-      unless bulk_inserts.empty?
-        define_job do
-          bulk_inserts.each do |model, records|
-            ActiveGit.configuration.logger.debug "[ActiveGit] Inserting #{model.model_name} models"
-            import_result = model.import records, timestamps: false, validate: false
-            raise SynchronizationError.new(import_result.failed_instances) unless import_result.failed_instances.empty?
-          end
-        end
-      end
-
-      ::ActiveRecord::Base.transaction do
-        jobs.each do |job|
-          job.call
-        end
-      end
-      ActiveGit.add_all
-    end
-
-    def bulk_insert(data)
-      bulk_inserts[data.class] ||= [] unless bulk_inserts.has_key? data.class
-      bulk_inserts[data.class] << data
-    end
-
-    def define_job(&block)
-      jobs << Proc.new(&block)
-    end
-
-    private
-
-    def bulk_inserts
-      @bulk_inserts ||= {}
-    end
-
-    def jobs
-      @jobs ||= []
-    end
-
-  end
-
+module ActiveGit
+  class Synchronizer
+
+    def self.synchronize(*events)
+      batch = self.new
+
+      Array(events).flatten.each do |event|
+        event.synchronize batch
+      end
+
+      batch.run
+    end
+
+    def run
+      unless bulk_inserts.empty?
+        define_job do
+          bulk_inserts.each do |model, records|
+            ActiveGit.configuration.logger.debug "[ActiveGit] Inserting #{model.model_name} models"
+            import_result = model.import records, timestamps: false, validate: false
+            raise SynchronizationError.new(import_result.failed_instances) unless import_result.failed_instances.empty?
+          end
+        end
+      end
+
+      ::ActiveRecord::Base.transaction do
+        jobs.each do |job|
+          job.call
+        end
+      end
+      ActiveGit.add_all
+    end
+
+    def bulk_insert(data)
+      bulk_inserts[data.class] ||= [] unless bulk_inserts.has_key? data.class
+      bulk_inserts[data.class] << data
+    end
+
+    def define_job(&block)
+      jobs << Proc.new(&block)
+    end
+
+    private
+
+    def bulk_inserts
+      @bulk_inserts ||= {}
+    end
+
+    def jobs
+      @jobs ||= []
+    end
+
+  end
+
 end

data/lib/active_git/version.rb

@@ -1,3 +1,3 @@
-module ActiveGit
-  VERSION = '0.0.3'
-end
+module ActiveGit
+  VERSION = '0.0.4'
+end

data/spec/active_record_extension_spec.rb

@@ -1,51 +1,61 @@
-require 'spec_helper'
-
-describe ActiveGit::ActiveRecord do
-
-  before :each do
-    @file_helper = FileHelper.new
-    ActiveGit.configuration.working_path = @file_helper.create_temp_folder
-  end
-
-  after :each do
-    @file_helper.remove_temp_folders
-  end
-
-  it 'Registered models' do
-    ActiveGit.models.should include Language
-  end
-
-  it 'Create' do
-    language = Language.create! name: 'Spanish'
-
-    File.exist?(language.git_file).should be_true
-
-    json = JSON.parse(@file_helper.read_file(language.git_file))
-
-    json['id'].should eq language.id
-    json['name'].should eq language.name
-  end
-
-  it 'Update' do
-    language = Language.create! name: 'Spanish'
-
-    json = JSON.parse(@file_helper.read_file(language.git_file))
-    json['name'].should eq 'Spanish'
-
-    language.update_attributes name: 'English'
-
-    json = JSON.parse(@file_helper.read_file(language.git_file))
-    json['name'].should eq 'English'
-  end
-
-  it 'Destroy' do
-    language = Language.create! name: 'Spanish'
-
-    File.exist?(language.git_file).should be_true
-
-    language.destroy
-
-    File.exist?(language.git_file).should be_false
-  end
-
+require 'spec_helper'
+
+describe ActiveGit::ActiveRecord do
+
+  before :each do
+    @file_helper = FileHelper.new
+    ActiveGit.configuration.working_path = @file_helper.create_temp_folder
+  end
+
+  after :each do
+    @file_helper.remove_temp_folders
+  end
+
+  it 'Registered models' do
+    ActiveGit.models.should include Language
+  end
+
+  it 'Create' do
+    language = Language.create! name: 'Spanish'
+
+    File.exist?(git_filename(language)).should be_true
+
+    json = JSON.parse(@file_helper.read_file(git_filename(language)))
+
+    json['id'].should eq language.id
+    json['name'].should eq language.name
+  end
+
+  it 'Update' do
+    language = Language.create! name: 'Spanish'
+
+    json = JSON.parse(@file_helper.read_file(git_filename(language)))
+    json['name'].should eq 'Spanish'
+
+    language.update_attributes name: 'English'
+
+    json = JSON.parse(@file_helper.read_file(git_filename(language)))
+    json['name'].should eq 'English'
+  end
+
+  it 'Destroy' do
+    language = Language.create! name: 'Spanish'
+
+    File.exist?(git_filename(language)).should be_true
+
+    language.destroy
+
+    File.exist?(git_filename(language)).should be_false
+  end
+
+  it 'Load from json' do
+    attributes = {id: 1, name: 'Spanish', created_at: Time.now, updated_at: Time.now}
+    language = Language.from_json attributes.to_json
+
+    language.id.should eq attributes[:id]
+    language.name.should eq attributes[:name]
+    language.created_at.to_i.should eq attributes[:created_at].to_i
+    language.updated_at.to_i.should eq attributes[:updated_at].to_i
+  end
+
 end

data/spec/commands_spec.rb

@@ -1,246 +1,246 @@
-require 'spec_helper'
-
-describe ActiveGit::Commands do
-
-  before :each do
-    @file_helper = FileHelper.new
-    ActiveGit.configuration.working_path = @file_helper.create_temp_folder
-    ActiveGit.init
-  end
-
-  after :each do
-    @file_helper.remove_temp_folders
-  end
-
-  context 'Dump and load' do
-
-    it 'Dump complete db to files' do
-      languages = [
-          Language.create!(name: 'Spanish'),
-          Language.create!(name: 'English')
-      ]
-
-      @file_helper.write_file "#{ActiveGit.configuration.working_path}/test.txt", 'test'
-      @file_helper.write_file "#{Language.git_folder}/0.json", 'test'
-
-      ActiveGit.dump_db
-
-      File.exist?("#{ActiveGit.configuration.working_path}/test.txt").should be_false
-
-      Dir.glob("#{Language.git_folder}/*.json").should have(2).items
-
-      languages.each do |language|
-        File.exist?(language.git_file).should be_true
-        json = JSON.parse(@file_helper.read_file(language.git_file))
-        json['id'].should eq language.id
-        json['name'].should eq language.name
-      end
-    end
-
-    it 'Dump single table to files' do
-      language = Language.create! name: 'Spanish'
-      country = Country.create! name: 'Argentina'
-
-      Dir["#{ActiveGit.configuration.working_path}/*"].each { |f| FileUtils.rm_rf f }
-
-      Dir.exists?("#{ActiveGit.configuration.working_path}/languages").should be_false
-      File.exists?("#{ActiveGit.configuration.working_path}/languages/#{language.id}.json").should be_false
-      Dir.exists?("#{ActiveGit.configuration.working_path}/countries").should be_false
-      File.exists?("#{ActiveGit.configuration.working_path}/countries/#{country.id}.json").should be_false
-
-      ActiveGit.dump_db Language
-
-      Dir.exists?("#{ActiveGit.configuration.working_path}/languages").should be_true
-      File.exists?("#{ActiveGit.configuration.working_path}/languages/#{language.id}.json").should be_true
-      Dir.exists?("#{ActiveGit.configuration.working_path}/countries").should be_false
-      File.exists?("#{ActiveGit.configuration.working_path}/countries/#{country.id}.json").should be_false
-    end
-
-    it 'Load all files to db' do
-      languages = [
-          Language.create!(name: 'Spanish'),
-          Language.create!(name: 'English')
-      ]
-
-      Language.first.delete
-
-      languages.each do |language|
-        File.exist?(language.git_file).should be_true
-      end
-
-      ActiveGit.load_files
-
-      Language.count.should be 2
-
-      languages.each do |language|
-        language.reload.should be_a Language
-      end
-    end
-
-    it 'Load single model files to db' do
-      language = Language.create! name: 'Spanish'
-      brand = Brand.create! name: 'Coca Cola'
-
-      File.exists?(language.git_file).should be_true
-      File.exists?(brand.git_file).should be_true
-
-      language.delete
-      brand.delete
-
-      ActiveGit.load_files Language
-
-      Language.find_by_id(language.id).should_not be_nil
-      Brand.find_by_id(brand.id).should be_nil
-    end
-
-  end
-
-  context 'Git synchronization' do
-
-    it 'Commit all files' do
-      Language.create! name: 'Spanish'
-
-      ActiveGit.status.should_not be_empty
-
-      ActiveGit.commit_all 'Commit for test'
-
-      ActiveGit.status.should be_empty
-
-      ActiveGit.log.first.subject.should eq 'Commit for test'
-    end
-
-    it 'Push and pull' do
-      bare = GitWrapper::Repository.new @file_helper.create_temp_folder
-      bare.init_bare
-
-      spanish = Language.create! name: 'Spanish'
-      english = Language.create! name: 'English'
-      ActiveGit.commit_all 'Local commit'
-      ActiveGit.add_remote 'bare', bare.location
-      ActiveGit.push 'bare'
-
-      remote = GitWrapper::Repository.new @file_helper.create_temp_folder
-      remote.init
-      remote.add_remote 'bare', bare.location
-      remote.pull 'bare'
-
-      to_json = Proc.new do |id, name|
-        JSON.pretty_generate id: id, name: name, created_at: Time.now, updated_at: Time.now
-      end
-      @file_helper.write_file "#{remote.location}/languages/#{spanish.id}.json", to_json.call(spanish.id, 'Spanish 2')
-      @file_helper.write_file "#{remote.location}/languages/888.json", to_json.call(888, 'Portuguese')
-      @file_helper.write_file "#{remote.location}/languages/999.json", to_json.call(999, 'French')
-      FileUtils.rm "#{remote.location}/languages/#{english.id}.json"
-
-      remote.add_all
-      remote.commit 'Remote commit'
-      remote.push 'bare'
-
-      Language.count.should eq 2
-
-      ActiveGit.pull('bare').should be_true
-
-      ActiveGit.log.first.subject.should eq 'Remote commit'
-      Language.count.should eq 3
-      ['Spanish 2', 'Portuguese', 'French'].each do |lang_name|
-        File.exist?(Language.find_by_name(lang_name).git_file).should be_true
-      end
-    end
-
-    it 'Checkout' do
-      Language.create! name: 'Spanish'
-      Language.create! name: 'English'
-
-      ActiveGit.commit_all 'Commit 1'
-      ActiveGit.branch 'branch_test'
-      ActiveGit.checkout 'branch_test'
-
-      Language.first.destroy
-      ActiveGit.commit_all 'Commit 2'
-
-      Language.count.should eq 1
-
-      ActiveGit.checkout 'master'
-
-      Language.count.should eq 2
-
-      ActiveGit.checkout 'branch_test'
-
-      Language.count.should eq 1
-    end
-
-    it 'Reset to specific commit' do
-      spanish = Language.create! name: 'Spanish'
-      ActiveGit.commit_all 'Commit 1'
-
-      english = Language.create! name: 'English'
-      ActiveGit.commit_all 'Commit 1'
-
-      Language.count.should eq 2
-      File.exist?(spanish.git_file).should be_true
-      File.exist?(english.git_file).should be_true
-
-      ActiveGit.reset ActiveGit.log.last.commit_hash
-
-      Language.count.should eq 1
-      File.exist?(spanish.git_file).should be_true
-      File.exist?(english.git_file).should be_false
-    end
-
-    it 'Reset to HEAD' do
-      spanish = Language.create! name: 'Spanish'
-      ActiveGit.commit_all 'Commit 1'
-
-      english = Language.create! name: 'English'
-
-      Language.count.should eq 2
-      File.exist?(spanish.git_file).should be_true
-      File.exist?(english.git_file).should be_true
-
-      ActiveGit.reset
-
-      Language.count.should eq 1
-      File.exist?(spanish.git_file).should be_true
-      File.exist?(english.git_file).should be_false
-    end
-
-    it 'Resolve version conflicts' do
-      bare = GitWrapper::Repository.new @file_helper.create_temp_folder
-      bare.init_bare
-
-      ActiveGit.add_remote 'bare', bare.location
-
-      spanish = Language.create! name: 'Spanish'
-
-      ActiveGit.commit_all 'Commit v1'
-      ActiveGit.push 'bare'
-
-      other_repo = GitWrapper::Repository.new @file_helper.create_temp_folder
-      other_repo.init
-      other_repo.add_remote 'bare', bare.location
-      other_repo.pull 'bare'
-
-      @file_helper.write_file "#{other_repo.location}/languages/#{spanish.id}.json",
-                              JSON.pretty_generate(id: spanish.id, name: 'Spanish 2', created_at: Time.now, updated_at: Time.now)
-
-      other_repo.add_all
-      other_repo.commit 'Commit v2'
-      other_repo.push 'bare'
-
-      spanish.update_attributes name: 'Spanish 3'
-      ActiveGit.commit 'Commit v3'
-
-      ActiveGit.pull 'bare'
-
-      spanish.reload.name.should eq 'Spanish 3'
-
-      ActiveGit.log.should have(4).items
-      ActiveGit.log[0].subject.should eq 'Resolve conflicts'
-      ActiveGit.log[1].subject.should eq 'Commit v3'
-      ActiveGit.log[2].subject.should eq 'Commit v2'
-      ActiveGit.log[3].subject.should eq 'Commit v1'
-    end
-
-  end
-
+require 'spec_helper'
+
+describe ActiveGit::Commands do
+
+  before :each do
+    @file_helper = FileHelper.new
+    ActiveGit.configuration.working_path = @file_helper.create_temp_folder
+    ActiveGit.init
+  end
+
+  after :each do
+    @file_helper.remove_temp_folders
+  end
+
+  context 'Dump and load' do
+
+    it 'Dump complete db to files' do
+      languages = [
+          Language.create!(name: 'Spanish'),
+          Language.create!(name: 'English')
+      ]
+
+      @file_helper.write_file "#{ActiveGit.configuration.working_path}/test.txt", 'test'
+      @file_helper.write_file "#{git_dirname(Language)}/0.json", 'test'
+
+      ActiveGit.dump_db
+
+      File.exist?("#{ActiveGit.configuration.working_path}/test.txt").should be_false
+
+      Dir.glob("#{git_dirname(Language)}/*.json").should have(2).items
+
+      languages.each do |language|
+        File.exist?(git_filename(language)).should be_true
+        json = JSON.parse(@file_helper.read_file(git_filename(language)))
+        json['id'].should eq language.id
+        json['name'].should eq language.name
+      end
+    end
+
+    it 'Dump single table to files' do
+      language = Language.create! name: 'Spanish'
+      country = Country.create! name: 'Argentina'
+
+      Dir["#{ActiveGit.configuration.working_path}/*"].each { |f| FileUtils.rm_rf f }
+
+      Dir.exists?("#{ActiveGit.configuration.working_path}/languages").should be_false
+      File.exists?("#{ActiveGit.configuration.working_path}/languages/#{language.id}.json").should be_false
+      Dir.exists?("#{ActiveGit.configuration.working_path}/countries").should be_false
+      File.exists?("#{ActiveGit.configuration.working_path}/countries/#{country.id}.json").should be_false
+
+      ActiveGit.dump_db Language
+
+      Dir.exists?("#{ActiveGit.configuration.working_path}/languages").should be_true
+      File.exists?("#{ActiveGit.configuration.working_path}/languages/#{language.id}.json").should be_true
+      Dir.exists?("#{ActiveGit.configuration.working_path}/countries").should be_false
+      File.exists?("#{ActiveGit.configuration.working_path}/countries/#{country.id}.json").should be_false
+    end
+
+    it 'Load all files to db' do
+      languages = [
+          Language.create!(name: 'Spanish'),
+          Language.create!(name: 'English')
+      ]
+
+      Language.first.delete
+
+      languages.each do |language|
+        File.exist?(git_filename(language)).should be_true
+      end
+
+      ActiveGit.load_files
+
+      Language.count.should be 2
+
+      languages.each do |language|
+        language.reload.should be_a Language
+      end
+    end
+
+    it 'Load single model files to db' do
+      language = Language.create! name: 'Spanish'
+      brand = Brand.create! name: 'Coca Cola'
+
+      File.exists?(git_filename(language)).should be_true
+      File.exists?(git_filename(brand)).should be_true
+
+      language.delete
+      brand.delete
+
+      ActiveGit.load_files Language
+
+      Language.find_by_id(language.id).should_not be_nil
+      Brand.find_by_id(brand.id).should be_nil
+    end
+
+  end
+
+  context 'Git synchronization' do
+
+    it 'Commit all files' do
+      Language.create! name: 'Spanish'
+
+      ActiveGit.status.should_not be_empty
+
+      ActiveGit.commit_all 'Commit for test'
+
+      ActiveGit.status.should be_empty
+
+      ActiveGit.log.first.subject.should eq 'Commit for test'
+    end
+
+    it 'Push and pull' do
+      bare = GitWrapper::Repository.new @file_helper.create_temp_folder
+      bare.init_bare
+
+      spanish = Language.create! name: 'Spanish'
+      english = Language.create! name: 'English'
+      ActiveGit.commit_all 'Local commit'
+      ActiveGit.add_remote 'bare', bare.location
+      ActiveGit.push 'bare'
+
+      remote = GitWrapper::Repository.new @file_helper.create_temp_folder
+      remote.init
+      remote.add_remote 'bare', bare.location
+      remote.pull 'bare'
+
+      to_json = Proc.new do |id, name|
+        JSON.pretty_generate id: id, name: name, created_at: Time.now, updated_at: Time.now
+      end
+      @file_helper.write_file "#{remote.location}/languages/#{spanish.id}.json", to_json.call(spanish.id, 'Spanish 2')
+      @file_helper.write_file "#{remote.location}/languages/888.json", to_json.call(888, 'Portuguese')
+      @file_helper.write_file "#{remote.location}/languages/999.json", to_json.call(999, 'French')
+      FileUtils.rm "#{remote.location}/languages/#{english.id}.json"
+
+      remote.add_all
+      remote.commit 'Remote commit'
+      remote.push 'bare'
+
+      Language.count.should eq 2
+
+      ActiveGit.pull('bare').should be_true
+
+      ActiveGit.log.first.subject.should eq 'Remote commit'
+      Language.count.should eq 3
+      ['Spanish 2', 'Portuguese', 'French'].each do |lang_name|
+        File.exist?(git_filename(Language.find_by_name(lang_name))).should be_true
+      end
+    end
+
+    it 'Checkout' do
+      Language.create! name: 'Spanish'
+      Language.create! name: 'English'
+
+      ActiveGit.commit_all 'Commit 1'
+      ActiveGit.branch 'branch_test'
+      ActiveGit.checkout 'branch_test'
+
+      Language.first.destroy
+      ActiveGit.commit_all 'Commit 2'
+
+      Language.count.should eq 1
+
+      ActiveGit.checkout 'master'
+
+      Language.count.should eq 2
+
+      ActiveGit.checkout 'branch_test'
+
+      Language.count.should eq 1
+    end
+
+    it 'Reset to specific commit' do
+      spanish = Language.create! name: 'Spanish'
+      ActiveGit.commit_all 'Commit 1'
+
+      english = Language.create! name: 'English'
+      ActiveGit.commit_all 'Commit 1'
+
+      Language.count.should eq 2
+      File.exist?(git_filename(spanish)).should be_true
+      File.exist?(git_filename(english)).should be_true
+
+      ActiveGit.reset ActiveGit.log.last.commit_hash
+
+      Language.count.should eq 1
+      File.exist?(git_filename(spanish)).should be_true
+      File.exist?(git_filename(english)).should be_false
+    end
+
+    it 'Reset to HEAD' do
+      spanish = Language.create! name: 'Spanish'
+      ActiveGit.commit_all 'Commit 1'
+
+      english = Language.create! name: 'English'
+
+      Language.count.should eq 2
+      File.exist?(git_filename(spanish)).should be_true
+      File.exist?(git_filename(english)).should be_true
+
+      ActiveGit.reset
+
+      Language.count.should eq 1
+      File.exist?(git_filename(spanish)).should be_true
+      File.exist?(git_filename(english)).should be_false
+    end
+
+    it 'Resolve version conflicts' do
+      bare = GitWrapper::Repository.new @file_helper.create_temp_folder
+      bare.init_bare
+
+      ActiveGit.add_remote 'bare', bare.location
+
+      spanish = Language.create! name: 'Spanish'
+
+      ActiveGit.commit_all 'Commit v1'
+      ActiveGit.push 'bare'
+
+      other_repo = GitWrapper::Repository.new @file_helper.create_temp_folder
+      other_repo.init
+      other_repo.add_remote 'bare', bare.location
+      other_repo.pull 'bare'
+
+      @file_helper.write_file "#{other_repo.location}/languages/#{spanish.id}.json",
+                              JSON.pretty_generate(id: spanish.id, name: 'Spanish 2', created_at: Time.now, updated_at: Time.now)
+
+      other_repo.add_all
+      other_repo.commit 'Commit v2'
+      other_repo.push 'bare'
+
+      spanish.update_attributes name: 'Spanish 3'
+      ActiveGit.commit 'Commit v3'
+
+      ActiveGit.pull 'bare'
+
+      spanish.reload.name.should eq 'Spanish 3'
+
+      ActiveGit.log.should have(4).items
+      ActiveGit.log[0].subject.should eq 'Resolve conflicts'
+      ActiveGit.log[1].subject.should eq 'Commit v3'
+      ActiveGit.log[2].subject.should eq 'Commit v2'
+      ActiveGit.log[3].subject.should eq 'Commit v1'
+    end
+
+  end
+
 end