active_git 0.0.4 → 0.0.5

data/.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-ci
+repo_token: izy4r8FgdQzdUNEsV367gUbmlSuqqnlOA

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0
   - jruby
-script: bundle exec rspec spec
+env:
+  - DB=postgresql
+before_script:
+  - git config --global user.name "User Name"
+  - git config --global user.email "user@mail.com"
+  - psql -c 'create database test' -U postgres

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in active_git.gemspec
 gemspec
+
+gem 'coveralls', require: false

data/README.md

@@ -1,6 +1,10 @@
 # ActiveGit
 
+[![Gem Version](https://badge.fury.io/rb/active_git.png)](https://rubygems.org/gems/active_git)
 [![Build Status](https://travis-ci.org/gabynaiman/active_git.png?branch=master)](https://travis-ci.org/gabynaiman/active_git)
+[![Coverage Status](https://coveralls.io/repos/gabynaiman/active_git/badge.png?branch=master)](https://coveralls.io/r/gabynaiman/active_git?branch=master)
+[![Code Climate](https://codeclimate.com/github/gabynaiman/active_git.png)](https://codeclimate.com/github/gabynaiman/active_git)
+[![Dependency Status](https://gemnasium.com/gabynaiman/active_git.png)](https://gemnasium.com/gabynaiman/active_git)
 
 DB and GIT synchronization via ActiveRecord and GitWrapper
 

data/Rakefile

@@ -1,2 +1,11 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new do |task|
+  task.pattern = 'spec/**/*_spec.rb'
+  task.rspec_opts = '--tty --color -f documentation'
+  task.verbose = false
+end
+
+task default: :spec

data/active_git.gemspec

@@ -16,10 +16,19 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'activerecord', '>= 3.0.0'
-  s.add_dependency 'git_wrapper', '~> 1.0'
+  s.add_dependency 'git_wrapper', '~> 1.1'
   s.add_dependency 'activerecord-import'
   s.add_dependency 'easy_diff'
 
+  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency "rake"
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency "simplecov"
+  if RUBY_ENGINE == 'jruby'
+    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
+    s.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
+  else
+    s.add_development_dependency 'sqlite3'
+    s.add_development_dependency 'pg'
+  end
 end

data/lib/active_git/commands.rb

@@ -44,7 +44,7 @@ module ActiveGit
     end
 
     def merge(commit)
-      last_log = log.first
+      last_log = (log || []).first
       diffs = diff_reverse commit unless last_log
 
       unless repository.merge(commit)
@@ -58,7 +58,7 @@ module ActiveGit
         synchronize_diffs diffs
       rescue => e
         ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
-        reset last_log.commit_hash
+        last_log ? reset(last_log.commit_hash) : reset
         return false
       end
 

data/lib/active_git/events/db_create.rb

@@ -2,7 +2,7 @@ module ActiveGit
   class DbCreate < DbEvent
 
     def synchronize(synchronizer)
-      synchronizer.bulk_insert data
+      create synchronizer
     end
 
   end

data/lib/active_git/events/db_delete.rb

@@ -2,11 +2,7 @@ module ActiveGit
   class DbDelete < DbEvent
 
     def synchronize(synchronizer)
-      synchronizer.define_job do
-        ActiveGit.configuration.logger.debug "[ActiveGit] Deleting #{model.model_name} #{model_id}"
-        record = model.find_by_id(model_id)
-        record.delete if record
-      end
+      delete synchronizer
     end
 
   end

data/lib/active_git/events/db_event.rb

@@ -10,7 +10,7 @@ module ActiveGit
       raise 'Must implement in subclass'
     end
 
-    protected
+    private
 
     def model
       @model ||= Inflector.model(@file_name, @working_path)
@@ -25,5 +25,17 @@ module ActiveGit
       model.from_json(json)
     end
 
+    def create(synchronizer)
+      synchronizer.bulk_insert data
+    end
+
+    def delete(synchronizer)
+      synchronizer.define_job do
+        ActiveGit.configuration.logger.debug "[ActiveGit] Deleting #{model.model_name} #{model_id}"
+        record = model.find_by_id(model_id)
+        record.delete if record
+      end
+    end
+
   end
 end

data/lib/active_git/events/db_update.rb

@@ -2,13 +2,8 @@ module ActiveGit
   class DbUpdate < DbEvent
 
     def synchronize(synchronizer)
-      synchronizer.bulk_insert data
-
-      synchronizer.define_job do
-        ActiveGit.configuration.logger.debug "[ActiveGit] Deleting #{model.model_name} #{model_id}"
-        record = model.find_by_id(model_id)
-        record.delete if record
-      end
+      delete synchronizer
+      create synchronizer
     end
 
   end

data/lib/active_git/inflector.rb

@@ -1,14 +1,22 @@
 module ActiveGit
   module Inflector
 
+    def self.relative_dirname(model)
+      model.model_name.underscore.pluralize
+    end
+
     def self.dirname(model, working_path=nil)
-      "#{working_path || ActiveGit.configuration.working_path}/#{model.model_name.underscore.pluralize}"
+      "#{working_path || ActiveGit.configuration.working_path}/#{relative_dirname(model)}"
     end
 
     def self.filename(instance, working_path=nil)
       "#{dirname(instance.class, working_path || ActiveGit.configuration.working_path)}/#{instance.id}.json"
     end
 
+    def self.relative_filename(instance)
+      "#{relative_dirname(instance.class)}/#{instance.id}.json"
+    end
+
     def self.model(filename, working_path=nil)
       File.dirname(filename.gsub(working_path || ActiveGit.configuration.working_path, '')).classify.constantize
     end

data/lib/active_git/version.rb

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

data/spec/coverage_helper.rb

@@ -0,0 +1,8 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start

data/spec/inflector_spec.rb

@@ -12,6 +12,10 @@ describe ActiveGit::Inflector do
     ActiveGit::Inflector.dirname(Crm::Customer, working_path).should eq "#{working_path}/crm/customers"
   end
 
+  it 'Git relative path' do
+    ActiveGit::Inflector.relative_dirname(Country).should eq "countries"
+  end
+
   it 'Git file' do
     country = Country.create! name: 'Argentina'
     ActiveGit::Inflector.filename(country, working_path).should eq "#{working_path}/countries/#{country.id}.json"
@@ -22,6 +26,11 @@ describe ActiveGit::Inflector do
     ActiveGit::Inflector.filename(customer, working_path).should eq "#{working_path}/crm/customers/#{customer.id}.json"
   end
 
+  it 'Git relative file' do
+    country = Country.create! name: 'Argentina'
+    ActiveGit::Inflector.relative_filename(country).should eq "countries/#{country.id}.json"
+  end
+
   it 'Model from filename' do
     ActiveGit::Inflector.model("#{working_path}/countries/1.json", working_path).should be Country
   end

data/spec/spec_helper.rb

@@ -1,11 +1,15 @@
+require 'coverage_helper'
 require 'active_git'
 require 'logger'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 ActiveRecord::Base.logger = Logger.new($stdout)
+ActiveRecord::Base.logger.level = Logger::Severity::ERROR
 ActiveRecord::Migrator.migrations_path = "#{File.dirname(__FILE__)}/migrations"
 
+ActiveGit.configuration.logger.level = Logger::Severity::ERROR
+
 module InflectorHelper
   def git_dirname(model, working_path=nil)
     ActiveGit::Inflector.dirname(model, working_path || ActiveGit.configuration.working_path)
@@ -26,7 +30,11 @@ RSpec.configure do |config|
   end
 
   config.before :all do
-    ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ":memory:"
+    if ENV['DB'] == 'postgresql'
+      ActiveRecord::Base.establish_connection adapter: 'postgresql', database: 'test', username: 'postgres'
+    else
+      ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
+    end
     ActiveRecord::Base.connection
     ActiveRecord::Migrator.migrate ActiveRecord::Migrator.migrations_path
   end

data/spec/support/helpers/file_helper.rb

@@ -19,12 +19,6 @@ class FileHelper
     end
   end
 
-  def create_temp_file(folder, content)
-    file_name = "#{folder}/file #{timestamp}.txt"
-    write_file file_name, content
-    file_name
-  end
-
   def write_file(file_name, content)
     Dir.mkdir File.dirname(file_name) unless Dir.exist? File.dirname(file_name)
     File.open(file_name, 'w') { |f| f.puts content }

metadata

@@ -1,112 +1,190 @@
 --- !ruby/object:Gem::Specification
 name: active_git
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  prerelease:
+  version: 0.0.5
 platform: ruby
 authors:
 - Gabriel Naiman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: git_wrapper
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: '1.1'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: activerecord-import
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: easy_diff
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  name: activerecord-jdbcsqlite3-adapter
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: activerecord-jdbcpostgresql-adapter
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 description: DB and GIT synchronization via ActiveRecord and GitWrapper
 email:
 - gabynaiman@gmail.com
@@ -114,6 +192,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -140,6 +219,7 @@ files:
 - lib/active_git/version.rb
 - spec/active_record_extension_spec.rb
 - spec/commands_spec.rb
+- spec/coverage_helper.rb
 - spec/inflector_spec.rb
 - spec/migrations/20121004135939_create_countries.rb
 - spec/migrations/20121004135940_create_languages.rb
@@ -154,31 +234,40 @@ files:
 - spec/synchronization_spec.rb
 homepage: https://github.com/gabynaiman/active_git
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      segments:
+      - 0
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      segments:
+      - 0
+      hash: 2
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: DB and GIT synchronization via ActiveRecord and GitWrapper
 test_files:
 - spec/active_record_extension_spec.rb
 - spec/commands_spec.rb
+- spec/coverage_helper.rb
 - spec/inflector_spec.rb
 - spec/migrations/20121004135939_create_countries.rb
 - spec/migrations/20121004135940_create_languages.rb
@@ -191,4 +280,3 @@ test_files:
 - spec/support/models/customer.rb
 - spec/support/models/language.rb
 - spec/synchronization_spec.rb
-has_rdoc: