active_git 0.0.3 → 0.0.4

data/.gitignore

@@ -1,18 +1,19 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.idea
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+spec/tmp
+test/tmp
+test/version_tmp
+tmp
+.idea

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0
+  - jruby
+script: bundle exec rspec spec

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in active_git.gemspec
-gemspec
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in active_git.gemspec
+gemspec

data/LICENSE

@@ -1,22 +1,22 @@
-Copyright (c) 2012 gabriel
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+Copyright (c) 2012 gabriel
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,29 +1,31 @@
-# ActiveGit
-
-DB and GIT synchronization via ActiveRecord and GitWrapper
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'active_git'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install active_git
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+# ActiveGit
+
+[![Build Status](https://travis-ci.org/gabynaiman/active_git.png?branch=master)](https://travis-ci.org/gabynaiman/active_git)
+
+DB and GIT synchronization via ActiveRecord and GitWrapper
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'active_git'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install active_git
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,2 +1,2 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/active_git.gemspec

@@ -1,25 +1,25 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/active_git/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name          = "active_git"
-  s.version       = ActiveGit::VERSION
-  s.authors       = ["Gabriel Naiman"]
-  s.email         = ["gabynaiman@gmail.com"]
-  s.description   = 'DB and GIT synchronization via ActiveRecord and GitWrapper'
-  s.summary       = 'DB and GIT synchronization via ActiveRecord and GitWrapper'
-  s.homepage      = 'https://github.com/gabynaiman/active_git'
-
-  s.files         = `git ls-files`.split($\)
-  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-
-  s.add_dependency 'activerecord', '>= 3.0.0'
-  s.add_dependency 'git_wrapper', '>= 1.0.2'
-  s.add_dependency 'activerecord-import'
-  s.add_dependency 'easy_diff'
-
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'sqlite3'
-end
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/active_git/version', __FILE__)
+
+Gem::Specification.new do |s|
+  s.name          = "active_git"
+  s.version       = ActiveGit::VERSION
+  s.authors       = ["Gabriel Naiman"]
+  s.email         = ["gabynaiman@gmail.com"]
+  s.description   = 'DB and GIT synchronization via ActiveRecord and GitWrapper'
+  s.summary       = 'DB and GIT synchronization via ActiveRecord and GitWrapper'
+  s.homepage      = 'https://github.com/gabynaiman/active_git'
+
+  s.files         = `git ls-files`.split($\)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
+
+  s.add_dependency 'activerecord', '>= 3.0.0'
+  s.add_dependency 'git_wrapper', '~> 1.0'
+  s.add_dependency 'activerecord-import'
+  s.add_dependency 'easy_diff'
+
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'sqlite3'
+end

data/lib/active_git.rb

@@ -1,46 +1,47 @@
-require 'active_record'
-require 'git_wrapper'
-require 'activerecord-import'
-require 'json'
-require 'easy_diff'
-
-require 'active_git/version'
-require 'active_git/synchronizer'
-require 'active_git/synchronization_error'
-require 'active_git/events/db_event'
-require 'active_git/events/db_create'
-require 'active_git/events/db_update'
-require 'active_git/events/db_delete'
-require 'active_git/events/db_delete_all'
-require 'active_git/events/file_event'
-require 'active_git/events/file_save'
-require 'active_git/events/file_delete'
-require 'active_git/events/folder_remove'
-require 'active_git/active_record_extension'
-require 'active_git/configuration'
-require 'active_git/commands'
-
-module ActiveGit
-  extend Commands
-
-  def self.configuration
-    @@configuration ||= Configuration.new
-  end
-
-  def self.configure
-    yield(configuration)
-  end
-
-  def self.models
-    @@models ||= []
-  end
-
-  def self.repository
-    @repository = GitWrapper::Repository.new(ActiveGit.configuration.working_path) if @repository.nil? || @repository.location != ActiveGit.configuration.working_path
-    @repository
-  end
-
-end
-
-ActiveRecord::Base.send :extend, ActiveGit::ActiveRecord::ClassMethods
-
+require 'active_record'
+require 'git_wrapper'
+require 'activerecord-import'
+require 'json'
+require 'easy_diff'
+
+require 'active_git/version'
+require 'active_git/synchronizer'
+require 'active_git/synchronization_error'
+require 'active_git/events/db_event'
+require 'active_git/events/db_create'
+require 'active_git/events/db_update'
+require 'active_git/events/db_delete'
+require 'active_git/events/db_delete_all'
+require 'active_git/events/file_event'
+require 'active_git/events/file_save'
+require 'active_git/events/file_delete'
+require 'active_git/events/folder_remove'
+require 'active_git/active_record_extension'
+require 'active_git/configuration'
+require 'active_git/commands'
+require 'active_git/inflector'
+
+module ActiveGit
+  extend Commands
+
+  def self.configuration
+    @@configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+
+  def self.models
+    @@models ||= []
+  end
+
+  def self.repository
+    @repository = GitWrapper::Repository.new(ActiveGit.configuration.working_path) if @repository.nil? || @repository.location != ActiveGit.configuration.working_path
+    @repository
+  end
+
+end
+
+ActiveRecord::Base.send :extend, ActiveGit::ActiveRecord::ClassMethods
+

data/lib/active_git/active_record_extension.rb

@@ -1,50 +1,35 @@
-module ActiveGit
-  module ActiveRecord
-
-    module ClassMethods
-
-      def git_versioned
-        ActiveGit.models << self
-
-        after_save do |record|
-          Synchronizer.synchronize FileSave.new(record)
-        end
-
-        after_destroy do |record|
-          Synchronizer.synchronize FileDelete.new(record)
-        end
-
-        def git_folder
-          "#{ActiveGit.configuration.working_path}/#{table_name}"
-        end
-
-        def from_json(json)
-          record = self.new
-          hash = json.is_a?(Hash) ? json : JSON.parse(json)
-          hash.each do |attr, value|
-            if record.respond_to? "#{attr}="
-              if self.columns_hash[attr].type == :datetime
-                record.send("#{attr}=", Time.parse(value).utc)
-              else
-                record.send("#{attr}=", value)
-              end
-            end
-          end
-          record
-        end
-
-        include InstanceMethods
-      end
-
-    end
-
-    module InstanceMethods
-
-      def git_file
-        "#{self.class.git_folder}/#{id}.json"
-      end
-
-    end
-
-  end
+module ActiveGit
+  module ActiveRecord
+
+    module ClassMethods
+
+      def git_versioned
+        ActiveGit.models << self
+
+        after_save do |record|
+          Synchronizer.synchronize FileSave.new(record)
+        end
+
+        after_destroy do |record|
+          Synchronizer.synchronize FileDelete.new(record)
+        end
+
+        def from_json(json)
+          record = self.new
+          hash = json.is_a?(Hash) ? json : JSON.parse(json)
+          hash.each do |attr, value|
+            if record.respond_to? "#{attr}="
+              if self.columns_hash[attr].type == :datetime
+                record.send("#{attr}=", Time.parse(value).utc)
+              else
+                record.send("#{attr}=", value)
+              end
+            end
+          end
+          record
+        end
+      end
+
+    end
+  end
 end

data/lib/active_git/commands.rb

@@ -1,147 +1,147 @@
-module ActiveGit
-  module Commands
-
-    GitWrapper::Repository.instance_methods(false).each do |method|
-      define_method method do |*args, &block|
-        repository.send method, *args, &block
-      end
-    end
-
-    def dump_db(*models)
-      events = (Dir["#{ActiveGit.configuration.working_path}/*"] - ActiveGit.models.map(&:git_folder)).map do |folder|
-        FolderRemove.new(folder)
-      end
-
-      (models.any? ? models : ActiveGit.models).each do |model|
-        events << FolderRemove.new(model.git_folder)
-        events = events + model.all.map { |r| FileSave.new r }
-      end
-
-      Synchronizer.synchronize events
-    end
-
-    def load_files(*models)
-      events = []
-
-      (models.any? ? models : ActiveGit.models).each do |model|
-        events << DbDeleteAll.new(model)
-        Dir.glob("#{model.git_folder}/*.json").each do |file_name|
-          events << DbCreate.new(file_name)
-        end
-      end
-
-      Synchronizer.synchronize events
-    end
-
-    def commit_all(message, options={})
-      add_all
-      commit(message, options)
-    end
-
-    def pull(remote='origin', branch='master')
-      fetch remote
-      merge "#{remote}/#{branch}"
-    end
-
-    def merge(commit)
-      last_log = log.first
-      diffs = diff_reverse commit unless last_log
-
-      unless repository.merge(commit)
-        resolve_conflicts
-        diffs = diff 'HEAD'
-        commit_all 'Resolve conflicts'
-      end
-
-      diffs ||= repository.diff(last_log.commit_hash)
-      begin
-        synchronize_diffs diffs
-      rescue => e
-        ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
-        reset last_log.commit_hash
-        return false
-      end
-
-      true
-    end
-
-    def conflicts
-      status.select { |e| e.status == :merge_conflict }.map { |e| e.file_name }
-    end
-
-    def resolve_conflicts
-      json_parse = Proc.new do |text|
-        text.present? ? JSON.parse(text) : {}
-      end
-
-      events = conflicts.map do |file_name|
-        base = json_parse.call(show_base(file_name))
-        mine = json_parse.call(show_mine(file_name))
-        theirs = json_parse.call(show_theirs(file_name))
-
-        r_diff, a_diff = base.easy_diff(mine)
-        merge = theirs.easy_unmerge(r_diff).easy_merge(a_diff)
-
-        model = File.dirname(file_name).split(/\/|\\/).pop.classify.constantize
-
-        FileSave.new(model.from_json(merge))
-      end
-
-      Synchronizer.synchronize events
-    end
-
-    def checkout(commit, new_branch=nil)
-      current = current_branch
-      diffs = repository.diff_reverse commit
-      if repository.checkout(commit.split('/').last, new_branch)
-        begin
-          synchronize_diffs diffs
-        rescue SynchronizationError => e
-          ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
-          repository.checkout current
-          return false
-        end
-        true
-      else
-        false
-      end
-    end
-
-    def reset(commit='HEAD')
-      diffs = diff_reverse commit
-      if repository.reset mode: :hard, commit: commit
-        begin
-          synchronize_diffs diffs
-        rescue SynchronizationError => e
-          ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
-          #TODO: Rollback reset
-          return false
-        end
-        true
-      else
-        false
-      end
-    end
-
-    private
-
-    def synchronize_diffs(diffs)
-      events = diffs.map do |d|
-        file_name = "#{location}/#{d.file_name}"
-
-        if d.status == :new_file
-          DbCreate.new file_name
-        elsif [:modified, :renamed, :copied].include? d.status
-          DbUpdate.new file_name
-        elsif d.status == :deleted
-          DbDelete.new file_name
-        else
-          raise "Unexpected file status [#{d.status}]"
-        end
-      end
-
-      Synchronizer.synchronize events
-    end
-
-  end
+module ActiveGit
+  module Commands
+
+    GitWrapper::Repository.instance_methods(false).each do |method|
+      define_method method do |*args, &block|
+        repository.send method, *args, &block
+      end
+    end
+
+    def dump_db(*models)
+      events = (Dir["#{ActiveGit.configuration.working_path}/*"] - ActiveGit.models.map { |m| Inflector.dirname(m) }).map do |folder|
+        FolderRemove.new(folder)
+      end
+
+      (models.any? ? models : ActiveGit.models).each do |model|
+        events << FolderRemove.new(Inflector.dirname(model))
+        events = events + model.all.map { |r| FileSave.new r }
+      end
+
+      Synchronizer.synchronize events
+    end
+
+    def load_files(*models)
+      events = []
+
+      (models.any? ? models : ActiveGit.models).each do |model|
+        events << DbDeleteAll.new(model)
+        Dir.glob("#{Inflector.dirname(model)}/*.json").each do |file_name|
+          events << DbCreate.new(file_name)
+        end
+      end
+
+      Synchronizer.synchronize events
+    end
+
+    def commit_all(message, options={})
+      add_all
+      commit(message, options)
+    end
+
+    def pull(remote='origin', branch='master')
+      fetch remote
+      merge "#{remote}/#{branch}"
+    end
+
+    def merge(commit)
+      last_log = log.first
+      diffs = diff_reverse commit unless last_log
+
+      unless repository.merge(commit)
+        resolve_conflicts
+        diffs = diff 'HEAD'
+        commit_all 'Resolve conflicts'
+      end
+
+      diffs ||= repository.diff(last_log.commit_hash)
+      begin
+        synchronize_diffs diffs
+      rescue => e
+        ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
+        reset last_log.commit_hash
+        return false
+      end
+
+      true
+    end
+
+    def conflicts
+      status.select { |e| e.status == :merge_conflict }.map { |e| e.file_name }
+    end
+
+    def resolve_conflicts
+      json_parse = Proc.new do |text|
+        text.present? ? JSON.parse(text) : {}
+      end
+
+      events = conflicts.map do |file_name|
+        base = json_parse.call(show_base(file_name))
+        mine = json_parse.call(show_mine(file_name))
+        theirs = json_parse.call(show_theirs(file_name))
+
+        r_diff, a_diff = base.easy_diff(mine)
+        merge = theirs.easy_unmerge(r_diff).easy_merge(a_diff)
+
+        model = File.dirname(file_name).split(/\/|\\/).pop.classify.constantize
+
+        FileSave.new(model.from_json(merge))
+      end
+
+      Synchronizer.synchronize events
+    end
+
+    def checkout(commit, new_branch=nil)
+      current = current_branch
+      diffs = repository.diff_reverse commit
+      if repository.checkout(commit.split('/').last, new_branch)
+        begin
+          synchronize_diffs diffs
+        rescue SynchronizationError => e
+          ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
+          repository.checkout current
+          return false
+        end
+        true
+      else
+        false
+      end
+    end
+
+    def reset(commit='HEAD')
+      diffs = diff_reverse commit
+      if repository.reset mode: :hard, commit: commit
+        begin
+          synchronize_diffs diffs
+        rescue SynchronizationError => e
+          ActiveGit.configuration.logger.error "[ActiveGit] #{e}"
+          #TODO: Rollback reset
+          return false
+        end
+        true
+      else
+        false
+      end
+    end
+
+    private
+
+    def synchronize_diffs(diffs)
+      events = diffs.map do |d|
+        file_name = "#{location}/#{d.file_name}"
+
+        if d.status == :new_file
+          DbCreate.new file_name
+        elsif [:modified, :renamed, :copied].include? d.status
+          DbUpdate.new file_name
+        elsif d.status == :deleted
+          DbDelete.new file_name
+        else
+          raise "Unexpected file status [#{d.status}]"
+        end
+      end
+
+      Synchronizer.synchronize events
+    end
+
+  end
 end